Attachment #171330 for bug #209240

View | Details | Raw Unified | Return to bug 209240
Collapse All | Expand All

Lines 2-9 Link Here

(-)../../home/pi/myp/www/hiawatha/Makefile (-2 / +1 lines)
2	# $FreeBSD: head/www/hiawatha/Makefile 415742 2016-05-23 20:35:01Z amdmi3 $	2	# $FreeBSD: head/www/hiawatha/Makefile 415742 2016-05-23 20:35:01Z amdmi3 $
3		3
4	PORTNAME= hiawatha	4	PORTNAME= hiawatha
5	PORTVERSION= 10.1	5	PORTVERSION= 10.3
6	PORTREVISION= 1
7	CATEGORIES= www	6	CATEGORIES= www
8	MASTER_SITES= https://www.hiawatha-webserver.org/files/	7	MASTER_SITES= https://www.hiawatha-webserver.org/files/
9		8

Lines 1-2 Link Here

(-)../../home/pi/myp/www/hiawatha/distinfo (-2 / +3 lines)
1	SHA256 (hiawatha-10.1.tar.gz) = 3892e0a1836661c8dcc649f9ae965289f701640a618baf2c2287da9b78e36cf1	1	TIMESTAMP = 1465723990
2	SIZE (hiawatha-10.1.tar.gz) = 887895	2	SHA256 (hiawatha-10.3.tar.gz) = 99d185fb16bb1ab706724494d3cac86464f1485ed4b0fff09a192eca6da5ff8e
		3	SIZE (hiawatha-10.3.tar.gz) = 897607




--- src/http.c.orig	2015-12-28 15:05:15 UTC
+++ src/http.c
@@ -845,8 +845,8 @@ int last_forwarded_ip(t_http_header *htt
 		/* Forwarded header
 		 */
 		begin = NULL;
-		while ((forwarded = strcasestr(forwarded, "for=")) == NULL) {
-			begin = forwarded;
+		while ((forwarded = strcasestr(forwarded, "for=")) != NULL) {
+			begin = forwarded + 4;
 			forwarded++;
 		}
 

Return to bug 209240

Lines 1-13 Link Here

(-)../../home/pi/myp/www/hiawatha/files/patch-src__http.c (-13 lines)
1	--- src/http.c.orig 2015-12-28 15:05:15 UTC
2	+++ src/http.c
3	@@ -845,8 +845,8 @@ int last_forwarded_ip(t_http_header *htt
4	/* Forwarded header
5	*/
6	begin = NULL;
7	- while ((forwarded = strcasestr(forwarded, "for=")) == NULL) {
8	- begin = forwarded;
9	+ while ((forwarded = strcasestr(forwarded, "for=")) != NULL) {
10	+ begin = forwarded + 4;
11	forwarded++;
12	}
13