PHP 5.3.17

NEWS

@@ -1,27 +1,24 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2012, PHP 5.3.16
+13 Sep 2012, PHP 5.3.17
 
 - Core:
   . Fixed bug (segfault while build with zts and GOTO vm-kind). (Laruence)
+  . Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" 
+    Windows registry). (aserbulov at parallels dot com)
   . Fixed bug #62763 (register_shutdown_function and extending class). 
     (Laruence)
   . Fixed bug #62744 (dangling pointers made by zend_disable_class). (Laruence)
   . Fixed bug #62716 (munmap() is called with the incorrect length). 
     (slangley@google.com)
   . Fixed bug ##62460 (php binaries installed as binary.dSYM). (Reeze Xia)
-  . Fixed bug #60194 (--with-zend-multibyte and --enable-debug reports LEAK
-    with run-test.php). (Laruence)
 
 - CURL:
   . Fixed bug #62839 (curl_copy_handle segfault with CURLOPT_FILE). (Pierrick)
-  . Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false).
-    (r.hampartsumyan@gmail.com, Laruence)
 
 - DateTime:
   . Fixed bug #62852 (Unserialize invalid DateTime causes crash).
     (reeze.xia@gmail.com)
-  . Fixed bug #62500 (Segfault in DateInterval class when extended). (Laruence)
 
 - Intl:
   . Fix null pointer dereferences in some classes of ext/intl. (Gustavo)
@@ -32,23 +29,38 @@ PHP                                                                        NEWS
 - PDO:
   . Fixed bug #62685 (Wrong return datatype in PDO::inTransaction()). (Laruence)
 
-- Reflection:
-  . Fixed bug #62715 (ReflectionParameter::isDefaultValueAvailable() wrong
-    result). (Laruence)
-
 - Session:
   . Fixed bug (segfault due to retval is not initialized). (Laruence)
 
 - SPL:
   . Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray)
     (Laruence)
-  . Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance
-    gives Segmentation fault). (Laruence, Gustavo)
 
 - Enchant:
   . Fixed bug #62838 (enchant_dict_quick_check() destroys zval, but fails to 
   initialize it). (Tony, Mateusz Goik).
 
+16 Aug 2012, PHP 5.3.16
+
+- Core:
+  . Fixed bug #60194 (--with-zend-multibyte and --enable-debug reports LEAK
+    with run-test.php). (Laruence)
+
+- CURL:
+  . Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false).
+    (r.hampartsumyan@gmail.com, Laruence)
+
+- DateTime:
+  . Fixed Bug #62500 (Segfault in DateInterval class when extended). (Laruence)
+
+- Reflection:
+  . Fixed bug #62715 (ReflectionParameter::isDefaultValueAvailable() wrong
+    result). (Laruence)
+
+- SPL:
+  . Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance
+    gives Segmentation fault). (Laruence, Gustavo)
+
 19 Jul 2012, PHP 5.3.15
 
 - Zend Engine:

configure.in

@@ -41,8 +41,8 @@ AC_CONFIG_HEADER(main/php_config.h)
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=3
-PHP_RELEASE_VERSION=16
-PHP_EXTRA_VERSION="-dev"
+PHP_RELEASE_VERSION=17
+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`
 

main/php_version.h

@@ -2,7 +2,7 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 3
-#define PHP_RELEASE_VERSION 16
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.3.16-dev"
-#define PHP_VERSION_ID 50316
+#define PHP_RELEASE_VERSION 17
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.3.17"
+#define PHP_VERSION_ID 50317

win32/registry.c

@@ -77,12 +77,13 @@ static int LoadDirectory(HashTable *directories, HKEY key, char *path, int path_
 				value_len = max_value+1;
 				if (RegEnumValue(key, i, name, &name_len, NULL, &type, value, &value_len) == ERROR_SUCCESS) {
 					if ((type == REG_SZ) || (type == REG_EXPAND_SZ)) {
-						ht = (HashTable*)malloc(sizeof(HashTable));
 						if (!ht) {
-							return ret;
+							ht = (HashTable*)malloc(sizeof(HashTable));
+							if (!ht) {
+								return ret;
+							}
+							zend_hash_init(ht, 0, NULL, ZVAL_INTERNAL_PTR_DTOR, 1);
 						}
-						zend_hash_init(ht, 0, NULL, ZVAL_INTERNAL_PTR_DTOR, 1);
-
 						data = (zval*)malloc(sizeof(zval));
 						if (!data) {
 							return ret;