[PHP-CVS] com php-src: Add json_last_error_msg() function: ext/json/json.c ext/json/tests/003.phpt ext/json/tests/004.phpt ext/json/tests/007.phpt ext/json/tests/bug54058.phpt ext/json/tests/bug61537.

2012-06-28 Thread Nikita Popov
Commit:974324676b2436f159f42d9241c569f813471684
Author:Nikita Popov ni...@php.net Thu, 28 Jun 2012 20:09:47 +0200
Parents:   b025b9d0cf9921d26fc4dad43cf26390d0a8c5dd
Branches:  PHP-5.3 PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=974324676b2436f159f42d9241c569f813471684

Log:
Add json_last_error_msg() function

This replaces json_last_error(true) and is consistent with other custom
error handling functions.

Changed paths:
  M  ext/json/json.c
  M  ext/json/tests/003.phpt
  M  ext/json/tests/004.phpt
  M  ext/json/tests/007.phpt
  M  ext/json/tests/bug54058.phpt
  M  ext/json/tests/bug61537.phpt
  M  ext/json/tests/inf_nan_error.phpt
  M  ext/json/tests/unsupported_type_error.phpt

diff --git a/ext/json/json.c b/ext/json/json.c
index 5e0351f..4d29a66 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -34,6 +34,7 @@ static PHP_MINFO_FUNCTION(json);
 static PHP_FUNCTION(json_encode);
 static PHP_FUNCTION(json_decode);
 static PHP_FUNCTION(json_last_error);
+static PHP_FUNCTION(json_last_error_msg);
 
 static const char digits[] = 0123456789abcdef;
 
@@ -51,8 +52,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_json_decode, 0, 0, 1)
ZEND_ARG_INFO(0, depth)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_json_last_error, 0, 0, 0)
-   ZEND_ARG_INFO(0, as_string)
+ZEND_BEGIN_ARG_INFO(arginfo_json_last_error, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_json_last_error_msg, 0)
 ZEND_END_ARG_INFO()
 /* }}} */
 
@@ -61,6 +64,7 @@ static const function_entry json_functions[] = {
PHP_FE(json_encode, arginfo_json_encode)
PHP_FE(json_decode, arginfo_json_decode)
PHP_FE(json_last_error, arginfo_json_last_error)
+   PHP_FE(json_last_error_msg, arginfo_json_last_error_msg)
PHP_FE_END
 };
 /* }}} */
