1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00

134 Commits

Author SHA1 Message Date
Jeff Trawick
2809f49e71 Use ap_log_rdata() to dump the FastCGI header, axing a bunch
of custom data dumping code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1525281 13f79535-47bb-0310-9956-ffa450edef68
2013-09-21 18:59:47 +00:00
Jeff Trawick
76dc5d2055 Borrow a fix from mod_authnz_fcgi:
mod_proxy_fcgi: Handle reading protocol data that is split between
packets.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1525280 13f79535-47bb-0310-9956-ffa450edef68
2013-09-21 18:48:20 +00:00
Jeff Trawick
6a64fadd63 Bring some envvar flexibility from mod_authnz_fcgi to mod_proxy_fcgi:
mod_proxy_fcgi: Remove 64K limit on encoded length of all envvars.
An individual envvar with an encoded length of more than 16K will be
omitted.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1525276 13f79535-47bb-0310-9956-ffa450edef68
2013-09-21 18:29:57 +00:00
Jan Kaluža
40538bb4be Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1524368 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 11:18:02 +00:00
Jeff Trawick
67b1aa4bd8 Switch from private FastCGI protocol handling to util_fcgi API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1523281 13f79535-47bb-0310-9956-ffa450edef68
2013-09-14 18:14:49 +00:00
Guenter Knauf
3400ec7e6a Fix some compiler warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1500423 13f79535-47bb-0310-9956-ffa450edef68
2013-07-07 13:04:39 +00:00
Stefan Fritsch
555c89745f If there is an error reading the headers from the backend,
send an error to the client


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1311172 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 09:28:14 +00:00
Jim Jagielski
732f60dc2c Handle cases, esp when using mod_proxy_fcgi, when we do not
want SCRIPT_FILENAME to include the query string.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1242351 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 15:07:22 +00:00
Stefan Fritsch
92e366007c Add lots of unique tags to error log messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209766 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 23:02:04 +00:00
Stefan Fritsch
8ec7f5c5bf great proxy logging cleanup:
* remove "proxy:", "FCGI", etc. prefixes and pid which are now
    included in the error log format

  * propagate frontend request's logconfig to backend request
    
  * use ap_log_rerror where possible
    
  * remove obsolete APLOG_NOERRNO


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203859 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 21:41:09 +00:00
Rainer Jung
219333e4bf Silence compiler warning about signedness differences.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199435 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 20:14:12 +00:00
Stefan Fritsch
1951a037bf More cleanup: Expand tabs and some more indentation fixes
No functional change


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174929 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 18:08:42 +00:00
Jim Jagielski
427c85bd23 Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:39:32 +00:00
Stefan Fritsch
beb3ea9c11 Add more (trace) logging to the ap_scan_script_header*() functions
Add ap_scan_script_header*_ex() functions that take a module index for
logging.
Make mod_cgi, mod_cgid, mod_proxy_fcgi, mod_proxy_scgi, mod_isapi use the
new functions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1147493 13f79535-47bb-0310-9956-ffa450edef68
2011-07-16 21:53:18 +00:00
Jim Jagielski
d80376cdab *) mod_proxy_fcgi: Add support for 'ProxyErrorOverride on' PR 50913.
[Mark Montague <mark catseye.org>, Jim Jagielski]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1087863 13f79535-47bb-0310-9956-ffa450edef68
2011-04-01 19:25:23 +00:00
Jim Jagielski
b6debecc34 Fix/workaround for BUGZ PR 50851.
By default, mod_proxy_fcgi with not create PATH_INFO, unless
specifically told to.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1078089 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 18:31:17 +00:00
Jim Jagielski
201bbd1ba9 More movement to shared stuff...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1058623 13f79535-47bb-0310-9956-ffa450edef68
2011-01-13 15:58:57 +00:00
Jeff Trawick
a1a3d3820c mark connection for close after the return from
ap_proxy_determine_connection()

before this revision: if there was an existing connection,
ap_proxy_determine_connection() would close it but then clear
the close flag, so it didn't get closed by
ap_proxy_release_connection()

thus, if this child process doesn't use the connection for a
while, the application could be stuck in read() for the same
while

