delta/apache/httpd.git/server/util_script.c, branch 2.2.x github.com: apache/httpd.git Merge r1753228 from trunk: 2016-08-16T23:32:35+00:00 Yann Ylavic ylavic@apache.org 2016-08-16T23:32:35+00:00 b4dc46030c57751ab9a46202aa08254424d2c48a httpoxy workarounds, first draft patch as published for all 2.2.x+ sources Submitted by: Dominic Scheirlinck <dominic vendhq.com>, ylavic Reviewed by: wrowe, rpluem, ylavic git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1756564 13f79535-47bb-0310-9956-ffa450edef68 
httpoxy workarounds, first draft patch as published for all 2.2.x+ sources

Submitted by: Dominic Scheirlinck <dominic vendhq.com>, ylavic
Reviewed by: wrowe, rpluem, ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1756564 13f79535-47bb-0310-9956-ffa450edef68
* core: Fix error handling in ap_scan_script_header_err_brigade() if there 2012-08-21T17:42:49+00:00 William A. Rowe Jr wrowe@apache.org 2012-08-21T17:42:49+00:00 78e47d923a3e444ac2ee729a679c2b938790a7f6 is no EOS bucket in the brigade: Also don't loop if there is a timeout when discarding the script output. Thanks to Edgar Frank for the analysis. Note CHANGES entry omits mention of non-2.2 mod_proxy_fcgi Backports: r1311174 Submitted by: sf Reviewed by: rjung, trawick, wrowe git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1375683 13f79535-47bb-0310-9956-ffa450edef68 
  is no EOS bucket in the brigade:
  Also don't loop if there is a timeout when discarding the script output.
  Thanks to Edgar Frank for the analysis.

  Note CHANGES entry omits mention of non-2.2 mod_proxy_fcgi

Backports: r1311174
Submitted by: sf
Reviewed by: rjung, trawick, wrowe



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1375683 13f79535-47bb-0310-9956-ffa450edef68
Merge r1244211: 2012-07-03T19:53:09+00:00 Stefan Fritsch sf@apache.org 2012-07-03T19:53:09+00:00 27bef2405f1ed7fe9231a1596147a24ff972329d Make sure the getsfunc_*() functions used by ap_scan_script_header_err*() NUL-terminate the resulting string, even in case of an error. mod_cgi and mod_cgid try to log incomplete output from CGI scripts. Reviewed by: sf, covener, wrowe git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1356894 13f79535-47bb-0310-9956-ffa450edef68 
    Make sure the getsfunc_*() functions used by ap_scan_script_header_err*()
    NUL-terminate the resulting string, even in case of an error. mod_cgi and
    mod_cgid try to log incomplete output from CGI scripts.

Reviewed by: sf, covener, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1356894 13f79535-47bb-0310-9956-ffa450edef68
Grab these from trunk: 2011-05-06T13:51:38+00:00 Jeff Trawick trawick@apache.org 2011-05-06T13:51:38+00:00 f4286c21a96d407a4c9d5d31f262808830f8f176 r1091079 fix const-ness mismatch in call to mpm_nt_eventlog_stderr_open() r1091076 match expected type of arg to StartService() r1089600 cleanups to function signatures, prototypes, visibility r1089605 yank some dead code and variables (only a small part of the patch to service.c was applicable) r1089614 Log the OS socket (int) instead of the apr_socket_t *. r1089624 can't format time_t with %d; cast this small interval time to int r1089639 HANDLE is PVOID which is reasonably formatted by %pp, but not by %d r1089659 format string fixes: DWORD is unsigned long and needs %lu instead of %d or %i r1089688 axe ap_registry_get_server_root(), which seems to have been unused after httpd 1.3 r1089689 get prototype for ap_os_create_privileged_process() r1089690 axe a couple of unused vars, mark a function as static r1089857-equivalent Fix format string for pid in "Child: <pid>" messages r1040220 subset (fuangk) Fixed some win32 types. mod_win32.c changes aren't needed "DWORD tid" is "unsigned tid" due to use of different thread create fn r1025492 subset (fuangk) get prototypes for time(), _beginthreadex() remove cast from apr_getopt_init() call to fix warning, fix const-ness of service_name r983412 (fuangk) ap_regkey.c: Added casts to silent compiler warnings. No direct trunk equiv since code was rewritten or removed: . util_script.c warnings for assignent+truth value . missing const from signature of set_disable_acceptex() Reviewed by: wrowe, covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100216 13f79535-47bb-0310-9956-ffa450edef68 
r1091079 fix const-ness mismatch in call to mpm_nt_eventlog_stderr_open()
r1091076 match expected type of arg to StartService()
r1089600 cleanups to function signatures, prototypes, visibility
r1089605 yank some dead code and variables
         (only a small part of the patch to service.c was applicable)
