httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaillet...@apache.org
Subject svn commit: r1717063 - in /httpd/httpd/trunk: CHANGES docs/manual/mod/mod_proxy.xml docs/manual/mod/mod_proxy_fdpass.xml modules/proxy/mod_proxy_fdpass.c
Date Sun, 29 Nov 2015 13:26:03 GMT
Author: jailletc36
Date: Sun Nov 29 13:26:03 2015
New Revision: 1717063

URL: http://svn.apache.org/viewvc?rev=1717063&view=rev
Log:
Fix the use of the default 'flush' provider.
Improve documentation for the "flusher" parameter.
Remove useless empty lines.

See http://mail-archives.apache.org/mod_mbox/httpd-dev/200812.mbox/%3C494226C0.4050407@force-elite.com%3E
for some more explanation.
A python script is given there to test.
I had to tweak it to have it work
(use:
        fd, payload = passfd.recvfd(conn.fileno())
instead of:
        fd = passfd.recvfd(conn.fileno())
)


This is a r1058621 regression, where somehow "char *flusher" has been turned into a "char
flusher[]". So it is been broken since the beginning of 2.4.x

After this change (i.e. r1058621), 'flusher' is no more a pointer (NULL'ed when the structure
it belongs to is created) but the address of an array within a structure. It can not be NULL
anymore.
So, we now have to look at the content of the array itself to see if it has been initialized
or if we have to use the default value instead.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
    httpd/httpd/trunk/docs/manual/mod/mod_proxy_fdpass.xml
    httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1717063&r1=1717062&r2=1717063&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sun Nov 29 13:26:03 2015
@@ -1,6 +1,12 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_proxy_fdpass: Fix AH01153 error when using the default configuration.
+     In earlier version of httpd, you can explicitelly set the 'flusher' parameter
+     to 'flush' as a workaround. (i.e. flusher=flush)
+     Add documentation for the 'flusher' parameter when defining a proxy worker.
+     [Christophe Jaillet]
+
   *) mod_ssl: For the "SSLStaplingReturnResponderErrors off" case, make sure
      to only staple responses with certificate status "good". [Kaspar Brand]
 

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml?rev=1717063&r1=1717062&r2=1717063&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml Sun Nov 29 13:26:03 2015
@@ -1178,6 +1178,11 @@ ProxyPass "/example" "http://backend.exa
         connection will not be used again; it will be closed at some
         later time.
     </td></tr>
+    <tr><td>flusher</td>
+        <td>flush</td>
+        <td><p>Name of the provider used by <module>mod_proxy_fdpass</module>.
+        See the documentation of this module for more details.</p>
+    </td></tr>
 
     </table>
 

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_fdpass.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_fdpass.xml?rev=1717063&r1=1717062&r2=1717063&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_fdpass.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_fdpass.xml Sun Nov 29 13:26:03 2015
@@ -42,9 +42,14 @@
 
     <p>The module has a <code>proxy_fdpass_flusher</code> provider interface,
     which allows another module to optionally send the response headers, or even
-    the start of the response body.  The default flush provider disables keep-alive,
-    and sends the response headers, letting the external process just send a
-    response body.</p>
+    the start of the response body.  The default <code>flush</code> provider
+    disables keep-alive, and sends the response headers, letting the external
+    process just send a response body.
+    </p>
+    
+    <p>In order to use another provider, you have to set the <code>flusher</code>
+    parameter in the <directive module="mod_proxy">ProxyPass</directive> directive.
+    </p>
 
     <p>At this time the only data passed to the external process is the client
     socket. To receive a client socket, call recvfrom with an allocated

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c?rev=1717063&r1=1717062&r2=1717063&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_fdpass.c Sun Nov 29 13:26:03 2015
@@ -57,7 +57,6 @@ static apr_status_t get_socket_from_path
     *out_sock = NULL;
 
     rv = apr_socket_create(&s, AF_UNIX, SOCK_STREAM, 0, p);
-
     if (rv != APR_SUCCESS) {
         return rv;
     }
@@ -72,7 +71,6 @@ static apr_status_t get_socket_from_path
     return APR_SUCCESS;
 }
 
-
 static apr_status_t send_socket(apr_pool_t *p,
                                 apr_socket_t *s,
                                 apr_socket_t *outbound)
@@ -119,7 +117,6 @@ static apr_status_t send_socket(apr_pool
         return errno;
     }
 
-
     return APR_SUCCESS;
 }
 
@@ -149,7 +146,7 @@ static int proxy_fdpass_handler(request_
 
     {
         int status;
-        const char *flush_method = worker->s->flusher ? worker->s->flusher :
"flush";
+        const char *flush_method = *worker->s->flusher ? worker->s->flusher :
"flush";
 
         proxy_fdpass_flush *flush = ap_lookup_provider(PROXY_FDPASS_FLUSHER,
                                                        flush_method, "0");
@@ -191,7 +188,6 @@ static int proxy_fdpass_handler(request_
         ap_set_core_module_config(r->connection->conn_config, dummy);
     }
 
-
     return OK;
 }
 



Mime
View raw message