svn commit: r209632 - head/lib/libfetch

[Dag-Erling Smorgrav]

Author: des
Date: Thu Jul  1 17:44:33 2010
New Revision: 209632
URL: http://svn.freebsd.org/changeset/base/209632

Log:
  If the A flag is supplied, http_request() will attempt the request only
  once, even if authentication is required, instead of retrying with the
  proper credentials.  Fix this by bumping the countdown if the origin or
  proxy server requests authentication so that the initial unauthenticated
  request does not count as an attempt.
  
  PR:		148087
  Submitted by:	Tom Evans <tevans.uk at googlemail.com>
  MFC after:	2 weeks

Modified:
  head/lib/libfetch/http.c

Modified: head/lib/libfetch/http.c
==============================================================================
--- head/lib/libfetch/http.c	Thu Jul  1 15:23:29 2010	(r209631)
+++ head/lib/libfetch/http.c	Thu Jul  1 17:44:33 2010	(r209632)
@@ -1786,12 +1786,14 @@ http_request(struct url *URL, const char
 			case hdr_www_authenticate:
 				if (conn->err != HTTP_NEED_AUTH)
 					break;
-				http_parse_authenticate(p, &server_challenges);
+				if (http_parse_authenticate(p, &server_challenges))
+					++n;
 				break;
 			case hdr_proxy_authenticate:
 				if (conn->err != HTTP_NEED_PROXY_AUTH)
 					break;
-				http_parse_authenticate(p, &proxy_challenges);
+				if (http_parse_authenticate(p, &proxy_challenges) == 0);
+					++n;
 				break;
 			case hdr_end:
 				/* fall through */