mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
- Renamed all *php4* files to *php5*, changed all php4/PHP4 to php5/PHP5
This commit is contained in:
foobar
parent
b851f37123
commit
f4983c0d3f
167 changed files with 1134 additions and 1147 deletions
|
|
@ -1,38 +1,38 @@
|
|||
##
|
||||
## Apache 1.3 Makefile template for PHP 4.0 Module
|
||||
## [src/modules/php4/Makefile.tmpl]
|
||||
## [src/modules/php5/Makefile.tmpl]
|
||||
##
|
||||
|
||||
# the parametrized target
|
||||
LIB=libphp4.$(LIBEXT)
|
||||
LIB=libphp5.$(LIBEXT)
|
||||
|
||||
# objects for building the static library
|
||||
OBJS=mod_php4.o
|
||||
OBJS_LIB=libmodphp4.a
|
||||
OBJS=mod_php5.o
|
||||
OBJS_LIB=libmodphp5.a
|
||||
|
||||
# objects for building the shared object library
|
||||
SHLIB_OBJS=mod_php4.so-o
|
||||
SHLIB_OBJS_LIB=libmodphp4.a
|
||||
SHLIB_OBJS=mod_php5.so-o
|
||||
SHLIB_OBJS_LIB=libmodphp5.a
|
||||
|
||||
# the general targets
|
||||
all: lib
|
||||
lib: $(LIB)
|
||||
|
||||
# build the static library by merging the object files
|
||||
libphp4.a: $(OBJS) $(OBJS_LIB)
|
||||
libphp5.a: $(OBJS) $(OBJS_LIB)
|
||||
cp $(OBJS_LIB) $@
|
||||
ar r $@ $(OBJS)
|
||||
$(RANLIB) $@
|
||||
|
||||
# ugly hack to support older Apache-1.3 betas that don't set $LIBEXT
|
||||
libphp4.: $(OBJS) $(OBJS_LIB)
|
||||
libphp5.: $(OBJS) $(OBJS_LIB)
|
||||
cp $(OBJS_LIB) $@
|
||||
ar r $@ $(OBJS)
|
||||
$(RANLIB) $@
|
||||
cp libphp4. libphp4.a
|
||||
cp libphp5. libphp5.a
|
||||
|
||||
# build the shared object library by linking the object files
|
||||
libphp4.so: $(SHLIB_OBJS) $(SHLIB_OBJS_LIB)
|
||||
libphp5.so: $(SHLIB_OBJS) $(SHLIB_OBJS_LIB)
|
||||
rm -f $@
|
||||
$(LD_SHLIB) $(LDFLAGS_SHLIB) -o $@ $(SHLIB_OBJS) $(SHLIB_OBJS_LIB) $(LIBS) $(PHP_LIBS)
|
||||
|
||||
|
|
@ -69,9 +69,9 @@ depend:
|
|||
$(OBJS): Makefile
|
||||
|
||||
# DO NOT REMOVE
|
||||
mod_php4.o: mod_php4.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
|
||||
mod_php5.o: mod_php5.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
|
||||
$(INCDIR)/buff.h \
|
||||
$(INCDIR)/http_config.h \
|
||||
$(INCDIR)/http_core.h $(INCDIR)/http_main.h \
|
||||
$(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
|
||||
$(INCDIR)/http_log.h $(INCDIR)/util_script.h mod_php4.h
|
||||
$(INCDIR)/http_log.h $(INCDIR)/util_script.h mod_php5.h
|
||||
|
|
|
|||
|
|
@ -53,16 +53,16 @@ AC_ARG_WITH(apache-hooks,
|
|||
*aix*)
|
||||
APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR`
|
||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
|
||||
PHP_SELECT_SAPI(apache_hooks, shared, sapi_apache.c mod_php4.c php_apache.c, -I$APXS_INCLUDEDIR)
|
||||
PHP_SELECT_SAPI(apache_hooks, shared, sapi_apache.c mod_php5.c php_apache.c, -I$APXS_INCLUDEDIR)
|
||||
;;
|
||||
*darwin*)
|
||||
MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD"
|
||||
PHP_SUBST(MH_BUNDLE_FLAGS)
|
||||
SAPI_SHARED=libs/libphp4.so
|
||||
PHP_SELECT_SAPI(apache_hooks, bundle, sapi_apache.c mod_php4.c php_apache.c, -I$APXS_INCLUDEDIR)
|
||||
SAPI_SHARED=libs/libphp5.so
|
||||
PHP_SELECT_SAPI(apache_hooks, bundle, sapi_apache.c mod_php5.c php_apache.c, -I$APXS_INCLUDEDIR)
|
||||
;;
|
||||
*)
|
||||
PHP_SELECT_SAPI(apache_hooks, shared, sapi_apache.c mod_php4.c php_apache.c, -I$APXS_INCLUDEDIR)
|
||||
PHP_SELECT_SAPI(apache_hooks, shared, sapi_apache.c mod_php5.c php_apache.c, -I$APXS_INCLUDEDIR)
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -70,9 +70,9 @@ AC_ARG_WITH(apache-hooks,
|
|||
$APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
|
||||
|
||||
if test "$?" != "0"; then
|
||||
APACHE_INSTALL="$APXS -i -a -n php4 $SAPI_SHARED" # Old apxs does not have -S option
|
||||
APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
|
||||
else
|
||||
APACHE_INSTALL="\$(mkinstalldirs) \"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" && $APXS -S LIBEXECDIR=\"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" -i -a -n php4 $SAPI_SHARED"
|
||||
APACHE_INSTALL="\$(mkinstalldirs) \"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" && $APXS -S LIBEXECDIR=\"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" -i -a -n php5 $SAPI_SHARED"
|
||||
fi
|
||||
|
||||
if test -z "`$APXS -q LD_SHLIB`" || test "`$APXS -q LIBEXECDIR`" = "modules"; then
|
||||
|
|
@ -86,7 +86,7 @@ AC_ARG_WITH(apache-hooks,
|
|||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache_hooks/mod_php4.* sapi/apache_hooks/libphp4.module"
|
||||
APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache_hooks/mod_php5.* sapi/apache_hooks/libphp5.module"
|
||||
|
||||
if test "$PHP_SAPI" != "apache_hooks"; then
|
||||
AC_MSG_CHECKING(for Apache 1.x (hooks) module support)
|
||||
|
|
@ -106,7 +106,7 @@ AC_ARG_WITH(apache-hooks-static,
|
|||
if test -f $withval/src/httpd.h; then
|
||||
APACHE_INCLUDE=-I$withval/src
|
||||
APACHE_TARGET=$withval/src
|
||||
PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php4.c php_apache.c, $APACHE_INCLUDE)
|
||||
PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE)
|
||||
APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_INSTALL_FILES $APACHE_TARGET"
|
||||
PHP_LIBS="-L. -lphp3"
|
||||
AC_MSG_RESULT(yes - Apache 1.2.x)
|
||||
|
|
@ -122,13 +122,13 @@ AC_ARG_WITH(apache-hooks-static,
|
|||
elif test -f $withval/src/main/httpd.h; then
|
||||
APACHE_HAS_REGEX=1
|
||||
APACHE_INCLUDE="-I$withval/src/main -I$withval/src/os/unix -I$withval/src/ap"
|
||||
APACHE_TARGET=$withval/src/modules/php4
|
||||
APACHE_TARGET=$withval/src/modules/php5
|
||||
if test ! -d $APACHE_TARGET; then
|
||||
mkdir $APACHE_TARGET
|
||||
fi
|
||||
PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php4.c php_apache.c, $APACHE_INCLUDE)
|
||||
APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
|
||||
PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
|
||||
PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE)
|
||||
APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
|
||||
PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
|
||||
AC_MSG_RESULT(yes - Apache 1.3.x)
|
||||
STRONGHOLD=
|
||||
if test -f $withval/src/include/ap_config.h; then
|
||||
|
|
@ -148,13 +148,13 @@ AC_ARG_WITH(apache-hooks-static,
|
|||
elif test -f $withval/src/include/httpd.h; then
|
||||
APACHE_HAS_REGEX=1
|
||||
APACHE_INCLUDE="-I$withval/src/include -I$withval/src/os/unix"
|
||||
APACHE_TARGET=$withval/src/modules/php4
|
||||
APACHE_TARGET=$withval/src/modules/php5
|
||||
if test ! -d $APACHE_TARGET; then
|
||||
mkdir $APACHE_TARGET
|
||||
fi
|
||||
PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php4.c php_apache.c, $APACHE_INCLUDE)
|
||||
PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
|
||||
APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
|
||||
PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE)
|
||||
PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
|
||||
APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
|
||||
AC_MSG_RESULT(yes - Apache 1.3.x)
|
||||
STRONGHOLD=
|
||||
if test -f $withval/src/include/ap_config.h; then
|
||||
|
|
@ -174,9 +174,9 @@ AC_ARG_WITH(apache-hooks-static,
|
|||
elif test -f $withval/apache/httpd.h; then
|
||||
APACHE_INCLUDE=-"I$withval/apache -I$withval/ssl/include"
|
||||
APACHE_TARGET=$withval/apache
|
||||
PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php4.c php_apache.c, $APACHE_INCLUDE)
|
||||
PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
|
||||
APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET"
|
||||
PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE)
|
||||
PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
|
||||
APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET"
|
||||
STRONGHOLD=-DSTRONGHOLD=1
|
||||
AC_MSG_RESULT(yes - StrongHold)
|
||||
if test -f $withval/apache/ap_config.h; then
|
||||
|
|
@ -206,7 +206,7 @@ AC_ARG_WITH(apache-hooks-static,
|
|||
fi
|
||||
|
||||
if test "x$APXS" != "x" -a "`uname -sv`" = "AIX 4" -a "$GCC" != "yes"; then
|
||||
APXS_EXP=-bE:sapi/apache_hooks/mod_php4.exp
|
||||
APXS_EXP=-bE:sapi/apache_hooks/mod_php5.exp
|
||||
fi
|
||||
|
||||
PHP_SUBST(APXS_EXP)
|
||||
|
|
@ -230,7 +230,7 @@ AC_ARG_WITH(mod_charset,
|
|||
if test -n "$APACHE_MODULE"; then
|
||||
PHP_TARGET_RDYNAMIC
|
||||
$php_shtool mkdir -p sapi/apache_hooks
|
||||
PHP_OUTPUT(sapi/apache_hooks/libphp4.module)
|
||||
PHP_OUTPUT(sapi/apache_hooks/libphp5.module)
|
||||
fi
|
||||
|
||||
if test -n "$APACHE_INSTALL"; then
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ if (PHP_APACHE_HOOKS != "no") {
|
|||
';..\\php_build\\apache\\src\\corer')) {
|
||||
// We need to play tricks to get our readdir.h used by apache
|
||||
// headers
|
||||
SAPI('apache_hooks', 'mod_php4.c sapi_apache.c php_apache.c',
|
||||
SAPI('apache_hooks', 'mod_php5.c sapi_apache.c php_apache.c',
|
||||
'php' + PHP_VERSION + 'apache_hooks.dll',
|
||||
'/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H /I win32');
|
||||
'/D APACHEPHP5_EXPORTS /D APACHE_READDIR_H /I win32');
|
||||
} else {
|
||||
WARNING("Could not find apache libraries/headers");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Name: php4_module
|
||||
Name: php5_module
|
||||
ConfigStart
|
||||
RULE_WANTHSREGEX=no
|
||||
RULE_HIDE=yes
|
||||
|
|
@ -1 +0,0 @@
|
|||
php4_module
|
||||
|
|
@ -88,11 +88,11 @@ static CONST_PREFIX char *php_apache_flag_handler(cmd_parms *cmd, php_per_dir_co
|
|||
static CONST_PREFIX char *php_apache_flag_handler_ex(cmd_parms *cmd, HashTable *conf, char *arg1, char *arg2, int mode);
|
||||
static CONST_PREFIX char *php_apache_admin_flag_handler(cmd_parms *cmd, php_per_dir_config *conf, char *arg1, char *arg2);
|
||||
|
||||
/* ### these should be defined in mod_php4.h or somewhere else */
|
||||
/* ### these should be defined in mod_php5.h or somewhere else */
|
||||
#define USE_PATH 1
|
||||
#define IGNORE_URL 2
|
||||
|
||||
module MODULE_VAR_EXPORT php4_module;
|
||||
module MODULE_VAR_EXPORT php5_module;
|
||||
|
||||
int saved_umask;
|
||||
//static int setup_env = 0;
|
||||
|
|
@ -657,7 +657,7 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
|
|||
return DECLINED;
|
||||
}
|
||||
|
||||
per_dir_conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
|
||||
per_dir_conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
|
||||
if (per_dir_conf) {
|
||||
zend_hash_apply((HashTable *) per_dir_conf->ini_settings, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC);
|
||||
}
|
||||
|
|
@ -931,7 +931,7 @@ static CONST_PREFIX char *php_set_server_handler(server_rec *s, char *arg1, long
|
|||
handler->type = handler_type;
|
||||
handler->stage = handler_stage;
|
||||
handler->name = strdup(arg1);
|
||||
conf = get_module_config(s->module_config, &php4_module);
|
||||
conf = get_module_config(s->module_config, &php5_module);
|
||||
switch(handler_stage) {
|
||||
case AP_URI_TRANS:
|
||||
sapi_stack_push(&conf->uri_handlers, handler);
|
||||
|
|
@ -1169,7 +1169,7 @@ static int php_xbithack_handler(request_rec * r)
|
|||
r->allowed |= (1 << METHODS) - 1;
|
||||
return DECLINED;
|
||||
}
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
|
||||
if (conf) {
|
||||
zend_hash_apply((HashTable *) conf->ini_settings, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC);
|
||||
}
|
||||
|
|
@ -1248,7 +1248,7 @@ static int php_run_hook(php_handler *handler, request_rec *r)
|
|||
TSRMLS_FETCH();
|
||||
|
||||
if(!AP(apache_config_loaded)) {
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
|
||||
if (conf)
|
||||
zend_hash_apply((HashTable *)conf->ini_settings, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC);
|
||||
AP(apache_config_loaded) = 1;
|
||||
|
|
@ -1280,7 +1280,7 @@ static int php_uri_translation(request_rec *r)
|
|||
php_per_server_config *conf;
|
||||
TSRMLS_FETCH();
|
||||
AP(current_hook) = AP_URI_TRANS;
|
||||
conf = (php_per_server_config *) get_module_config(r->server->module_config, &php4_module);
|
||||
conf = (php_per_server_config *) get_module_config(r->server->module_config, &php5_module);
|
||||
return sapi_stack_apply_with_argument_stop_if_equals(&conf->uri_handlers,
|
||||
ZEND_STACK_APPLY_BOTTOMUP,
|
||||
(int (*)(void *element, void *)) php_run_hook, r, OK);
|
||||
|
|
@ -1291,7 +1291,7 @@ static int php_header_hook(request_rec *r)
|
|||
php_per_dir_config *conf;
|
||||
TSRMLS_FETCH();
|
||||
AP(current_hook) = AP_HEADER_PARSE;
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
|
||||
return sapi_stack_apply_with_argument_stop_if_http_error(&conf->headers_handlers,
|
||||
ZEND_STACK_APPLY_BOTTOMUP,
|
||||
(int (*)(void *element, void *)) php_run_hook, r);
|
||||
|
|
@ -1302,7 +1302,7 @@ static int php_auth_hook(request_rec *r)
|
|||
php_per_dir_config *conf;
|
||||
TSRMLS_FETCH();
|
||||
AP(current_hook) = AP_AUTHENTICATION;
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
|
||||
return sapi_stack_apply_with_argument_stop_if_equals(&conf->auth_handlers,
|
||||
ZEND_STACK_APPLY_BOTTOMUP,
|
||||
(int (*)(void *element, void *)) php_run_hook, r, OK);
|
||||
|
|
@ -1314,7 +1314,7 @@ static int php_access_hook(request_rec *r)
|
|||
int status = DECLINED;
|
||||
TSRMLS_FETCH();
|
||||
AP(current_hook) = AP_ACCESS_CONTROL;
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
|
||||
status = sapi_stack_apply_with_argument_stop_if_http_error(&conf->access_handlers,
|
||||
ZEND_STACK_APPLY_BOTTOMUP,
|
||||
(int (*)(void *element, void *)) php_run_hook, r);
|
||||
|
|
@ -1327,7 +1327,7 @@ static int php_type_hook(request_rec *r)
|
|||
php_per_dir_config *conf;
|
||||
TSRMLS_FETCH();
|
||||
AP(current_hook) = AP_TYPE_CHECKING;
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
|
||||
return sapi_stack_apply_with_argument_stop_if_equals(&conf->type_handlers,
|
||||
ZEND_STACK_APPLY_BOTTOMUP,
|
||||
(int (*)(void *element, void *)) php_run_hook,
|
||||
|
|
@ -1339,7 +1339,7 @@ static int php_fixup_hook(request_rec *r)
|
|||
php_per_dir_config *conf;
|
||||
TSRMLS_FETCH();
|
||||
AP(current_hook) = AP_FIXUP;
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
|
||||
return sapi_stack_apply_with_argument_stop_if_http_error(&conf->fixup_handlers,
|
||||
ZEND_STACK_APPLY_BOTTOMUP,
|
||||
(int (*)(void *element, void *)) php_run_hook,
|
||||
|
|
@ -1351,7 +1351,7 @@ static int php_logger_hook(request_rec *r)
|
|||
php_per_dir_config *conf;
|
||||
TSRMLS_FETCH();
|
||||
AP(current_hook) = AP_LOGGING;
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
|
||||
return sapi_stack_apply_with_argument_stop_if_http_error(&conf->logger_handlers,
|
||||
ZEND_STACK_APPLY_BOTTOMUP,
|
||||
(int (*)(void *element, void *)) php_run_hook,
|
||||
|
|
@ -1364,11 +1364,11 @@ static int php_post_read_hook(request_rec *r)
|
|||
php_per_server_config *svr;
|
||||
TSRMLS_FETCH();
|
||||
AP(current_hook) = AP_POST_READ;
|
||||
svr = get_module_config(r->server->module_config, &php4_module);
|
||||
svr = get_module_config(r->server->module_config, &php5_module);
|
||||
if(ap_is_initial_req(r)) {
|
||||
sapi_stack_apply_with_argument_all(&svr->requires, ZEND_STACK_APPLY_BOTTOMUP, (int (*)(void *element, void *)) php_run_hook, r);
|
||||
}
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
|
||||
return sapi_stack_apply_with_argument_stop_if_http_error(&conf->post_read_handlers,
|
||||
ZEND_STACK_APPLY_BOTTOMUP,
|
||||
(int (*)(void *element, void *)) php_run_hook, r);
|
||||
|
|
@ -1379,7 +1379,7 @@ static int php_response_handler(request_rec *r)
|
|||
php_per_dir_config *conf;
|
||||
TSRMLS_FETCH();
|
||||
AP(current_hook) = AP_RESPONSE;
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
|
||||
conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
|
||||
return sapi_stack_apply_with_argument_all(&conf->response_handlers, ZEND_STACK_APPLY_BOTTOMUP, (int (*)(void *element, void *)) php_run_hook, r);
|
||||
}
|
||||
|
||||
|
|
@ -1430,9 +1430,9 @@ command_rec php_commands[] =
|
|||
};
|
||||
/* }}} */
|
||||
|
||||
/* {{{ module MODULE_VAR_EXPORT php4_module
|
||||
/* {{{ module MODULE_VAR_EXPORT php5_module
|
||||
*/
|
||||
module MODULE_VAR_EXPORT php4_module =
|
||||
module MODULE_VAR_EXPORT php5_module =
|
||||
{
|
||||
STANDARD_MODULE_STUFF,
|
||||
php_init_handler, /* initializer */
|
||||
1
sapi/apache_hooks/mod_php5.exp
Normal file
1
sapi/apache_hooks/mod_php5.exp
Normal file
|
|
@ -0,0 +1 @@
|
|||
php5_module
|
||||
|
|
@ -17,8 +17,8 @@
|
|||
*/
|
||||
/* $Id$ */
|
||||
|
||||
#ifndef MOD_PHP4_H
|
||||
#define MOD_PHP4_H
|
||||
#ifndef MOD_PHP5_H
|
||||
#define MOD_PHP5_H
|
||||
|
||||
#if !defined(WIN32) && !defined(WINNT)
|
||||
#ifndef MODULE_VAR_EXPORT
|
||||
|
|
@ -71,7 +71,7 @@ extern php_apache_info_struct php_apache_info;
|
|||
#define AP_LOGGING 10
|
||||
#define AP_CLEANUP 11
|
||||
|
||||
#endif /* MOD_PHP4_H */
|
||||
#endif /* MOD_PHP5_H */
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
|
|
@ -1 +1 @@
|
|||
php4_module
|
||||
php5_module
|
||||
|
|
|
|||
|
|
@ -1,25 +1,25 @@
|
|||
# Microsoft Developer Studio Project File - Name="php4apache_hooks" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Project File - Name="php5apache_hooks" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
|
||||
|
||||
CFG=php4apache_hooks - Win32 Release_TS
|
||||
CFG=php5apache_hooks - Win32 Release_TS
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "php4apache_hooks.mak".
|
||||
!MESSAGE NMAKE /f "php5apache_hooks.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "php4apache_hooks.mak" CFG="php4apache_hooks - Win32 Release_TS"
|
||||
!MESSAGE NMAKE /f "php5apache_hooks.mak" CFG="php5apache_hooks - Win32 Release_TS"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "php4apache_hooks - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "php4apache_hooks - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "php4apache_hooks - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "php5apache_hooks - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "php5apache_hooks - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "php5apache_hooks - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
|
|
@ -30,7 +30,7 @@ CPP=cl.exe
|
|||
MTL=midl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "php4apache_hooks - Win32 Release_TS"
|
||||
!IF "$(CFG)" == "php5apache_hooks - Win32 Release_TS"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
|
|
@ -43,8 +43,8 @@ RSC=rc.exe
|
|||
# PROP Intermediate_Dir "Release_TS"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP4_EXPORTS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\..\regex" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\apache\src\include" /I "..\..\main" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APACHEPHP4_EXPORTS" /D "WIN32" /D "_MBCS" /D "APACHE_READDIR_H" /YX /FD /c
|
||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP5_EXPORTS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\..\regex" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\apache\src\include" /I "..\..\main" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APACHEPHP5_EXPORTS" /D "WIN32" /D "_MBCS" /D "APACHE_READDIR_H" /YX /FD /c
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
|
|
@ -54,9 +54,9 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
||||
# ADD LINK32 php4ts.lib ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x60000000" /version:4.0 /dll /machine:I386 /libpath:"..\..\..\php_build\apache\src\corer" /libpath:"..\..\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\Zend\Release_TS"
|
||||
# ADD LINK32 php5ts.lib ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x60000000" /version:4.0 /dll /machine:I386 /libpath:"..\..\..\php_build\apache\src\corer" /libpath:"..\..\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\Zend\Release_TS"
|
||||
|
||||
!ELSEIF "$(CFG)" == "php4apache_hooks - Win32 Debug_TS"
|
||||
!ELSEIF "$(CFG)" == "php5apache_hooks - Win32 Debug_TS"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
|
|
@ -69,8 +69,8 @@ LINK32=link.exe
|
|||
# PROP Intermediate_Dir "Debug_TS"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP4_EXPORTS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\..\regex" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\apache\src\include" /I "..\..\main" /I "..\..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APACHEPHP4_EXPORTS" /D "WIN32" /D "_MBCS" /D "APACHE_READDIR_H" /FR /YX /FD /c
|
||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP5_EXPORTS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\..\regex" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\apache\src\include" /I "..\..\main" /I "..\..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APACHEPHP5_EXPORTS" /D "WIN32" /D "_MBCS" /D "APACHE_READDIR_H" /FR /YX /FD /c
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
|
|
@ -80,9 +80,9 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
||||
# ADD LINK32 php4ts_debug.lib ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x60000000" /version:4.0 /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php4apache_hooks.dll" /pdbtype:sept /libpath:"..\..\..\php_build\apache\src\cored" /libpath:"..\..\Debug_TS" /libpath:"..\..\TSRM\Debug_TS" /libpath:"..\..\Zend\Debug_TS"
|
||||
# ADD LINK32 php5ts_debug.lib ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x60000000" /version:4.0 /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php5apache_hooks.dll" /pdbtype:sept /libpath:"..\..\..\php_build\apache\src\cored" /libpath:"..\..\Debug_TS" /libpath:"..\..\TSRM\Debug_TS" /libpath:"..\..\Zend\Debug_TS"
|
||||
|
||||
!ELSEIF "$(CFG)" == "php4apache_hooks - Win32 Release_TS_inline"
|
||||
!ELSEIF "$(CFG)" == "php5apache_hooks - Win32 Release_TS_inline"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
|
|
@ -95,8 +95,8 @@ LINK32=link.exe
|
|||
# PROP Intermediate_Dir "Release_TS_inline"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP4_EXPORTS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\..\regex" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\apache\src\include" /I "..\..\main" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APACHEPHP4_EXPORTS" /D "WIN32" /D "_MBCS" /D "APACHE_READDIR_H" /YX /FD /c
|
||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP5_EXPORTS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\..\regex" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\apache\src\include" /I "..\..\main" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APACHEPHP5_EXPORTS" /D "WIN32" /D "_MBCS" /D "APACHE_READDIR_H" /YX /FD /c
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
|
|
@ -106,21 +106,21 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
||||
# ADD LINK32 php4ts.lib ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"\apache\src\corer" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline"
|
||||
# ADD LINK32 php5ts.lib ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"\apache\src\corer" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "php4apache_hooks - Win32 Release_TS"
|
||||
# Name "php4apache_hooks - Win32 Debug_TS"
|
||||
# Name "php4apache_hooks - Win32 Release_TS_inline"
|
||||
# Name "php5apache_hooks - Win32 Release_TS"
|
||||
# Name "php5apache_hooks - Win32 Debug_TS"
|
||||
# Name "php5apache_hooks - Win32 Release_TS_inline"
|
||||
# Begin Group "Source Files"
|
||||
|
||||
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\mod_php4.c
|
||||
SOURCE=.\mod_php5.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
|
|
@ -136,7 +136,7 @@ SOURCE=.\sapi_apache.c
|
|||
# PROP Default_Filter "h;hpp;hxx;hm;inl"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\mod_php4.h
|
||||
SOURCE=.\mod_php5.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
#include "php_ini.h"
|
||||
#include "ext/standard/php_standard.h"
|
||||
|
||||
#include "mod_php4.h"
|
||||
#include "mod_php5.h"
|
||||
|
||||
|
||||
zval *php_apache_request_new(request_rec *r);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue