set versions

(cherry picked from commit 61e9b7354f)

NEWS

@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2017 PHP 7.0.17
+16 Mar 2017 PHP 7.0.17
 
 - Core:
   . Fixed bug #73989 (PHP 7.1 Segfaults within Symfony test suite).
@@ -53,8 +53,6 @@ PHP                                                                        NEWS
 - OpenSSL:
   . Fixed bug #74022 (PHP Fast CGI crashes when reading from a pfx file).
     (Anatol)
-  . Fixed bug #74159 (Writing a large buffer to a non-blocking encrypted stream
-    fails with "bad write retry"). (trowski)
 
 - Standard:
   . Fixed bug #74148 (ReflectionFunction incorrectly reports the number of

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=17
-PHP_EXTRA_VERSION="-dev"
+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/date/tests/bug73858.phpt

@@ -7,8 +7,8 @@ In the "verbose setup method" I'm trying setup the DateTime object myself
 to see if it's the format string which is parsed in correctly or if it's the DateTime
 object which is breaking stuff. From the testing it appears DateTime is broken somehow.
 */
-$ss = 'first day of last month midnight';
-$es = 'first day of this month midnight - 1 second';
+$ss = 'february first day of last month midnight';
+$es = 'february first day of this month midnight - 1 second';
 
 $s = new DateTime($ss);
 $e = new DateTime($es);
@@ -50,7 +50,7 @@ effect on the results of the diff. By modifying the datetime with ->modify every
 it just means you have to be careful of how we work with DateTimes .
 */
 $s = new DateTime($ss);
-$e = new DateTime('first day of this month midnight');
+$e = new DateTime('february first day of this month midnight');
 $e->modify('- 1 second');
 var_dump($e->diff($s)->days); // 30 ... and should be 30
 ?>

ext/openssl/tests/bug74159.phpt

@@ -1,106 +0,0 @@
---TEST--
-Bug #74159: Writing a large buffer to non-blocking encrypted streams fails
---SKIPIF--
-<?php
-if (!extension_loaded("openssl")) die("skip openssl not loaded");
-if (!function_exists("proc_open")) die("skip no proc_open");
---FILE--
-<?php
-$serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
-    $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
-    $serverCtx = stream_context_create(['ssl' => [
-        'local_cert' => __DIR__ . '/bug54992.pem',
-        'crypto_method' => STREAM_CRYPTO_METHOD_TLSv1_2_SERVER,
-    ]]);
-
-    $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
-
-    $client = stream_socket_accept($server, 1);
-
-    if (!$client) {
-        exit();
-    }
-
-    $data = '';
-    while (strlen($data) < 0xfffff) {
-        $buffer = fread($client, 8192);
-        if (empty($buffer)) {
-            exit();
-        }
-        $data .= $buffer;
-        usleep(100);
-    }
-    
-    fclose($client);
-CODE;
-
-$clientCode = <<<'CODE'
-    function streamRead($stream) : int {
-        return strlen(fread($stream, 8192));
-    }
-
-    function streamWrite($stream, $data) : int {
-        return fwrite($stream, $data);
-    }
-
-    function waitForWrite(...$streams) : bool {
-        $read = null;
-        $except = null;
-        while($streams && !($n = stream_select($read, $streams, $except, 1)));
-        return $n > 0;
-    }
-
-    function waitForRead(...$streams) : bool {
-        $write = null;
-        $except = null;
-        while ($streams && !($n = stream_select($streams, $write, $except, 1)));
-        return $n > 0;
-    }
-
-    set_error_handler(function ($errno, $errstr) {
-        exit("$errstr\n");
-    });
-
-    $serverUri = "tcp://127.0.0.1:64321";
-    $clientFlags = STREAM_CLIENT_CONNECT;
-    $clientCtx = stream_context_create(['ssl' => [
-        'verify_peer' => true,
-        'cafile' => __DIR__ . '/bug54992-ca.pem',
-        'peer_name' => 'bug54992.local',
-    ]]);
-
-    phpt_wait();
-
-    $fp = stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx);
-
-    stream_set_blocking($fp, false);
-    while (0 === ($n = stream_socket_enable_crypto($fp, true, STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT)));
-
-    $data = str_repeat("a", 0xfffff);
-    $written = 0;
-    $total = $written;
-    while(!empty($data)) {
-        $written = streamWrite($fp, $data);
-        $total += $written;
-        $data = substr($data, $written);
-        waitForWrite($fp);
-    }
-    printf("Written %d bytes\n", $total);
-
-    while(waitForRead($fp)) {
-        streamRead($fp);
-        if (feof($fp)) {
-            break;
-        }
-    }
-
-    exit("DONE\n");
-CODE;
-
-include 'ServerClientTestCase.inc';
-ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
---EXPECTF--
-Written 1048575 bytes
-DONE

ext/openssl/xp_ssl.c

@@ -1666,16 +1666,6 @@ int php_openssl_setup_crypto(php_stream *stream,
 		SSL_set_mode(sslsock->ssl_handle, mode | SSL_MODE_RELEASE_BUFFERS);
 	} while (0);
 #endif
-	
-	do {
-		long mode = SSL_get_mode(sslsock->ssl_handle);
-		SSL_set_mode(sslsock->ssl_handle, mode | SSL_MODE_ENABLE_PARTIAL_WRITE);
-	} while (0);
-	
-	do {
-		long mode = SSL_get_mode(sslsock->ssl_handle);
-		SSL_set_mode(sslsock->ssl_handle, mode | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
-	} while (0);
 
 	if (cparam->inputs.session) {
 		if (cparam->inputs.session->ops != &php_openssl_socket_ops) {

main/php_version.h

@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 7
 #define PHP_MINOR_VERSION 0
 #define PHP_RELEASE_VERSION 17
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "7.0.17-dev"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "7.0.17"
 #define PHP_VERSION_ID 70017