www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Code Activity
22,624 Commits 62 Branches 304 Tags
a03bcce31d66aac6556a5160b51f9c9643f61b29
Commit Graph

49 Commits

Author SHA1 Message Date
Graham Leggett
2af2fa44ad Further clarify the naming of the entity that originates the request by 
calling that entity a useragent instead of a client.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1214003 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 00:31:51 +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
Graham Leggett
394e5594d6 Introduce a per connection "peer_ip" and a per request "client_ip" to 
distinguish between the raw IP address of the connection and the effective
IP address of the request.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1206291 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-25 19:42:04 +00:00
Graham Leggett
4ee7eea4cf Introduce a per request version of the remote IP address, which can be 
optionally modified by a module when the effective IP of the client
is not the same as the real IP of the client (such as a load balancer).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204968 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-22 13:10:39 +00:00
Jim Jagielski
f16552affe check return status 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204556 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-21 15:51:46 +00:00
Stefan Fritsch
b56ba5a823 More ap_log_rerror() usage and axe some more AJP: prefixes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203878 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-18 22:02:27 +00:00
Rainer Jung
966df72b7c Improve logging for mod_proxy_ajp. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152452 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-30 10:58:34 +00:00
Rainer Jung
a7fe66131c Make AJP trace messages a bit less cryptic. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152450 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-30 10:54:04 +00:00
Rainer Jung
bed1021e56 Move some debug log statements to trace level 
and improve message format consistency.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152448 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-30 10:49:32 +00:00
Rainer Jung
73cf5b7f29 mod_proxy_ajp: Respect "reuse" flag in END_REPONSE 
packets.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152379 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-29 21:41:00 +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
Rainer Jung
8a65f5dff0 The remote port information was forgotten from the builtin 
data of the AJP 13 protocol.  Since the servlet spec allows
to retrieve it via getRemotePort(), we provide the port to
the Tomcat connector as an additional request attribute.
Modern/future Tomcat versions know how to retrieve
the remote port from the attribute AJP_REMOTE_PORT.

See:
https://issues.apache.org/bugzilla/show_bug.cgi?id=41263
http://svn.eu.apache.org/viewvc?view=rev&revision=756926
http://svn.eu.apache.org/viewvc?view=rev&revision=757223


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@761329 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-02 15:49:29 +00:00
Ruediger Pluem
0c674a71e6 * save_table needs to be declared first before it can be used. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@707665 13f79535-47bb-0310-9956-ffa450edef68
 2008-10-24 16:00:10 +00:00
Jim Jagielski
9b6fefa44f AJP was dropping pre-existing cookies. Use same logic 
as HTTP to tuck them away


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@707649 13f79535-47bb-0310-9956-ffa450edef68
 2008-10-24 15:01:44 +00:00
Jim Jagielski
1a2c2c2f7c Make AJP HEAD aware 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@574024 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-09 16:20:45 +00:00
Martin Kraemer
0aae30b211 Here too, the limited comparison ignored the trailing NIL character 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@571232 13f79535-47bb-0310-9956-ffa450edef68
 2007-08-30 16:27:22 +00:00
Martin Kraemer
bfed1d7fae Convert just the message text to EBCDIC, and not the (already EBCDIC) status code 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@571219 13f79535-47bb-0310-9956-ffa450edef68
 2007-08-30 15:54:44 +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
4932849eec Revert 451953 and 451951. Log the real r->method that is 
unsupported by the AJP protocol.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@452536 13f79535-47bb-0310-9956-ffa450edef68
 2006-10-03 15:18:57 +00:00
Mladen Turk
fe00141420 Ups. Fix typo. We are logging int, not string. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@451953 13f79535-47bb-0310-9956-ffa450edef68
 2006-10-02 10:26:13 +00:00
Mladen Turk
0102152486 If the r->method_number is unknown the r->method 
is unknown or corrupted as well. Log the method number
that was not recognized.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@451951 13f79535-47bb-0310-9956-ffa450edef68
 2006-10-02 10:24:45 +00:00
Mladen Turk
7aa10a383a Fix compile time warning. AJP protocol method is byte. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427059 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-31 09:42:57 +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
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
Ruediger Pluem
b5ca8f8f3f * Crosscheck the length of the body chunk with the length of the ajp message 
to prevent readings beyond the buffer boundaries which possibly could reveal
  sensitive memory contents to the client.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@383339 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-05 15:22:18 +00:00
