archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

php_error -> php_error_docref

Browse source
This commit is contained in:
Marcus Boerger 2002-12-05 23:18:28 +00:00
parent 2cca05a32a
commit ae35c4731f
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sapi/apache/php_apache.c
View file

@ -115,11 +115,11 @@ PHP_FUNCTION(apache_child_terminate)
ap_child_terminate( ((request_rec *)SG(server_context)) ); ap_child_terminate( ((request_rec *)SG(server_context)) );
RETURN_TRUE; RETURN_TRUE;
} else { /* tell them to get lost! */ } 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; RETURN_FALSE;
} }
#else #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; RETURN_FALSE;
#endif #endif
} }
@ -304,13 +304,13 @@ PHP_FUNCTION(virtual)
convert_to_string_ex(filename); convert_to_string_ex(filename);
if (!(rr = sub_req_lookup_uri ((*filename)->value.str.val, ((request_rec *) SG(server_context))))) { 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); if (rr) destroy_sub_req (rr);
RETURN_FALSE; RETURN_FALSE;
} }
if (rr->status != 200) { 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); if (rr) destroy_sub_req (rr);
RETURN_FALSE; RETURN_FALSE;
} }
@ -319,7 +319,7 @@ PHP_FUNCTION(virtual)
php_header(); php_header();
if (run_sub_req(rr)) { 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); if (rr) destroy_sub_req (rr);
RETURN_FALSE; RETURN_FALSE;
} else { } else {
@ -415,7 +415,7 @@ PHP_FUNCTION(apache_lookup_uri)
convert_to_string_ex(filename); convert_to_string_ex(filename);
if(!(rr = sub_req_lookup_uri((*filename)->value.str.val, ((request_rec *) SG(server_context))))) { 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; RETURN_FALSE;
} }
object_init(return_value); object_init(return_value);
@ -490,7 +490,7 @@ PHP_FUNCTION(apache_exec_uri)
convert_to_string_ex(filename); convert_to_string_ex(filename);
if(!(rr = ap_sub_req_lookup_uri((*filename)->value.str.val, ((request_rec *) SG(server_context))))) { 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; RETURN_FALSE;
} }
RETVAL_LONG(ap_run_sub_req(rr)); RETVAL_LONG(ap_run_sub_req(rr));