From: Xinchen Hui <laruence@php.net>
Date: Mon, 16 Feb 2015 06:18:08 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~144
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10fe317300b59b3fc8dbce8ea9757e6692a77174;p=php

Merge branch 'PHP-5.6'

Conflicts:
	ext/openssl/openssl.c
---

10fe317300b59b3fc8dbce8ea9757e6692a77174
diff --cc ext/openssl/openssl.c
index 5a0d4687de,5538ef76da..98904cc38e
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@@ -1545,7 -1532,7 +1545,7 @@@ cleanup
  		efree(spkstr);
  	}
  
- 	if (s->len <= 0) {
 -	if (s && strlen(s) <= 0) {
++	if (s && s->len <= 0) {
  		RETVAL_FALSE;
  	}