httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject svn commit: r820216 - /httpd/httpd/trunk/modules/proxy/mod_serf.c
Date Wed, 30 Sep 2009 08:56:10 GMT
Author: jfclere
Date: Wed Sep 30 08:56:10 2009
New Revision: 820216

URL: http://svn.apache.org/viewvc?rev=820216&view=rev
Log:
When connecting to no http protocol response will be NULL and httpd cores.

Modified:
    httpd/httpd/trunk/modules/proxy/mod_serf.c

Modified: httpd/httpd/trunk/modules/proxy/mod_serf.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_serf.c?rev=820216&r1=820215&r2=820216&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_serf.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_serf.c Wed Sep 30 08:56:10 2009
@@ -122,6 +122,7 @@
         ap_mpm_register_timed_callback(apr_time_from_msec(1),
                                        timed_cleanup_callback, ctx);
     }
+    ctx->keep_reading = 0;
 }
 
 static serf_bucket_t* conn_setup(apr_socket_t *sock,
@@ -268,6 +269,11 @@
     apr_size_t len;
     serf_status_line sl;
 
+    if (response == NULL) {
+        ctx->rstatus = HTTP_INTERNAL_SERVER_ERROR;
+        return APR_EGENERAL;
+    }
+
     /* XXXXXXX: Create better error message. */
     rv = serf_bucket_response_status(response, &sl);
     if (rv) {



Mime
View raw message