components/php-5_2/php-sapi/patches/16_php_openssl_tests.patch
author Craig Mohrman <craig.mohrman@oracle.com>
Wed, 29 Jan 2014 18:57:31 -0800
branchs11u1-sru
changeset 2926 73b93bcb8a2c
permissions -rw-r--r--
16658678 problem in UTILITY/PHP 16004918 problem in UTILITY/PHP 16098069 /etc/apache2/2.2/conf.d/php/php.conf missing on upgrade to s11.1 17026033 problem in UTILITY/PHP 17157091 problem in UTILITY/PHP 18156529 upgrade php 5.3 to 5.3.27
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2926
73b93bcb8a2c 16658678 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     1
This test now causing an infinite loop.
73b93bcb8a2c 16658678 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     2
Produced fix by comparing to the php 5.3.26 version of the test.
73b93bcb8a2c 16658678 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     3
73b93bcb8a2c 16658678 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     4
--- php-5.2.17/ext/openssl/tests/bug48182.phpt_orig	2009-09-22 03:15:10.000000000 -0700
73b93bcb8a2c 16658678 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     5
+++ php-5.2.17/ext/openssl/tests/bug48182.phpt	2013-06-20 14:16:39.947981967 -0700
73b93bcb8a2c 16658678 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     6
@@ -51,7 +51,7 @@
73b93bcb8a2c 16658678 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     7
 	$socket = stream_socket_client($host, $errno, $errstr, 10, $flags);
73b93bcb8a2c 16658678 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     8
 	stream_set_blocking($socket, 0);
73b93bcb8a2c 16658678 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     9
 
73b93bcb8a2c 16658678 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    10
-	while ($data) {
73b93bcb8a2c 16658678 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    11
+	while ($socket && $data) {
73b93bcb8a2c 16658678 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    12
 		$wrote = fwrite($socket, $data, strlen($data));
73b93bcb8a2c 16658678 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    13
 		$data = substr($data, $wrote);
73b93bcb8a2c 16658678 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    14
 	}