@@ -607,21 +611,25 @@ static PHP_FUNCTION(json_decode)
 /* }}} */
 
 /* {{{ proto int json_last_error()
-   Returns the error code of the last json_decode(). */
+   Returns the error code of the last json_encode() or json_decode() call. */
 static PHP_FUNCTION(json_last_error)
 {
-   zend_bool as_string = 0;
-
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |b, as_string) 
== FAILURE) {
+   if (zend_parse_parameters_none() == FAILURE) {
return;
}
 
-   /* return error code (JSON_ERROR_* constants) */
-   if (!as_string) {
-   RETURN_LONG(JSON_G(error_code));
+   RETURN_LONG(JSON_G(error_code));
+}
+/* }}} */
+
+/* {{{ proto string json_last_error_msg()
+   Returns the error string of the last json_encode() or json_decode() call. */
+static PHP_FUNCTION(json_last_error_msg)
+{
+   if (zend_parse_parameters_none() == FAILURE) {
+   return;
}
 
-   /* return error message (for debugging purposes) */
switch(JSON_G(error_code)) {
case PHP_JSON_ERROR_NONE:
RETURN_STRING(No error, 1);
@@ -644,6 +652,7 @@ static PHP_FUNCTION(json_last_error)
default:
RETURN_STRING(Unknown error, 1);
}
+
 }
 /* }}} */
 
diff --git a/ext/json/tests/003.phpt b/ext/json/tests/003.phpt
index 7187452..4ce5b0f 100644
--- a/ext/json/tests/003.phpt
+++ b/ext/json/tests/003.phpt
@@ -13,14 +13,12 @@ var_dump($a);
 echo \n;
 
 var_dump(json_encode($a));
-var_dump(json_last_error());
-var_dump(json_last_error(true));
+var_dump(json_last_error(), json_last_error_msg());
 
 echo \n;
 
 var_dump(json_encode($a, JSON_PARTIAL_OUTPUT_ON_ERROR));
-var_dump(json_last_error());
-var_dump(json_last_error(true));
+var_dump(json_last_error(), json_last_error_msg());
 
 echo Done\n;
 ?
diff --git a/ext/json/tests/004.phpt b/ext/json/tests/004.phpt
index 49c543e..70ef3ff 100644
--- a/ext/json/tests/004.phpt
+++ b/ext/json/tests/004.phpt
@@ -13,14 +13,12 @@ var_dump($a);
 echo \n;
 
 var_dump(json_encode($a));
-var_dump(json_last_error());
-var_dump(json_last_error(true));
+var_dump(json_last_error(), json_last_error_msg());
 
 echo \n;
 
 var_dump(json_encode($a, JSON_PARTIAL_OUTPUT_ON_ERROR));
-var_dump(json_last_error());
-var_dump(json_last_error(true));
+var_dump(json_last_error(), json_last_error_msg());
 
 echo Done\n;
 ?
diff --git a/ext/json/tests/007.phpt b/ext/json/tests/007.phpt
index 9ee190a..7557ac9 100644
--- a/ext/json/tests/007.phpt
+++ b/ext/json/tests/007.phpt
@@ -5,15 +5,15 @@ json_last_error() tests
 --FILE--
 ?php
 var_dump(json_decode([1]));
-var_dump(json_last_error());
+var_dump(json_last_error(), json_last_error_msg());
 var_dump(json_decode([[1]], false, 2));
-var_dump(json_last_error());
+var_dump(json_last_error(), json_last_error_msg());
 var_dump(json_decode([1}));
-var_dump(json_last_error());
+var_dump(json_last_error(), json_last_error_msg());
 var_dump(json_decode('[' . chr(0) . 'abcd]'));
-var_dump(json_last_error());
+var_dump(json_last_error(), json_last_error_msg());
 var_dump(json_decode([1));
-var_dump(json_last_error());
+var_dump(json_last_error(), 

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/json/json.c

2012-06-28 Thread Nikita Popov
Commit:405ebfcd182a39f0960ff7d7055d49053d3e0316
Author:Nikita Popov ni...@php.net Thu, 28 Jun 2012 20:18:19 +0200
Parents:   2996d094f66d57d79552d642129d60937c6d 
974324676b2436f159f42d9241c569f813471684
Branches:  PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=405ebfcd182a39f0960ff7d7055d49053d3e0316

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Add json_last_error_msg() function

Changed paths:
  MM  ext/json/json.c


Diff:
diff --cc ext/json/json.c
index 5ea3070,4d29a66..b467079
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@@ -52,11 -50,12 +53,13 @@@ ZEND_BEGIN_ARG_INFO_EX(arginfo_json_dec
ZEND_ARG_INFO(0, json)
ZEND_ARG_INFO(0, assoc)
ZEND_ARG_INFO(0, depth)
 +  ZEND_ARG_INFO(0, options)
  ZEND_END_ARG_INFO()
  
- ZEND_BEGIN_ARG_INFO_EX(arginfo_json_last_error, 0, 0, 0)
-   ZEND_ARG_INFO(0, as_string)
+ ZEND_BEGIN_ARG_INFO(arginfo_json_last_error, 0)
+ ZEND_END_ARG_INFO()
+ 
+ ZEND_BEGIN_ARG_INFO(arginfo_json_last_error_msg, 0)
  ZEND_END_ARG_INFO()
  /* }}} */


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



Re: [PHP-CVS] com php-src: Add json_last_error_msg() function: ext/json/json.c ext/json/tests/003.phpt ext/json/tests/004.phpt ext/json/tests/007.phpt ext/json/tests/bug54058.phpt ext/json/tests/bug61

2012-06-28 Thread Peter Cowburn
On 28 June 2012 19:11, Nikita Popov ni...@php.net wrote:
 Commit:    974324676b2436f159f42d9241c569f813471684
 Author:    Nikita Popov ni...@php.net         Thu, 28 Jun 2012 20:09:47 
 +0200
 Parents:   b025b9d0cf9921d26fc4dad43cf26390d0a8c5dd
 Branches:  PHP-5.3 PHP-5.4

 Link:       
 http://git.php.net/?p=php-src.git;a=commitdiff;h=974324676b2436f159f42d9241c569f813471684

 Log:
 Add json_last_error_msg() function

 This replaces json_last_error(true) and is consistent with other custom
 error handling functions.


I hope you picked this function name to fuel the PHP is so
inconsistent lovers.  Could I suggest picking something a little less
a) different from everything else, and b) different from *everything*
else?

The following is a quick tally of error functions that return error
message strings and reference last or previous in their documented
purpose.

*_error_msg (1)
*_errcode (1)
*_errormsg (4)
*_error (17)
*_last_error (2)
*_get_error (2)
*_get_error_message (7)

Added to this, is a whole new choice; your *_last_error_msg.  The
behaviour might be consistent (having a separate
error-string-returning function) but the name isn't at all.



Appendix - Functions containing err, returning an error message
string with refpurpose mentioning last/previous.

cubrid_error_msg

dbplus_errcode

db2_conn_errormsg
db2_stmt_errormsg
ifx_errormsg
odbc_errormsg

curl_error
db2_conn_error
ingres_error
fbsql_error
ldap_error
maxdb_connect_error
maxdb_error
maxdb_stmt_error
msql_error
mysql_error
mysqli_connect_error
mysqli_error
mysqli_stmt_error
qdom_error
stomp_connect_error
stomp_error
vpopmail_error

imap_last_error
pg_last_error

enchant_broker_get_error
enchant_dict_get_error

collator_get_error_message
datefmt_get_error_message
intl_get_error_message
msgfmt_get_error_message
numfmt_get_error_message
resourcebundle_get_error_message
transliterator_get_error_message

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/standard/crypt.c

2012-06-28 Thread Anthony Ferrara
Commit:34ab5650bcea46825ed1f9021c5a52b161705c27
Author:Anthony Ferrara ircmax...@ircmaxell.com Thu, 28 Jun 2012 
20:36:21 -0400
Parents:   405ebfcd182a39f0960ff7d7055d49053d3e0316 
7e8276ca68fc622124d51d18e4f7b5cde3536de4
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=34ab5650bcea46825ed1f9021c5a52b161705c27

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)

Bugs:
https://bugs.php.net/62443

Changed paths:
  MM  NEWS
  MM  ext/standard/crypt.c


Diff:
diff --cc NEWS
index b1de5f1,80d56bc..6821a7e
--- a/NEWS
+++ b/NEWS
@@@ -1,39 -1,39 +1,41 @@@
  PHP
NEWS
  
|||
 -?? ??? 2012, PHP 5.3.15
 -- Zend Engine:
 -  . Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that
 -includes a semi-colon). (Pierrick)
 -
 -- COM:
 -  . Fixed bug #62146 com_dotnet cannot be built shared. (Johannes)
 +?? ??? 2012, PHP 5.4.5
  
  - Core:
 -  . Fixed CVE-2012-2143. (Solar Designer)
 -  . Fixed potential overflow in _php_stream_scandir. (Jason Powell,
 -Stas)
 -  . Fixed bug #62432 (ReflectionMethod random corrupt memory on high
 -concurrent). (Johannes)
 +  . Fixed bug #62357 (compile failure: (S) Arguments missing for built-in
 +function __memcmp). (Laruence)
 +  . Fixed bug #61998 (Using traits with method aliases appears to result in
 +crash during execution). (Dmitry)
 +  . Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that
 +includes a semi-colon). (Pierrick)
 +  . Fixed potential overflow in _php_stream_scandir (CVE-2012-2688). 
 +(Jason Powell, Stas)
