usr/src/cmd/php5/patches/16_php_openssl_tests.patch
author Jon Tibble <meths@btinternet.com>
Sun, 01 Sep 2013 18:44:44 +0100
branchoi_151a
changeset 239 c26ca4f9158b
permissions -rw-r--r--
Pull Oracle PHP 5.2 patches
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
239
c26ca4f9158b Pull Oracle PHP 5.2 patches
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     1
This test now causing an infinite loop.
c26ca4f9158b Pull Oracle PHP 5.2 patches
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     2
Produced fix by comparing to the php 5.3.26 version of the test.
c26ca4f9158b Pull Oracle PHP 5.2 patches
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     3
c26ca4f9158b Pull Oracle PHP 5.2 patches
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     4
--- php-5.2.17/ext/openssl/tests/bug48182.phpt_orig	2009-09-22 03:15:10.000000000 -0700
c26ca4f9158b Pull Oracle PHP 5.2 patches
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     5
+++ php-5.2.17/ext/openssl/tests/bug48182.phpt	2013-06-20 14:16:39.947981967 -0700
c26ca4f9158b Pull Oracle PHP 5.2 patches
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     6
@@ -51,7 +51,7 @@
c26ca4f9158b Pull Oracle PHP 5.2 patches
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     7
 	$socket = stream_socket_client($host, $errno, $errstr, 10, $flags);
c26ca4f9158b Pull Oracle PHP 5.2 patches
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     8
 	stream_set_blocking($socket, 0);
c26ca4f9158b Pull Oracle PHP 5.2 patches
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     9
 
c26ca4f9158b Pull Oracle PHP 5.2 patches
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    10
-	while ($data) {
c26ca4f9158b Pull Oracle PHP 5.2 patches
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    11
+	while ($socket && $data) {
c26ca4f9158b Pull Oracle PHP 5.2 patches
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    12
 		$wrote = fwrite($socket, $data, strlen($data));
c26ca4f9158b Pull Oracle PHP 5.2 patches
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    13
 		$data = substr($data, $wrote);
c26ca4f9158b Pull Oracle PHP 5.2 patches
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    14
 	}