Merge branch 'PHP-5.6'

Conflicts:
	ext/openssl/openssl.c

diff --cc ext/openssl/openssl.c
index 5a0d4687de83dafcd2b8b33edf3122369796dedd,5538ef76da18e15e5f43a003c8ca69a0162a5ebb..98904cc38e8d4982a46c4afd033ade0e6da60cb3
--- 1/ext/openssl/openssl.c
--- 2/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;
        }