+   . Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed 
+ Salt). (Anthony Ferrara)
  
 -- Fileinfo:
 -  . Fixed magic file regex support. (Felipe)
 +- EXIF:
 +  . Fixed information leak in ext exif (discovered by Martin Noga, 
 +Matthew j00ru Jurczyk, Gynvael Coldwind)
  
  - FPM:
 -  . Fixed bug #61045 (fpm don't send error log to fastcgi clients). (fat)
 +  . Fixed bug #62205 (php-fpm segfaults (null passed to strstr)). (fat)
 +  . Fixed bug #62160 (Add process.priority to set nice(2) priorities). (fat)
 +  . Fixed bug #62153 (when using unix sockets, multiples FPM instances
 +  . Fixed bug #62033 (php-fpm exits with status 0 on some failures to start).
 +(fat)
 +  . Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm). (fat)
. Fixed bug #61835 (php-fpm is not allowed to run as root). (fat)
. Fixed bug #61295 (php-fpm should not fail with commented 'user'
 +  . Fixed bug #61218 (FPM drops connection while receiving some binary values
 +in FastCGI requests). (fat)
 +  . Fixed bug #61045 (fpm don't send error log to fastcgi clients). (fat)
  for non-root start). (fat)
. Fixed bug #61026 (FPM pools can listen on the same address). (fat)
 -  . Fixed bug #62033 (php-fpm exits with status 0 on some failures to start).
 -(fat)
 -  . Fixed bug #62153 (when using unix sockets, multiples FPM instances
  can be launched without errors). (fat)
 -  . Fixed bug #62160 (Add process.priority to set nice(2) priorities). (fat)
 -  . Fixed bug #61218 (FPM drops connection while receiving some binary values
 -in FastCGI requests). (fat)
 -  . Fixed bug #62205 (php-fpm segfaults (null passed to strstr)). (fat)
 +
 +- Iconv:
 +  . Fix bug #55042 (Erealloc in iconv.c unsafe). (Stas)
  
  - Intl:
. Fixed bug #62083 (grapheme_extract() memory leaks). (Gustavo)
diff --cc ext/standard/crypt.c
index 9a1fcf1,2eb4fc3..3ade86a
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@@ -199,8 -199,8 +199,8 @@@ PHP_FUNCTION(crypt
char *output;
int needed = (sizeof(sha512_salt_prefix) - 1
+ sizeof(sha512_rounds_prefix) 
+ 9 + 1
-   + strlen(salt) + 1 + 43 + 1);
+   + PHP_MAX_SALT_LEN + 1 + 43 + 
1);
 -  output = emalloc(needed * sizeof(char *));
 +  output = emalloc(needed);
salt[salt_in_len] = '\0';
  
crypt_res = php_sha512_crypt_r(str, salt, output, 
needed);
@@@ -222,8 -222,8 +222,8 @@@
char *output;
int needed = (sizeof(sha256_salt_prefix) - 1
+ sizeof(sha256_rounds_prefix) 
+ 9 + 1
-   + strlen(salt) + 1 + 43 + 1);
+   + PHP_MAX_SALT_LEN + 1 + 43 + 
1);
 -  output = emalloc(needed * sizeof(char *));
 +  output = emalloc(needed);
salt[salt_in_len] = '\0';
  

[PHP-CVS] com php-src: Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt): NEWS ext/standard/crypt.c ext/standard/tests/strings/bug62443.phpt

2012-06-28 Thread Anthony Ferrara
Commit:7e8276ca68fc622124d51d18e4f7b5cde3536de4
Author:Anthony Ferrara ircmax...@ircmaxell.com Thu, 28 Jun 2012 
20:00:03 -0400
Parents:   974324676b2436f159f42d9241c569f813471684
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=7e8276ca68fc622124d51d18e4f7b5cde3536de4

Log:
Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)

Fixed a memory allocation bug in crypt() SHA256/512 that can
cause segmentation faults when passed in salts with a null byte
early.

Bugs:
https://bugs.php.net/62443

Changed paths:
  M  NEWS
  M  ext/standard/crypt.c
  A  ext/standard/tests/strings/bug62443.phpt


Diff:
diff --git a/NEWS b/NEWS
index 520aa19..80d56bc 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@ PHP   
 NEWS
 Stas)
   . Fixed bug #62432 (ReflectionMethod random corrupt memory on high
 concurrent). (Johannes)
+  . Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed 
+Salt). (Anthony Ferrara)
 
 - Fileinfo:
   . Fixed magic file regex support. (Felipe)
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
index e0d90e7..2eb4fc3 100644
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@ -199,7 +199,7 @@ PHP_FUNCTION(crypt)
char *output;
int needed = (sizeof(sha512_salt_prefix) - 1
+ sizeof(sha512_rounds_prefix) 
+ 9 + 1
-   + strlen(salt) + 1 + 43 + 1);
+   + PHP_MAX_SALT_LEN + 1 + 43 + 
1);
output = emalloc(needed * sizeof(char *));
salt[salt_in_len] = '\0';
 