Ruediger Pluem
d66bb0a4d0 * Fix PR38340 by actual getting the word and thus advancing the message buffer 
pointer to the next data.

Submitted by: Aleksey Pesternikov <apesternikov yahoo.com>
Reviewed by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@371013 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-21 11:30:41 +00:00
Mladen Turk
49ce35caa5 Fix Cookie2 header problems that originates back 
from mod_jk. Cookie2 was always sent as Cookie.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@358769 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-23 08:36:18 +00:00
Martin Kraemer
e4c6f88a87 In Apache-2.x, the function is called apr_pstrdup(). 
The 'tmp' variable is not really necessary.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357699 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-19 14:50:56 +00:00
Jean-Frederic Clere
fe2d495671 Sorry, previous commit was not ok. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357044 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-15 16:58:10 +00:00
Jean-Frederic Clere
5aa5b6bf3e The string comming from TC is in ASCII and the string returned by apr_psprintf isn't. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357022 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-15 14:44:39 +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
Ruediger Pluem
7a221adca5 * Fix PR36883 (mod_proxy_ajp and tomcat issues). 
Submitted by: William Barker <william.barker wilshire.com>
Reviewed by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@307195 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-07 21:05:01 +00:00
Nick Kew
ab0fd007b9 Fix mess left by incompleteness of previous ProxyPassReverse fix 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232247 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-12 09:38:09 +00:00
Mladen Turk
0eab042f6a Use two optional functions from mod_ssl so that we 
can receive both is_ssl and ssl_var for ajp protocol.
This is combined work based on patch from Brad Boyer and
Joe Orton's suggestion to use ssl_var_lookup.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160690 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-09 16:16:54 +00:00
Mladen Turk
f29c4bc75a Return 'real' error status codes instead APR_EGENERAL. 
The return status code will be used to determine wether
the message is invalid or the remote host failed processing
the request. This is needed to mark the worker as in
error state in case it is member of load balancer.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160668 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-09 08:37:06 +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
15ec543f2b Also translate Destination headers when ProxyPassReverse'd 
* modules\proxy\mod_proxy_http.c

  (process_proxy_header): reverse map Destination header.

  NOTE: This is some darn nasty looking code...


* modules\proxy\ajp_header.c

  (ajp_unmarshal_response): reverse map Destination header.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151246 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-03 23:04:04 +00:00
Jim Jagielski
bd10bb4108 Match parameter types 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124912 13f79535-47bb-0310-9956-ffa450edef68
 2005-01-11 17:15:02 +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
Sander Striker
47c6e884b2 Make the combination of mod_proxy_ajp and mod_rewrite work correctly. 
* modules/proxy/proxy_ajp.c

  (ap_proxy_ajp_request): Update call to ajp_send_header().


* modules/proxy/ajp.h

  (ajp_send_header): Add a uri parameter.


* modules/proxy/ajp_header.c

  (ajp_marshal_into_msgb): Add a uri parameter and use the
   passed in uri instead of r->uri.

  (ajp_send_header): Add a uri parameter.  Update call to
   ajp_marshal_into_msgb().


* modules/mappers/mod_rewrite.c

  (is_absolute_uri): Add handling of 'ajp' and 'balancer' schemes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124584 13f79535-47bb-0310-9956-ffa450edef68
 2005-01-07 22:17:48 +00:00
Mladen Turk
8a33fdf6fb Remove duplicate logging from alloc and send data_msg. 
The logging is already done in the proxy_ajp. Also remove
unused function params.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105185 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-17 12:59:44 +00:00
Mladen Turk
fd59405083 Remove logging inside ajp_send_data_msg. If send fails it is logged 
inside proxy_ajp with the same message.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105184 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-17 12:52:49 +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
Mladen Turk
4adc3e69d9 Added SSL custom indicators. They can be set using SetEnv directive, 
so we don't need an extra one like the JkEnvVar is in the mod_jk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104796 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-25 09:56:43 +00:00
Mladen Turk
41b64427f7 Implement REQ_ATTRIBUTE using request rec environment table, 
so we can use standard SetEnv directive for that.
The ajp specific attributes has to be prefixed using 'AJP_', and are passed
withouth that prefix to the backend.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104788 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-24 11:55:23 +00:00
Mladen Turk
3b81c4cc5e Use the session route from request rec notes. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104787 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-24 11:28:10 +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