svn commit: r311864 - stable/10/lib/libfetch

[Dag-Erling Smørgrav]

Author: des
Date: Tue Jan 10 08:12:56 2017
New Revision: 311864
URL: https://svnweb.freebsd.org/changeset/base/311864

Log:
  MFH (r301027): fix 307 / 308 redirects
  MFH (r310823): fix multi-line CONNECT responses
  
  PR:		112515 173451 194483 209546

Modified:
  stable/10/lib/libfetch/http.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libfetch/http.c
==============================================================================
--- stable/10/lib/libfetch/http.c	Tue Jan 10 08:08:49 2017	(r311863)
+++ stable/10/lib/libfetch/http.c	Tue Jan 10 08:12:56 2017	(r311864)
@@ -114,6 +114,7 @@ __FBSDID("$FreeBSD$");
 #define HTTP_REDIRECT(xyz) ((xyz) == HTTP_MOVED_PERM \
 			    || (xyz) == HTTP_MOVED_TEMP \
 			    || (xyz) == HTTP_TEMP_REDIRECT \
+			    || (xyz) == HTTP_PERM_REDIRECT \
 			    || (xyz) == HTTP_USE_PROXY \
 			    || (xyz) == HTTP_SEE_OTHER)
 
@@ -1431,7 +1432,7 @@ http_connect(struct url *URL, struct url
 			default:
 				/* ignore */ ;
 			}
-		} while (h < hdr_end);
+		} while (h > hdr_end);
 	}
 	if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0 &&
 	    fetch_ssl(conn, URL, verbose) == -1) {
@@ -1767,6 +1768,8 @@ http_request_body(struct url *URL, const
 			break;
 		case HTTP_MOVED_PERM:
 		case HTTP_MOVED_TEMP:
+		case HTTP_TEMP_REDIRECT:
+		case HTTP_PERM_REDIRECT:
 		case HTTP_SEE_OTHER:
 		case HTTP_USE_PROXY:
 			/*