sniper Tue Oct 21 07:48:32 2003 EDT
Added files:
/php-src/sapi/apache2handler mod_php5.c
Modified files:
/php-src/sapi/apache2handler config.m4 php4apache2.dsp php_apache.h
sapi_apache2.c
Log:
Fixed bug #25768
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.8
php-src/sapi/apache2handler/config.m4:1.9
--- php-src/sapi/apache2handler/config.m4:1.8 Wed Jul 16 01:46:36 2003
+++ php-src/sapi/apache2handler/config.m4 Tue Oct 21 07:48:31 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.8 2003/07/16 05:46:36 sniper Exp $
+dnl $Id: config.m4,v 1.9 2003/10/21 11:48:31 sniper Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS)
@@ -75,7 +75,7 @@
case $host_alias in
*aix*)
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
- PHP_SELECT_SAPI(apache2handler, shared, sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
+ PHP_SELECT_SAPI(apache2handler, shared, mod_php5.c sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;;
*darwin*)
@@ -91,7 +91,7 @@
fi
MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
PHP_SUBST(MH_BUNDLE_FLAGS)
- PHP_SELECT_SAPI(apache2handler, bundle, sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
+ PHP_SELECT_SAPI(apache2handler, bundle, mod_php5.c sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
SAPI_SHARED=libs/libphp5.so
INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
;;
@@ -99,11 +99,11 @@
if test -f _APP_; then `rm _APP_`; fi
`ln -s $APXS_BINDIR/httpd _APP_`
EXTRA_LIBS="$EXTRA_LIBS _APP_"
- PHP_SELECT_SAPI(apache2handler, shared, sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
+ PHP_SELECT_SAPI(apache2handler, shared, mod_php5.c sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;;
*)
- PHP_SELECT_SAPI(apache2handler, shared, sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
+ PHP_SELECT_SAPI(apache2handler, shared, mod_php5.c sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;;
esac
Index: php-src/sapi/apache2handler/php4apache2.dsp
diff -u php-src/sapi/apache2handler/php4apache2.dsp:1.2
php-src/sapi/apache2handler/php4apache2.dsp:1.3
--- php-src/sapi/apache2handler/php4apache2.dsp:1.2 Tue Mar 25 06:50:18 2003
+++ php-src/sapi/apache2handler/php4apache2.dsp Tue Oct 21 07:48:31 2003
@@ -123,6 +123,10 @@
# End Source File
# Begin Source File
+SOURCE=.\mod_php5.c
+# End Source File
+# Begin Source File
+
SOURCE=.\php_functions.c
# End Source File
# Begin Source File
Index: php-src/sapi/apache2handler/php_apache.h
diff -u php-src/sapi/apache2handler/php_apache.h:1.5
php-src/sapi/apache2handler/php_apache.h:1.6
--- php-src/sapi/apache2handler/php_apache.h:1.5 Tue Jun 10 16:03:44 2003
+++ php-src/sapi/apache2handler/php_apache.h Tue Oct 21 07:48:31 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.h,v 1.5 2003/06/10 20:03:44 imajes Exp $ */
+/* $Id: php_apache.h,v 1.6 2003/10/21 11:48:31 sniper Exp $ */
#ifndef PHP_APACHE_H
#define PHP_APACHE_H
@@ -51,6 +51,7 @@
char *get_php_config(void *conf, char *name, size_t name_len);
void apply_config(void *);
extern const command_rec php_dir_cmds[];
+void php_ap2_register_hook(apr_pool_t *p);
#define APR_ARRAY_FOREACH_OPEN(arr, key, val) \
{
\
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.28
php-src/sapi/apache2handler/sapi_apache2.c:1.29
--- php-src/sapi/apache2handler/sapi_apache2.c:1.28 Wed Oct 1 23:24:36 2003
+++ php-src/sapi/apache2handler/sapi_apache2.c Tue Oct 21 07:48:31 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.28 2003/10/02 03:24:36 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.29 2003/10/21 11:48:31 sniper Exp $ */
#include <fcntl.h>
@@ -61,7 +61,7 @@
#define PHP_MAGIC_TYPE "application/x-httpd-php"
#define PHP_SOURCE_MAGIC_TYPE "application/x-httpd-php-source"
-#define PHP_SCRIPT "php-script"
+#define PHP_SCRIPT "php5-script"
/* A way to specify the location of the php.ini dir in an apache directive */
char *apache2_php_ini_path_override = NULL;
@@ -564,22 +564,12 @@
return OK;
}
-static void php_register_hook(apr_pool_t *p)
+void php_ap2_register_hook(apr_pool_t *p)
{
ap_hook_pre_config(php_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_post_config(php_apache_server_startup, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_handler(php_handler, NULL, NULL, APR_HOOK_MIDDLE);
}
-
-AP_MODULE_DECLARE_DATA module php5_module = {
- STANDARD20_MODULE_STUFF,
- create_php_config, /* create per-directory config structure */
- merge_php_config, /* merge per-directory config structures */
- NULL, /* create per-server config structure */
- NULL, /* merge per-server config structures */
- php_dir_cmds, /* command apr_table_t */
- php_register_hook /* register hooks */
-};
/*
* Local variables:
Index: php-src/sapi/apache2handler/mod_php5.c
+++ php-src/sapi/apache2handler/mod_php5.c
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2003 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_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 |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Authors: Sascha Schumann <[EMAIL PROTECTED]> |
| Parts based on Apache 1.3 SAPI module by |
| Rasmus Lerdorf and Zeev Suraski |
+----------------------------------------------------------------------+
*/
/* $Id: mod_php5.c,v 1.1 2003/10/21 11:48:31 sniper Exp $ */
#include "php.h"
#include "php_apache.h"
AP_MODULE_DECLARE_DATA module php5_module = {
STANDARD20_MODULE_STUFF,
create_php_config, /* create per-directory config structure */
merge_php_config, /* merge per-directory config structures */
NULL, /* create per-server config structure
*/
NULL, /* merge per-server config structures
*/
php_dir_cmds, /* command apr_table_t */
php_ap2_register_hook /* register hooks */
};
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 fdm=marker
* vim<600: sw=4 ts=4
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
