fielding 97/10/05 22:35:07
Modified: src CHANGES
src/main http_request.c
Log:
Fix support for Proxy Authentication (we were testing the response
status too early).
Submitted by: Marc Slemko
Reviewed by: Roy Fielding, Dean Gaudet
Revision Changes Path
1.458 +3 -0 apachen/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -r1.457 -r1.458
--- CHANGES 1997/10/05 07:47:41 1.457
+++ CHANGES 1997/10/06 05:35:03 1.458
@@ -1,5 +1,8 @@
Changes with Apache 1.3b1
+ *) Fix support for Proxy Authentication (we were testing the response
+ status too early). [Marc Slemko]
+
*) CoreDumpDirectory directive directs where the core file is
written when a SIGSEGV, SIGBUS, SIGABORT or SIGABRT are
received. [Marc Slemko, Dean Gaudet]
1.87 +9 -9 apachen/src/main/http_request.c
Index: http_request.c
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_request.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- http_request.c 1997/10/05 02:04:44 1.86
+++ http_request.c 1997/10/06 05:35:06 1.87
@@ -850,15 +850,6 @@
char *custom_response = response_code_string(r, error_index);
int recursive_error = 0;
- /*
- * This test is done here so that none of the auth modules needs to know
- * about proxy authentication. They treat it like normal auth, and then
- * we tweak the status.
- */
- if (r->status == AUTH_REQUIRED && r->proxyreq) {
- r->status = HTTP_PROXY_AUTHENTICATION_REQUIRED;
- }
-
if (type == DONE) {
finalize_request_protocol(r);
return;
@@ -882,6 +873,15 @@
}
r->status = type;
+
+ /*
+ * This test is done here so that none of the auth modules needs to know
+ * about proxy authentication. They treat it like normal auth, and then
+ * we tweak the status.
+ */
+ if (r->status == AUTH_REQUIRED && r->proxyreq) {
+ r->status = HTTP_PROXY_AUTHENTICATION_REQUIRED;
+ }
/*
* Two types of custom redirects --- plain text, and URLs. Plain text has