after: ap_proxy_release_connection() will close it after the
request completes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032345 13f79535-47bb-0310-9956-ffa450edef68
2010-11-07 18:54:44 +00:00
Jeff Trawick
2c8ec34cd0 avoid duplicate end-of-stdin header
avoid passing {iov_base = &buffer, iov_len=0} to writev() when
there is no stdin data


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032266 13f79535-47bb-0310-9956-ffa450edef68
2010-11-07 12:35:32 +00:00
Jeff Trawick
91ab95835f repeat apr_poll() while EINTR
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031613 13f79535-47bb-0310-9956-ffa450edef68
2010-11-05 15:04:37 +00:00
Stefan Fritsch
aa576071af - Remove a load of unused variables (or variables that are set but never read).
- Move some declarations into the correct #ifdef scope.

I couldn't compile/test netware, but the changes look obvious enough.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@982016 13f79535-47bb-0310-9956-ffa450edef68
2010-08-03 19:45:21 +00:00
Stefan Fritsch
01b9f2e551 - Be less verbose at levels INFO and DEBUG in mod_proxy* and mod_ssl
- Add some trace logging to core and http


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951900 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 17:07:12 +00:00
Stefan Fritsch
ebb62867fb Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 16:59:50 +00:00
Jeff Trawick
1477c61e6f odd assortment of spelling fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@947651 13f79535-47bb-0310-9956-ffa450edef68
2010-05-24 14:26:49 +00:00
Jim Jagielski
5ee4ddf065 use what we know
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@816361 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 19:58:40 +00:00
Jim Jagielski
5ff697d52a Add comment on why the cast is safe and does not result
in lost info.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@686786 13f79535-47bb-0310-9956-ffa450edef68
2008-08-18 15:30:23 +00:00
Jim Jagielski
2424180c00 We are really looking for the scheme here... so be consistant
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@686785 13f79535-47bb-0310-9956-ffa450edef68
2008-08-18 15:26:46 +00:00
Jim Jagielski
39fa5f326a and make mod_proxy_fcgi also nocanon aware
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@649170 13f79535-47bb-0310-9956-ffa450edef68
2008-04-17 16:24:16 +00:00
Jean-Frederic Clere
d7a8b67102 Otherwise it doesn't compile on HP-UX when using cc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@590038 13f79535-47bb-0310-9956-ffa450edef68
2007-10-30 11:21:11 +00:00
Ruediger Pluem
18748acaa6 * Followup patch on r427959:
Also substitute close_on_recycle with close in mod_proxy_fcgi. This makes
  mod_proxy_fcgi compile again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428152 13f79535-47bb-0310-9956-ffa450edef68
2006-08-02 21:19:09 +00:00
Roy T. Fielding
de659cbed0 update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 20:33:53 +00:00
Garrett Rooney
4213de4712 Make the logging in mod_proxy_fcgi more consistent.
* modules/proxy/mod_proxy_fcgi.c
  (fcgi_do_request): Log errors as APLOG_ERR.
  (proxy_fcgi_handler): Log debug info as APLOG_DEBUG.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@408520 13f79535-47bb-0310-9956-ffa450edef68
2006-05-21 23:08:56 +00:00
Garrett Rooney
30a1824be9 Fix compile time warnings.
Pointed out by: jorton

* modules/proxy/mod_proxy_fcgi.c
  Add include of util_script.h to pick up some function prototypes.
  (send_begin_request): Initialize the reserved bytes in the request
   body to zero.
  (dispatch): Use APR_SIZE_T_FMT instead of %d when logging an apr_size_t.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397968 13f79535-47bb-0310-9956-ffa450edef68
2006-04-28 17:50:56 +00:00
Garrett Rooney
ca55328af7 Merge the fcgi-proxy-dev branch to trunk, adding a FastCGI back end for
mod_proxy.  This log message is just a summary of the changes, for the
full original log messages see r357431:393955 in branches/fcgi-proxy-dev.

* modules/proxy/mod_proxy_fcgi.c: New file, holds the impementation of
  our new fcgi backend for mod_proxy.

* modules/proxy/fcgi_protocol.h: New file, holds constants and structures
  for the fcgi protocol.

* modules/proxy/mod_proxy_balancer.c
  (proxy_balancer_canon): Set up r->path_info, so the PATH_INFO env
   variable is correctly passed on to balancer workers.

* modules/proxy/config.m4: Build the new mod_proxy_fcgi module.

* support: Add fcgistarter to svn:ignore.

* support/Makefile.in: Build the new fcgistarter program.

* support/fcgistarter.c: New program, a helper for starting fcgi worker
  processes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@396063 13f79535-47bb-0310-9956-ffa450edef68
2006-04-22 03:44:05 +00:00