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

28 Commits

Author SHA1 Message Date
Rainer Jung
af14d158a3 Added many log numbers to log statements that
had none.

Those were not detected by the coccinelle script.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725485 13f79535-47bb-0310-9956-ffa450edef68
2016-01-19 12:02:41 +00:00
Christophe Jaillet
4fb2059a58 Silence a sparse warning about inconsistent indenting
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700318 13f79535-47bb-0310-9956-ffa450edef68
2015-08-31 19:47:12 +00:00
Rainer Jung
212cf7938c Fix crash in packet dump code of mod_proxy_ajp when
logging with LogLevel trace7 or trace8.

PR 53730


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1373898 13f79535-47bb-0310-9956-ffa450edef68
2012-08-16 16:05:21 +00:00
William A. Rowe Jr
33d94f3328 Cure size_t abuse, curse some recent code [recommit good bits from r1227852]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1227856 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 21:50:31 +00:00
William A. Rowe Jr
07e32f24db Revert a whole mess that was not ment to be committed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1227855 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 21:48:21 +00:00
William A. Rowe Jr
0d1f9f658a Cure size_t abuse, curse some recent code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1227852 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 21:43:24 +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
37e5132bd6 Fix compiler warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1153511 13f79535-47bb-0310-9956-ffa450edef68
2011-08-03 14:39:21 +00:00
Rainer Jung
3c52446a2b Slightly reorganize previously unused dump method.
Add AJP packet log method on top of dump method.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152451 13f79535-47bb-0310-9956-ffa450edef68
2011-07-30 10:56:41 +00:00
Jeff Trawick
f63c745050 axe some useless or debug-inhibiting error checking
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1075064 13f79535-47bb-0310-9956-ffa450edef68
2011-02-27 14:38:17 +00:00
Jeff Trawick
ae6a997ddf fix function name in log text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1074659 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 18:25:57 +00:00
Stefan Fritsch
6da4e2a55b Fix some compiler warnings:
- suggest braces around empty body in an 'if' statement
- comparison of unsigned expression >= 0 is always true
- comparison of unsigned expression < 0 is always false

Please review carefully.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@954641 13f79535-47bb-0310-9956-ffa450edef68
2010-06-14 20:55:59 +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
Joe Orton
193a30eea0 * modules/proxy/ajp_msg.c (ajp_msg_dump, ajp_msg_check_header,
asj_msg_copy): Fix format string warnings on x86_64.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@510522 13f79535-47bb-0310-9956-ffa450edef68
2007-02-22 14:12:14 +00:00
Jean-Frederic Clere
aab07de155 At support for ProxyIOBufferSize in AJP.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@467014 13f79535-47bb-0310-9956-ffa450edef68
2006-10-23 15:31:59 +00:00
Mladen Turk
02c70cf77e Make sure the error signature is logged as double
hex byte.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427951 13f79535-47bb-0310-9956-ffa450edef68
2006-08-02 10:42:07 +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
Jeff Trawick
3c4c74840d small cleanup of EBCDIC support in mod_proxy_ajp
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@409709 13f79535-47bb-0310-9956-ffa450edef68
2006-05-26 18:03:01 +00:00
Ruediger Pluem
3b5b0d5882 * Actually we are adding 3 bytes to the string (two for the length in front
and a \0 at the end) and not 2. So adjust the length check.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@409446 13f79535-47bb-0310-9956-ffa450edef68
2006-05-25 19:50:25 +00:00
Colm MacCarthaigh
dd95d7c37c Update the copyright year in all .c, .h and .xml files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:11:27 +00:00
Jim Jagielski
5061d9fa92 No functional Change: Removing trailing whitespace. This also
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:11:44 +00:00
Ruediger Pluem
a9d2ab75d0 * Fix PR37100 (SEGV in mod_proxy_ajp), by sending the data up the filter
chain immediately instead of spooling it completely before passing it
  to the filter chain. It contains a bandaid to handle intentional
  flushes from Tomcat side. Further explanation in code and report.

  ajp.h:           Add ajp_msg_reuse prototype

  mod_proxy_ajp.c: Adjust logic of ap_proxy_ajp_request

  ajp_msg.c:       Add ajp_msg_reuse

  ajp_header.c:    Adjusting logic of ajp_read_header


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327185 13f79535-47bb-0310-9956-ffa450edef68
2005-10-21 13:54:38 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
Sander Striker
46ba14216d Rewrite Cookies and other headers in mod_proxy_ajp as configured with
ProxyPassReverse and ProxyPassReverseCookiePath.

* modules/proxy/proxy_ajp.c

  (ap_proxy_ajp_request): Update call to ajp_parse_header().


* modules/proxy/ajp.h

  (ajp_msg_get_string): constify argument.

  (ajp_parse_header): Add conf argument.


* modules/proxy/proxy_util.c

  (ap_proxy_location_reverse_map): Promoted from mod_proxy_http.

  (ap_proxy_cookie_reverse_map): Promoted from mod_proxy_http;
    renamed from proxy_cookie_reverse_map.


* modules/proxy/ajp_msg.c

  (ajp_msg_get_string): constify argument.


* modules/proxy/proxy_http.c

  (ap_proxy_location_reverse_map, proxy_cookie_reverse_map: Removed.

  (process_proxy_header): Update header mapping table to reference the now
    public functions.


* modules/proxy/ajp_header.c

  (ajp_unmarshal_response): And conf argument.  Reverse map cookies and
    other headers.

  (ajp_parse_header): Update call to ajp_unmarshal_response().


* modules/proxy/mod_proxy.h

  (ap_proxy_location_reverse_map, ap_proxy_cookie_reverse_map): Declare
    functions that have been promoted to be public.

  (ap_proxy_header_reverse_map_fn): Typedef for the signature of the above
    two functions (currently used in mod_proxy_http).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124901 13f79535-47bb-0310-9956-ffa450edef68
2005-01-11 08:35:46 +00:00
Mladen Turk
67841c5715 Use plain apr/apr-util for ajp.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105353 13f79535-47bb-0310-9956-ffa450edef68
2004-09-30 15:35:45 +00:00
Joe Orton
dd9b830d5d * modules/proxy/ajp_msg.c (ajp_msg_dump): Cast apr_size_t to unsigned
long to avoid the warning with %lx for 32-bit size_t too.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105104 13f79535-47bb-0310-9956-ffa450edef68
2004-09-13 10:39:37 +00:00
Joe Orton
e75696f56e Fix format string warnings in proxy_ajp on 64-bit platforms:
* modules/proxy/ajp_header.c (ajp_send_data_msg): Use
APR_SIZE_T_FMT.

* modules/proxy/ajp_link.c (ajp_ilink_receive): Don't pass
\n to ap_log_error; do use APR_SIZE_T_FMT.

* modules/proxy/ajp_msg.c (ajp_msg_dump, ajp_msg_check_header,
ajp_msg_copy): Use APR_SIZE_T_FMT.
(ajp_log_overflow): New function.
(ajp_msg_{append,peek,get}_*): Use it.

* modules/proxy/proxy_ajp.c (ap_proxy_ajp_request): Use
APR_SIZE_T_FMT.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105071 13f79535-47bb-0310-9956-ffa450edef68
2004-09-11 09:57:12 +00:00
Jean-Frederic Clere
5e63bc4a90 jakarta-tomcat-connectors AJP files.
The original location of the files in jakarta is:
jakarta-tomcat-connectors/ajp/ajplib/test
(That was not a good idea)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104711 13f79535-47bb-0310-9956-ffa450edef68
2004-08-18 16:09:27 +00:00