[PHP-CVS] cvs: php-src /sapi/apache2handler config.m4

2008-03-11 Thread Lars Strojny 
lstrojnyTue Mar 11 22:50:41 2008 UTC

  Modified files:  
/php-src/sapi/apache2handlerconfig.m4 
  Log:
  Adding itk again to non-threaded MPMs. Sorry for the confusion
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/config.m4?r1=1.20&r2=1.21&diff_format=u
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.20 
php-src/sapi/apache2handler/config.m4:1.21
--- php-src/sapi/apache2handler/config.m4:1.20  Sun Mar  9 12:37:05 2008
+++ php-src/sapi/apache2handler/config.m4   Tue Mar 11 22:50:41 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.20 2008/03/09 12:37:05 lstrojny Exp $
+dnl $Id: config.m4,v 1.21 2008/03/11 22:50:41 lstrojny Exp $
 dnl
 
 PHP_ARG_WITH(apxs2,,
@@ -117,7 +117,7 @@
 ;;
   esac
 
-  if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser"; then
+  if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test 
"$APXS_MPM" != "itk"; then
 PHP_BUILD_THREAD_SAFE
   fi
   AC_MSG_RESULT(yes)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler config.m4

2005-04-10 Thread Jani Taskinen 
sniper  Sun Apr 10 15:32:20 2005 EDT

  Modified files:  
/php-src/sapi/apache2handlerconfig.m4 
  Log:
  - Say in the help too this is the handler module..
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/config.m4?r1=1.11&r2=1.12&ty=u
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.11 
php-src/sapi/apache2handler/config.m4:1.12
--- php-src/sapi/apache2handler/config.m4:1.11  Sat Dec 11 21:11:27 2004
+++ php-src/sapi/apache2handler/config.m4   Sun Apr 10 15:32:19 2005
@@ -1,10 +1,10 @@
 dnl
-dnl $Id: config.m4,v 1.11 2004/12/12 02:11:27 moriyoshi Exp $
+dnl $Id: config.m4,v 1.12 2005/04/10 19:32:19 sniper Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS)
 AC_ARG_WITH(apxs2,
-[  --with-apxs2[=FILE] EXPERIMENTAL: Build shared Apache 2.0 module. FILE 
is the optional
+[  --with-apxs2[=FILE] EXPERIMENTAL: Build shared Apache 2.0 Handler 
module. FILE is the optional
   pathname to the Apache apxs tool; defaults to 
"apxs".],[
   if test "$withval" = "yes"; then
 APXS=apxs

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /sapi/apache2handler config.m4

2004-12-11 Thread Moriyoshi Koizumi 
I think this patch should also go in PHP_4_3 and PHP_5_0.
Moriyoshi
On 2004/12/12, at 11:11, Moriyoshi Koizumi wrote:
moriyoshi   Sat Dec 11 21:11:30 2004 EDT
  Modified files:
/php-src/sapi/apache2handlerconfig.m4
  Log:
  - Fixlet for httpd-2.1 on Darwin platforms
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/config.m4? 
r1=1.10&r2=1.11&ty=u
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.10  
php-src/sapi/apache2handler/config.m4:1.11
--- php-src/sapi/apache2handler/config.m4:1.10	Mon Aug 23 05:01:27 2004
+++ php-src/sapi/apache2handler/config.m4	Sat Dec 11 21:11:27 2004
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.10 2004/08/23 09:01:27 derick Exp $
+dnl $Id: config.m4,v 1.11 2004/12/12 02:11:27 moriyoshi Exp $
 dnl

 AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through  
APXS)
@@ -89,11 +89,11 @@
 dnl the linker does not recursively look at the bundle loader and
 dnl pull in its dependencies.  Therefore, we must pull in the APR
 dnl and APR-util libraries.
-if test -x "$APR_BINDIR/apr-config"; then
-MH_BUNDLE_FLAGS="`$APR_BINDIR/apr-config --ldflags --link-ld  
--libs`"
+if test -x "$APR_CONFIG"; then
+MH_BUNDLE_FLAGS="`$APR_CONFIG --ldflags --link-ld --libs`"
 fi
-if test -x "$APU_BINDIR/apu-config"; then
-MH_BUNDLE_FLAGS="`$APU_BINDIR/apu-config --ldflags --link-ld  
--libs` $MH_BUNDLE_FLAGS"
+if test -x "$APU_CONFIG"; then
+MH_BUNDLE_FLAGS="`$APU_CONFIG --ldflags --link-ld --libs`  
$MH_BUNDLE_FLAGS"
 fi
 MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD  
$MH_BUNDLE_FLAGS"
 PHP_SUBST(MH_BUNDLE_FLAGS)

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler config.m4

2004-12-11 Thread Moriyoshi Koizumi 
moriyoshi   Sat Dec 11 21:11:30 2004 EDT

  Modified files:  
/php-src/sapi/apache2handlerconfig.m4 
  Log:
  - Fixlet for httpd-2.1 on Darwin platforms
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/config.m4?r1=1.10&r2=1.11&ty=u
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.10 
php-src/sapi/apache2handler/config.m4:1.11
--- php-src/sapi/apache2handler/config.m4:1.10  Mon Aug 23 05:01:27 2004
+++ php-src/sapi/apache2handler/config.m4   Sat Dec 11 21:11:27 2004
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.10 2004/08/23 09:01:27 derick Exp $
+dnl $Id: config.m4,v 1.11 2004/12/12 02:11:27 moriyoshi Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS)
@@ -89,11 +89,11 @@
 dnl the linker does not recursively look at the bundle loader and
 dnl pull in its dependencies.  Therefore, we must pull in the APR
 dnl and APR-util libraries.
-if test -x "$APR_BINDIR/apr-config"; then
-MH_BUNDLE_FLAGS="`$APR_BINDIR/apr-config --ldflags --link-ld --libs`"
+if test -x "$APR_CONFIG"; then
+MH_BUNDLE_FLAGS="`$APR_CONFIG --ldflags --link-ld --libs`"
 fi
-if test -x "$APU_BINDIR/apu-config"; then
-MH_BUNDLE_FLAGS="`$APU_BINDIR/apu-config --ldflags --link-ld --libs` 
$MH_BUNDLE_FLAGS"
+if test -x "$APU_CONFIG"; then
+MH_BUNDLE_FLAGS="`$APU_CONFIG --ldflags --link-ld --libs` 
$MH_BUNDLE_FLAGS"
 fi
 MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
 PHP_SUBST(MH_BUNDLE_FLAGS)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler config.m4 mod_php5.c php4apache2.dsp php_apache.h sapi_apache2.c

2003-10-21 Thread Jani Taskinen 
sniper  Tue Oct 21 07:48:32 2003 EDT

  Added files: 
/php-src/sapi/apache2handlermod_php5.c 

  Modified files:  
/php-src/sapi/apache2handlerconfig.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.5Tue Jun 10 16:03:44 2003
+++ php-src/sapi/apache2handler/php_apache.hTue 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 
 
@@ -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