From: Andrei Zmievski Date: Wed, 2 Feb 2000 06:09:00 +0000 (+0000) Subject: Moved ext/apache into sapi/apache. X-Git-Tag: BEFORE_SAPIFICATION_FEB_10_2000~112 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0f00daa9269bb0415aa6d7f20ceff3d05a7c804;p=php Moved ext/apache into sapi/apache. --- diff --git a/acinclude.m4 b/acinclude.m4 index 0fe1571c49..7a1f85304a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -351,7 +351,7 @@ dnl "shared" can be set to "shared" or "yes" to build the extension as dnl a dynamically loadable library. dnl AC_DEFUN(PHP_EXTENSION,[ - if test -d "$cwd/$srcdir/ext/$1" ; then + if test -d "$cwd/$srcdir/ext/$1" -o -d "$cwd/$srcdir/sapi/$1" ; then EXT_SUBDIRS="$EXT_SUBDIRS $1" if test "$2" != "shared" && test "$2" != "yes" && test -z "$php_always_shared"; then _extlib="lib$1.a" diff --git a/ext/apache/Makefile.in b/ext/apache/Makefile.in deleted file mode 100644 index 8a27bb166c..0000000000 --- a/ext/apache/Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ - -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -LTLIBRARY_NAME = libapache.la -LTLIBRARY_SOURCES = apache.c - -include $(topsrcdir)/build/ltlib.mk diff --git a/ext/apache/apache.c b/ext/apache/apache.c deleted file mode 100644 index ff0cb4da26..0000000000 --- a/ext/apache/apache.c +++ /dev/null @@ -1,450 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP version 4.0 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 2.0 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available at through the world-wide-web at | - | http://www.php.net/license/2_0.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Authors: Rasmus Lerdorf | - | Stig Sæther Bakken | - | David Sklar | - +----------------------------------------------------------------------+ - */ - -/* $Id$ */ -#include "php.h" -#include "ext/standard/head.h" -#include "php_globals.h" -#include "php_ini.h" -#include "SAPI.h" -#include "sapi/apache/mod_php4.h" -#include "ext/standard/info.h" - -#include -#if HAVE_UNISTD_H -#include -#endif -#include -#include -#include - -#if APACHE -#include "http_request.h" -#include "build-defs.h" - -#define SECTION(name) PUTS("

" name "

\n") - -extern module *top_module; - -PHP_FUNCTION(virtual); -PHP_FUNCTION(getallheaders); -PHP_FUNCTION(apachelog); -PHP_FUNCTION(apache_note); -PHP_FUNCTION(apache_lookup_uri); - -PHP_MINFO_FUNCTION(apache); - -function_entry apache_functions[] = { - PHP_FE(virtual, NULL) - PHP_FE(getallheaders, NULL) - PHP_FE(apache_note, NULL) - PHP_FE(apache_lookup_uri, NULL) - {NULL, NULL, NULL} -}; - - -static PHP_INI_MH(OnChangeApacheInt) -{ - long *p; - char *base = (char *) &php_apache_info; - - p = (long *) (base+(size_t) mh_arg1); - - if (new_value) { - *p = atoi(new_value); - return SUCCESS; - } else { - return FAILURE; - } -} - - -static PHP_INI_MH(OnChangeApacheString) -{ - char **p; - char *base = (char *) &php_apache_info; - - p = (char **) (base+(size_t) mh_arg1); - - if (new_value) { - *p = new_value; - return SUCCESS; - } else { - return FAILURE; - } -} - -PHP_INI_BEGIN() - PHP_INI_ENTRY1("xbithack", "0", PHP_INI_ALL, OnChangeApacheInt, (void *) XtOffsetOf(php_apache_info_struct, xbithack)) - PHP_INI_ENTRY1("engine", "1", PHP_INI_ALL, OnChangeApacheInt, (void *) XtOffsetOf(php_apache_info_struct, engine)) - PHP_INI_ENTRY1("last_modified", "0", PHP_INI_ALL, OnChangeApacheInt, (void *) XtOffsetOf(php_apache_info_struct, last_modified)) - PHP_INI_ENTRY1("dav_script", NULL, PHP_INI_ALL, OnChangeApacheString, (void *) XtOffsetOf(php_apache_info_struct, dav_script)) -PHP_INI_END() - - -static PHP_MINIT_FUNCTION(apache) -{ - REGISTER_INI_ENTRIES(); - return SUCCESS; -} - - -static PHP_MSHUTDOWN_FUNCTION(apache) -{ - UNREGISTER_INI_ENTRIES(); - return SUCCESS; -} - - -zend_module_entry apache_module_entry = { - "Apache", apache_functions, PHP_MINIT(apache), PHP_MSHUTDOWN(apache), NULL, NULL, PHP_MINFO(apache), STANDARD_MODULE_PROPERTIES -}; - -/* {{{ proto string apache_note(string note_name [, string note_value]) - Get and set Apache request notes */ -PHP_FUNCTION(apache_note) -{ - pval **arg_name,**arg_val; - char *note_val; - int arg_count = ARG_COUNT(ht); - SLS_FETCH(); - - if (arg_count<1 || arg_count>2 || - zend_get_parameters_ex(arg_count,&arg_name,&arg_val) ==FAILURE ) { - WRONG_PARAM_COUNT; - } - - convert_to_string_ex(arg_name); - note_val = (char *) table_get(((request_rec *)SG(server_context))->notes,(*arg_name)->value.str.val); - - if (arg_count == 2) { - convert_to_string_ex(arg_val); - table_set(((request_rec *)SG(server_context))->notes,(*arg_name)->value.str.val,(*arg_val)->value.str.val); - } - - if (note_val) { - RETURN_STRING(note_val,1); - } else { - RETURN_FALSE; - } -} -/* }}} */ - -PHP_MINFO_FUNCTION(apache) -{ - module *modp = NULL; - char output_buf[128]; -#if !defined(WIN32) && !defined(WINNT) - char name[64]; - char *p; -#endif - server_rec *serv; - extern char server_root[MAX_STRING_LEN]; - extern uid_t user_id; - extern char *user_name; - extern gid_t group_id; - extern int max_requests_per_child; - SLS_FETCH(); - - serv = ((request_rec *) SG(server_context))->server; - - PUTS("\n"); - php_info_print_table_header(2, "Entry", "Value"); -#if WIN32|WINNT - PUTS("Apache for Windows 95/NT
"); -#else - php_info_print_table_row(2, "APACHE_INCLUDE", PHP_APACHE_INCLUDE); - php_info_print_table_row(2, "APACHE_TARGET", PHP_APACHE_TARGET); -#endif - php_info_print_table_row(2, "Apache Version", SERVER_VERSION); -#ifdef APACHE_RELEASE - sprintf(output_buf, "%d", APACHE_RELEASE); - php_info_print_table_row(2, "Apache Release", output_buf); -#endif - sprintf(output_buf, "%d", MODULE_MAGIC_NUMBER); - php_info_print_table_row(2, "Apache API Version", output_buf); - sprintf(output_buf, "%s:%u", serv->server_hostname,serv->port); - php_info_print_table_row(2, "Hostname/Port", output_buf); -#if !defined(WIN32) && !defined(WINNT) - sprintf(output_buf, "%s(%d)/%d", user_name,(int)user_id,(int)group_id); - php_info_print_table_row(2, "User/Group", output_buf); - sprintf(output_buf, "per child: %d
keep alive: %s
max per connection: %d",max_requests_per_child,serv->keep_alive ? "on":"off", serv->keep_alive_max); - php_info_print_table_row(2, "Max Requests", output_buf); -#endif - sprintf(output_buf, "connection: %d
keep-alive: %d",serv->timeout,serv->keep_alive_timeout); - php_info_print_table_row(2, "Timeouts", output_buf); -#if !defined(WIN32) && !defined(WINNT) - php_info_print_table_row(2, "Server Root", server_root); - - - PUTS("\n"); - PUTS("
Loaded modules"); - for(modp = top_module; modp; modp = modp->next) { - strlcpy(name, modp->name, sizeof(name)); - if ((p = strrchr(name, '.'))) { - *p='\0'; /* Cut off ugly .c extensions on module names */ - } - PUTS(name); - if (modp->next) { - PUTS(", "); - } - } -#endif - PUTS("
\n"); - - - { - register int i; - array_header *arr; - table_entry *elts; - request_rec *r; - SLS_FETCH(); - - r = ((request_rec *) SG(server_context)); - arr = table_elts(r->subprocess_env); - elts = (table_entry *)arr->elts; - - SECTION("Apache Environment"); - PUTS("\n"); - php_info_print_table_header(2, "Variable", "Value"); - for (i=0; i < arr->nelts; i++) { - php_info_print_table_row(2, elts[i].key, elts[i].val); - } - PUTS("
\n"); - } - - { - array_header *env_arr; - table_entry *env; - int i; - request_rec *r; - SLS_FETCH(); - - r = ((request_rec *) SG(server_context)); - SECTION("HTTP Headers Information"); - PUTS("\n"); - PUTS(" \n"); - php_info_print_table_row(2, "HTTP Request", r->the_request); - env_arr = table_elts(r->headers_in); - env = (table_entry *)env_arr->elts; - for (i = 0; i < env_arr->nelts; ++i) { - if (env[i].key) { - php_info_print_table_row(2, env[i].key, env[i].val); - } - } - PUTS(" \n"); - env_arr = table_elts(r->headers_out); - env = (table_entry *)env_arr->elts; - for(i = 0; i < env_arr->nelts; ++i) { - if (env[i].key) { - php_info_print_table_row(2, env[i].key, env[i].val); - } - } - PUTS("
HTTP Request Headers
HTTP Response Headers
\n\n"); - } - -} - -/* This function is equivalent to - * in mod_include. It does an Apache sub-request. It is useful - * for including CGI scripts or .shtml files, or anything else - * that you'd parse through Apache (for .phtml files, you'd probably - * want to use . This only works when PHP is compiled - * as an Apache module, since it uses the Apache API for doing - * sub requests. - */ -/* {{{ proto int virtual(string filename) - Perform an Apache sub-request */ -PHP_FUNCTION(virtual) -{ - pval **filename; - request_rec *rr = NULL; - SLS_FETCH(); - - if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1,&filename) == FAILURE) { - WRONG_PARAM_COUNT; - } - 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); - 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); - if (rr) destroy_sub_req (rr); - RETURN_FALSE; - } - - /* Cannot include another PHP file because of global conflicts */ - if (rr->content_type && - !strcmp(rr->content_type, PHP_MIME_TYPE)) { - php_error(E_WARNING, "Cannot include a PHP file " - "(use <?include \"%s\"> instead)", (*filename)->value.str.val); - if (rr) destroy_sub_req (rr); - RETURN_FALSE; - } - - if (run_sub_req(rr)) { - php_error(E_WARNING, "Unable to include '%s' - request execution failed", (*filename)->value.str.val); - if (rr) destroy_sub_req (rr); - RETURN_FALSE; - } else { - if (rr) destroy_sub_req (rr); - RETURN_TRUE; - } -} -/* }}} */ - -/* {{{ proto array getallheaders(void) - Fetch all HTTP request headers */ -PHP_FUNCTION(getallheaders) -{ - array_header *env_arr; - table_entry *tenv; - int i; - SLS_FETCH(); - PLS_FETCH(); - - if (array_init(return_value) == FAILURE) { - RETURN_FALSE; - } - env_arr = table_elts(((request_rec *) SG(server_context))->headers_in); - tenv = (table_entry *)env_arr->elts; - for (i = 0; i < env_arr->nelts; ++i) { - if (!tenv[i].key || - (PG(safe_mode) && - !strncasecmp(tenv[i].key, "authorization", 13))) { - continue; - } - if (add_assoc_string(return_value, tenv[i].key,(tenv[i].val==NULL) ? "" : tenv[i].val, 1)==FAILURE) { - RETURN_FALSE; - } - } -} -/* }}} */ - -/* {{{ proto class apache_lookup_uri(string URI) - Perform a partial request of the given URI to obtain information about it */ -PHP_FUNCTION(apache_lookup_uri) -{ - pval **filename; - request_rec *rr=NULL; - SLS_FETCH(); - - if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1,&filename) == FAILURE) { - WRONG_PARAM_COUNT; - } - 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); - 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",(char *)rr->status_line,1); - } - if (rr->method) { - add_property_string(return_value,"method",(char *)rr->method,1); - } - if (rr->content_type) { - add_property_string(return_value,"content_type",(char *)rr->content_type,1); - } - if (rr->handler) { - add_property_string(return_value,"handler",(char *)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); - add_property_long(return_value,"sent_bodyct",rr->sent_bodyct); - 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); - } - - destroy_sub_req(rr); -} -/* }}} */ - - -#if 0 -This function is most likely a bad idea. Just playing with it for now. - -PHP_FUNCTION(apache_exec_uri) -{ - pval **filename; - request_rec *rr=NULL; - SLS_FETCH(); - - if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1,&filename) == FAILURE) { - WRONG_PARAM_COUNT; - } - 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); - RETURN_FALSE; - } - RETVAL_LONG(ap_run_sub_req(rr)); - ap_destroy_sub_req(rr); -} -#endif - -#endif - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ diff --git a/ext/apache/config.m4 b/ext/apache/config.m4 deleted file mode 100644 index 88575c9e98..0000000000 --- a/ext/apache/config.m4 +++ /dev/null @@ -1,2 +0,0 @@ -dnl $Id$ - diff --git a/main/internal_functions_registry.h b/main/internal_functions_registry.h index cedea2ba1c..7152eb8b16 100644 --- a/main/internal_functions_registry.h +++ b/main/internal_functions_registry.h @@ -25,6 +25,7 @@ extern int php_init_mime(INIT_FUNC_ARGS); +#if 0 #if APACHE extern zend_module_entry apache_module_entry; #define phpext_apache_ptr &apache_module_entry @@ -32,6 +33,7 @@ extern void php_virtual(INTERNAL_FUNCTION_PARAMETERS); #else #define phpext_apache_ptr NULL #endif +#endif /* environment functions */ extern int php_init_environment(void); diff --git a/sapi/apache/Makefile.in b/sapi/apache/Makefile.in index 5a72f36b96..3151826121 100644 --- a/sapi/apache/Makefile.in +++ b/sapi/apache/Makefile.in @@ -5,7 +5,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ LTLIBRARY_NAME = libsapi.la -LTLIBRARY_SOURCES = sapi_apache.c mod_php4.c +LTLIBRARY_SOURCES = sapi_apache.c mod_php4.c php_apache.c EXTRA_INCLUDES = $(APACHE_INCLUDE) diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4 index a9c26ee3bd..e35b11caf0 100644 --- a/sapi/apache/config.m4 +++ b/sapi/apache/config.m4 @@ -29,7 +29,6 @@ AC_ARG_WITH(apxs, if test -n "`$APXS -q CFLAGS | grep USE_HSREGEX`"; then APACHE_HAS_REGEX=yes fi - PHP_EXTENSION(apache) PHP_SAPI=apache APACHE_INSTALL="$APXS -i -a -n php4 $SAPI_SHARED" PHP_BUILD_SHARED @@ -234,7 +233,6 @@ if test -n "$APACHE_MODULE"; then fi PHP_SUBST(APACHE_WANT_HSREGEX) PHP_APACHE_CHECK_RDYNAMIC - PHP_EXTENSION(apache) PHP_OUTPUT(sapi/apache/libphp4.module) PHP_BUILD_STATIC fi diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c index ea259ec340..60be851a40 100644 --- a/sapi/apache/mod_php4.c +++ b/sapi/apache/mod_php4.c @@ -58,6 +58,8 @@ # include "mod_dav.h" #endif +extern zend_module_entry apache_module_entry; + PHPAPI int apache_php_module_main(request_rec *r, int fd, int display_source_mode SLS_DC); void php_save_umask(void); void php_restore_umask(void); @@ -255,11 +257,22 @@ static void sapi_apache_register_server_variables(zval *track_vars_array ELS_DC php_register_variable("PHP_SELF", ((request_rec *) SG(server_context))->uri, NULL ELS_CC PLS_CC); } +static int +php_apache_startup(sapi_module_struct *sapi_module) +{ + if(php_module_startup(sapi_module) == FAILURE + || zend_register_module(&apache_module_entry) == FAILURE) { + return FAILURE; + } else { + return SUCCESS; + } +} + static sapi_module_struct sapi_module = { "Apache", /* name */ - php_module_startup, /* startup */ + php_apache_startup, /* startup */ php_module_shutdown_wrapper, /* shutdown */ sapi_apache_ub_write, /* unbuffered write */