httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/proxy proxy_http.c
Date Wed, 11 Aug 2004 22:45:08 GMT
wrowe       2004/08/11 15:45:08

  Modified:    modules/proxy proxy_http.c
  Log:
  Always use the cleanup. Do not close the socket directly.
  
  Submitted by: mturk
  
  Revision  Changes    Path
  1.192     +2 -6      httpd-2.0/modules/proxy/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_http.c,v
  retrieving revision 1.191
  retrieving revision 1.192
  diff -u -r1.191 -r1.192
  --- proxy_http.c	11 Aug 2004 22:44:38 -0000	1.191
  +++ proxy_http.c	11 Aug 2004 22:45:08 -0000	1.192
  @@ -795,9 +795,7 @@
               len = ap_getline(buffer, sizeof(buffer), rp, 0);
           }
           if (len <= 0) {
  -            apr_socket_close(backend->sock);
  -            backend->sock = NULL;
  -//            backend->connection = NULL;
  +            ap_proxy_http_cleanup(NULL, r, backend);
               ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "proxy: error reading status line from remote "
                             "server %s", backend->hostname);
  @@ -819,9 +817,7 @@
                * if the status line was > 8192 bytes
                */
               else if ((buffer[5] != '1') || (len >= sizeof(buffer)-1)) {
  -                apr_socket_close(backend->sock);
  -//                backend->connection = NULL;
  -                backend->sock = NULL;
  +                ap_proxy_http_cleanup(NULL, r, backend);
                   return ap_proxyerror(r, HTTP_BAD_GATEWAY,
                   apr_pstrcat(p, "Corrupt status line returned by remote "
                               "server: ", buffer, NULL));
  
  
  

Mime
View raw message