com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: Zend/zend .h Zend/zend_API.c Zend/zend_API.h
Zend/zend_ compile.c Zend/zend_compile.h Zend/zend_object_ha ndlers.c ext/fileinfo/fileinfo.c ext/fileinfo/libmagic/ apprentice.c
ext/fileinfo/libmagic/compress.c ext/filei nfo/libmagic/file.h ext/fileinfo/libmagic/fsmagic.c ext /fileinfo/libmagic/funcs.c
ext/fileinfo/libmagic/readelf. c ext/fileinfo/libmagic/softm

Commit: cd064187da8bfa7915c5f4716ae8d4efe13e25bd Author: Anatol Belski <ab@php.net> Wed, 19 Feb 2014 12:42:20 +0100 Parents: 4dd4f728ce1947f3e10aebd5284eb6e80313ed3c e272225e2a7b7725fdc9741a549ba428acca49e7 Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cd064187da8bfa7915c5f4716ae8d4efe13e25bd Log: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport Conflicts: ext/fileinfo/libmagic.patch ext/fileinfo/libmagic/readcdf.c ext/openssl/openssl.c Changed paths: MM Zend/zend.h MM Zend/zend_API.c MM Zend/zend_API.h MM Zend/zend_compile.c MM Zend/zend_compile.h MM Zend/zend_object_handlers.c MM ext/fileinfo/fileinfo.c MM ext/fileinfo/libmagic/apprentice.c MM ext/fileinfo/libmagic/compress.c MM ext/fileinfo/libmagic/file.h MM ext/fileinfo/libmagic/fsmagic.c MM ext/fileinfo/libmagic/funcs.c MM ext/fileinfo/libmagic/readelf.c MM ext/fileinfo/libmagic/softmagic.c MM ext/mysqlnd/mysqlnd_ps.c MM ext/mysqlnd/mysqlnd_result.c MM ext/openssl/openssl.c Diff: diff --cc Zend/zend_API.c index a71dbd3,ed13c6a..56e2d4b --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@@ -2038,12 -2034,12 +2041,12 @@@ ZEND_API int zend_register_functions(ze int count=0, unload=0; HashTable *target_function_table = function_table; int error_type; - zend_function *ctor = NULL, *dtor = NULL, *clone = NULL, *__get = NULL, *__set = NULL, *__unset = NULL, *__isset = NULL, *__call = NULL, *__callstatic = NULL, *__tostring = NULL; + zend_function *ctor = NULL, *dtor = NULL, *clone = NULL, *__get = NULL, *__set = NULL, *__unset = NULL, *__isset = NULL, *__call = NULL, *__callstatic = NULL, *__tostring = NULL, *__debugInfo = NULL; const char *lowercase_name; - int fname_len; + zend_size_t fname_len; const char *lc_class_name = NULL; - int class_name_len = 0; - zend_ulong hash; + zend_size_t class_name_len = 0; + zend_uint_t hash; if (type==MODULE_PERSISTENT) { error_type = E_CORE_WARNING; diff --cc ext/fileinfo/libmagic/apprentice.c index 8fde5b4,4196e17..e2308e7 --- a/ext/fileinfo/libmagic/apprentice.c +++ b/ext/fileinfo/libmagic/apprentice.c @@@ -1134,16 -1143,20 +1143,20 @@@ apprentice_load(struct magic_set *ms, c uint32_t i, j; size_t files = 0, maxfiles = 0; char **filearr = NULL; - struct stat st; + zend_stat_t st; struct magic_map *map; + struct magic_entry_set mset[MAGIC_SETS]; php_stream *dir; php_stream_dirent d; - + TSRMLS_FETCH(); + memset(mset, 0, sizeof(mset)); ms->flags |= MAGIC_CHECK; /* Enable checks for parsed files */ - if ((map = CAST(struct magic_map *, ecalloc(1, sizeof(*map)))) == NULL) { + + if ((map = CAST(struct magic_map *, ecalloc(1, sizeof(*map)))) == NULL) + { file_oomem(ms, sizeof(*map)); return NULL; } diff --cc ext/fileinfo/libmagic/funcs.c index b053123,f17f365..ecf60ce --- a/ext/fileinfo/libmagic/funcs.c +++ b/ext/fileinfo/libmagic/funcs.c @@@ -446,18 -442,20 +442,21 @@@ file_replace(struct magic_set *ms, cons pcre_cache_entry *pce; char *res; zval *repl; - int res_len, rep_cnt = 0; + php_size_t res_len; + int rep_cnt = 0; TSRMLS_FETCH(); + (void)setlocale(LC_CTYPE, "C"); + MAKE_STD_ZVAL(patt); ZVAL_STRINGL(patt, pat, strlen(pat), 0); opts |= PCRE_MULTILINE; convert_libmagic_pattern(patt, opts); - if ((pce = pcre_get_compiled_regex_cache(Z_STRVAL_P(patt), Z_STRLEN_P(patt) TSRMLS_CC)) == NULL) { + if ((pce = pcre_get_compiled_regex_cache(Z_STRVAL_P(patt), Z_STRSIZE_P(patt) TSRMLS_CC)) == NULL) { zval_dtor(patt); FREE_ZVAL(patt); - return -1; + rep_cnt = -1; + goto out; } MAKE_STD_ZVAL(repl); diff --cc ext/openssl/openssl.c index 038decf,04d8b5e..3542b5e mode 100644,100755..100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@@ -1166,17 -1168,17 +1170,17 @@@ PHP_MINIT_FUNCTION(openssl #endif /* Values for key types */ - REGISTER_LONG_CONSTANT("OPENSSL_KEYTYPE_RSA", OPENSSL_KEYTYPE_RSA, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("OPENSSL_KEYTYPE_RSA", OPENSSL_KEYTYPE_RSA, CONST_CS|CONST_PERSISTENT); #ifndef NO_DSA - REGISTER_LONG_CONSTANT("OPENSSL_KEYTYPE_DSA", OPENSSL_KEYTYPE_DSA, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("OPENSSL_KEYTYPE_DSA", OPENSSL_KEYTYPE_DSA, CONST_CS|CONST_PERSISTENT); #endif - REGISTER_LONG_CONSTANT("OPENSSL_KEYTYPE_DH", OPENSSL_KEYTYPE_DH, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("OPENSSL_KEYTYPE_DH", OPENSSL_KEYTYPE_DH, CONST_CS|CONST_PERSISTENT); - #ifdef EVP_PKEY_EC + #ifdef HAVE_EVP_PKEY_EC - REGISTER_LONG_CONSTANT("OPENSSL_KEYTYPE_EC", OPENSSL_KEYTYPE_EC, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("OPENSSL_KEYTYPE_EC", OPENSSL_KEYTYPE_EC, CONST_CS|CONST_PERSISTENT); #endif - REGISTER_LONG_CONSTANT("OPENSSL_RAW_DATA", OPENSSL_RAW_DATA, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("OPENSSL_ZERO_PADDING", OPENSSL_ZERO_PADDING, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("OPENSSL_RAW_DATA", OPENSSL_RAW_DATA, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("OPENSSL_ZERO_PADDING", OPENSSL_ZERO_PADDING, CONST_CS|CONST_PERSISTENT); #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) /* SNI support included in OpenSSL >= 0.9.8j */