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

diff --cc ext/phar/func_interceptors.c
index 5fd3753ab68b500e6e315d8fcb4767ae79d0d36c,fa303a3b22048e016bb2bcfbdb064483a92150cb..afdf58b66537cf6059b3cf45653fa236f4534144
--- 1/ext/phar/func_interceptors.c
--- 2/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 70577ff496a2542b67b1dbf4ecbaebc9868e6db3,b6ce546086d7700b53cbd44d9134fcb2b2d39690..737ec97852c7b63d2e208890663c00b9b48b95d9
--- 1/ext/phar/phar_object.c
--- 2/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 1284b3e87905c7e2dab34524edb34df63a12ac08,3b7eaf22837f71124509dfedc7b8456be0cc8d4e..5336b115c06ab315959be71011a1fba7dc75ed0b
--- 1/sapi/apache2handler/sapi_apache2.c
--- 2/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);
        }
  }