You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2002/04/21 13:35:08 UTC
cvs commit: apache-1.3/src/modules/proxy mod_proxy.h proxy_http.c proxy_util.c
minfrin 02/04/21 04:35:08
Modified: src/modules/proxy mod_proxy.h proxy_http.c proxy_util.c
Log:
Remove a last remnant of the expect-100-continue patch - the ETIMEOUT caused
windows builds to fail.
Revision Changes Path
1.59 +1 -0 apache-1.3/src/modules/proxy/mod_proxy.h
Index: mod_proxy.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/proxy/mod_proxy.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- mod_proxy.h 7 Apr 2002 18:57:36 -0000 1.58
+++ mod_proxy.h 21 Apr 2002 11:35:07 -0000 1.59
@@ -321,6 +321,7 @@
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 */
1.97 +2 -2 apache-1.3/src/modules/proxy/proxy_http.c
Index: proxy_http.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_http.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- proxy_http.c 19 Apr 2002 11:15:19 -0000 1.96
+++ proxy_http.c 21 Apr 2002 11:35:07 -0000 1.97
@@ -414,7 +414,7 @@
/* 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 @@
*/
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 */
1.121 +1 -9 apache-1.3/src/modules/proxy/proxy_util.c
Index: proxy_util.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_util.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- proxy_util.c 19 Apr 2002 11:15:19 -0000 1.120
+++ proxy_util.c 21 Apr 2002 11:35:08 -0000 1.121
@@ -1557,23 +1557,15 @@
/* 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,