httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r390183 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/proxy/ajp_header.c
Date Thu, 30 Mar 2006 17:36:06 GMT
Author: jim
Date: Thu Mar 30 09:36:04 2006
New Revision: 390183

URL: http://svn.apache.org/viewcvs?rev=390183&view=rev
Log:
Merge r371013 from trunk:

* 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

Submitted by: rpluem
Reviewed by: jim

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=390183&r1=390182&r2=390183&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Thu Mar 30 09:36:04 2006
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.1
 
+  *) mod_proxy_ajp: Support common headers of the AJP protocol in responses.
+     PR 38340. [Aleksey Pesternikov <apesternikov yahoo.com>, Ruediger Pluem]
+
   *) mod_proxy_balancer: Do not overwrite the status of initialized workers and
      respect the configured status of uninitilized workers when creating a new
      child process. [Ruediger Pluem]

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=390183&r1=390182&r2=390183&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Mar 30 09:36:04 2006
@@ -83,14 +83,6 @@
       -0: niq: Please explain why return value of ap_pass_brigade is
                put into a variable and immediately discarded.
 
-    * mod_proxy_ajp: Fix PR38340 (mod_proxy_ajp does not support common
-      headers (0xA0??))
-      Trunk version of patch:
-         http://svn.apache.org/viewcvs.cgi?rev=371013&view=rev
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem, wrowe, jerenkrantz
-
     * core: Fix PR38123 (Invalid Expect header not immediately rejected)
       Trunk version of patch:
          http://svn.apache.org/viewcvs.cgi?rev=370172&view=rev

Modified: httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c?rev=390183&r1=390182&r2=390183&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c Thu Mar 30 09:36:04 2006
@@ -506,7 +506,7 @@
         }
 
         if ((name & 0XFF00) == 0XA000) {
-            ajp_msg_peek_uint16(msg, &name);
+            ajp_msg_get_uint16(msg, &name);
             stringname = long_res_header_for_sc(name);
             if (stringname == NULL) {
                 ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,



Mime
View raw message