martin 98/06/08 07:23:51
Modified: src/modules/proxy proxy_connect.c proxy_ftp.c proxy_http.c
Log:
Globally replaced HTTP/1.0 return codes by HTTP/1.1 ones. (proxy only)
Revision Changes Path
1.29 +2 -2 apache-1.3/src/modules/proxy/proxy_connect.c
Index: proxy_connect.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_connect.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -u -r1.28 -r1.29
--- proxy_connect.c 1998/05/27 22:56:04 1.28
+++ proxy_connect.c 1998/06/08 14:23:50 1.29
@@ -162,7 +162,7 @@
if (sock == -1) {
ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
"proxy: error creating socket");
- return SERVER_ERROR;
+ return HTTP_INTERNAL_SERVER_ERROR;
}
#ifndef WIN32
@@ -173,7 +173,7 @@
"found, you probably need to rebuild Apache with a "
"larger FD_SETSIZE", sock, FD_SETSIZE);
ap_pclosesocket(r->pool, sock);
- return SERVER_ERROR;
+ return HTTP_INTERNAL_SERVER_ERROR;
}
#endif
1.61 +22 -22 apache-1.3/src/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_ftp.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -u -r1.60 -r1.61
--- proxy_ftp.c 1998/05/27 22:56:05 1.60
+++ proxy_ftp.c 1998/06/08 14:23:50 1.61
@@ -499,7 +499,7 @@
/* we only support GET and HEAD */
if (r->method_number != M_GET)
- return NOT_IMPLEMENTED;
+ return HTTP_NOT_IMPLEMENTED;
/* allocate a buffer for the response message */
resplen = MAX_STRING_LEN;
@@ -572,7 +572,7 @@
if (sock == -1) {
ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
"proxy: error creating socket");
- return SERVER_ERROR;
+ return HTTP_INTERNAL_SERVER_ERROR;
}
if (conf->recv_buffer_size) {
@@ -590,7 +590,7 @@
ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
"proxy: error setting reuseaddr option:
setsockopt(SO_REUSEADDR)");
ap_pclosesocket(p, sock);
- return SERVER_ERROR;
+ return HTTP_INTERNAL_SERVER_ERROR;
#endif /*_OSD_POSIX*/
}
@@ -641,7 +641,7 @@
}
if (i != 220) {
ap_kill_timeout(r);
- return BAD_GATEWAY;
+ return HTTP_BAD_GATEWAY;
}
Explain0("FTP: connected.");
@@ -666,12 +666,12 @@
}
if (i != 230 && i != 331) {
ap_kill_timeout(r);
- return BAD_GATEWAY;
+ return HTTP_BAD_GATEWAY;
}
if (i == 331) { /* send password */
if (password == NULL)
- return FORBIDDEN;
+ return HTTP_FORBIDDEN;
ap_bputs("PASS ", f);
ap_bwrite(f, password, passlen);
ap_bputs(CRLF, f);
@@ -694,7 +694,7 @@
}
if (i != 230 && i != 202) {
ap_kill_timeout(r);
- return BAD_GATEWAY;
+ return HTTP_BAD_GATEWAY;
}
}
@@ -724,11 +724,11 @@
}
if (i == 550) {
ap_kill_timeout(r);
- return NOT_FOUND;
+ return HTTP_NOT_FOUND;
}
if (i != 250) {
ap_kill_timeout(r);
- return BAD_GATEWAY;
+ return HTTP_BAD_GATEWAY;
}
path = strp + 1;
@@ -761,7 +761,7 @@
}
if (i != 200 && i != 504) {
ap_kill_timeout(r);
- return BAD_GATEWAY;
+ return HTTP_BAD_GATEWAY;
}
/* Allow not implemented */
if (i == 504)
@@ -775,7 +775,7 @@
"proxy: error creating PASV socket");
ap_bclose(f);
ap_kill_timeout(r);
- return SERVER_ERROR;
+ return HTTP_INTERNAL_SERVER_ERROR;
}
if (conf->recv_buffer_size) {
@@ -798,7 +798,7 @@
ap_pclosesocket(p, dsock);
ap_bclose(f);
ap_kill_timeout(r);
- return SERVER_ERROR;
+ return HTTP_INTERNAL_SERVER_ERROR;
}
else {
pasv[i - 1] = '\0';
@@ -852,7 +852,7 @@
"proxy: error getting socket address");
ap_bclose(f);
ap_kill_timeout(r);
- return SERVER_ERROR;
+ return HTTP_INTERNAL_SERVER_ERROR;
}
dsock = ap_psocket(p, PF_INET, SOCK_STREAM, IPPROTO_TCP);
@@ -861,7 +861,7 @@
"proxy: error creating socket");
ap_bclose(f);
ap_kill_timeout(r);
- return SERVER_ERROR;
+ return HTTP_INTERNAL_SERVER_ERROR;
}
if (setsockopt(dsock, SOL_SOCKET, SO_REUSEADDR, (void *) &one,
@@ -872,7 +872,7 @@
ap_pclosesocket(p, dsock);
ap_bclose(f);
ap_kill_timeout(r);
- return SERVER_ERROR;
+ return HTTP_INTERNAL_SERVER_ERROR;
#endif /*_OSD_POSIX*/
}
@@ -885,7 +885,7 @@
"proxy: error binding to ftp data socket %s", buff);
ap_bclose(f);
ap_pclosesocket(p, dsock);
- return SERVER_ERROR;
+ return HTTP_INTERNAL_SERVER_ERROR;
}
listen(dsock, 2); /* only need a short queue */
}
@@ -923,11 +923,11 @@
}
if (i == 550) {
ap_kill_timeout(r);
- return NOT_FOUND;
+ return HTTP_NOT_FOUND;
}
if (i != 250) {
ap_kill_timeout(r);
- return BAD_GATEWAY;
+ return HTTP_BAD_GATEWAY;
}
path = "";
len = 0;
@@ -976,11 +976,11 @@
}
if (rc == 550) {
ap_kill_timeout(r);
- return NOT_FOUND;
+ return HTTP_NOT_FOUND;
}
if (rc != 250) {
ap_kill_timeout(r);
- return BAD_GATEWAY;
+ return HTTP_BAD_GATEWAY;
}
ap_bputs("LIST -lag" CRLF, f);
@@ -993,7 +993,7 @@
}
ap_kill_timeout(r);
if (rc != 125 && rc != 150 && rc != 226 && rc != 250)
- return BAD_GATEWAY;
+ return HTTP_BAD_GATEWAY;
r->status = 200;
r->status_line = "200 OK";
@@ -1045,7 +1045,7 @@
ap_bclose(f);
ap_kill_timeout(r);
ap_proxy_cache_error(c);
- return BAD_GATEWAY;
+ return HTTP_BAD_GATEWAY;
}
ap_note_cleanups_for_socket(p, csd);
data = ap_bcreate(p, B_RDWR | B_SOCKET);
1.48 +1 -1 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.47
retrieving revision 1.48
diff -u -u -r1.47 -r1.48
--- proxy_http.c 1998/05/27 22:56:05 1.47
+++ proxy_http.c 1998/06/08 14:23:50 1.48
@@ -342,7 +342,7 @@
if (buffer[5] != '1' || buffer[len - 1] != '\n') {
ap_bclose(f);
ap_kill_timeout(r);
- return BAD_GATEWAY;
+ return HTTP_BAD_GATEWAY;
}
backasswards = 0;
buffer[--len] = '\0';
