diff options
| -rw-r--r-- | sapi/aolserver/aolserver.c | 4 | ||||
| -rw-r--r-- | sapi/apache/php_apache.c | 8 | ||||
| -rw-r--r-- | sapi/apache2filter/php_functions.c | 8 | ||||
| -rw-r--r-- | sapi/apache_hooks/php_apache.c | 4 |
4 files changed, 6 insertions, 18 deletions
diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c index 159d452d5d..3f414b5ec7 100644 --- a/sapi/aolserver/aolserver.c +++ b/sapi/aolserver/aolserver.c @@ -262,9 +262,7 @@ PHP_FUNCTION(getallheaders) { int i; - if (array_init(return_value) == FAILURE) { - RETURN_FALSE; - } + array_init(return_value); for (i = 0; i < Ns_SetSize(NSG(conn->headers)); i++) { char *key = Ns_SetKey(NSG(conn->headers), i); diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c index 5e5c95d216..59241a5fe8 100644 --- a/sapi/apache/php_apache.c +++ b/sapi/apache/php_apache.c @@ -345,9 +345,7 @@ PHP_FUNCTION(apache_request_headers) table_entry *tenv; int i; - if (array_init(return_value) == FAILURE) { - RETURN_FALSE; - } + array_init(return_value); env_arr = table_elts(((request_rec *) SG(server_context))->headers_in); tenv = (table_entry *)env_arr->elts; for (i = 0; i < env_arr->nelts; ++i) { @@ -371,9 +369,7 @@ PHP_FUNCTION(apache_response_headers) table_entry *tenv; int i; - if (array_init(return_value) == FAILURE) { - RETURN_FALSE; - } + array_init(return_value); env_arr = table_elts(((request_rec *) SG(server_context))->headers_out); tenv = (table_entry *)env_arr->elts; for (i = 0; i < env_arr->nelts; ++i) { diff --git a/sapi/apache2filter/php_functions.c b/sapi/apache2filter/php_functions.c index a26d6ad527..ae29e6e030 100644 --- a/sapi/apache2filter/php_functions.c +++ b/sapi/apache2filter/php_functions.c @@ -158,9 +158,7 @@ PHP_FUNCTION(apache_request_headers) const apr_array_header_t *arr; char *key, *val; - if (array_init(return_value) == FAILURE) { - RETURN_FALSE; - } + array_init(return_value); ctx = SG(server_context); arr = apr_table_elts(ctx->f->r->headers_in); @@ -180,9 +178,7 @@ PHP_FUNCTION(apache_response_headers) const apr_array_header_t *arr; char *key, *val; - if (array_init(return_value) == FAILURE) { - RETURN_FALSE; - } + array_init(return_value); ctx = SG(server_context); arr = apr_table_elts(ctx->f->r->headers_out); diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c index 86b2abe900..aabb29835a 100644 --- a/sapi/apache_hooks/php_apache.c +++ b/sapi/apache_hooks/php_apache.c @@ -1754,9 +1754,7 @@ static void apache_table_to_zval(table *t, int safe_mode, zval *return_value) table_entry *tenv; int i; - if (array_init(return_value) == FAILURE) { - RETURN_FALSE; - } + array_init(return_value); env_arr = table_elts(t); tenv = (table_entry *)env_arr->elts; for (i = 0; i < env_arr->nelts; ++i) { |