[PHP-CVS] cvs: php4 /sapi/apache php_apache.c

[Marcus Boerger]

helly           Thu Dec  5 18:18:29 2002 EDT

  Modified files:              
    /php4/sapi/apache   php_apache.c 
  Log:
  php_error -> php_error_docref
  
  
Index: php4/sapi/apache/php_apache.c
diff -u php4/sapi/apache/php_apache.c:1.69 php4/sapi/apache/php_apache.c:1.70
--- php4/sapi/apache/php_apache.c:1.69  Thu Oct 24 09:14:48 2002
+++ php4/sapi/apache/php_apache.c       Thu Dec  5 18:18:28 2002
@@ -17,7 +17,7 @@
    |          David Sklar <[EMAIL PROTECTED]>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_apache.c,v 1.69 2002/10/24 13:14:48 sas Exp $ */
+/* $Id: php_apache.c,v 1.70 2002/12/05 23:18:28 helly Exp $ */
 
 #include "php_apache_http.h"
 
@@ -115,11 +115,11 @@
                ap_child_terminate( ((request_rec *)SG(server_context)) );
                RETURN_TRUE;
        } else { /* tell them to get lost! */
-               php_error(E_WARNING, "apache.child_terminate is disabled");
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "apache.child_terminate is 
+disabled");
                RETURN_FALSE;
        }
 #else
-               php_error(E_WARNING, "apache_child_terminate() is not supported in 
this build");
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "apache_child_terminate() 
+is not supported in this build");
                RETURN_FALSE;
 #endif
 }
@@ -304,13 +304,13 @@
        convert_to_string_ex(filename);
        
        if (!(rr = sub_req_lookup_uri ((*filename)->value.str.val, ((request_rec *) 
SG(server_context))))) {
-               php_error(E_WARNING, "Unable to include '%s' - URI lookup failed", 
(*filename)->value.str.val);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include '%s' - 
+URI lookup failed", (*filename)->value.str.val);
                if (rr) destroy_sub_req (rr);
                RETURN_FALSE;
        }
 
        if (rr->status != 200) {
-               php_error(E_WARNING, "Unable to include '%s' - error finding URI", 
(*filename)->value.str.val);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include '%s' - 
+error finding URI", (*filename)->value.str.val);
                if (rr) destroy_sub_req (rr);
                RETURN_FALSE;
        }
@@ -319,7 +319,7 @@
        php_header();
 
        if (run_sub_req(rr)) {
-               php_error(E_WARNING, "Unable to include '%s' - request execution 
failed", (*filename)->value.str.val);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include '%s' - 
+request execution failed", (*filename)->value.str.val);
                if (rr) destroy_sub_req (rr);
                RETURN_FALSE;
        } else {
@@ -415,7 +415,7 @@
        convert_to_string_ex(filename);
 
        if(!(rr = sub_req_lookup_uri((*filename)->value.str.val, ((request_rec *) 
SG(server_context))))) {
-               php_error(E_WARNING, "URI lookup failed", (*filename)->value.str.val);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "URI lookup failed", 
+(*filename)->value.str.val);
                RETURN_FALSE;
        }
        object_init(return_value);
@@ -490,7 +490,7 @@
        convert_to_string_ex(filename);
 
        if(!(rr = ap_sub_req_lookup_uri((*filename)->value.str.val, ((request_rec *) 
SG(server_context))))) {
-               php_error(E_WARNING, "URI lookup failed", (*filename)->value.str.val);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "URI lookup failed", 
+(*filename)->value.str.val);
                RETURN_FALSE;
        }
        RETVAL_LONG(ap_run_sub_req(rr));



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