Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add support for CGI #618

Merged
merged 17 commits into from
Dec 9, 2015
Merged

add support for CGI #618

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d93a468
extract https://github.com/chansen/p5-net-fastcgi @ 28b0a27 at misc/p…
kazuho Dec 8, 2015
ba21cb8
implement daemon for running CGI scripts
kazuho Dec 8, 2015
a9f2c24
add example cgi
kazuho Dec 8, 2015
d91c934
set H2O_ROOT when spawning an external process
kazuho Dec 8, 2015
87e665a
close sockets, so that they would not leak to the CGI
kazuho Dec 8, 2015
73e32d6
add minimal test
kazuho Dec 8, 2015
150bda5
rewrite SCRIPT_FILENAME to full-path
kazuho Dec 8, 2015
da8564d
convert regen.sh to Makefile
kazuho Dec 8, 2015
cb87568
add POST test
kazuho Dec 8, 2015
bf95640
fix bugs in code handling request body
kazuho Dec 8, 2015
854ec33
encapusulate the daemon logic
kazuho Dec 8, 2015
14bd4ac
accept command-line option: --listen, --help
kazuho Dec 9, 2015
a740af0
add --max-workers=nnn option
kazuho Dec 9, 2015
3a51656
end-of-response should be notified using zero-length stream
kazuho Dec 9, 2015
1fbc8b5
do not report error for a valid behavior (closing the socket without …
kazuho Dec 9, 2015
7ce29bb
in the test CGI, emit to STDERR after closing STDOUT
kazuho Dec 9, 2015
b8cbd42
detect close of fcgi connection and terminate the CGI process
kazuho Dec 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
detect close of fcgi connection and terminate the CGI process
  • Loading branch information
@kazuho
kazuho committed Dec 9, 2015
commit b8cbd425b848c5685d054062f37ede6d3a32599e
10 changes: 10 additions & 0 deletions misc/fastcgi-cgi.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ sub handle_connection {
if $stdout_rfh;
vec($rin, fileno $stderr_rfh, 1) = 1
if $stderr_rfh;
vec($rin, fileno $sock, 1) = 1;
if (select($rin, undef, undef, undef) <= 0) {
next;
}
Expand All @@ -189,6 +190,15 @@ sub handle_connection {
transfer($sock, FCGI_STDERR, $cur_req_id, $stderr_rfh)
or undef $stderr_rfh;
}
if (vec($rin, fileno $sock, 1)) {
# atually means that the client has closed the connection, terminate the CGI process the same way apache does
kill 'TERM', $pid;
$SIG{ALRM} = sub {
kill 'KILL', $pid;
};
alarm 3;
last;
}
}

# close (closing without sending FCGI_END_REQUEST indicates to the client that the connection is not persistent)
Expand Down
10 changes: 10 additions & 0 deletions share/h2o/fastcgi-cgi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ sub handle_connection {
if $stdout_rfh;
vec($rin, fileno $stderr_rfh, 1) = 1
if $stderr_rfh;
vec($rin, fileno $sock, 1) = 1;
if (select($rin, undef, undef, undef) <= 0) {
next;
}
Expand All @@ -250,6 +251,15 @@ sub handle_connection {
transfer($sock, FCGI_STDERR, $cur_req_id, $stderr_rfh)
or undef $stderr_rfh;
}
if (vec($rin, fileno $sock, 1)) {
# atually means that the client has closed the connection, terminate the CGI process the same way apache does
kill 'TERM', $pid;
$SIG{ALRM} = sub {
kill 'KILL', $pid;
};
alarm 3;
last;
}
}

# close (closing without sending FCGI_END_REQUEST indicates to the client that the connection is not persistent)
Expand Down