diff options
| author | Zeev Suraski <zeev@php.net> | 1999-08-02 19:17:14 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-08-02 19:17:14 +0000 |
| commit | 3cb1eb047187d53688545ae6f64d4df880298e72 (patch) | |
| tree | 7fb20f178b9df5a33a83a2b7537f5614910697c0 /ext/apache | |
| parent | 07e0885519ccabbd9cebfce7223be657171a6629 (diff) | |
| download | php-git-3cb1eb047187d53688545ae6f64d4df880298e72.tar.gz | |
Removed '3' from key functions in PHP (maintained compatibility through
php3_compat.h)
Diffstat (limited to 'ext/apache')
| -rw-r--r-- | ext/apache/apache.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/apache/apache.c b/ext/apache/apache.c index 18a742ddb7..be7b68d1aa 100644 --- a/ext/apache/apache.c +++ b/ext/apache/apache.c @@ -282,13 +282,13 @@ PHP_FUNCTION(virtual) convert_to_string(filename); if (!(rr = sub_req_lookup_uri (filename->value.str.val, ((request_rec *) SG(server_context))))) { - php3_error(E_WARNING, "Unable to include '%s' - URI lookup failed", filename->value.str.val); + php_error(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) { - php3_error(E_WARNING, "Unable to include '%s' - error finding URI", filename->value.str.val); + php_error(E_WARNING, "Unable to include '%s' - error finding URI", filename->value.str.val); if (rr) destroy_sub_req (rr); RETURN_FALSE; } @@ -296,14 +296,14 @@ PHP_FUNCTION(virtual) /* Cannot include another PHP file because of global conflicts */ if (rr->content_type && !strcmp(rr->content_type, PHP3_MIME_TYPE)) { - php3_error(E_WARNING, "Cannot include a PHP file " + php_error(E_WARNING, "Cannot include a PHP file " "(use <code><?include \"%s\"></code> instead)", filename->value.str.val); if (rr) destroy_sub_req (rr); RETURN_FALSE; } if (run_sub_req(rr)) { - php3_error(E_WARNING, "Unable to include '%s' - request execution failed", filename->value.str.val); + php_error(E_WARNING, "Unable to include '%s' - request execution failed", filename->value.str.val); if (rr) destroy_sub_req (rr); RETURN_FALSE; } else { @@ -354,7 +354,7 @@ PHP_FUNCTION(apache_lookup_uri) convert_to_string(filename); if(!(rr = sub_req_lookup_uri(filename->value.str.val, ((request_rec *) SG(server_context))))) { - php3_error(E_WARNING, "URI lookup failed", filename->value.str.val); + php_error(E_WARNING, "URI lookup failed", filename->value.str.val); RETURN_FALSE; } object_init(return_value); @@ -428,7 +428,7 @@ PHP_FUNCTION(apache_exec_uri) convert_to_string(filename); if(!(rr = ap_sub_req_lookup_uri(filename->value.str.val, ((request_rec *) SG(server_context))))) { - php3_error(E_WARNING, "URI lookup failed", filename->value.str.val); + php_error(E_WARNING, "URI lookup failed", filename->value.str.val); RETURN_FALSE; } RETVAL_LONG(ap_run_sub_req(rr)); |