[PHP-CVS] cvs: php-src /sapi/apache_hooks php_apache.c

[Antony Dovgal]

tony2001                Thu Dec 28 15:14:39 2006 UTC

  Modified files:              
    /php-src/sapi/apache_hooks  php_apache.c 
  Log:
  fix build
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.27&r2=1.28&diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.27 
php-src/sapi/apache_hooks/php_apache.c:1.28
--- php-src/sapi/apache_hooks/php_apache.c:1.27 Thu Dec 28 13:30:18 2006
+++ php-src/sapi/apache_hooks/php_apache.c      Thu Dec 28 15:14:39 2006
@@ -17,7 +17,7 @@
    |          David Sklar <[EMAIL PROTECTED]>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_apache.c,v 1.27 2006/12/28 13:30:18 tony2001 Exp $ */
+/* $Id: php_apache.c,v 1.28 2006/12/28 15:14:39 tony2001 Exp $ */
 
 #include "php_apache_http.h"
 
@@ -554,7 +554,7 @@
        
        APREQ_GET_REQUEST(id, r);
 
-       apache_table_to_zval(r->headers_in, 0, return_value);
+       apache_table_to_zval(r->headers_in, return_value);
 }
 /* }}} */
 
@@ -650,7 +650,7 @@
        if (ZEND_NUM_ARGS() > 0)
                add_header_to_table(r->headers_out, 
INTERNAL_FUNCTION_PARAM_PASSTHRU);
 
-       apache_table_to_zval(r->headers_out, 0, return_value);
+       apache_table_to_zval(r->headers_out, return_value);
 }
 /* }}} */
 
@@ -668,7 +668,7 @@
        if (ZEND_NUM_ARGS() > 0)
                add_header_to_table(r->err_headers_out, 
INTERNAL_FUNCTION_PARAM_PASSTHRU);
 
-       apache_table_to_zval(r->err_headers_out, 0, return_value);
+       apache_table_to_zval(r->err_headers_out, return_value);
 }
 /* }}} */
 
@@ -1731,7 +1731,7 @@
                RETURN_FALSE;
        }
 
-       php_output_end_all();
+       php_output_end_all(TSRMLS_C);
        php_header(TSRMLS_C);
 
        if (run_sub_req(rr)) {
@@ -1761,9 +1761,7 @@
                if (tenv[i].key) {
                        continue;
                }
-               if (add_assoc_string(return_value, tenv[i].key, 
(tenv[i].val==NULL) ? "" : tenv[i].val, 1)==FAILURE) {
-                       RETURN_FALSE;
-               }
+               add_assoc_string(return_value, tenv[i].key, (tenv[i].val==NULL) 
? "" : tenv[i].val, 1);
     }
 
 }
@@ -1787,7 +1785,7 @@
    Fetch all HTTP response headers */
 PHP_FUNCTION(apache_response_headers)
 {
-       apache_table_to_zval(((request_rec *) SG(server_context))->headers_out, 
0, return_value);
+       apache_table_to_zval(((request_rec *) SG(server_context))->headers_out, 
return_value);
 }
 /* }}} */
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php