Make scheme part decoding rfc2396 compliant.

Change zlib:// and bzip2:// to compress.zlib:// and compress.bzip2://
Tidy up old socket/network code/comments.

2 files changed, 5 insertions, 5 deletions

diff --git a/main/network.c b/main/network.c
index 03270bcdfa..a34244e84e 100644
--- a/main/network.c
+++ b/main/network.c
@@ -465,7 +465,7 @@ PHPAPI php_stream *_php_stream_sock_open_unix(const char *path, int pathlen, int
 	memset(&unix_addr, 0, sizeof(unix_addr));
 	unix_addr.sun_family = AF_UNIX;
 
-	/* we need to be binary safe for the on systems that support an abstract
+	/* we need to be binary safe on systems that support an abstract
 	 * namespace */
 	if (pathlen >= sizeof(unix_addr.sun_path)) {
 		/* On linux, when the path begins with a NUL byte we are
diff --git a/main/streams.c b/main/streams.c
index a6cfccddb8..3af18e25b9 100755
--- a/main/streams.c
+++ b/main/streams.c
@@ -1180,7 +1180,7 @@ static php_stream_wrapper *locate_url_wrapper(char *path, char **path_for_open,
 	if (options & IGNORE_URL)
 		return &php_plain_files_wrapper;
 	
-	for (p = path; isalnum((int)*p); p++) {
+	for (p = path; isalnum((int)*p) || *p == '+' || *p == '-' || *p == '.'; p++) {
 		n++;
 	}
 
@@ -1188,9 +1188,9 @@ static php_stream_wrapper *locate_url_wrapper(char *path, char **path_for_open,
 		protocol = path;
 	} else if (strncasecmp(path, "zlib:", 5) == 0) {
 		/* BC with older php scripts and zlib wrapper */
-		protocol = path;
-		n = 4;
-		zend_error(E_WARNING, "Use of \"zlib:\" wrapper is deprecated; please use \"zlib://\" instead.");
+		protocol = "compress.zlib";
+		n = 13;
+		zend_error(E_WARNING, "Use of \"zlib:\" wrapper is deprecated; please use \"compress.zlib://\" instead.");
 	}
 
 	if (protocol)	{