PHP 5.4.2

This patch fixes the failure caused by the
posix lseek and read versions under windows in cdf_read() .
Additionally all the occurences of lseek and read
was replaced by _lseek and _reed for windows.

.gitattributes

@@ -22,3 +22,152 @@ sapi/continuity/capi.c          ident
 Zend/RFCs/002.txt               ident
 Zend/RFCs/003.txt               ident
 NEWS                            merge=NEWS
+/ext/bz2/tests/005.phpt	-crlf
+/ext/dom/tests/dom005.phpt	-crlf
+/ext/dom/tests/DOMImplementation_createDocumentType_basic.phpt	-crlf
+/ext/ereg/tests/009.phpt	-crlf
+/ext/iconv/tests/eucjp2sjis.phpt	-crlf
+/ext/iconv/tests/eucjp2utf8.phpt	-crlf
+/ext/iconv/tests/iconv_stream_filter_delimiter.phpt	-crlf
+/ext/iconv/tests/iconv_stream_filter.phpt	-crlf
+/ext/mbstring/tests/mb_split-compat-01.phpt	-crlf
+/ext/phar/tests/005.phpt	-crlf
+/ext/phar/tests/phar_commitwrite.phpt	-crlf
+/ext/phar/tests/phar_create_in_cwd.phpt	-crlf
+/ext/phar/tests/phar_mount.phpt	-crlf
+/ext/reflection/tests/009.phpt	-crlf
+/ext/reflection/tests/025.phpt	-crlf
+/ext/standard/tests/general_functions/highlight_heredoc.phpt	-crlf
+/ext/standard/tests/general_functions/parse_ini_file.phpt	-crlf
+/ext/standard/tests/general_functions/parse_ini_string_002.phpt	-crlf
+/ext/standard/tests/strings/006.phpt	-crlf
+/ext/standard/tests/strings/addslashes_variation2.phpt	-crlf
+/ext/standard/tests/strings/addslashes_variation3.phpt	-crlf
+/ext/standard/tests/strings/bug21453.phpt	-crlf
+/ext/standard/tests/strings/chop_variation3.phpt	-crlf
+/ext/standard/tests/strings/chunk_split_variation11.phpt	-crlf
+/ext/standard/tests/strings/chunk_split_variation12.phpt	-crlf
+/ext/standard/tests/strings/chunk_split_variation4.phpt	-crlf
+/ext/standard/tests/strings/crc32_variation2.phpt	-crlf
+/ext/standard/tests/strings/crc32_variation3.phpt	-crlf
+/ext/standard/tests/strings/crc32_variation4.phpt	-crlf
+/ext/standard/tests/strings/highlight_file.phpt	-crlf
+/ext/standard/tests/strings/htmlentities_html4.phpt	-crlf
+/ext/standard/tests/strings/lcfirst.phpt	-crlf
+/ext/standard/tests/strings/ltrim.phpt	-crlf
+/ext/standard/tests/strings/nl2br_variation2.phpt	-crlf
+/ext/standard/tests/strings/php_strip_whitespace.phpt	-crlf
+/ext/standard/tests/strings/rtrim.phpt	-crlf
+/ext/standard/tests/strings/sprintf_f_2.phpt	-crlf
+/ext/standard/tests/strings/sprintf_variation15.phpt	-crlf
+/ext/standard/tests/strings/strcspn_variation6.phpt	-crlf
+/ext/standard/tests/strings/strcspn_variation7.phpt	-crlf
+/ext/standard/tests/strings/strcspn_variation8.phpt	-crlf
+/ext/standard/tests/strings/stripos_variation1.phpt	-crlf
+/ext/standard/tests/strings/stripos_variation3.phpt	-crlf
+/ext/standard/tests/strings/stripos_variation4.phpt	-crlf
+/ext/standard/tests/strings/stripos_variation5.phpt	-crlf
+/ext/standard/tests/strings/stripos_variation6.phpt	-crlf
+/ext/standard/tests/strings/stripslashes_variation2.phpt	-crlf
+/ext/standard/tests/strings/stripslashes_variation3.phpt	-crlf
+/ext/standard/tests/strings/stripslashes_variation4.phpt	-crlf
+/ext/standard/tests/strings/stripslashes_variation5.phpt	-crlf
+/ext/standard/tests/strings/str_ireplace.phpt	-crlf
+/ext/standard/tests/strings/strnatcmp_basic.phpt	-crlf
+/ext/standard/tests/strings/strncasecmp_variation9.phpt	-crlf
+/ext/standard/tests/strings/strpos.phpt	-crlf
+/ext/standard/tests/strings/strrchr_variation1.phpt	-crlf
+/ext/standard/tests/strings/strrchr_variation2.phpt	-crlf
+/ext/standard/tests/strings/strrchr_variation3.phpt	-crlf
+/ext/standard/tests/strings/strrchr_variation4.phpt	-crlf
+/ext/standard/tests/strings/strrchr_variation6.phpt	-crlf
+/ext/standard/tests/strings/strrchr_variation7.phpt	-crlf
+/ext/standard/tests/strings/str_replace.phpt	-crlf
+/ext/standard/tests/strings/strrev_variation3.phpt	-crlf
+/ext/standard/tests/strings/strrev_variation4.phpt	-crlf
+/ext/standard/tests/strings/strripos_variation1.phpt	-crlf
+/ext/standard/tests/strings/strripos_variation2.phpt	-crlf
+/ext/standard/tests/strings/strripos_variation3.phpt	-crlf
+/ext/standard/tests/strings/strripos_variation4.phpt	-crlf
+/ext/standard/tests/strings/strripos_variation5.phpt	-crlf
+/ext/standard/tests/strings/strrpos_variation1.phpt	-crlf
+/ext/standard/tests/strings/strrpos_variation2.phpt	-crlf
+/ext/standard/tests/strings/strrpos_variation3.phpt	-crlf
+/ext/standard/tests/strings/strrpos_variation4.phpt	-crlf
+/ext/standard/tests/strings/strrpos_variation5.phpt	-crlf
+/ext/standard/tests/strings/strrpos_variation6.phpt	-crlf
+/ext/standard/tests/strings/strspn_variation5.phpt	-crlf
+/ext/standard/tests/strings/strspn_variation6.phpt	-crlf
+/ext/standard/tests/strings/strspn_variation7.phpt	-crlf
+/ext/standard/tests/strings/strspn_variation8.phpt	-crlf
+/ext/standard/tests/strings/strstr.phpt	-crlf
+/ext/standard/tests/strings/strtok_variation1.phpt	-crlf
+/ext/standard/tests/strings/strtok_variation3.phpt	-crlf
+/ext/standard/tests/strings/strtr_variation1.phpt	-crlf
+/ext/standard/tests/strings/strtr_variation2.phpt	-crlf
+/ext/standard/tests/strings/str_word_count.phpt	-crlf
+/ext/standard/tests/strings/trim1.phpt	-crlf
+/ext/standard/tests/strings/ucfirst.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation10.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation12.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation16.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation18.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation4.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation6.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation7.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation8.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation10.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation12.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation14.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation18.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation4.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation6.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation7.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation8.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation10.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation12.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation14.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation16.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation4.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation6.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation7.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation8.phpt	-crlf
+/ext/standard/tests/strings/wordwrap.phpt	-crlf
+/ext/tidy/tests/010.phpt	-crlf
+/ext/tidy/tests/012.phpt	-crlf
+/ext/tidy/tests/025.phpt	-crlf
+/ext/tidy/tests/030.phpt	-crlf
+/ext/tokenizer/tests/bug26463.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation12.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation13.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation14.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation15.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation16.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation17.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation18.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation19.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation4.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation5.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation6.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation7.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation8.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation9.phpt	-crlf
+/ext/xml/tests/bug26614_libxml.phpt	-crlf
+/ext/xmlwriter/tests/004.phpt		-crlf
+/ext/xmlwriter/tests/OO_004.phpt	-crlf
+/ext/zlib/tests/005.phpt			-crlf
+/ext/zlib/tests/gzfile_basic2.phpt	-crlf
+/ext/zlib/tests/gzfile_basic.phpt	-crlf
+/ext/zlib/tests/gzfilegzreadfile.phpt	-crlf
+/ext/zlib/tests/readgzfile_basic2.phpt	-crlf
+/ext/zlib/tests/readgzfile_basic.phpt	-crlf
+/sapi/cli/tests/014.phpt			-crlf
+/tests/run-test/test010.phpt		-crlf
+/Zend/tests/bug35655.phpt			-crlf
+/Zend/tests/bug48930.phpt			-crlf
+/Zend/tests/bug61095.phpt			-crlf
+/Zend/tests/heredoc_017.phpt		-crlf
+/Zend/tests/heredoc_018.phpt		-crlf
+/Zend/tests/nowdoc_013.phpt			-crlf
+/Zend/tests/nowdoc_014.phpt			-crlf
+/Zend/tests/nowdoc_015.phpt			-crlf

