diff options
Diffstat (limited to 'sapi/apache_hooks/php_apache.c')
| -rw-r--r-- | sapi/apache_hooks/php_apache.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c index 74a9a65acd..8045bbce32 100644 --- a/sapi/apache_hooks/php_apache.c +++ b/sapi/apache_hooks/php_apache.c @@ -1764,7 +1764,7 @@ static void apache_table_to_zval(table *t, zval *return_value) if (!tenv[i].key) { continue; } - if (add_assoc_string(return_value, tenv[i].key, (tenv[i].val==NULL) ? "" : tenv[i].val, 1)==FAILURE) { + if (add_assoc_string(return_value, tenv[i].key, (tenv[i].val==NULL) ? "" : tenv[i].val)==FAILURE) { RETURN_FALSE; } } @@ -1848,34 +1848,34 @@ PHP_FUNCTION(apache_lookup_uri) add_property_long(return_value,"status", rr->status); if (rr->the_request) { - add_property_string(return_value,"the_request", rr->the_request, 1); + add_property_string(return_value,"the_request", rr->the_request); } if (rr->status_line) { - add_property_string(return_value,"status_line", (char *)rr->status_line, 1); + add_property_string(return_value,"status_line", (char *)rr->status_line); } if (rr->method) { - add_property_string(return_value,"method", (char *)rr->method, 1); + add_property_string(return_value,"method", (char *)rr->method); } if (rr->content_type) { - add_property_string(return_value,"content_type", (char *)rr->content_type, 1); + add_property_string(return_value,"content_type", (char *)rr->content_type); } if (rr->handler) { - add_property_string(return_value,"handler", (char *)rr->handler, 1); + add_property_string(return_value,"handler", (char *)rr->handler); } if (rr->uri) { - add_property_string(return_value,"uri", rr->uri, 1); + add_property_string(return_value,"uri", rr->uri); } if (rr->filename) { - add_property_string(return_value,"filename", rr->filename, 1); + add_property_string(return_value,"filename", rr->filename); } if (rr->path_info) { - add_property_string(return_value,"path_info", rr->path_info, 1); + add_property_string(return_value,"path_info", rr->path_info); } if (rr->args) { - add_property_string(return_value,"args", rr->args, 1); + add_property_string(return_value,"args", rr->args); } if (rr->boundary) { - add_property_string(return_value,"boundary", rr->boundary, 1); + add_property_string(return_value,"boundary", rr->boundary); } add_property_long(return_value,"no_cache", rr->no_cache); add_property_long(return_value,"no_local_copy", rr->no_local_copy); @@ -1887,7 +1887,7 @@ PHP_FUNCTION(apache_lookup_uri) #if MODULE_MAGIC_NUMBER >= 19980324 if (rr->unparsed_uri) { - add_property_string(return_value,"unparsed_uri", rr->unparsed_uri, 1); + add_property_string(return_value,"unparsed_uri", rr->unparsed_uri); } if(rr->mtime) { add_property_long(return_value,"mtime", rr->mtime); @@ -1952,9 +1952,9 @@ PHP_FUNCTION(apache_get_modules) for (n = 0; ap_loaded_modules[n]; ++n) { char *s = (char *) ap_loaded_modules[n]->name; if ((p = strchr(s, '.'))) { - add_next_index_stringl(return_value, s, (p - s), 1); + add_next_index_stringl(return_value, s, (p - s)); } else { - add_next_index_string(return_value, s, 1); + add_next_index_string(return_value, s); } } } |