[PHP-CVS] cvs: php-src /sapi/apache2handler .cvsignore config.m4 config.w32 mod_php.c mod_php5.c php.sym php5apache2.dsp php_apache.h sapi_apache2.c

2007-02-07 Thread Antony Dovgal 
tony2001Wed Feb  7 09:35:09 2007 UTC

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

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

  Modified files:  
/php-src/sapi/apache2handler.cvsignore config.m4 config.w32 
php.sym php5apache2.dsp php_apache.h 
sapi_apache2.c 
  Log:
  change php5 to php6 everywhere
  rename mod_php5.c to mod_php.c
  
  http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/.cvsignore?r1=1.3r2=1.4diff_format=u
Index: php-src/sapi/apache2handler/.cvsignore
diff -u php-src/sapi/apache2handler/.cvsignore:1.3 
php-src/sapi/apache2handler/.cvsignore:1.4
--- php-src/sapi/apache2handler/.cvsignore:1.3  Sun Oct 10 16:10:31 2004
+++ php-src/sapi/apache2handler/.cvsignore  Wed Feb  7 09:35:09 2007
@@ -1,4 +1,4 @@
-libphp5.module
+libphp6.module
 *.la
 *.lo
 .deps
@@ -14,3 +14,4 @@
 Debug_TS
 *.gcda
 *.gcno
+.libs
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/config.m4?r1=1.15r2=1.16diff_format=u
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.15 
php-src/sapi/apache2handler/config.m4:1.16
--- php-src/sapi/apache2handler/config.m4:1.15  Thu Sep  1 14:33:37 2005
+++ php-src/sapi/apache2handler/config.m4   Wed Feb  7 09:35:09 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.15 2005/09/01 14:33:37 sniper Exp $
+dnl $Id: config.m4,v 1.16 2007/02/07 09:35:09 tony2001 Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS)
@@ -68,20 +68,20 @@
   if test -z `$APXS -q SYSCONFDIR`; then
 INSTALL_IT=\$(mkinstalldirs) '$APXS_LIBEXECDIR'  \
  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-   -i -n php5
+   -i -n php6
   else
 APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
 INSTALL_IT=\$(mkinstalldirs) '$APXS_LIBEXECDIR'  \
 \$(mkinstalldirs) '$APXS_SYSCONFDIR'  \
  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
-   -i -a -n php5
+   -i -a -n php6
   fi
 
   case $host_alias in
   *aix*)
 EXTRA_LDFLAGS=$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp
-PHP_SELECT_SAPI(apache2handler, shared, mod_php5.c sapi_apache2.c 
apache_config.c php_functions.c, $APACHE_CFLAGS)
+PHP_SELECT_SAPI(apache2handler, shared, mod_php.c sapi_apache2.c 
apache_config.c php_functions.c, $APACHE_CFLAGS)
 INSTALL_IT=$INSTALL_IT $SAPI_LIBTOOL 
 ;;
   *darwin*)
@@ -97,19 +97,19 @@
 fi
 MH_BUNDLE_FLAGS=-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS
 PHP_SUBST(MH_BUNDLE_FLAGS)
-PHP_SELECT_SAPI(apache2handler, bundle, mod_php5.c sapi_apache2.c 
apache_config.c php_functions.c, $APACHE_CFLAGS)
-SAPI_SHARED=libs/libphp5.so
+PHP_SELECT_SAPI(apache2handler, bundle, mod_php.c sapi_apache2.c 
apache_config.c php_functions.c, $APACHE_CFLAGS)
+SAPI_SHARED=libs/libphp6.so
 INSTALL_IT=$INSTALL_IT $SAPI_SHARED
 ;;
   *beos*)
 if test -f _APP_; then `rm _APP_`; fi
 `ln -s $APXS_BINDIR/httpd _APP_`
 EXTRA_LIBS=$EXTRA_LIBS _APP_
-PHP_SELECT_SAPI(apache2handler, shared, mod_php5.c sapi_apache2.c 
apache_config.c php_functions.c, $APACHE_CFLAGS)
+PHP_SELECT_SAPI(apache2handler, shared, mod_php.c sapi_apache2.c 
apache_config.c php_functions.c, $APACHE_CFLAGS)
 INSTALL_IT=$INSTALL_IT $SAPI_LIBTOOL 
 ;;
   *)
-PHP_SELECT_SAPI(apache2handler, shared, mod_php5.c sapi_apache2.c 
apache_config.c php_functions.c, $APACHE_CFLAGS) 
+PHP_SELECT_SAPI(apache2handler, shared, mod_php.c sapi_apache2.c 
apache_config.c php_functions.c, $APACHE_CFLAGS) 
 INSTALL_IT=$INSTALL_IT $SAPI_LIBTOOL
 ;;
   esac
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/config.w32?r1=1.2r2=1.3diff_format=u
Index: php-src/sapi/apache2handler/config.w32
diff -u php-src/sapi/apache2handler/config.w32:1.2 
php-src/sapi/apache2handler/config.w32:1.3
--- php-src/sapi/apache2handler/config.w32:1.2  Sun May  7 00:10:06 2006
+++ php-src/sapi/apache2handler/config.w32  Wed Feb  7 09:35:09 2007
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.2 2006/05/07 00:10:06 edink Exp $
+// $Id: config.w32,v 1.3 2007/02/07 09:35:09 tony2001 Exp $
 
 ARG_ENABLE('apache2handler', 'Build Apache 2.x handler', 'no');
 
@@ -9,7 +9,7 @@
CHECK_LIB(libapr.lib, apache2handler, PHP_PHP_BUILD 
+ \\apache2\\lib) 
CHECK_LIB(libaprutil.lib, apache2handler, 
PHP_PHP_BUILD + \\apache2\\lib)
) {
-   SAPI('apache2handler', 'mod_php5.c sapi_apache2.c 
apache_config.c php_functions.c',
+   SAPI('apache2handler', 'mod_php.c sapi_apache2.c 
apache_config.c php_functions.c',
'php' +

Re: [PHP-CVS] cvs: php-src /sapi/apache2handler .cvsignore config.m4 config.w32 mod_php.c mod_php5.c php.sym php5apache2.dsp php_apache.h sapi_apache2.c

2007-02-07 Thread Andrei Zmievski 
Don't we need to explicitly specify the module name, like sapi/apache  
does it? Otherwise the name's going to be mod_php.c.


AP_MODULE_DECLARE_DATA module php6_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 */
};


-Andrei


On Feb 7, 2007, at 1:35 AM, Antony Dovgal wrote:


tony2001Wed Feb  7 09:35:09 2007 UTC

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

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

  Modified files:
/php-src/sapi/apache2handler.cvsignore config.m4 config.w32
php.sym php5apache2.dsp php_apache.h
sapi_apache2.c
  Log:
  change php5 to php6 everywhere
  rename mod_php5.c to mod_php.c

tony2001-20070207093509.txt
--
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