Remove a last remnant of the expect-100-continue patch - the ETIMEOUT caused

windows builds to fail.
PR:
Obtained from:
Submitted by:
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@94737 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/modules/proxy/mod_proxy.h b/src/modules/proxy/mod_proxy.h
index 0a8c853475e5495edf30b57d73146bb013963fd4..79d1ed8998b7cd1dd9f01a9c939d3e183c2d2219 100644 (file)
--- a/src/modules/proxy/mod_proxy.h
+++ b/src/modules/proxy/mod_proxy.h
@@ -321,6 +321,7 @@ BUFF *ap_proxy_create_cachefile(request_rec *r, char *filename);
 void ap_proxy_clear_connection(pool *p, table *headers);
 int ap_proxy_table_replace(table *base, table *overlay);
 void ap_proxy_table_unmerge(pool *p, table *t, char *key);
+int ap_proxy_read_response_line(BUFF *f, request_rec *r, char *buffer, int size, int *backasswards, int *major, int *minor);
 
 /* WARNING - PRIVATE DEFINITION BELOW */
 

diff --git a/src/modules/proxy/proxy_http.c b/src/modules/proxy/proxy_http.c
index 65f4207a327f6af7ab57d88fad9b51f02b3a6699..9809482a8ae158d65dd3f45b0afe65d7d73cf518 100644 (file)
--- a/src/modules/proxy/proxy_http.c
+++ b/src/modules/proxy/proxy_http.c
@@ -414,7 +414,7 @@ int ap_proxy_http_handler(request_rec *r, cache_req *c, char *url,
 
         /* then, read a response line */
         ap_hard_timeout("proxy receive response status line", r);
-        result = ap_proxy_read_response_line(f, r, buffer, sizeof(buffer)-1, 1, &backasswards, &major, &minor);
+        result = ap_proxy_read_response_line(f, r, buffer, sizeof(buffer)-1, &backasswards, &major, &minor);
         ap_kill_timeout(r);
 
         /* trap any errors */
@@ -428,7 +428,7 @@ int ap_proxy_http_handler(request_rec *r, cache_req *c, char *url,
          */
         if (r->status == 100) {
             ap_hard_timeout("proxy receive response status line", r);
-            result = ap_proxy_read_response_line(f, r, buffer, sizeof(buffer)-1, 1, &backasswards, &major, &minor);
+            result = ap_proxy_read_response_line(f, r, buffer, sizeof(buffer)-1, &backasswards, &major, &minor);
             ap_kill_timeout(r);
 
             /* trap any errors */

diff --git a/src/modules/proxy/proxy_util.c b/src/modules/proxy/proxy_util.c
index 402b1e4ac5600062e70a85ed96b30961f3a0f8ef..e4b30ee7e752ee2994e16736a5151231a261197a 100644 (file)
--- a/src/modules/proxy/proxy_util.c
+++ b/src/modules/proxy/proxy_util.c
@@ -1557,23 +1557,15 @@ int ap_proxy_table_replace(table *base, table *overlay)
 /* read the response line
  * This function reads a single line of response from the server,
  * and returns a status code.
- * The timeout flag if non-zero means we return BAD_GATEWAY on timeout
- * errors, otherwise we silently return to handle 100-continue.
  * It also populates the request_rec with the resultant status, and
  * returns backasswards status (HTTP/0.9).
  */
-int ap_proxy_read_response_line(BUFF *f, request_rec *r, char *buffer, int size, int timeout, int *backasswards, int *major, int *minor) {
+int ap_proxy_read_response_line(BUFF *f, request_rec *r, char *buffer, int size, int *backasswards, int *major, int *minor) {
 
     long len;
 
     len = ap_getline(buffer, size-1, f, 0);
     if (len == -1) {
-        if (!timeout && errno == ETIMEDOUT) {
-            /* emulate 100-continue */
-            r->status = 100;
-            r->status_line = "100 Continue";
-            return OK;
-        }
         ap_bclose(f);
         ap_kill_timeout(r);
         return ap_proxyerror(r, HTTP_BAD_GATEWAY,