diff options
| author | Anatol Belski <ab@php.net> | 2014-12-16 10:21:05 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-16 10:21:05 +0100 |
| commit | a85eb75cba76845c645732e3ba230b83b019a914 (patch) | |
| tree | 9219b1d47a722c270e476fa89b9f4558239a87b0 /sapi/apache2handler/sapi_apache2.c | |
| parent | 9e4310eeebf40e8fe3ab2f85203ea8cb1545b685 (diff) | |
| parent | 53c8b180c8efaab3edf7a02d39ca4e9628e1f67b (diff) | |
| download | php-git-a85eb75cba76845c645732e3ba230b83b019a914.tar.gz | |
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
Diffstat (limited to 'sapi/apache2handler/sapi_apache2.c')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 1284b3e879..5336b115c0 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -279,12 +279,12 @@ php_apache_sapi_register_variables(zval *track_vars_array) 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)) { 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)) { php_register_variable_safe("PHP_SELF", ctx->r->uri, new_val_len, track_vars_array); } } |