- 08 Jan, 2006 1 commit
-
-
Garrett Rooney authored
there's no reason that request ids wouldn't be matching up. Until we see an example of a request id mismatch error that is absolutely not caused by an error in our parsing of the FastCGI protocol, we should be able to go back to treating mismatches as errors. * modules/proxy/mod_proxy_fcgi.c (dispatch): Remove #ifdef that turned off treating rid mismatches as fatal errors. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@366985 13f79535-47bb-0310-9956-ffa450edef68
-
- 07 Jan, 2006 2 commits
-
-
Garrett Rooney authored
* modules/proxy/mod_proxy_fcgi.c (fcgi_do_request): We're no longer just handling STDIN in this call... git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@366927 13f79535-47bb-0310-9956-ffa450edef68
-
Garrett Rooney authored
used a struct to hold the data when writing it, but read it into an array when reading it. This meant that the knowledge of the header layout was in two places. This change moves both sides to using an array, and adds a set of #defines for the offsets into the array, so neither side can get out of sync. This also moves the logic for setting up the content length bytes into one place, where before we had it in several places. * modules/proxy/fcgi_protocol.h (fcgi_header): Removed. (FCGI_HDR_VERSION_OFFSET, FCGI_HDR_TYPE_OFFSET, FCGI_HDR_REQUEST_ID_B1_OFFSET, FCGI_HDR_REQUEST_ID_B0_OFFSET, FCGI_HDR_CONTENT_LEN_B1_OFFSET, FCGI_HDR_CONTENT_LEN_B0_OFFSET, FCGI_HDR_PADDING_LEN_OFFSET, FCGI_HDR_RESERVED_OFFSET): New constants. * modules/proxy/mod_proxy_fcgi.c (fill_in_header): Take an array, not a struct pointer, and handle all the contents of the header, not just the type and request id. (send_begin_request, send_environment, dispatch): Update for new way to fill in headers. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@366926 13f79535-47bb-0310-9956-ffa450edef68
-
- 06 Jan, 2006 2 commits
-
-
Garrett Rooney authored
makes everything consistent with regard to spacing, line length, etc. * modules/proxy/mod_proxy_fcgi.c (dump_header_to_log, dispatch, proxy_fcgi_handler): Clean up. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@366414 13f79535-47bb-0310-9956-ffa450edef68
-
Garrett Rooney authored
cleanup, but at least it keeps us from messing up the stream when we get stuff written to stderr by the fastcgi process. * modules/proxy/mod_proxy_fcgi.c (dispatch): Move the plen recv down after the switch, so it gets done for all cases that have padding. Read data for the FCGI_STDERR case just like we do for FCGI_STDOUT, but write it to the log instead of sending it to the client. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@366412 13f79535-47bb-0310-9956-ffa450edef68
-
- 05 Jan, 2006 1 commit
-
-
Garrett Rooney authored
down on some of the crazy verbose logging, since this seems to be the problem we were trying to find. * modules/proxy/mod_proxy_fcgi.c (dispatch): Remove really verbose logging, move reading of the padding bytes down to the end of the FCGI_STDOUT case. Tested By: iholsman git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@366086 13f79535-47bb-0310-9956-ffa450edef68
-
- 04 Jan, 2006 3 commits
-
-
Ian Holsman authored
right now it looks like for large requests it isn't reading enough off the wire. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@365863 13f79535-47bb-0310-9956-ffa450edef68
-
Ian Holsman authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@365824 13f79535-47bb-0310-9956-ffa450edef68
-
Garrett Rooney authored
people have seen where rid != request_id. * modules/proxy/mod_proxy_fcgi.c (dispatch): Stop initializing things we're just going to assign over them later, initialize all of the rid and clen variables, and fix a warning from passing an unsigned char array into apr_socket_recv by adding a cast to char *. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@365813 13f79535-47bb-0310-9956-ffa450edef68
-
- 03 Jan, 2006 2 commits
-
-
Jim Jagielski authored
struct, and assuming that it's following the correct format, we should be extra careful when rec'ing the header info, and ensure that each byte is followed one after another. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@365698 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@365643 13f79535-47bb-0310-9956-ffa450edef68
-
- 02 Jan, 2006 3 commits
-
-
Jim Jagielski authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@365432 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
other FCGI modules (like mod_fcgid) don't bother to test the return request_id... git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@365387 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
be explicit about it. Also removes the need to clean up the readbuf again, and any potential for confusion on what we are doing ;) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@365376 13f79535-47bb-0310-9956-ffa450edef68
-
- 30 Dec, 2005 2 commits
-
-
Paul Querna authored
When we get some kind of write failure or protocol problem, close the current socket, since we don't know if we are left in a working state. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@360174 13f79535-47bb-0310-9956-ffa450edef68
-
Paul Querna authored
* modules/proxy/mod_proxy_fcgi.c (proxy_fcgi_baton_t): New struct, holds per-connection data. (dispatch): Set buckets aside into the scratch pool in the baton, clearing it when we pass the baton on. Deal with the case where the content length is larger than AP_IOBUFSIZE. Consistently use sizeof when referring to the length of buffers. Explicitly null terminate the read buffer after reading. Read the padding bytes in a second pass to simplify logic. (proxy_fcgi_handler): Create our baton and stash it in the connection's data member. Submitted By: Garrett Rooney <rooneg apache.org> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@360164 13f79535-47bb-0310-9956-ffa450edef68
-
- 29 Dec, 2005 1 commit
-
-
Paul Querna authored
back end fastcgi process. This includes switching to a poll based dispatch loop that handles interleaved reads and writes. * modules/proxy/mod_proxy_fcgi.c (MAX_INPUT_BYTES): Removed, we now use AP_IOBUFSIZE. (handle_headers): New helper function for parsing headers out of the response data. (send_stdin): Removed, code incorporated into dispatch routine. (dispatch): New, poll based dispatch loop that handles both reads and writes. (fcgi_do_request): Call new dispatch routine. Return OK if we get through without errors. Submitted By: Garrett Rooney <rooneg apache.org> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@359901 13f79535-47bb-0310-9956-ffa450edef68
-
- 27 Dec, 2005 1 commit
-
-
Paul Querna authored
process. * modules/proxy/mod_proxy_fcgi.c (fill_in_header): New helper function. (send_begin_request, send_environment): Fix formatting, use fill_in_header. (MAX_INPUT_BYTES): New constant. (send_stdin): New function. (fcgi_do_request): Send the body of the request via send_stdin. Submitted By: Garrett Rooney <rooneg apache.org> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@359183 13f79535-47bb-0310-9956-ffa450edef68
-
- 26 Dec, 2005 1 commit
-
-
Paul Querna authored
to mod_proxy_fcgi. * modules/proxy/mod_proxy_fcgi.c (proxy_fcgi_canon): Remove unused variables, wrap a long line. (send_begin_request): Helper function to send the FCGI_BEGIN_REQUEST message. (send_environment): Helper function to send the environment. (fcgi_do_request): Use send_begin_request and send_environment. Submitted By: Garrett Rooney <rooneg apache.org> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@359043 13f79535-47bb-0310-9956-ffa450edef68
-
- 23 Dec, 2005 2 commits
-
-
Paul Querna authored
- Add basic structures, defined in the FastCGI Spec. - Write a request to the server. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@358719 13f79535-47bb-0310-9956-ffa450edef68
-
Paul Querna authored
ProxyPass / fcgi-tcp://localhost:9000/, and we will try to connect with TCP. I still need to write supporting code to send/recv the FastCGI protocol packets. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@358690 13f79535-47bb-0310-9956-ffa450edef68
-
- 18 Dec, 2005 2 commits
-
-
Paul Querna authored
Create a templte for a FastCGI proxy backend. It does not actually do much yet, but is the base for more development. I hope to work on this more tomorrow. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@357444 13f79535-47bb-0310-9956-ffa450edef68
-
Paul Querna authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@357431 13f79535-47bb-0310-9956-ffa450edef68
-
- 17 Dec, 2005 1 commit
-
-
Ruediger Pluem authored
flush bucket is pre- and postfixed by data buckets in the brigade. Submitted by: Ruediger Pluem Reviewed by: Justin Erenkrantz, Joe Orton, Jim Jagielski git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357328 13f79535-47bb-0310-9956-ffa450edef68
-
- 16 Dec, 2005 9 commits
-
-
William A. Rowe Jr authored
Add the module details for our /base:@...,mod_foo.so magic git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357234 13f79535-47bb-0310-9956-ffa450edef68
-
William A. Rowe Jr authored
A more generic explanation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357231 13f79535-47bb-0310-9956-ffa450edef68
-
William A. Rowe Jr authored
Test _NMAKE_VER define to determine nmake -nologo behavior, and use $(MAKEOPT) -f syntax throughout to avoid problems on mingw, borland, etc. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357226 13f79535-47bb-0310-9956-ffa450edef68
-
William A. Rowe Jr authored
New Win32 9x efforts are a nonstarter. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357223 13f79535-47bb-0310-9956-ffa450edef68
-
William A. Rowe Jr authored
Not Applicable anymore git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357222 13f79535-47bb-0310-9956-ffa450edef68
-
Joe Orton authored
pointer not 0. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357170 13f79535-47bb-0310-9956-ffa450edef68
-
Joe Orton authored
--enable-modules to build an httpd with no optional modules enabled. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357168 13f79535-47bb-0310-9956-ffa450edef68
-
Joe Orton authored
* modules/mappers/mod_imagemap.c (imap_url): Escape the referer. * server/util.c (ap_escape_html): Escape the " character. Submitted by: mjc Reviewed by: fielding, jorton git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357161 13f79535-47bb-0310-9956-ffa450edef68
-
Joe Orton authored
the brigade if the pass delimiter is reached and not for any flush delimiter; allows creating brigades with a flush bucket in the middle. Fail if ap_pass_brigade() fails. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357156 13f79535-47bb-0310-9956-ffa450edef68
-
- 15 Dec, 2005 2 commits
-
-
Jean-Frederic Clere authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357044 13f79535-47bb-0310-9956-ffa450edef68
-
Jean-Frederic Clere authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357022 13f79535-47bb-0310-9956-ffa450edef68
-
- 14 Dec, 2005 5 commits
-
-
William A. Rowe Jr authored
Mirror Makefile.win from the GUI environment. The path here must be explicit to help point the debugger at the resulting, installed binaries. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356853 13f79535-47bb-0310-9956-ffa450edef68
-
William A. Rowe Jr authored
Revert 1/2 of my last commit, keep Apache2 as the default name so we don't need to keep syncing this with releases. Retain the other 1/2 - a better message since apr's must be in the build tree srclib/ not the install target srclib/. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356852 13f79535-47bb-0310-9956-ffa450edef68
-
William A. Rowe Jr authored
Keep default INSTDIR out of a 2.0, 2.2 tree when working in svn trunk git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356844 13f79535-47bb-0310-9956-ffa450edef68
-
Andre Malo authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356801 13f79535-47bb-0310-9956-ffa450edef68
-
Andre Malo authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356799 13f79535-47bb-0310-9956-ffa450edef68
-