chiark
/
gitweb
/
~ian
/
chiark-utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c72a0f4
)
cgi-fcgi-interp: new garbage collection approach, spec (more)
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 24 Mar 2016 22:03:07 +0000
(22:03 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Tue, 29 Mar 2016 18:32:50 +0000
(19:32 +0100)
cprogs/cgi-fcgi-interp.c
patch
|
blob
|
history
diff --git
a/cprogs/cgi-fcgi-interp.c
b/cprogs/cgi-fcgi-interp.c
index bfcfd9afe546e0719ceb519cf24cd2f7e7e1698a..602ffa62d274a8165a95b3ee65dfed0a911c478b 100644
(file)
--- a/
cprogs/cgi-fcgi-interp.c
+++ b/
cprogs/cgi-fcgi-interp.c
@@
-76,7
+76,7
@@
* ~/.cgi-fcgi-interp/<node>/
* and inside there uses these paths
* s<ident>
* ~/.cgi-fcgi-interp/<node>/
* and inside there uses these paths
* s<ident>
- *
g<inum>
+ *
l<ident> used to lock around garbage collection
*
* If -M<ident> is not specified then an initial substricg of the
* lowercase hex of the sha256 of the <script> (ie, our argv[1]) is
*
* If -M<ident> is not specified then an initial substricg of the
* lowercase hex of the sha256 of the <script> (ie, our argv[1]) is
@@
-100,10
+100,12
@@
* - stat the socket and check its timestamp
* if it is too old, unlink it
* - dup2 stderr, mark no cloexec
* - stat the socket and check its timestamp
* if it is too old, unlink it
* - dup2 stderr, mark no cloexec
- * - run cgi-fcgi -connect SOCKET \
- * cgi-fcgi-interp --stage2 <was-stderr> <socket> <interp> <script>
+ * - run cgi-fcgi -connect SOCKET \
+ * cgi-fcgi-interp -c<check-interval> \
+ * --stage2 <was-stderr> <socket> \
+ * <interp> <script>
*
*
- * -
E<was-stderr>
does this:
+ * -
-stage2
does this:
* - dup2 <was-stderr> to fd 2
* - open /dev/null and expect fd 1 (and if not, close it)
* - become a new process group
* - dup2 <was-stderr> to fd 2
* - open /dev/null and expect fd 1 (and if not, close it)
* - become a new process group