com php-src: Merge remote-tracking branch 'origin/master' into native-tls: ext/phar/func_interceptors.c ext/phar/phar_object.c
sapi/apache2handler/sapi_apache2.c

From: Date: Tue, 16 Dec 2014 09:21:05 +0000
Subject: com php-src: Merge remote-tracking branch 'origin/master' into native-tls: ext/phar/func_interceptors.c ext/phar/phar_object.c
sapi/apache2handler/sapi_apache2.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83736@lists.php.net to get a copy of this message
Commit: a85eb75cba76845c645732e3ba230b83b019a914 Author: Anatol Belski <ab@php.net> Tue, 16 Dec 2014 10:21:05 +0100 Parents: 9e4310eeebf40e8fe3ab2f85203ea8cb1545b685 53c8b180c8efaab3edf7a02d39ca4e9628e1f67b Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a85eb75cba76845c645732e3ba230b83b019a914 Log: Merge remote-tracking branch 'origin/master' into native-tls * origin/master: fix perm again... cleanup uneeded cast fix bad pointer cast in ext/phar, fix segfault and failed tests (bigendian) Conflicts: ext/phar/func_interceptors.c ext/phar/phar_object.c sapi/apache2handler/sapi_apache2.c Changed paths: MM ext/phar/func_interceptors.c MM ext/phar/phar_object.c MM sapi/apache2handler/sapi_apache2.c Diff: diff --cc ext/phar/func_interceptors.c index 5fd3753,fa303a3..afdf58b --- a/ext/phar/func_interceptors.c +++ b/ext/phar/func_interceptors.c @@@ -349,7 -349,7 +349,7 @@@ PHAR_FUNC(phar_fopen) /* {{{ * goto skip_phar; } fname_len = strlen(fname); - if (FAILURE == phar_split_fname(fname, fname_len, &arch, (int *)&arch_len, &entry, (int *)&entry_len, 2, 0)) { - if (FAILURE == phar_split_fname(fname, fname_len, &arch, &arch_len, &entry, &entry_len, 2, 0 TSRMLS_CC)) { ++ if (FAILURE == phar_split_fname(fname, fname_len, &arch, &arch_len, &entry, &entry_len, 2, 0)) { goto skip_phar; } @@@ -371,7 -371,7 +371,7 @@@ name = entry; } } else { - entry = phar_fix_filepath(estrndup(entry, entry_len), (int *)&entry_len, 1); - entry = phar_fix_filepath(estrndup(entry, entry_len), &entry_len, 1 TSRMLS_CC); ++ entry = phar_fix_filepath(estrndup(entry, entry_len), &entry_len, 1); if (entry[0] == '/') { if (!zend_hash_str_exists(&(phar->manifest), entry + 1, entry_len - 1)) { /* this file is not in the phar, use the original path */ diff --cc ext/phar/phar_object.c index 70577ff,b6ce546..737ec97 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@@ -729,7 -730,7 +730,7 @@@ PHP_METHOD(Phar, webPhar } if (entry_len) { - phar_postprocess_ru_web(fname, fname_len, &entry, (int *)&entry_len, &ru, (int *)&ru_len); - phar_postprocess_ru_web(fname, fname_len, &entry, &entry_len, &ru, &ru_len TSRMLS_CC); ++ phar_postprocess_ru_web(fname, fname_len, &entry, &entry_len, &ru, &ru_len); } if (!entry_len || (entry_len == 1 && entry[0] == '/')) { @@@ -2050,12 -2051,12 +2051,12 @@@ static zend_object *phar_rename_archive ext = "phar"; } } - } else if (phar_path_check(&ext, (int *)&ext_len, &pcr_error) > pcr_is_ok) { + } else if (phar_path_check(&ext, &ext_len, &pcr_error) > pcr_is_ok) { if (phar->is_data) { - zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "data phar converted from \"%s\" has invalid extension %s", phar->fname, ext); + zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "data phar converted from \"%s\" has invalid extension %s", phar->fname, ext); } else { - zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "phar converted from \"%s\" has invalid extension %s", phar->fname, ext); + zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "phar converted from \"%s\" has invalid extension %s", phar->fname, ext); } return NULL; } diff --cc sapi/apache2handler/sapi_apache2.c index 1284b3e,3b7eaf2..5336b11 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@@ -279,13 -276,13 +279,13 @@@ php_apache_sapi_register_variables(zva if (!val) { val = ""; } - if (sapi_module.input_filter(PARSE_SERVER, key, &val, strlen(val), (size_t *)&new_val_len)) { - if (sapi_module.input_filter(PARSE_SERVER, key, &val, strlen(val), &new_val_len TSRMLS_CC)) { - php_register_variable_safe(key, val, new_val_len, track_vars_array TSRMLS_CC); ++ if (sapi_module.input_filter(PARSE_SERVER, key, &val, strlen(val), &new_val_len)) { + php_register_variable_safe(key, val, new_val_len, track_vars_array); } APR_ARRAY_FOREACH_CLOSE() - if (sapi_module.input_filter(PARSE_SERVER, "PHP_SELF", &ctx->r->uri, strlen(ctx->r->uri), (size_t *)&new_val_len)) { - if (sapi_module.input_filter(PARSE_SERVER, "PHP_SELF", &ctx->r->uri, strlen(ctx->r->uri), &new_val_len TSRMLS_CC)) { - php_register_variable_safe("PHP_SELF", ctx->r->uri, new_val_len, track_vars_array TSRMLS_CC); ++ if (sapi_module.input_filter(PARSE_SERVER, "PHP_SELF", &ctx->r->uri, strlen(ctx->r->uri), &new_val_len)) { + php_register_variable_safe("PHP_SELF", ctx->r->uri, new_val_len, track_vars_array); } }

« previous php.cvs (#83736) next »