r1089614 Log the OS socket (int) instead of the apr_socket_t *.
r1089624 can't format time_t with %d; cast this small interval time to int
r1089639 HANDLE is PVOID which is reasonably formatted by %pp, but not by %d
r1089659 format string fixes: DWORD is unsigned long and needs %lu instead of %d or %i
r1089688 axe ap_registry_get_server_root(), which seems to have been unused after httpd 1.3
r1089689 get prototype for ap_os_create_privileged_process()
r1089690 axe a couple of unused vars, mark a function as static
r1089857-equivalent Fix format string for pid in "Child: <pid>" messages
r1040220 subset (fuangk) Fixed some win32 types.
         mod_win32.c changes aren't needed
         "DWORD tid" is "unsigned tid" due to use of different thread create fn
r1025492 subset (fuangk)  get prototypes for time(), _beginthreadex()
         remove cast from apr_getopt_init() call to fix warning,
         fix const-ness of service_name
r983412 (fuangk) ap_regkey.c: Added casts to silent compiler warnings.

No direct trunk equiv since code was rewritten or removed:
. util_script.c warnings for assignent+truth value
. missing const from signature of set_disable_acceptex()

Reviewed by: wrowe, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100216 13f79535-47bb-0310-9956-ffa450edef68
Merge r729586, r732504 from trunk: 2009-01-12T13:59:56+00:00 Jim Jagielski jim@apache.org 2009-01-12T13:59:56+00:00 d066ba3e9291dd6922df03ab5e90ee17c94fac30 CGI: return 504 (Gateway timeout) rather than 500 when a script times out before returning status line/headers. PR 42190 Improve canned 504 error message in the light of r729586 and covener's comment. Submitted by: niq Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@733757 13f79535-47bb-0310-9956-ffa450edef68 
CGI: return 504 (Gateway timeout) rather than 500 when a script
times out before returning status line/headers.
PR 42190


Improve canned 504 error message in the light of r729586 and covener's comment.

Submitted by: niq
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@733757 13f79535-47bb-0310-9956-ffa450edef68
merge from trunk (but preserve ap_get_server_version()): 2006-09-15T13:19:25+00:00 Jeff Trawick trawick@apache.org 2006-09-15T13:19:25+00:00 492e695c40e714d1973a7bb0569a584f4f2373dc *) The full server version information is now included in the error log at startup as well as server status reports, irrespective of the setting of the ServerTokens directive. ap_get_server_version() is now deprecated, and is replaced by ap_get_server_banner() and ap_get_server_description(). Reviewed by: rpluem, jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@446606 13f79535-47bb-0310-9956-ffa450edef68 
  *) The full server version information is now included in the error log at
     startup as well as server status reports, irrespective of the setting
     of the ServerTokens directive.  ap_get_server_version() is now 
     deprecated, and is replaced by ap_get_server_banner() and 
     ap_get_server_description().

Reviewed by: rpluem, jim



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@446606 13f79535-47bb-0310-9956-ffa450edef68
update license header text 2006-07-12T03:38:44+00:00 Roy T. Fielding fielding@apache.org 2006-07-12T03:38:44+00:00 ae1748a99f901a249de1f3eab52e35594b6d1a0b git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@421103 13f79535-47bb-0310-9956-ffa450edef68 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@421103 13f79535-47bb-0310-9956-ffa450edef68
Revert r395231 from the 2.2.x branch. This gets us back to the old place with regard to the copyright statements. 2006-04-22T01:53:06+00:00 Paul Querna pquerna@apache.org 2006-04-22T01:53:06+00:00 786089eef9a5ed532224599acc96e2ca5bb8bc61 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396056 13f79535-47bb-0310-9956-ffa450edef68 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396056 13f79535-47bb-0310-9956-ffa450edef68
Update the last year of copyright for the 2.2.x branch 2006-04-19T12:33:16+00:00 Colm MacCarthaigh colm@apache.org 2006-04-19T12:33:16+00:00 8ffd8c554bfbf342358e027f5fd9e67c66db5241 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@395231 13f79535-47bb-0310-9956-ffa450edef68 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@395231 13f79535-47bb-0310-9956-ffa450edef68
Fix PR#38070 2006-02-04T17:45:51+00:00 Nick Kew niq@apache.org 2006-02-04T17:45:51+00:00 5c9b5bc30b45dcfef356968398f2c2f7ef762586 Avoid server-driven negotiation when a script has sent a Status: header. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@374895 13f79535-47bb-0310-9956-ffa450edef68 
Avoid server-driven negotiation when a script has sent a Status: header.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@374895 13f79535-47bb-0310-9956-ffa450edef68