NEWS

@@ -1,6 +1,10 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2012, PHP 5.4.1 RC1
+03 Mar 2012, PHP 5.4.2
+
+- Fix PHP-CGI query string parameter vulnerability, CVE-2012-1823. (Rasmus)
+
+26 Apr 2012, PHP 5.4.1
 
 - CLI Server:
   . Fixed bug #61461 (missing checks around malloc() calls). (Ilia)
@@ -9,6 +13,7 @@ PHP                                                                        NEWS
   . "Connection: close" instead of "Connection: closed" (Gustavo)
 
 - Core:
+  . Fixed crash in ZTS using same class in many threads. (Johannes)
   . Fixed bug #61374 (html_entity_decode tries to decode code points that don't
     exist in ISO-8859-1). (Gustavo)
   . Fixed bug #61273 (call_user_func_array with more than 16333 arguments 
@@ -40,6 +45,9 @@ PHP                                                                        NEWS
     function is by reference). (Nikita Popov)
   . Improve performance of set_exception_handler while doing reset (Laruence)
 
+- fileinfo:
+  . Fix fileinfo test problems. (Anatoliy Belsky)
+
 - FPM
   . Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
     (michaelhood at gmail dot com, Ilia)

Zend/zend_API.c

@@ -1093,7 +1093,12 @@ ZEND_API void object_properties_init(zend_object *object, zend_class_entry *clas
 		for (i = 0; i < class_type->default_properties_count; i++) {
 			object->properties_table[i] = class_type->default_properties_table[i];
 			if (class_type->default_properties_table[i]) {
+#if ZTS
+				ALLOC_ZVAL( object->properties_table[i]);
+				MAKE_COPY_ZVAL(&class_type->default_properties_table[i], object->properties_table[i]);
+#else
 				Z_ADDREF_P(object->properties_table[i]);
+#endif
 			}
 		}
 		object->properties = NULL;

configure.in

@@ -119,8 +119,8 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=4
-PHP_RELEASE_VERSION=1
-PHP_EXTRA_VERSION="RC1-dev"
+PHP_RELEASE_VERSION=2
+PHP_EXTRA_VERSION=""
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
 

ext/fileinfo/fileinfo.c

@@ -510,11 +510,22 @@ static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode, int mime
 			wrap = php_stream_locate_url_wrapper(buffer, &tmp2, 0 TSRMLS_CC);
 
 			if (wrap) {
+				php_stream *stream;
 				php_stream_context *context = php_stream_context_from_zval(zcontext, 0);
+
+#ifdef PHP_WIN32
+				if (php_stream_stat_path_ex(buffer, 0, &ssb, context) == SUCCESS) {
+					if (ssb.sb.st_mode & S_IFDIR) {
+						ret_val = mime_directory;
+						goto common;
+					}
+				}
+#endif
+
 #if PHP_API_VERSION < 20100412
-				php_stream *stream = php_stream_open_wrapper_ex(buffer, "rb", ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context);
+				stream = php_stream_open_wrapper_ex(buffer, "rb", ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context);
 #else
-				php_stream *stream = php_stream_open_wrapper_ex(buffer, "rb", REPORT_ERRORS, NULL, context);
+				stream = php_stream_open_wrapper_ex(buffer, "rb", REPORT_ERRORS, NULL, context);
 #endif
 
 				if (!stream) {

ext/fileinfo/libmagic/cdf.c

@@ -306,10 +306,10 @@ cdf_read(const cdf_info_t *info, off_t off, void *buf, size_t len)
 	if (info->i_fd == -1)
 		return -1;
 
-	if (lseek(info->i_fd, off, SEEK_SET) == (off_t)-1)
+	if (FINFO_LSEEK_FUNC(info->i_fd, off, SEEK_SET) == (off_t)-1)
 		return -1;
 
-	if (read(info->i_fd, buf, len) != (ssize_t)len)
+	if (FINFO_READ_FUNC(info->i_fd, buf, len) != (ssize_t)len)
 		return -1;
 
 	return (ssize_t)len;

ext/fileinfo/libmagic/compress.c

@@ -224,7 +224,7 @@ sread(int fd, void *buf, size_t n, int canbepipe)
 
 nocheck:
 	do
-		switch ((rv = read(fd, buf, n))) {
+		switch ((rv = FINFO_READ_FUNC(fd, buf, n))) {
 		case -1:
 			if (errno == EINTR)
 				continue;
@@ -301,7 +301,7 @@ file_pipe2file(struct magic_set *ms, int fd, const void *startbuf,
 		return -1;
 	}
 	(void)close(tfd);
-	if (lseek(fd, (off_t)0, SEEK_SET) == (off_t)-1) {
+	if (FINFO_LSEEK_FUNC(fd, (off_t)0, SEEK_SET) == (off_t)-1) {
 		file_badseek(ms);
 		return -1;
 	}
@@ -405,7 +405,7 @@ uncompressbuf(struct magic_set *ms, int fd, size_t method,
 		(void) close(0);
 		if (fd != -1) {
 		    (void) dup(fd);
-		    (void) lseek(0, (off_t)0, SEEK_SET);
+		    (void) FINFO_LSEEK_FUNC(0, (off_t)0, SEEK_SET);
 		} else {
 		    (void) dup(fdin[0]);
 		    (void) close(fdin[0]);

ext/fileinfo/libmagic/file.h

@@ -486,4 +486,12 @@ static const char *rcsid(const char *p) { \
 #define FILE_RCSID(id)
 #endif
 
+#ifdef PHP_WIN32
+#define FINFO_LSEEK_FUNC _lseek
+#define FINFO_READ_FUNC _read
+#else
+#define FINFO_LSEEK_FUNC lseek
+#define FINFO_READ_FUNC read
+#endif
+
 #endif /* __file_h__ */

ext/fileinfo/libmagic/readelf.c

@@ -309,11 +309,11 @@ dophn_core(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
 	 * Loop through all the program headers.
 	 */
 	for ( ; num; num--) {
-		if (lseek(fd, off, SEEK_SET) == (off_t)-1) {
+		if (FINFO_LSEEK_FUNC(fd, off, SEEK_SET) == (off_t)-1) {
 			file_badseek(ms);
 			return -1;
 		}
-		if (read(fd, xph_addr, xph_sizeof) == -1) {
+		if (FINFO_READ_FUNC(fd, xph_addr, xph_sizeof) == -1) {
 			file_badread(ms);
 			return -1;
 		}
@@ -331,11 +331,11 @@ dophn_core(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
 		 * This is a PT_NOTE section; loop through all the notes
 		 * in the section.
 		 */
-		if (lseek(fd, xph_offset, SEEK_SET) == (off_t)-1) {
+		if (FINFO_LSEEK_FUNC(fd, xph_offset, SEEK_SET) == (off_t)-1) {
 			file_badseek(ms);
 			return -1;
 		}
-		bufsize = read(fd, nbuf,
+		bufsize = FINFO_READ_FUNC(fd, nbuf,
 		    ((xph_filesz < sizeof(nbuf)) ? xph_filesz : sizeof(nbuf)));
 		if (bufsize == -1) {
 			file_badread(ms);
@@ -858,11 +858,11 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
 	}
 
 	for ( ; num; num--) {
-		if (lseek(fd, off, SEEK_SET) == (off_t)-1) {
+		if (FINFO_LSEEK_FUNC(fd, off, SEEK_SET) == (off_t)-1) {
 			file_badseek(ms);
 			return -1;
 		}
-		if (read(fd, xsh_addr, xsh_sizeof) == -1) {
+		if (FINFO_READ_FUNC(fd, xsh_addr, xsh_sizeof) == -1) {
 			file_badread(ms);
 			return -1;
 		}
@@ -888,13 +888,13 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
 		switch (xsh_type) {
 		case SHT_NOTE:
 			nbuf = emalloc((size_t)xsh_size);
-			if ((noff = lseek(fd, (off_t)xsh_offset, SEEK_SET)) ==
+			if ((noff = FINFO_LSEEK_FUNC(fd, (off_t)xsh_offset, SEEK_SET)) ==
 			    (off_t)-1) {
 				file_badread(ms);
 				efree(nbuf);
 				return -1;
 			}
-			if (read(fd, nbuf, (size_t)xsh_size) !=
+			if (FINFO_READ_FUNC(fd, nbuf, (size_t)xsh_size) !=
 			    (ssize_t)xsh_size) {
 				efree(nbuf);
 				file_badread(ms);
@@ -914,7 +914,7 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
 			efree(nbuf);
 			break;
 		case SHT_SUNW_cap:
-			if (lseek(fd, (off_t)xsh_offset, SEEK_SET) ==
+			if (FINFO_LSEEK_FUNC(fd, (off_t)xsh_offset, SEEK_SET) ==
 			    (off_t)-1) {
 				file_badseek(ms);
 				return -1;
@@ -927,7 +927,7 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
 				    MAX(sizeof cap32, sizeof cap64)];
 				if ((coff += xcap_sizeof) > (off_t)xsh_size)
 					break;
-				if (read(fd, cbuf, (size_t)xcap_sizeof) !=
+				if (FINFO_READ_FUNC(fd, cbuf, (size_t)xcap_sizeof) !=
 				    (ssize_t)xcap_sizeof) {
 					file_badread(ms);
 					return -1;
@@ -1046,12 +1046,12 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
 	}
 
   	for ( ; num; num--) {
-		if (lseek(fd, off, SEEK_SET) == (off_t)-1) {
+		if (FINFO_LSEEK_FUNC(fd, off, SEEK_SET) == (off_t)-1) {
 			file_badseek(ms);
 			return -1;
 		}
 
-  		if (read(fd, xph_addr, xph_sizeof) == -1) {
+  		if (FINFO_READ_FUNC(fd, xph_addr, xph_sizeof) == -1) {
   			file_badread(ms);
 			return -1;
 		}
@@ -1090,11 +1090,11 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
 			 * This is a PT_NOTE section; loop through all the notes
 			 * in the section.
 			 */
-			if (lseek(fd, xph_offset, SEEK_SET) == (off_t)-1) {
+			if (FINFO_LSEEK_FUNC(fd, xph_offset, SEEK_SET) == (off_t)-1) {
 				file_badseek(ms);
 				return -1;
 			}
-			bufsize = read(fd, nbuf, ((xph_filesz < sizeof(nbuf)) ?
+			bufsize = FINFO_READ_FUNC(fd, nbuf, ((xph_filesz < sizeof(nbuf)) ?
 			    xph_filesz : sizeof(nbuf)));
 			if (bufsize == -1) {
 				file_badread(ms);
@@ -1156,7 +1156,7 @@ file_tryelf(struct magic_set *ms, int fd, const unsigned char *buf,
 	/*
 	 * If we cannot seek, it must be a pipe, socket or fifo.
 	 */
-	if((lseek(fd, (off_t)0, SEEK_SET) == (off_t)-1) && (errno == ESPIPE))
+	if((FINFO_LSEEK_FUNC(fd, (off_t)0, SEEK_SET) == (off_t)-1) && (errno == ESPIPE))
 		fd = file_pipe2file(ms, fd, buf, nbytes);
 
 	if (fstat(fd, &st) == -1) {

ext/fileinfo/tests/finfo_open_001.phpt

@@ -19,23 +19,23 @@ bool(false)
 resource(%d) of type (file_info)
 resource(%d) of type (file_info)
 
-Warning: finfo_open(%s/123): failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(%s123): failed to open stream: No such file or directory in %s on line %d
 
-Warning: finfo_open(%s/123): failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(%s123): failed to open stream: No such file or directory in %s on line %d
 
-Warning: finfo_open(): Failed to load magic database at '%s/123'. in %s on line %d
+Warning: finfo_open(): Failed to load magic database at '%s123'. in %s on line %d
 bool(false)
 
-Warning: finfo_open(%s/1): failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(%s1): failed to open stream: No such file or directory in %s on line %d
 
-Warning: finfo_open(%s/1): failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(%s1): failed to open stream: No such file or directory in %s on line %d
 
-Warning: finfo_open(): Failed to load magic database at '%s/1'. in %s on line %d
+Warning: finfo_open(): Failed to load magic database at '%s1'. in %s on line %d
 bool(false)
 
-Warning: finfo_open(/foo/bar/inexistent): failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(%sinexistent): failed to open stream: No such file or directory in %s on line %d
 
-Warning: finfo_open(/foo/bar/inexistent): failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(%sinexistent): failed to open stream: No such file or directory in %s on line %d
 
-Warning: finfo_open(): Failed to load magic database at '/foo/bar/inexistent'. in %s on line %d
+Warning: finfo_open(): Failed to load magic database at '%sinexistent'. in %s on line %d
 bool(false)

ext/fileinfo/tests/finfo_open_error.phpt

@@ -27,11 +27,11 @@ var_dump( new finfo('foobar') );
 --EXPECTF--
 *** Testing finfo_open() : error functionality ***
 
-Warning: finfo_open(%s/foobarfile): failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or directory in %s on line %d
 
-Warning: finfo_open(%s/foobarfile): failed to open stream: No such file or directory in %s on line %d
+Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or directory in %s on line %d
 
-Warning: finfo_open(): Failed to load magic database at '%s/foobarfile'. in %s on line %d
+Warning: finfo_open(): Failed to load magic database at '%sfoobarfile'. in %s on line %d
 bool(false)
 
 Warning: finfo_open() expects parameter 1 to be long, array given in %s on line %d

ext/standard/exec.c

@@ -272,8 +272,8 @@ PHPAPI char *php_escape_shell_cmd(char *str)
 					p = NULL;
 				} else {
 					cmd[y++] = '\\';
-					cmd[y++] = str[x];
 				}
+				cmd[y++] = str[x];
 				break;
 #else
 			/* % is Windows specific for enviromental variables, ^%PATH% will 

main/php_version.h

@@ -2,7 +2,7 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 4
-#define PHP_RELEASE_VERSION 1
-#define PHP_EXTRA_VERSION "RC1-dev"
-#define PHP_VERSION "5.4.1RC1-dev"
-#define PHP_VERSION_ID 50401
+#define PHP_RELEASE_VERSION 2
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.4.2"
+#define PHP_VERSION_ID 50402

sapi/cgi/cgi_main.c

@@ -70,6 +70,7 @@
 #include "php_main.h"
 #include "fopen_wrappers.h"
 #include "ext/standard/php_standard.h"
+#include "ext/standard/url.h"
 
 #ifdef PHP_WIN32
 # include <io.h>
@@ -1752,6 +1753,9 @@ int main(int argc, char *argv[])
 #ifndef PHP_WIN32
 	int status = 0;
 #endif
+	char *query_string;
+	char *decoded_query_string;
+	int skip_getopt = 0;
 
 #if 0 && defined(PHP_DEBUG)
 	/* IIS is always making things more difficult.  This allows
@@ -1802,7 +1806,16 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) {
+	if(query_string = getenv("QUERY_STRING")) {
+		decoded_query_string = strdup(query_string);
+		php_url_decode(decoded_query_string, strlen(decoded_query_string));
+		if(*decoded_query_string == '-' && strchr(decoded_query_string, '=') == NULL) {
+			skip_getopt = 1;
+		}
+		free(decoded_query_string);
+	}
+
+	while (!skip_getopt && (c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) {
 		switch (c) {
 			case 'c':
 				if (cgi_sapi_module.php_ini_path_override) {