Patch Remove-from-header-for-http-streams for Streams related Bug #53198

Patch version 2010-10-29 08:16 UTC

• 2010-10-29 08:16 UTC [diff to current]

Developer: RQuadling@GMail.com

Index: branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
===================================================================
--- branches/PHP_5_3/ext/standard/http_fopen_wrapper.c	(revision 304979)
+++ branches/PHP_5_3/ext/standard/http_fopen_wrapper.c	(working copy)
@@ -442,12 +442,6 @@
 		tmp = NULL;
 	}
 
-	/* if the user has configured who they are, send a From: line */
-	if (((have_header & HTTP_HEADER_FROM) == 0) && cfg_get_string("from", &tmp) == SUCCESS) {
-		if (snprintf(scratch, scratch_len, "From: %s\r\n", tmp) > 0)
-			php_stream_write(stream, scratch, strlen(scratch));
-	}
-
 	/* Send Host: header so name-based virtual hosts work */
 	if ((have_header & HTTP_HEADER_HOST) == 0) {
 		if ((use_ssl && resource->port != 443 && resource->port != 0) || 
Index: trunk/ext/standard/http_fopen_wrapper.c
===================================================================
--- trunk/ext/standard/http_fopen_wrapper.c	(revision 304979)
+++ trunk/ext/standard/http_fopen_wrapper.c	(working copy)
@@ -442,12 +442,6 @@
 		tmp = NULL;
 	}
 
-	/* if the user has configured who they are, send a From: line */
-	if (((have_header & HTTP_HEADER_FROM) == 0) && cfg_get_string("from", &tmp) == SUCCESS) {
-		if (snprintf(scratch, scratch_len, "From: %s\r\n", tmp) > 0)
-			php_stream_write(stream, scratch, strlen(scratch));
-	}
-
 	/* Send Host: header so name-based virtual hosts work */
 	if ((have_header & HTTP_HEADER_HOST) == 0) {
 		if ((use_ssl && resource->port != 443 && resource->port != 0) ||