[PHP-CVS] cvs: php-src(PHP_5_2) / TODO
iliaa Thu Feb 8 02:10:24 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcTODO Log: Remove already done item from the todo http://cvs.php.net/viewvc.cgi/php-src/TODO?r1=1.156.2.1&r2=1.156.2.1.2.1&diff_format=u Index: php-src/TODO diff -u php-src/TODO:1.156.2.1 php-src/TODO:1.156.2.1.2.1 --- php-src/TODO:1.156.2.1 Wed Sep 7 02:33:12 2005 +++ php-src/TODOThu Feb 8 02:10:24 2007 @@ -129,7 +129,6 @@ ext/wddx * See if we can support the remaining data types: -dateTime binary http://www.wddx.org/WDDX_SDK_10a/7__References/WDDX_DTD.htm -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file bug40374.phpt
tony2001Wed Feb 7 21:13:02 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/filebug40374.phpt Log: add test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug40374.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/bug40374.phpt +++ php-src/ext/standard/tests/file/bug40374.phpt --TEST-- Bug #40374 (php_shutdown_temporary_directory() tries to free local value) --FILE-- --EXPECTF-- string(%d) "/tmp/test_%s" Done --UEXPECTF-- unicode(%d) "/tmp/test_%s" Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file bug40374.phpt
tony2001Wed Feb 7 21:12:48 2007 UTC Added files: /php-src/ext/standard/tests/filebug40374.phpt Log: add test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug40374.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/bug40374.phpt +++ php-src/ext/standard/tests/file/bug40374.phpt --TEST-- Bug #40374 (php_shutdown_temporary_directory() tries to free local value) --FILE-- --EXPECTF-- string(%d) "/tmp/test_%s" Done --UEXPECTF-- unicode(%d) "/tmp/test_%s" Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main php_open_temporary_file.c
tony2001Wed Feb 7 21:07:32 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main php_open_temporary_file.c
Log:
fix MFHed segfault
http://cvs.php.net/viewvc.cgi/php-src/main/php_open_temporary_file.c?r1=1.34.2.1.2.6&r2=1.34.2.1.2.7&diff_format=u
Index: php-src/main/php_open_temporary_file.c
diff -u php-src/main/php_open_temporary_file.c:1.34.2.1.2.6
php-src/main/php_open_temporary_file.c:1.34.2.1.2.7
--- php-src/main/php_open_temporary_file.c:1.34.2.1.2.6 Wed Feb 7 21:01:06 2007
+++ php-src/main/php_open_temporary_file.c Wed Feb 7 21:07:31 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_open_temporary_file.c,v 1.34.2.1.2.6 2007/02/07 21:01:06 helly Exp
$ */
+/* $Id: php_open_temporary_file.c,v 1.34.2.1.2.7 2007/02/07 21:07:31 tony2001
Exp $ */
#include "php.h"
@@ -194,12 +194,12 @@
#ifdef P_tmpdir
/* Use the standard default temporary directory. */
if (P_tmpdir) {
- temporary_directory = P_tmpdir;
+ temporary_directory = strdup(P_tmpdir);
return temporary_directory;
}
#endif
/* Shouldn't ever(!) end up here ... last ditch default. */
- temporary_directory = "/tmp";
+ temporary_directory = strdup("/tmp");
return temporary_directory;
#endif
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main main.c php_open_temporary_file.c php_open_temporary_file.h
helly Wed Feb 7 21:01:06 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main main.c php_open_temporary_file.c
php_open_temporary_file.h
Log:
- MFH Fix memleak with temp dir
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.29&r2=1.640.2.23.2.30&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.29 php-src/main/main.c:1.640.2.23.2.30
--- php-src/main/main.c:1.640.2.23.2.29 Mon Jan 8 03:39:09 2007
+++ php-src/main/main.c Wed Feb 7 21:01:06 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.640.2.23.2.29 2007/01/08 03:39:09 iliaa Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.30 2007/02/07 21:01:06 helly Exp $ */
/* {{{ includes
*/
@@ -83,6 +83,7 @@
#include "php_ticks.h"
#include "php_logos.h"
#include "php_streams.h"
+#include "php_open_temporary_file.h"
#include "SAPI.h"
#include "rfc1867.h"
@@ -1692,6 +1693,8 @@
ts_free_id(core_globals_id);
#endif
+ php_shutdown_temporary_directory();
+
module_initialized = 0;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/main/php_open_temporary_file.c?r1=1.34.2.1.2.5&r2=1.34.2.1.2.6&diff_format=u
Index: php-src/main/php_open_temporary_file.c
diff -u php-src/main/php_open_temporary_file.c:1.34.2.1.2.5
php-src/main/php_open_temporary_file.c:1.34.2.1.2.6
--- php-src/main/php_open_temporary_file.c:1.34.2.1.2.5 Mon Jan 1 09:36:11 2007
+++ php-src/main/php_open_temporary_file.c Wed Feb 7 21:01:06 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_open_temporary_file.c,v 1.34.2.1.2.5 2007/01/01 09:36:11 sebastian
Exp $ */
+/* $Id: php_open_temporary_file.c,v 1.34.2.1.2.6 2007/02/07 21:01:06 helly Exp
$ */
#include "php.h"
@@ -148,14 +148,22 @@
}
/* }}} */
+/* Cache the chosen temporary directory. */
+static char* temporary_directory;
+
+PHPAPI void php_shutdown_temporary_directory()
+{
+ if (temporary_directory) {
+ free(temporary_directory);
+ temporary_directory = NULL;
+ }
+}
+
/*
* Determine where to place temporary files.
*/
PHPAPI const char* php_get_temporary_directory(void)
{
- /* Cache the chosen temporary directory. */
- static char* temporary_directory;
-
/* Did we determine the temporary directory already? */
if (temporary_directory) {
return temporary_directory;
http://cvs.php.net/viewvc.cgi/php-src/main/php_open_temporary_file.h?r1=1.13.2.1.2.1&r2=1.13.2.1.2.2&diff_format=u
Index: php-src/main/php_open_temporary_file.h
diff -u php-src/main/php_open_temporary_file.h:1.13.2.1.2.1
php-src/main/php_open_temporary_file.h:1.13.2.1.2.2
--- php-src/main/php_open_temporary_file.h:1.13.2.1.2.1 Mon Jan 1 09:36:11 2007
+++ php-src/main/php_open_temporary_file.h Wed Feb 7 21:01:06 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_open_temporary_file.h,v 1.13.2.1.2.1 2007/01/01 09:36:11 sebastian
Exp $ */
+/* $Id: php_open_temporary_file.h,v 1.13.2.1.2.2 2007/02/07 21:01:06 helly Exp
$ */
#ifndef PHP_OPEN_TEMPORARY_FILE_H
#define PHP_OPEN_TEMPORARY_FILE_H
@@ -25,6 +25,7 @@
PHPAPI FILE *php_open_temporary_file(const char *dir, const char *pfx, char
**opened_path_p TSRMLS_DC);
PHPAPI int php_open_temporary_fd(const char *dir, const char *pfx, char
**opened_path_p TSRMLS_DC);
PHPAPI const char *php_get_temporary_directory(void);
+PHPAPI void php_shutdown_temporary_directory();
END_EXTERN_C()
#endif /* PHP_OPEN_TEMPORARY_FILE_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main/streams memory.c
helly Wed Feb 7 20:59:59 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main/streams memory.c
Log:
- MFH options/exports
http://cvs.php.net/viewvc.cgi/php-src/main/streams/memory.c?r1=1.8.2.6.2.15&r2=1.8.2.6.2.16&diff_format=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.8.2.6.2.15
php-src/main/streams/memory.c:1.8.2.6.2.16
--- php-src/main/streams/memory.c:1.8.2.6.2.15 Sat Feb 3 16:40:05 2007
+++ php-src/main/streams/memory.c Wed Feb 7 20:59:59 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: memory.c,v 1.8.2.6.2.15 2007/02/03 16:40:05 helly Exp $ */
+/* $Id: memory.c,v 1.8.2.6.2.16 2007/02/07 20:59:59 helly Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -282,7 +282,7 @@
php_stream_memory_seek,
php_stream_memory_cast,
php_stream_memory_stat,
- NULL /* php_stream_memory_set_option */
+ php_stream_memory_set_option
};
@@ -729,7 +729,7 @@
return stream;
}
-static php_stream_wrapper_ops php_stream_rfc2397_wops = {
+PHPAPI php_stream_wrapper_ops php_stream_rfc2397_wops = {
php_stream_url_wrap_rfc2397,
NULL, /* close */
NULL, /* fstat */
@@ -742,7 +742,7 @@
NULL /* rmdir */
};
-php_stream_wrapper php_stream_rfc2397_wrapper ={
+PHPAPI php_stream_wrapper php_stream_rfc2397_wrapper = {
&php_stream_rfc2397_wops,
NULL,
1, /* is_url */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2handler mod_php.c
tony2001Wed Feb 7 18:22:38 2007 UTC
Modified files:
/php-src/sapi/apache2handlermod_php.c
Log:
explicitly set module name
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/mod_php.c?r1=1.1&r2=1.2&diff_format=u
Index: php-src/sapi/apache2handler/mod_php.c
diff -u php-src/sapi/apache2handler/mod_php.c:1.1
php-src/sapi/apache2handler/mod_php.c:1.2
--- php-src/sapi/apache2handler/mod_php.c:1.1 Wed Feb 7 09:35:09 2007
+++ php-src/sapi/apache2handler/mod_php.c Wed Feb 7 18:22:38 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mod_php.c,v 1.1 2007/02/07 09:35:09 tony2001 Exp $ */
+/* $Id: mod_php.c,v 1.2 2007/02/07 18:22:38 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -26,7 +26,14 @@
#include "php_apache.h"
AP_MODULE_DECLARE_DATA module php6_module = {
- STANDARD20_MODULE_STUFF,
+ MODULE_MAGIC_NUMBER_MAJOR,
+ MODULE_MAGIC_NUMBER_MINOR,
+ -1,
+ "mod_php6.c",
+ NULL,
+ NULL,
+ MODULE_MAGIC_COOKIE,
+ NULL,
create_php_config, /* create per-directory config
structure */
merge_php_config, /* merge per-directory config
structures */
NULL, /* create per-server config
structure */
--
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 .cvsignore config.m4 config.w32 mod_php.c mod_php5.c php.sym php5apache2.dsp php_apache.h sapi_apache2.c
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
--
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(PHP_5_2) / run-tests.php
nlopess Wed Feb 7 11:31:22 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcrun-tests.php
Log:
MFH: use getenv() instead of _ENV
enable multiple error reporting on the same test
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.21&r2=1.226.2.37.2.22&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.21
php-src/run-tests.php:1.226.2.37.2.22
--- php-src/run-tests.php:1.226.2.37.2.21 Mon Jan 1 19:32:09 2007
+++ php-src/run-tests.php Wed Feb 7 11:31:22 2007
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.21 2007/01/01 19:32:09 iliaa Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.22 2007/02/07 11:31:22 nlopess Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -398,7 +398,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.21
$'."\n";
+ echo '$Revision: 1.226.2.37.2.22
$'."\n";
exit(1);
default:
echo "Illegal switch '$switch'
specified!\n";
@@ -700,8 +700,8 @@
if (substr(PHP_OS, 0, 3) != "WIN") {
/* If PHP_AUTOCONF is set, use it; otherwise, use
'autoconf'. */
- if (!empty($_ENV['PHP_AUTOCONF'])) {
- $autoconf = shell_exec($_ENV['PHP_AUTOCONF'] .
' --version');
+ if (getenv('PHP_AUTOCONF')) {
+ $autoconf = shell_exec(getenv('PHP_AUTOCONF') .
' --version');
} else {
$autoconf = shell_exec('autoconf --version');
}
@@ -1511,11 +1511,13 @@
}
if ($leaked) {
- $restype = 'LEAK';
- } else if ($warn) {
- $restype = 'WARN';
- } else {
- $restype = 'FAIL';
+ $restype[] = 'LEAK';
+ }
+ if ($warn) {
+ $restype[] = 'WARN';
+ }
+ if (!$passed) {
+ $restype[] = 'FAIL';
}
if (!$passed) {
@@ -1547,21 +1549,23 @@
}
}
- show_result($restype, $tested, $tested_file, $info, $temp_filenames);
+ show_result(implode('&', $restype), $tested, $tested_file, $info,
$temp_filenames);
- $PHP_FAILED_TESTS[$restype.'ED'][] = array (
+ foreach ($restype as $type) {
+ $PHP_FAILED_TESTS[$type.'ED'][] = array (
'name' => $file,
'test_name' =>
(is_array($IN_REDIRECT) ? $IN_REDIRECT['via'] : '') . $tested . "
[$tested_file]",
'output' => $output_filename,
'diff' => $diff_filename,
'info' => $info,
);
+ }
if (isset($old_php)) {
$php = $old_php;
}
- return $restype.'ED';
+ return $restype[0].'ED';
}
function comp_line($l1,$l2,$is_reg)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in
tony2001Wed Feb 7 11:16:53 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcconfigure.in Log: MFH: check if GCC on MacOS supports -no-cpp-precomp before using it http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.42&r2=1.579.2.52.2.43&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.42 php-src/configure.in:1.579.2.52.2.43 --- php-src/configure.in:1.579.2.52.2.42Wed Feb 7 01:01:37 2007 +++ php-src/configure.inWed Feb 7 11:16:52 2007 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.52.2.42 2007/02/07 01:01:37 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.52.2.43 2007/02/07 11:16:52 tony2001 Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -168,7 +168,12 @@ *dgux*) CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR";; *darwin*|*rhapsody*) -CPPFLAGS="$CPPFLAGS -no-cpp-precomp" +if test -n "$GCC"; then + PHP_CHECK_GCC_ARG(-no-cpp-precomp, gcc_no_cpp_precomp=yes) + if test "$gcc_no_cpp_precomp" = "yes"; then +CPPFLAGS="$CPPFLAGS -no-cpp-precomp" + fi +fi AC_DEFINE(BIND_8_COMPAT, 1, [Enabling BIND8 compatibility for Panther]) php_multiple_shlib_versions_ok=yes;; *beos*) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2filter config.m4 php.sym php_apache.h sapi_apache2.c
tony2001Wed Feb 7 09:37:34 2007 UTC
Modified files:
/php-src/sapi/apache2filter config.m4 php.sym php_apache.h
sapi_apache2.c
Log:
upgrade apache2filter to php6
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.m4?r1=1.42&r2=1.43&diff_format=u
Index: php-src/sapi/apache2filter/config.m4
diff -u php-src/sapi/apache2filter/config.m4:1.42
php-src/sapi/apache2filter/config.m4:1.43
--- php-src/sapi/apache2filter/config.m4:1.42 Thu Sep 1 14:33:36 2005
+++ php-src/sapi/apache2filter/config.m4Wed Feb 7 09:37:34 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.42 2005/09/01 14:33:36 sniper Exp $
+dnl $Id: config.m4,v 1.43 2007/02/07 09:37:34 tony2001 Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 filter-module support via DSO through APXS)
@@ -69,14 +69,14 @@
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
@@ -99,7 +99,7 @@
MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
PHP_SUBST(MH_BUNDLE_FLAGS)
PHP_SELECT_SAPI(apache2filter, bundle, sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
-SAPI_SHARED=libs/libphp5.so
+SAPI_SHARED=libs/libphp6.so
INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
;;
*beos*)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/php.sym?r1=1.2&r2=1.3&diff_format=u
Index: php-src/sapi/apache2filter/php.sym
diff -u php-src/sapi/apache2filter/php.sym:1.2
php-src/sapi/apache2filter/php.sym:1.3
--- php-src/sapi/apache2filter/php.sym:1.2 Sat Mar 29 04:52:46 2003
+++ php-src/sapi/apache2filter/php.sym Wed Feb 7 09:37:34 2007
@@ -1 +1 @@
-php5_module
+php6_module
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/php_apache.h?r1=1.27&r2=1.28&diff_format=u
Index: php-src/sapi/apache2filter/php_apache.h
diff -u php-src/sapi/apache2filter/php_apache.h:1.27
php-src/sapi/apache2filter/php_apache.h:1.28
--- php-src/sapi/apache2filter/php_apache.h:1.27Mon Jan 1 09:29:36 2007
+++ php-src/sapi/apache2filter/php_apache.h Wed Feb 7 09:37:34 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_apache.h,v 1.27 2007/01/01 09:29:36 sebastian Exp $ */
+/* $Id: php_apache.h,v 1.28 2007/02/07 09:37:34 tony2001 Exp $ */
#ifndef PHP_APACHE_H
#define PHP_APACHE_H
@@ -26,7 +26,7 @@
#include "http_core.h"
/* Declare this so we can get to it from outside the sapi_apache2.c file */
-extern module AP_MODULE_DECLARE_DATA php5_module;
+extern module AP_MODULE_DECLARE_DATA php6_module;
/* A way to specify the location of the php.ini dir in an apache directive */
extern char *apache2_php_ini_path_override;
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.145&r2=1.146&diff_format=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.145
php-src/sapi/apache2filter/sapi_apache2.c:1.146
--- php-src/sapi/apache2filter/sapi_apache2.c:1.145 Mon Jan 1 09:29:36 2007
+++ php-src/sapi/apache2filter/sapi_apache2.c Wed Feb 7 09:37:34 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.145 2007/01/01 09:29:36 sebastian Exp $ */
+/* $Id: sapi_apache2.c,v 1.146 2007/02/07 09:37:34 tony2001 Exp $ */
#include
@@ -440,7 +440,7 @@
{
php_struct *ctx;
apr_bucket *b;
- void *conf = ap_get_module_config(f->r->per_dir_config, &php5_module);
+ void *conf = ap_get_module_config(f->r->per_dir_config, &php6_module);
char *p = get_php_config(conf, "engine", sizeof("engine"));
TSRMLS_FETCH();
@@ -701,7 +701,7 @@
ap_register_input_filter("PHP", php_input_filter,
php_apache_disable_caching, AP_FTYPE_RESOURCE);
}
-AP_MODULE_DECLARE_DATA module php5_module = {
+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 */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[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
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.3&r2=1.4&diff_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.15&r2=1.16&diff_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.2&r2=1.3&diff_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_funct
[PHP-CVS] multifarious sophism
San Benardino National Forest to its very core and shocked the entire world." District Attorney-elect Rod Pacheco said the evidence against Oyler was "overwhelming," from terrorists. Bush said Democrats calling for withdrawing U.S. troops from Iraq after Sunday's expected announcement of a verdict in the trial of former Iraqi leader San Benardino National Forest to its very core and shocked the entire world." swept over their truck, and a fourth died soon after at a hospital. A fifth was taken Glenwood Springs, Colorado, according to the National Interagency Fire Center. aircraft away from its intended path over the East River and into the building. Series victory. Missouri's Senate race is intertwined with a ballot measure that would of starting that fire with murder. A light wind was cited by federal investigators the aircraft would have had to bank so steeply that it might have stalled, the NTSB said told CBS's "The Early Show" on Friday, before her brother Jason McKay's funeral. and into a New York City high-rise on October 11.The National Transportation Safety in an update on the crash. Lidle and Stanger were making an aerial tour of Manhattan who is seeking re-election in one of the tightest races in the nation. (Watch how Bush is picking his election battles -- 1:36 ) "The truth is the Democrats " attorney Mark McDonald said outside court. "He's very distraught and scared District Attorney-elect Rod Pacheco said the evidence against Oyler was "overwhelming," San Benardino National Forest to its very core and shocked the entire world." Oyler has any links to at least 40 fires in the area since May, according to an Mourners honored the firefighters killed by the California arson fire as the first Laura, to celebrate her birthday Saturday. McKay's funeral in Victorville was the in the past month, with more than 1,300 killed since October 1. Fearing more bloodshed National Forest supervisor.Oyler was charged with five counts of murder, 11 (Watch Michael J. Fox back McCaskill on stem cells -- :32 ) Democrats say they are ahead of five funerals began Friday, and praised authorities for charging the man accused fixed-wing planes not to fly over the East River unless the pilot is in contact with Jess McLean, 27, of Beaumont; Daniel Hoover-Najera, 20, of San Jacinto; Mark course," said Adrianne Marsh, a spokeswoman for McCaskill who was finishing a four-day from terrorists. Bush said Democrats calling for withdrawing U.S. troops from Iraq course," said Adrianne Marsh, a spokeswoman for McCaskill who was finishing a four-day Republicans are all calling for change, he's desperately clinging to his stay the Mourners honored the firefighters killed by the California arson fire as the first air traffic controllers. Small planes could previously fly below 1,100 feet along support the president's handling of it. Violence against Iraqis has grown unabated San Benardino National Forest to its very core and shocked the entire world." said as the service began. "It has shaken this agency and the men and women of the first for the five U.S. Forest Service firefighters who were overrun by flames "Nine days ago, one of the worst tragedies in the 100-year history of the Forest before flying back to California. If the pilot used the full width of the river to turn, told CBS's "The Early Show" on Friday, before her brother Jason McKay's funeral.
