Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	NEWS

diff --cc NEWS
index 1fbd5a2858903ab92db8fac54638865b07a0df5a,fb877c01853142d7ad5c889e33f522b849520421..ac0c94346ba1707470b328f015041512991f9b8c
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,45 -1,15 +1,49 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.3.24
 +?? ??? 2013, PHP 5.4.14
  - PCRE:
 -  . Merged PCRE 8.32). (Anatol)
 +  . Merged PCRE 8.32. (Anatol)
 +
 +?? ??? 2013, PHP 5.4.13
 +
 +- Core:
 +  . Fixed bug #64354 (Unserialize array of objects whose class can't
 +    be autoloaded fail). (Laruence)
 +  . Fixed bug #64235 (Insteadof not work for class method in 5.4.11).
 +    (Laruence)
 +  . Fixed bug #64197 (_Offsetof() macro used but not defined on ARM/Clang). 
 +    (Ard Biesheuvel)
 +  . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell)
 +  . Fixed bug #64142 (dval to lval different behavior on ppc64). (Remi)
 +  . Fixed bug #64070 (Inheritance with Traits failed with error). (Dmitry)
 +
 +- CLI server:
 +  . Fixed bug #64128 (buit-in web server is broken on ppc64). (Remi)
 +
 +- Mbstring:
 +  . mb_split() can now handle empty matches like preg_split() does. (Moriyoshi)
  
+ - mysqlnd
+   . Fixed bug #63530 (mysqlnd_stmt::bind_one_parameter crashes, uses wrong alloc
+     for stmt->param_bind). (Andrey)
+ 
 +- OpenSSL:
 +  . New SSL stream context option to prevent CRIME attack vector. (Daniel Lowrey,
 +      Lars)
 +  . Fixed bug #61930 (openssl corrupts ssl key resource when using 
 +    openssl_get_publickey()). (Stas)
  
 -28 Feb 2013, PHP 5.3.23RC1
 +- PDO_mysql:
 +  . Fixed bug #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs).
 +    (Johannes)
 +
 +- Phar:
 +  . Fixed timestamp update on Phar contents modification. (Dmitry)
 +
 +- SOAP
 +  . Added check that soap.wsdl_cache_dir conforms to open_basedir
 +    (CVE-2013-1635). (Dmitry)
 +  . Disabled external entities loading (CVE-2013-1643). (Dmitry)
  
  - Phar:
    . Fixed timestamp update on Phar contents modification. (Dmitry)

diff --cc ext/mysqlnd/mysqlnd_ps.c
Simple merge

diff --cc ext/pdo_mysql/mysql_statement.c
index f2e36c1719ea1aa06bf64e3a7983eb590a62a6a0,d6dcb3a2e6035af712cf0d5075dcd7ec8b9ffd2d..2ae559571d48dc93ab4e056f567341981962e558
--- 1/ext/pdo_mysql/mysql_statement.c
--- 2/ext/pdo_mysql/mysql_statement.c
+++ b/ext/pdo_mysql/mysql_statement.c
@@@ -343,7 -351,8 +343,6 @@@ static int pdo_mysql_stmt_next_rowset(p
        pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data;
        pdo_mysql_db_handle *H = S->H;
        long row_count;
--      int ret;
        PDO_DBG_ENTER("pdo_mysql_stmt_next_rowset");
        PDO_DBG_INF_FMT("stmt=%p", S->stmt);
  
@@@ -412,26 -421,26 +411,21 @@@
                S->result = NULL;
        }
  
--      ret = mysql_next_result(H->server);
++      if (!mysql_more_results(H->server)) {
++              /* No more results */
++              PDO_DBG_RETURN(0);      
++      }
  #if PDO_USE_MYSQLND
--      /* for whatever reason mysqlnd breaks with libmysql compatibility at the C level, no -1 */
--      if (PASS != ret) {
++      if (mysql_next_result(H->server) == FAIL) {
                pdo_mysql_error_stmt(stmt);
                PDO_DBG_RETURN(0);
--      }
--      if (mysql_more_results(H->server)) {
--              PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt TSRMLS_CC));
        } else {
--              /* No more results */
--              PDO_DBG_RETURN(0);
++              PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt TSRMLS_CC));
        }
  #else
--      if (ret > 0) {
++      if (mysql_next_result(H->server) > 0) {
                pdo_mysql_error_stmt(stmt);
                PDO_DBG_RETURN(0);
--      } else if (ret < 0) {
--              /* No more results */
--              PDO_DBG_RETURN(0);
        } else {
                PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt TSRMLS_CC));
        }