Merge branch 'PHP-7.0'

weltling · weltling · commit 655e266440bc · 2015-11-06T23:10:40.000+01:00
* PHP-7.0:
  update NEWS
  fix decrement_function regarding bug #70863
  Fixed bug #70863 Incorect logic to increment_function for proxy objects
  no more dev ZEND_VERSION
  Add support for IPV6_V6ONLY on sockets

Conflicts:
	Zend/zend.h
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
@@ -2277,7 +2277,7 @@ ZEND_API int ZEND_FASTCALL increment_function(zval *op1) /* {{{ */
 				zval *val;
 
 				val = Z_OBJ_HANDLER_P(op1, get)(op1, &rv);
-				Z_ADDREF_P(val);
+				Z_TRY_ADDREF_P(val);
 				increment_function(val);
 				Z_OBJ_HANDLER_P(op1, set)(op1, val);
 				zval_ptr_dtor(val);
@@ -2345,7 +2345,7 @@ ZEND_API int ZEND_FASTCALL decrement_function(zval *op1) /* {{{ */
 				zval *val;
 
 				val = Z_OBJ_HANDLER_P(op1, get)(op1, &rv);
-				Z_ADDREF_P(val);
+				Z_TRY_ADDREF_P(val);
 				decrement_function(val);
 				Z_OBJ_HANDLER_P(op1, set)(op1, val);
 				zval_ptr_dtor(val);
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
@@ -716,6 +716,10 @@ static PHP_MINIT_FUNCTION(sockets)
 	REGISTER_LONG_CONSTANT("IPV6_MULTICAST_LOOP",		IPV6_MULTICAST_LOOP,	CONST_CS | CONST_PERSISTENT);
 #endif
 
+#ifdef IPV6_V6ONLY
+	REGISTER_LONG_CONSTANT("IPV6_V6ONLY",			IPV6_V6ONLY,		CONST_CS | CONST_PERSISTENT);
+#endif
+
 #ifndef WIN32
 # include "unix_socket_constants.h"
 #else
diff --git a/main/network.c b/main/network.c
@@ -472,6 +472,12 @@ php_socket_t php_network_bind_socket_to_local_addr(const char *host, unsigned po
 #ifdef SO_REUSEADDR
 			setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*)&sockoptval, sizeof(sockoptval));
 #endif
+#ifdef IPV6_V6ONLY
+			if (sockopts & STREAM_SOCKOP_IPV6_V6ONLY) {
+				int ipv6_val = !!(sockopts & STREAM_SOCKOP_IPV6_V6ONLY_ENABLED);
+				setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&ipv6_val, sizeof(sockoptval));
+			}
+#endif
 #ifdef SO_REUSEPORT
 			if (sockopts & STREAM_SOCKOP_SO_REUSEPORT) {
 				setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, (char*)&sockoptval, sizeof(sockoptval));
diff --git a/main/php_network.h b/main/php_network.h
@@ -106,9 +106,11 @@ typedef int php_socket_t;
 # define SOCK_RECV_ERR -1
 #endif
 
-#define STREAM_SOCKOP_NONE         1 << 0
-#define STREAM_SOCKOP_SO_REUSEPORT 1 << 1
-#define STREAM_SOCKOP_SO_BROADCAST 1 << 2
+#define STREAM_SOCKOP_NONE                (1 << 0)
+#define STREAM_SOCKOP_SO_REUSEPORT        (1 << 1)
+#define STREAM_SOCKOP_SO_BROADCAST        (1 << 2)
+#define STREAM_SOCKOP_IPV6_V6ONLY         (1 << 3)
+#define STREAM_SOCKOP_IPV6_V6ONLY_ENABLED (1 << 4)
 
 
 /* uncomment this to debug poll(2) emulation on systems that have poll(2) */
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
@@ -635,6 +635,16 @@ static inline int php_tcp_sockop_bind(php_stream *stream, php_netstream_data_t *
 		return -1;
 	}
 
+#ifdef IPV6_V6ONLY
+	if (PHP_STREAM_CONTEXT(stream)
+		&& (tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "ipv6_v6only")) != NULL
+		&& Z_TYPE_P(tmpzval) != IS_NULL
+	) {
+		sockopts |= STREAM_SOCKOP_IPV6_V6ONLY;
+		sockopts |= STREAM_SOCKOP_IPV6_V6ONLY_ENABLED * zend_is_true(tmpzval);
+	}
+#endif
+
 #ifdef SO_REUSEPORT
 	if (PHP_STREAM_CONTEXT(stream)
 		&& (tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "so_reuseport")) != NULL
diff --git a/sapi/cli/tests/006.phpt b/sapi/cli/tests/006.phpt
@@ -25,7 +25,7 @@ string(44) "Exception: Extension unknown does not exist
 "
 string(37) "Exception: Extension  does not exist
 "
-string(%d) "Extension [ <persistent> extension #%d pcre version %d.%d.%d%a ] {
+string(%d) "Extension [ <persistent> extension #%d pcre version %s ] {
 
   - INI {
     Entry [ pcre.backtrack_limit <ALL> ]

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ string(44) "Exception: Extension unknown does not exist`
`25`	`25`	`"`
`26`	`26`	`string(37) "Exception: Extension does not exist`
`27`	`27`	`"`
`28`		`-string(%d) "Extension [ <persistent> extension #%d pcre version %d.%d.%d%a ] {`
	`28`	`+string(%d) "Extension [ <persistent> extension #%d pcre version %s ] {`
`29`	`29`
`30`	`30`	`- INI {`
`31`	`31`	`Entry [ pcre.backtrack_limit <ALL> ]`