reapply the sysconf error check patch

NEWS

@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2016 PHP 7.0.3
+04 Feb 2016 PHP 7.0.3
 
 - Core:
   . Added support for new HTTP 451 code. (Julien)
@@ -40,10 +40,10 @@ PHP                                                                        NEWS
   . Fixed bug #71249 (ldap_mod_replace/ldap_mod_add store value as string
     "Array"). (Laruence)
 
-- mbsgring:
-  . Fixed bug #71397 (mb_send_mail segmentation fault). (Yasuo)
+- mbstring:
+  . Fixed bug #71397 (mb_send_mail segmentation fault). (Andrea, Yasuo)
 
-OpenSSL:
+- OpenSSL:
   . Fixed bug #71475 (openssl_seal() uninitialized memory usage). (Stas)
 
 - Phar:
@@ -64,16 +64,6 @@ OpenSSL:
     unserialize)). (Sean Heelan)
   . Fixed bug #71313 (Use-after-free vulnerability in SPL(SplObjectStorage,
     unserialize)). (Sean Heelan)
-  
-- Session:
-  . Improved fix for bug #68063 (Empty session IDs do still start sessions). (Yasuo)
-  . Fixed bug #69111 (Crash in SessionHandler::read()) (Yasuo)
-  . Fixed bug #71038 (session_start() returns TRUE on failure).
-    Session save handlers must return 'string' always for successful read.
-    i.e. Non-existing session read must return empty string. PHP 7.0 is made
-    not to tolerate buggy return value. (Yasuo)
-  . Fixed bug #71394 (session_regenerate_id() must close opened session on errors).
-    (Yasuo)
 
 - Standard:
   . Fixed bug #71287 (Error message contains hexadecimal instead of decimal
@@ -88,13 +78,11 @@ OpenSSL:
     array to strings). (Laruence)
   . Fixed bug #71188 (str_replace converts integers in original $search array
     to strings). (Laruence)
-  . Fixed bug #70720 (strip_tags improper php code parsing). (Julien)
   . Fixed bug #71132, #71197 (range() segfaults). (Thomas Punt)
 
 - WDDX:
   . Fixed bug #71335 (Type Confusion in WDDX Packet Deserialization). (Stas)
 
-
 07 Jan 2016 PHP 7.0.2
 
 - Core:

configure.in

@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 PHP_MAJOR_VERSION=7
 PHP_MINOR_VERSION=0
 PHP_RELEASE_VERSION=3
-PHP_EXTRA_VERSION="RC1"
+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/openssl/tests/bug71475.phpt

@@ -12,5 +12,5 @@ openssl_seal($_, $_, $_, array_fill(0,64,0));
 DONE
 --EXPECTF--
 
-Warning: openssl_seal(): not a public key (1th member of pubkeys) in %s/bug71475.php on line %d
-DONE
+Warning: openssl_seal(): not a public key (1th member of pubkeys) in %s%ebug71475.php on line %d
+DONE

ext/standard/exec.c

@@ -50,6 +50,10 @@
 #include <unistd.h>
 #endif
 
+#if HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
 static int cmd_max_len;
 
 /* {{{ PHP_MINIT_FUNCTION(exec) */
@@ -57,6 +61,13 @@ PHP_MINIT_FUNCTION(exec)
 {
 #ifdef _SC_ARG_MAX
 	cmd_max_len = sysconf(_SC_ARG_MAX);
+	if (-1 == cmd_max_len) {
+#ifdef _POSIX_ARG_MAX
+		cmd_max_len = _POSIX_ARG_MAX;
+#else
+		cmd_max_len = 4096;
+#endif
+	}
 #elif defined(ARG_MAX)
 	cmd_max_len = ARG_MAX;
 #elif defined(PHP_WIN32)

ext/standard/tests/serialize/bug71311.phpt

@@ -6,11 +6,11 @@ $data = unserialize("C:11:\"ArrayObject\":11:{x:i:0;r:3;XX");
 var_dump($data);
 ?>
 --EXPECTF--
-Fatal error: Uncaught UnexpectedValueException: Error at offset 10 of 11 bytes in %s/bug71311.php:2
+Fatal error: Uncaught UnexpectedValueException: Error at offset 10 of 11 bytes in %s%ebug71311.php:2
 Stack trace:
 #0 [internal function]: ArrayObject->unserialize('x:i:0;r:3;X')
-#1 %s/bug71311.php(2): unserialize('%s')
+#1 %s%ebug71311.php(2): unserialize('%s')
 #2 {main}
-  thrown in %s/bug71311.php on line 2
+  thrown in %s%ebug71311.php on line 2
 
 

ext/standard/tests/serialize/bug71313.phpt

@@ -6,9 +6,9 @@ $data = unserialize("C:16:\"SplObjectStorage\":113:{x:i:2;O:8:\"stdClass\":0:{},
 var_dump($data);
 ?>
 --EXPECTF--
-Fatal error: Uncaught UnexpectedValueException: Error at offset 82 of 113 bytes in %s/bug71313.php:2
+Fatal error: Uncaught UnexpectedValueException: Error at offset 82 of 113 bytes in %s%ebug71313.php:2
 Stack trace:
 #0 [internal function]: SplObjectStorage->unserialize('%s')
-#1 %s/bug71313.php(2): unserialize('%s')
+#1 %s%ebug71313.php(2): unserialize('%s')
 #2 {main}
-  thrown in %s/bug71313.php on line 2
+  thrown in %s%ebug71313.php on line 2

main/php_version.h

@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 7
 #define PHP_MINOR_VERSION 0
 #define PHP_RELEASE_VERSION 3
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "7.0.3RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "7.0.3"
 #define PHP_VERSION_ID 70003

win32/build/libs_version.txt

@@ -13,4 +13,4 @@ libssh2-1.6.0
 libtidy-20090406
 libxslt-1.1.28
 libxml-2.9.3
-openssl-1.0.2e
+openssl-1.0.2f