Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
	Zend/zend_strtod.c

diff --cc Zend/zend_strtod.c
index 22d509e4a79ced44c3a9a65f19ed4ebc776fe8e1,e74cf0eb82070cfa6c591d00d9f4b93399a26166..8a0863261b16de6e291fd542298705072c2fdd06
--- 1/Zend/zend_strtod.c
--- 2/Zend/zend_strtod.c
+++ b/Zend/zend_strtod.c
@@@ -4416,10 -2590,8 +4416,10 @@@ ZEND_API double zend_hex_strtod(const c
        int any = 0;
        double value = 0;
  
-       if (strlen(str) < 2) {
+       if (s[0] == '\0' || s[1] == '\0') {
 -              *endptr = str;
 +              if (endptr != NULL) {
 +                      *endptr = str;
 +              }
                return 0.0;
        }