@@ -222,7 +222,7 @@ PHP_FUNCTION(crypt)
char *output;
int needed = (sizeof(sha256_salt_prefix) - 1
+ sizeof(sha256_rounds_prefix) 
+ 9 + 1
-   + strlen(salt) + 1 + 43 + 1);
+   + PHP_MAX_SALT_LEN + 1 + 43 + 
1);
output = emalloc(needed * sizeof(char *));
salt[salt_in_len] = '\0';
 
diff --git a/ext/standard/tests/strings/bug62443.phpt 
b/ext/standard/tests/strings/bug62443.phpt
new file mode 100644
index 000..9e0dc38
--- /dev/null
+++ b/ext/standard/tests/strings/bug62443.phpt
@@ -0,0 +1,9 @@
+--TEST--
+Bug #62443 Crypt SHA256/512 Segfaults With Malformed Salt
+--FILE--
+?php
+crypt(foo, '$5$'.chr(0).'abc');
+crypt(foo, '$6$'.chr(0).'abc');
+echo OK!;
+--EXPECT--
+OK!


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] com php-src: Merge branch 'PHP-5.4': NEWS

2012-06-28 Thread Anthony Ferrara
Commit:63318772ae2fc3b69391f38764b3ab9e834e9120
Author:Anthony Ferrara ircmax...@ircmaxell.com Thu, 28 Jun 2012 
20:38:31 -0400
Parents:   cd7ab5cd11f156d58306539f6298f1661bf06cab 
34ab5650bcea46825ed1f9021c5a52b161705c27
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=63318772ae2fc3b69391f38764b3ab9e834e9120

Log:
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)

Bugs:
https://bugs.php.net/62443

Changed paths:
  MM  NEWS


Diff: Diff exceeded maximum size

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] com php-src: fix NEWS order: NEWS

2012-06-28 Thread Stanislav Malyshev
Commit:8992da245136a2ef697fb2911cbf138910150d08
Author:Stanislav Malyshev s...@php.net Thu, 28 Jun 2012 18:08:11 
-0700
Parents:   34ab5650bcea46825ed1f9021c5a52b161705c27
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=8992da245136a2ef697fb2911cbf138910150d08

Log:
fix NEWS order

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 6821a7e..f511250 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP 
   NEWS
 ?? ??? 2012, PHP 5.4.5
 
 - Core:
+  . Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed 
+Salt). (Anthony Ferrara)
   . Fixed bug #62357 (compile failure: (S) Arguments missing for built-in
 function __memcmp). (Laruence)
   . Fixed bug #61998 (Using traits with method aliases appears to result in
@@ -11,8 +13,6 @@ PHP   
 NEWS
 includes a semi-colon). (Pierrick)
   . Fixed potential overflow in _php_stream_scandir (CVE-2012-2688). 
 (Jason Powell, Stas)
-  . Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed 
-Salt). (Anthony Ferrara)
 
 - EXIF:
   . Fixed information leak in ext exif (discovered by Martin Noga,


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] com php-src: Restore old NEWS file, and re-add new entry.: NEWS

2012-06-28 Thread Anthony Ferrara
Commit:e778b03307ef51a501136f6876495dc2e7409e41
Author:Anthony Ferrara ircmax...@gmail.com Thu, 28 Jun 2012 
22:43:59 -0400
Parents:   da5fb9cb98aca68d85d89a40244d4941d8442310
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=e778b03307ef51a501136f6876495dc2e7409e41

Log:
Restore old NEWS file, and re-add new entry.

This fixes a merge artifact where the 5.4 NEWS
file was accidentally brought in.

Changed paths:
  M  NEWS

diff --git a/NEWS b/NEWS
index 1b658c7..e76c564 100644
--- a/NEWS
+++ b/NEWS
@@ -2,338 +2,6 @@ PHP   
 NEWS
 |||
 ?? ??? 201?, PHP 5.5.0
 
-- Core:
-  . Fixed bug #62357 (compile failure: (S) Arguments missing for built-in
-function __memcmp). (Laruence)
-  . Fixed bug #61998 (Using traits with method aliases appears to result in
-crash during execution). (Dmitry)
-  . Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that
-includes a semi-colon). (Pierrick)
-  . Fixed potential overflow in _php_stream_scandir (CVE-2012-2688). 
-(Jason Powell, Stas)
-  . Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed 
-Salt). (Anthony Ferrara)
-
-- EXIF:
-  . Fixed information leak in ext exif (discovered by Martin Noga, 
-Matthew j00ru Jurczyk, Gynvael Coldwind)
-
-- FPM:
-  . Fixed bug #62205 (php-fpm segfaults (null passed to strstr)). (fat)
-  . Fixed bug #62160 (Add process.priority to set nice(2) priorities). (fat)
-  . Fixed bug #62153 (when using unix sockets, multiples FPM instances
-  . Fixed bug #62033 (php-fpm exits with status 0 on some failures to start).
-(fat)
-  . Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm). (fat)
-  . Fixed bug #61835 (php-fpm is not allowed to run as root). (fat)
-  . Fixed bug #61295 (php-fpm should not fail with commented 'user'
-  . Fixed bug #61218 (FPM drops connection while receiving some binary values
-in FastCGI requests). (fat)
-  . Fixed bug #61045 (fpm don't send error log to fastcgi clients). (fat)
-for non-root start). (fat)
-  . Fixed bug #61026 (FPM pools can listen on the same address). (fat)
-can be launched without errors). (fat)
-
-- Iconv:
-  . Fix bug #55042 (Erealloc in iconv.c unsafe). (Stas)
-
-- Intl:
-  . Fixed bug #62083 (grapheme_extract() memory leaks). (Gustavo)
-  . ResourceBundle constructor now accepts NULL for the first two arguments.
-(Gustavo)
-  . Fixed bug #62081 (IntlDateFormatter constructor leaks memory when called
-twice). (Gustavo)
-  . Fixed bug #62070 (Collator::getSortKey() returns garbage). (Gustavo)
-  . Fixed bug #62017 (datefmt_create with incorrectly encoded timezone leaks
-pattern). (Gustavo)
-
-- libxml:
-  . Fixed bug #62266 (Custom extension segfaults during xmlParseFile with FPM
-SAPI). (Gustavo)
-
-- Readline:
-  . Fixed bug #62186 (readline fails to compile - void function should not
-return a value). (Johannes)
-
-- Reflection:
-  . Fixed bug #62384 (Attempting to invoke a Closure more than once causes 
-segfault). (Felipe)
-  . Fixed bug #62202 (ReflectionParameter::getDefaultValue() memory leaks 
-with constant). (Laruence)
-
-- Sockets:
-  . Fixed bug #62025 (__ss_family was changed on AIX 5.3). (Felipe)
-
-- XML Writer:
-  . Fixed bug #62064 (memory leak in the XML Writer module). 
-(jean-pierre dot lozi at lip6 dot fr)
-
-- Zip:
-  . Upgraded libzip to 0.10.1 (Anatoliy)
-
-14 Jun 2012, PHP 5.4.4
-
-- COM:
-  . Fixed bug #62146 com_dotnet cannot be built shared. (Johannes)
-
-- CLI Server:
-  . Implemented FR #61977 (Need CLI web-server support for files with .htm  
-svg extensions). (Sixd, Laruence)
-  . Improved performance while sending error page, this also fixed
-bug #61785 (Memory leak when access a non-exists file without router).
-(Laruence)
-  . Fixed bug #61546 (functions related to current script failed when chdir() 
-in cli sapi). (Laruence, reeze@gmail.com)
-
-- CURL:
-  . Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction).
-(Laruence)
-
-- Core:
-  . Fixed missing bound check in iptcparse(). (chris at chiappa.net)
-  . Fixed CVE-2012-2143. (Solar Designer)
-  . Fixed bug #62097 (fix for for bug #54547). (Gustavo)
-  . Fixed bug #62005 (unexpected behavior when incrementally assigning to a 
-member of a null object). (Laruence)
-  . Fixed bug #61978 (Object recursion not detected for classes that implement
-JsonSerializable). (Felipe)
-  . Fixed bug #61991 (long overflow in realpath_cache_get()). (Anatoliy)
-  . Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config).
-(Laruence)
-  . Fixed bug #61827 (incorrect \e processing on Windows) (Anatoliy)
-  . Fixed bug #61782 (__clone/__destruct do not match other methods when 
checking
-access controls). (Stas)
-  . Fixed bug #61761 ('Overriding' a private