change test to non online

Author: devnexen

ext/standard/tests/network/gh14111.phpt

@@ -1,23 +1,38 @@
 --TEST--
 Testing linger `socket` option.
---SKIPIF--
-<?php
-//if (getenv("SKIP_ONLINE_TESTS")) die('skip online test');
-if (!in_array('https', stream_get_wrappers())) die('skip: https wrapper is required');
-?>
 --FILE--
 <?php
+for ($i=0; $i<100; $i++) {
+  $port = rand(10000, 65000);
+  /* Setup socket server */
+  $server = @stream_socket_server("tcp://127.0.0.1:$port");
+  if ($server) {
+    break;
+  }
+}
+$client = stream_socket_client("tcp://127.0.0.1:$port");
 $context = stream_context_create(['socket' => ['linger' => false]]);
-var_dump(file_get_contents('https://httpbin.org/get', false, $context) !== false);
+$socket = stream_socket_client("tcp://127.0.0.1:$port", $errno, $errstr, 0, STREAM_CLIENT_CONNECT, $context);
+var_dump($socket);
 $context = stream_context_create(['socket' => ['linger' => PHP_INT_MAX + 1]]);
-var_dump(file_get_contents('https://httpbin.org/get', false, $context) !== false);
-$context = stream_context_create(['socket' => ['linger' => 3]]);
-var_dump(file_get_contents('https://httpbin.org/get', false, $context) !== false);
+$socket = stream_socket_client("tcp://127.0.0.1:$port", $errno, $errstr, 0, STREAM_CLIENT_CONNECT, $context);
+var_dump($socket);
+$context = stream_context_create(['socket' => ['linger' => 5]]);
+$socket = stream_socket_client("tcp://127.0.0.1:$port", $errno, $errstr, 1, STREAM_CLIENT_CONNECT, $context);
+var_dump($socket);
+stream_set_blocking($socket, true);
+var_dump(stream_socket_sendto($socket, "data"));
+$data = base64_decode("1oIBAAABAAAAAAAAB2V4YW1wbGUDb3JnAAABAAE=");
+stream_set_blocking($socket, 0);
+stream_socket_sendto($socket, $data);
+stream_socket_shutdown($socket, STREAM_SHUT_RDWR);
+stream_socket_shutdown($server, STREAM_SHUT_RDWR);
 ?>
 --EXPECTF--
-Warning: file_get_contents(https://httpbin.org/get): Failed to open stream: Invalid `linger` value in %s on line %d
+Warning: stream_socket_client(): Unable to connect to tcp://127.0.0.1:%d (Invalid `linger` value) in %s on line %d
 bool(false)
 
-Warning: file_get_contents(https://httpbin.org/get): Failed to open stream: Invalid `linger` value in %s on line %d
+Warning: stream_socket_client(): Unable to connect to tcp://127.0.0.1:%d (Invalid `linger` value) in %s on line %d
 bool(false)
-bool(true)
+resource(%d) of type (stream)
+int(4)

main/network.c

@@ -470,15 +470,15 @@ php_socket_t php_network_bind_socket_to_local_addr(const char *host, unsigned po
 			setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char*)&sockoptval, sizeof(sockoptval));
 		}
 #endif
-#ifdef SO_LINGER
+#ifdef PHP_SO_LINGER
 		if (sockopts & STREAM_SOCKOP_SO_LINGER) {
 			ZEND_ASSERT(option != NULL);
 			long linger = *(long *)option;
 			struct linger val = {
 				.l_onoff = (linger > 0),
 				.l_linger = (int)linger
 			};
-			setsockopt(sock, IPPROTO_TCP, SO_LINGER, (char*)&val, sizeof(val));
+			setsockopt(sock, IPPROTO_TCP, PHP_SO_LINGER, (char*)&val, sizeof(val));
 		}
 #endif
 
@@ -909,7 +909,7 @@ php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short
 			}
 		}
 #endif
-#ifdef SO_LINGER
+#ifdef PHP_SO_LINGER
 		{
 			if (sockopts & STREAM_SOCKOP_SO_LINGER) {
 				ZEND_ASSERT(option != NULL);
@@ -918,7 +918,7 @@ php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short
 					.l_onoff = linger > 0,
 					.l_linger = (int)linger
 				};
-				setsockopt(sock, IPPROTO_TCP, SO_LINGER, (char*)&val, sizeof(val));
+				setsockopt(sock, IPPROTO_TCP, PHP_SO_LINGER, (char*)&val, sizeof(val));
 			}
 		}
 #endif

main/php_network.h

@@ -54,6 +54,14 @@
 # define PHP_IS_TRANSIENT_ERROR(err) (err == EAGAIN)
 #endif
 
+#ifdef SO_LINGER
+# ifdef SO_LINGER_SEC
+#  define PHP_SO_LINGER SO_LINGER_SEC
+# else
+#  define PHP_SO_LINGER SO_LINGER
+# endif
+#endif
+
 #ifdef PHP_WIN32
 #define php_socket_errno() WSAGetLastError()
 #else

main/streams/xp_socket.c

@@ -754,7 +754,7 @@ static inline int php_tcp_sockop_bind(php_stream *stream, php_netstream_data_t *
 	}
 #endif
 
-#ifdef SO_LINGER
+#ifdef PHP_SO_LINGER
 	if (PHP_STREAM_CONTEXT(stream)
 		&& (tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "linger")) != NULL) {
 		bool failed;
@@ -857,7 +857,7 @@ static inline int php_tcp_sockop_connect(php_stream *stream, php_netstream_data_
 	}
 #endif
 
-#ifdef SO_LINGER
+#ifdef PHP_SO_LINGER
 	if (PHP_STREAM_CONTEXT(stream)
 		&& (tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "linger")) != NULL) {
 		bool failed;