Merge branch 'PHP-5.5' into PHP-5.6

weltling · weltling · commit b3d28d14d6ce · 2015-02-13T13:40:10.000+01:00
* PHP-5.5:
  fix condition
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
@@ -1864,7 +1864,7 @@ static size_t php_openssl_sockop_io(int read, php_stream *stream, char *buf, siz
 				if (errno == EAGAIN && err == SSL_ERROR_WANT_READ && read) {
 					retry = 1;
 				}
-				if (errno == EAGAIN && SSL_ERROR_WANT_WRITE && read == 0) {
+				if (errno == EAGAIN && err == SSL_ERROR_WANT_WRITE && read == 0) {
 					retry = 1;
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -1864,7 +1864,7 @@ static size_t php_openssl_sockop_io(int read, php_stream stream, char buf, siz`
`1864`	`1864`	`if (errno == EAGAIN && err == SSL_ERROR_WANT_READ && read) {`
`1865`	`1865`	`retry = 1;`
`1866`	`1866`	`}`
`1867`		`- if (errno == EAGAIN && SSL_ERROR_WANT_WRITE && read == 0) {`
	`1867`	`+ if (errno == EAGAIN && err == SSL_ERROR_WANT_WRITE && read == 0) {`
`1868`	`1868`	`retry = 1;`
`1869`	`1869`	`}`
`1870`	`1870`