cvs: /php4/ext/apache .cvsignore Makefile.in apache.c config.m4 /php4 acinclude.m4 internal_functions_registry.h /php4/sapi/apache Makefile.in
config.m4 mod_php4.c

andrei Wed Feb 2 07:09:30 2000 EDT Removed files: /php4/ext/apache .cvsignore Makefile.in apache.c config.m4 Modified files: /php4 acinclude.m4 internal_functions_registry.h /php4/sapi/apache Makefile.in config.m4 mod_php4.c Log: Moved ext/apache into sapi/apache. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.57 php4/acinclude.m4:1.58 --- php4/acinclude.m4:1.57 Sat Jan 1 03:22:00 2000 +++ php4/acinclude.m4 Wed Feb 2 07:08:59 2000 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.57 2000/01/01 02:22:00 sas Exp $ +dnl $Id: acinclude.m4,v 1.58 2000/02/02 06:08:59 andrei Exp $ dnl dnl This file contains local autoconf functions. @@ -351,7 +351,7 @@ 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" Index: php4/internal_functions_registry.h diff -u php4/internal_functions_registry.h:1.5 php4/internal_functions_registry.h:1.6 --- php4/internal_functions_registry.h:1.5 Sat Jan 1 02:31:27 2000 +++ php4/internal_functions_registry.h Wed Feb 2 07:08:59 2000 @@ -18,19 +18,21 @@ */ -/* $Id: internal_functions_registry.h,v 1.5 2000/01/01 01:31:27 sas Exp $ */ +/* $Id: internal_functions_registry.h,v 1.6 2000/02/02 06:08:59 andrei Exp $ */ #ifndef _INTERNAL_FUNCTIONS_REGISTRY_H #define _INTERNAL_FUNCTIONS_REGISTRY_H 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 extern void php_virtual(INTERNAL_FUNCTION_PARAMETERS); #else #define phpext_apache_ptr NULL +#endif #endif /* environment functions */ Index: php4/sapi/apache/Makefile.in diff -u php4/sapi/apache/Makefile.in:1.2 php4/sapi/apache/Makefile.in:1.3 --- php4/sapi/apache/Makefile.in:1.2 Tue Jan 4 03:58:46 2000 +++ php4/sapi/apache/Makefile.in Wed Feb 2 07:09:00 2000 @@ -5,7 +5,7 @@ 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) Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.18 php4/sapi/apache/config.m4:1.19 --- php4/sapi/apache/config.m4:1.18 Thu Dec 30 03:59:38 1999 +++ php4/sapi/apache/config.m4 Wed Feb 2 07:09:00 2000 @@ -29,7 +29,6 @@ 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 @@ fi PHP_SUBST(APACHE_WANT_HSREGEX) PHP_APACHE_CHECK_RDYNAMIC - PHP_EXTENSION(apache) PHP_OUTPUT(sapi/apache/libphp4.module) PHP_BUILD_STATIC fi Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.17 php4/sapi/apache/mod_php4.c:1.18 --- php4/sapi/apache/mod_php4.c:1.17 Sat Jan 29 13:46:59 2000 +++ php4/sapi/apache/mod_php4.c Wed Feb 2 07:09:00 2000 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.17 2000/01/29 12:46:59 rasmus Exp $ */ +/* $Id: mod_php4.c,v 1.18 2000/02/02 06:09:00 andrei Exp $ */ #include "zend.h" #include "php.h" @@ -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 @@ 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 */