CVS update: php3/functions
| From: | zeev | Date: | Wed, 02 Sep 1998 20:24:09 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-753@lists.php.net to get a copy of this message | ||
Date: Wednesday September 2, 1998 @ 16:24
Author: zeev
Update of /repository/php3/functions
In directory asf:/u2/tmp/cvs-serv13989
Modified Files:
apache.c
Log Message:
Please stay Apache 1.2 compliant...
Index: php3/functions/apache.c
diff -c php3/functions/apache.c:1.37 php3/functions/apache.c:1.38
*** php3/functions/apache.c:1.37 Tue Sep 1 10:17:49 1998
--- php3/functions/apache.c Wed Sep 2 16:24:08 1998
***************
*** 29,35 ****
+----------------------------------------------------------------------+
*/
! /* $Id: apache.c,v 1.37 1998/09/01 14:17:49 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 29,35 ----
+----------------------------------------------------------------------+
*/
! /* $Id: apache.c,v 1.38 1998/09/02 20:24:08 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 223,229 ****
}
}
! void php3_apache_lookup_uri(INTERNAL_FUNCTION_PARAMETERS) {
pval *filename;
request_rec *rr=NULL;
--- 223,230 ----
}
}
! void php3_apache_lookup_uri(INTERNAL_FUNCTION_PARAMETERS)
! {
pval *filename;
request_rec *rr=NULL;
***************
*** 232,254 ****
}
convert_to_string(filename);
! if(!(rr = ap_sub_req_lookup_uri(filename->value.str.val, GLOBAL(php3_rqst)))) {
php3_error(E_WARNING, "URI lookup failed", filename->value.str.val);
RETURN_FALSE;
}
object_init(return_value);
add_property_long(return_value,"status",rr->status);
! if(rr->the_request)
add_property_string(return_value,"the_request",rr->the_request,1);
! if(rr->status_line)
add_property_string(return_value,"status_line",rr->status_line,1);
! if(rr->method) add_property_string(return_value,"method",rr->method,1);
! if(rr->content_type)
add_property_string(return_value,"content_type",rr->content_type,1);
! if(rr->handler) add_property_string(return_value,"handler",rr->handler,1);
! if(rr->unparsed_uri)
add_property_string(return_value,"unparsed_uri",rr->unparsed_uri,1);
! if(rr->uri) add_property_string(return_value,"uri",rr->uri,1);
! if(rr->filename) add_property_string(return_value,"filename",rr->filename,1);
! if(rr->path_info)
add_property_string(return_value,"path_info",rr->path_info,1);
! if(rr->args) add_property_string(return_value,"args",rr->args,1);
! if(rr->boundary) add_property_string(return_value,"boundary",rr->boundary,1);
add_property_long(return_value,"no_cache",rr->no_cache);
add_property_long(return_value,"no_local_copy",rr->no_local_copy);
add_property_long(return_value,"allowed",rr->allowed);
--- 233,274 ----
}
convert_to_string(filename);
! if(!(rr = sub_req_lookup_uri(filename->value.str.val, GLOBAL(php3_rqst)))) {
php3_error(E_WARNING, "URI lookup failed", filename->value.str.val);
RETURN_FALSE;
}
object_init(return_value);
add_property_long(return_value,"status",rr->status);
! if (rr->the_request) {
! add_property_string(return_value,"the_request",rr->the_request,1);
! }
! if (rr->status_line) {
! add_property_string(return_value,"status_line",rr->status_line,1);
! }
! if (rr->method) {
! add_property_string(return_value,"method",rr->method,1);
! }
! if (rr->content_type) {
! add_property_string(return_value,"content_type",rr->content_type,1);
! }
! if (rr->handler) {
! add_property_string(return_value,"handler",rr->handler,1);
! }
! if (rr->uri) {
! add_property_string(return_value,"uri",rr->uri,1);
! }
! if (rr->filename) {
! add_property_string(return_value,"filename",rr->filename,1);
! }
! if (rr->path_info) {
! add_property_string(return_value,"path_info",rr->path_info,1);
! }
! if (rr->args) {
! add_property_string(return_value,"args",rr->args,1);
! }
! if (rr->boundary) {
! add_property_string(return_value,"boundary",rr->boundary,1);
! }
add_property_long(return_value,"no_cache",rr->no_cache);
add_property_long(return_value,"no_local_copy",rr->no_local_copy);
add_property_long(return_value,"allowed",rr->allowed);
***************
*** 256,263 ****
add_property_long(return_value,"bytes_sent",rr->bytes_sent);
add_property_long(return_value,"byterange",rr->byterange);
add_property_long(return_value,"clength",rr->clength);
! if(rr->mtime) add_property_long(return_value,"mtime",rr->mtime);
! if(rr->request_time)
add_property_long(return_value,"request_time",rr->request_time);
ap_destroy_sub_req(rr);
}
--- 276,293 ----
add_property_long(return_value,"bytes_sent",rr->bytes_sent);
add_property_long(return_value,"byterange",rr->byterange);
add_property_long(return_value,"clength",rr->clength);
!
! #if MODULE_MAGIC_NUMBER >= 19980324
! if (rr->unparsed_uri) {
! add_property_string(return_value,"unparsed_uri",rr->unparsed_uri,1);
! }
! if(rr->mtime) {
! add_property_long(return_value,"mtime",rr->mtime);
! }
! #endif
! if(rr->request_time) {
! add_property_long(return_value,"request_time",rr->request_time);
! }
ap_destroy_sub_req(rr);
}
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net