[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Mar 10 01:31:31 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2982r2=1.2983diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2982 php-src/ChangeLog:1.2983 --- php-src/ChangeLog:1.2982Sun Mar 9 01:31:27 2008 +++ php-src/ChangeLog Mon Mar 10 01:31:31 2008 @@ -1,3 +1,65 @@ +2008-03-09 Scott MacVicar [EMAIL PROTECTED] + +* ext/sqlite/sqlite.c: + MFB: Fix memory issues with statement being deleted twice + +* (PHP_5_3) + ext/sqlite/sqlite.c: + Fix memory issues with statement being deleted twice + +2008-03-09 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_3) + ZendEngine2/zend_execute_API.c: + %v - %s, this is 5_3 + +2008-03-09 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/date/php_date.c: + + MFB: Initialize ts only after successful argument parsing + +* (PHP_5_3) + ext/date/php_date.c: + + Initialize ts only after successful argument parsing + +2008-03-09 Felipe Pena [EMAIL PROTECTED] + +* sapi/nsapi/nsapi.c + sapi/nsapi/nsapi.c + sapi/nsapi/nsapi.c: + Fix typo (#44381) + +2008-03-09 Gwynne Raskind [EMAIL PROTECTED] + +* (PHP_5_3) + configure.in: + MFH: Fix Darwin 9/Mac OS X 10.5 build problems, or at least patch them + +* configure.in: + Fix Darwin 9/Mac OS X 10.5 build problems, or at least patch them + +2008-03-09 Lars Strojny [EMAIL PROTECTED] + +* sapi/apache2filter/config.m4 + sapi/apache2filter/config.m4 + sapi/apache2handler/config.m4 + sapi/apache2handler/config.m4: + sapi/apache2(handler|filter)/config.m4: Removing itk from the list of + threaded MPMs (thanks Hannes) + +* sapi/apache2filter/config.m4 + sapi/apache2filter/config.m4 + sapi/apache2handler/config.m4 + sapi/apache2handler/config.m4: + Adding itk and and peruser MPM to the list of threaded Apache MPMs + +2008-03-09 Johannes Schlüter [EMAIL PROTECTED] + +* ext/mysql/tests/mysql_query_load_data_openbasedir.phpt: + - Fix typo in skipif + 2008-03-08 Felipe Pena [EMAIL PROTECTED] * (PHP_5_3)
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Mon Mar 10 01:31:34 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1257r2=1.1258diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1257 ZendEngine2/ChangeLog:1.1258 --- ZendEngine2/ChangeLog:1.1257Sun Mar 9 01:31:31 2008 +++ ZendEngine2/ChangeLog Mon Mar 10 01:31:34 2008 @@ -1,3 +1,9 @@ +2008-03-09 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_3) + zend_execute_API.c: + %v - %s, this is 5_3 + 2008-03-08 Felipe Pena [EMAIL PROTECTED] * zend.c @@ -21811,7 +21817,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1257 2008/03/09 01:31:31 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1258 2008/03/10 01:31:34 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -23535,7 +23541,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1257 2008/03/09 01:31:31 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1258 2008/03/10 01:31:34 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php-src /sapi/apache2filter config.m4 /sapi/apache2handler config.m4
2008/3/9 Lars Strojny [EMAIL PROTECTED]: lstrojnySun Mar 9 01:10:13 2008 UTC Modified files: /php-src/sapi/apache2filter config.m4 /php-src/sapi/apache2handlerconfig.m4 Log: Adding itk and and peruser MPM to the list of threaded Apache MPMs http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.m4?r1=1.45r2=1.46diff_format=u Index: php-src/sapi/apache2filter/config.m4 diff -u php-src/sapi/apache2filter/config.m4:1.45 php-src/sapi/apache2filter/config.m4:1.46 --- php-src/sapi/apache2filter/config.m4:1.45 Wed Jul 11 23:10:14 2007 +++ php-src/sapi/apache2filter/config.m4Sun Mar 9 01:10:13 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.45 2007/07/11 23:10:14 jani Exp $ +dnl $Id: config.m4,v 1.46 2008/03/09 01:10:13 lstrojny Exp $ dnl PHP_ARG_WITH(apxs2filter,, @@ -110,7 +110,7 @@ `ln -s $APXS_BINDIR/httpd _APP_` EXTRA_LIBS=$EXTRA_LIBS _APP_ PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) -INSTALL_IT=$INSTALL_IT $SAPI_LIBTOOL +INSTALL_IT=$INSTALL_IT $SAPI_LIBTOOL ;; *) PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) @@ -118,7 +118,7 @@ ;; esac - if test $APXS_MPM != prefork; then + if test $APXS_MPM != prefork test $APXS_MPM != peruser test $APXS_MPM != itk; then PHP_BUILD_THREAD_SAFE peruser is threaded, itk is not. -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /sapi/apache2filter config.m4 /sapi/apache2handler config.m4
Hi Hannes, Am Sonntag, den 09.03.2008, 12:08 +0100 schrieb Hannes Magnusson: peruser is threaded, itk is not. Thanks for pointing that out. Don't know why I was sure that both are threaded. cu, Lars signature.asc Description: Dies ist ein digital signierter Nachrichtenteil
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/apache2filter config.m4 /sapi/apache2handler config.m4
lstrojnySun Mar 9 12:35:56 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/sapi/apache2filter config.m4 /php-src/sapi/apache2handlerconfig.m4 Log: sapi/apache2(handler|filter)/config.m4: Removing itk from the list of threaded MPMs (thanks Hannes) http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.m4?r1=1.41.2.1.2.2.2.1r2=1.41.2.1.2.2.2.2diff_format=u Index: php-src/sapi/apache2filter/config.m4 diff -u php-src/sapi/apache2filter/config.m4:1.41.2.1.2.2.2.1 php-src/sapi/apache2filter/config.m4:1.41.2.1.2.2.2.2 --- php-src/sapi/apache2filter/config.m4:1.41.2.1.2.2.2.1 Sun Mar 9 01:10:25 2008 +++ php-src/sapi/apache2filter/config.m4Sun Mar 9 12:35:56 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.41.2.1.2.2.2.1 2008/03/09 01:10:25 lstrojny Exp $ +dnl $Id: config.m4,v 1.41.2.1.2.2.2.2 2008/03/09 12:35:56 lstrojny Exp $ dnl PHP_ARG_WITH(apxs2filter,, @@ -118,7 +118,7 @@ ;; esac - if test $APXS_MPM != prefork test $APXS_MPM != peruser test $APXS_MPM != itk; then + if test $APXS_MPM != prefork test $APXS_MPM != peruser; then PHP_BUILD_THREAD_SAFE fi AC_MSG_RESULT(yes) http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/config.m4?r1=1.14.2.1.2.2.2.1r2=1.14.2.1.2.2.2.2diff_format=u Index: php-src/sapi/apache2handler/config.m4 diff -u php-src/sapi/apache2handler/config.m4:1.14.2.1.2.2.2.1 php-src/sapi/apache2handler/config.m4:1.14.2.1.2.2.2.2 --- php-src/sapi/apache2handler/config.m4:1.14.2.1.2.2.2.1 Sun Mar 9 01:10:25 2008 +++ php-src/sapi/apache2handler/config.m4 Sun Mar 9 12:35:56 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.14.2.1.2.2.2.1 2008/03/09 01:10:25 lstrojny Exp $ +dnl $Id: config.m4,v 1.14.2.1.2.2.2.2 2008/03/09 12:35:56 lstrojny Exp $ dnl PHP_ARG_WITH(apxs2,, @@ -117,7 +117,7 @@ ;; esac - if test $APXS_MPM != prefork test $APXS_MPM != peruser test $APXS_MPM != itk; then + if test $APXS_MPM != prefork test $APXS_MPM != peruser; 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/apache2filter config.m4 /sapi/apache2handler config.m4
lstrojnySun Mar 9 12:37:05 2008 UTC Modified files: /php-src/sapi/apache2filter config.m4 /php-src/sapi/apache2handlerconfig.m4 Log: sapi/apache2(handler|filter)/config.m4: Removing itk from the list of threaded MPMs (thanks Hannes) http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.m4?r1=1.46r2=1.47diff_format=u Index: php-src/sapi/apache2filter/config.m4 diff -u php-src/sapi/apache2filter/config.m4:1.46 php-src/sapi/apache2filter/config.m4:1.47 --- php-src/sapi/apache2filter/config.m4:1.46 Sun Mar 9 01:10:13 2008 +++ php-src/sapi/apache2filter/config.m4Sun Mar 9 12:37:05 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.46 2008/03/09 01:10:13 lstrojny Exp $ +dnl $Id: config.m4,v 1.47 2008/03/09 12:37:05 lstrojny Exp $ dnl PHP_ARG_WITH(apxs2filter,, @@ -118,7 +118,7 @@ ;; esac - if test $APXS_MPM != prefork test $APXS_MPM != peruser test $APXS_MPM != itk; then + if test $APXS_MPM != prefork test $APXS_MPM != peruser; then PHP_BUILD_THREAD_SAFE fi AC_MSG_RESULT(yes) http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/config.m4?r1=1.19r2=1.20diff_format=u Index: php-src/sapi/apache2handler/config.m4 diff -u php-src/sapi/apache2handler/config.m4:1.19 php-src/sapi/apache2handler/config.m4:1.20 --- php-src/sapi/apache2handler/config.m4:1.19 Sun Mar 9 01:10:13 2008 +++ php-src/sapi/apache2handler/config.m4 Sun Mar 9 12:37:05 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.19 2008/03/09 01:10:13 lstrojny Exp $ +dnl $Id: config.m4,v 1.20 2008/03/09 12:37:05 lstrojny Exp $ dnl PHP_ARG_WITH(apxs2,, @@ -117,7 +117,7 @@ ;; esac - if test $APXS_MPM != prefork test $APXS_MPM != peruser test $APXS_MPM != itk; then + if test $APXS_MPM != prefork test $APXS_MPM != peruser; 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
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /sapi/apache2filter config.m4 /sapi/apache2handler config.m4
2008/3/9 Lars Strojny [EMAIL PROTECTED]: lstrojnySun Mar 9 12:35:56 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/sapi/apache2filter config.m4 /php-src/sapi/apache2handlerconfig.m4 Log: sapi/apache2(handler|filter)/config.m4: Removing itk from the list of threaded MPMs (thanks Hannes) http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.m4?r1=1.41.2.1.2.2.2.1r2=1.41.2.1.2.2.2.2diff_format=u Index: php-src/sapi/apache2filter/config.m4 diff -u php-src/sapi/apache2filter/config.m4:1.41.2.1.2.2.2.1 php-src/sapi/apache2filter/config.m4:1.41.2.1.2.2.2.2 --- php-src/sapi/apache2filter/config.m4:1.41.2.1.2.2.2.1 Sun Mar 9 01:10:25 2008 +++ php-src/sapi/apache2filter/config.m4Sun Mar 9 12:35:56 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.41.2.1.2.2.2.1 2008/03/09 01:10:25 lstrojny Exp $ +dnl $Id: config.m4,v 1.41.2.1.2.2.2.2 2008/03/09 12:35:56 lstrojny Exp $ dnl PHP_ARG_WITH(apxs2filter,, @@ -118,7 +118,7 @@ ;; esac - if test $APXS_MPM != prefork test $APXS_MPM != peruser test $APXS_MPM != itk; then + if test $APXS_MPM != prefork test $APXS_MPM != peruser; then PHP_BUILD_THREAD_SAFE You removed the wrong option. -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
gwynne Sun Mar 9 14:27:16 2008 UTC Modified files: /php-srcconfigure.in Log: Fix Darwin 9/Mac OS X 10.5 build problems, or at least patch them http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.647r2=1.648diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.647 php-src/configure.in:1.648 --- php-src/configure.in:1.647 Sun Feb 17 20:49:46 2008 +++ php-src/configure.inSun Mar 9 14:27:15 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.647 2008/02/17 20:49:46 helly Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.648 2008/03/09 14:27:15 gwynne Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -122,6 +122,21 @@ $php_shtool mkdir -p libs rm -f libs/* +dnl Darwin 9 hack +dnl Because the default debugging format used by Apple's GCC on Mac OS 10.5 +dnl causes errors in all current and past versions of Autoconf, we do a little +dnl messing with the CFLAGS here to trick it. +php_did_darwin9_cheat=0 +case $host_alias in +*darwin9*) + echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)' 2/dev/null /dev/null + if test $? -ne 0; then +php_did_darwin9_cheat=1 +CFLAGS=$CFLAGS -gstabs + fi + ;; +esac + dnl Checks for programs. dnl - @@ -167,7 +182,14 @@ dnl activate some gcc specific optimizations for gcc = 4 if test $GCC = yes; then - GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*\([[0-9]]\+\)\.[[0-9]]\+\..*/\1/;1p'` + case $host_alias in + *darwin*) +GCC_MAJOR_VERSION=`$CC -dumpversion | $SED -nE '1s/([[0-9]]+)\.[[0-9]]+\..*/\1/;1p'` +;; + *) +GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*\([[0-9]]\+\)\.[[0-9]]\+\..*/\1/;1p'` +;; + esac if test $GCC_MAJOR_VERSION -ge 4; then CFLAGS=$CFLAGS -fvisibility=hidden fi @@ -715,6 +737,10 @@ CXXFLAGS=$CXXFLAGS -O0 fi else + dnl Finish the Darwin hack + if test $php_did_darwin9_cheat -eq 1; then +CFLAGS=`echo $CFLAGS | $SED -e 's/-gstabs//g'` + fi PHP_DEBUG=0 ZEND_DEBUG=no fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / configure.in
gwynne Sun Mar 9 14:27:25 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcconfigure.in Log: MFH: Fix Darwin 9/Mac OS X 10.5 build problems, or at least patch them http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.11r2=1.579.2.52.2.77.2.12diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.77.2.11 php-src/configure.in:1.579.2.52.2.77.2.12 --- php-src/configure.in:1.579.2.52.2.77.2.11 Sun Feb 17 20:50:03 2008 +++ php-src/configure.inSun Mar 9 14:27:25 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.77.2.11 2008/02/17 20:50:03 helly Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.77.2.12 2008/03/09 14:27:25 gwynne Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -122,6 +122,21 @@ $php_shtool mkdir -p libs rm -f libs/* +dnl Darwin 9 hack +dnl Because the default debugging format used by Apple's GCC on Mac OS 10.5 +dnl causes errors in all current and past versions of Autoconf, we do a little +dnl messing with the CFLAGS here to trick it. +php_did_darwin9_cheat=0 +case $host_alias in +*darwin9*) + echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)' 2/dev/null /dev/null + if test $? -ne 0; then +php_did_darwin9_cheat=1 +CFLAGS=$CFLAGS -gstabs + fi + ;; +esac + dnl Checks for programs. dnl - @@ -167,7 +182,14 @@ dnl activate some gcc specific optimizations for gcc = 4 if test $GCC = yes; then - GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*\([[0-9]]\+\)\.[[0-9]]\+\..*/\1/;1p'` + case $host_alias in + *darwin*) +GCC_MAJOR_VERSION=`$CC -dumpversion | $SED -nE '1s/([[0-9]]+)\.[[0-9]]+\..*/\1/;1p'` +;; + *) +GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*\([[0-9]]\+\)\.[[0-9]]\+\..*/\1/;1p'` +;; + esac if test $GCC_MAJOR_VERSION -ge 4; then CFLAGS=$CFLAGS -fvisibility=hidden fi @@ -716,6 +738,10 @@ CXXFLAGS=$CXXFLAGS -O0 fi else + dnl Finish the Darwin hack + if test $php_did_darwin9_cheat -eq 1; then +CFLAGS=`echo $CFLAGS | $SED -e 's/-gstabs//g'` + fi PHP_DEBUG=0 ZEND_DEBUG=no fi -- 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) /sapi/nsapi nsapi.c
felipe Sun Mar 9 16:06:33 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/nsapi nsapi.c
Log:
Fix typo (#44381)
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.7r2=1.69.2.3.2.8diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.7
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.8
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.7 Mon Dec 31 07:20:16 2007
+++ php-src/sapi/nsapi/nsapi.c Sun Mar 9 16:06:33 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.7 2007/12/31 07:20:16 sebastian Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.8 2008/03/09 16:06:33 felipe Exp $ */
/*
* PHP includes
@@ -308,7 +308,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.7 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.8 $);
php_info_print_table_row(2, Server Software, system_version());
php_info_print_table_row(2, Sub-requests with nsapi_virtual(),
(nsapi_servact_service)?((zend_ini_long(zlib.output_compression,
sizeof(zlib.output_compression), 0))?not supported with
zlib.output_compression:enabled):not supported on this platform );
@@ -860,7 +860,7 @@
daemon_atrestart(php5_close, NULL);
- log_error(LOG_INFORM, pblock_findval(fn, pb), sn, rq, Initialized
PHP Module (%d threads exspected), threads);
+ log_error(LOG_INFORM, pblock_findval(fn, pb), sn, rq, Initialized
PHP Module (%d threads expected), threads);
return REQ_PROCEED;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
felipe Sun Mar 9 16:07:46 2008 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
Fix typo (#44381)
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.85r2=1.86diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.85 php-src/sapi/nsapi/nsapi.c:1.86
--- php-src/sapi/nsapi/nsapi.c:1.85 Mon Dec 31 07:12:20 2007
+++ php-src/sapi/nsapi/nsapi.c Sun Mar 9 16:07:46 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.85 2007/12/31 07:12:20 sebastian Exp $ */
+/* $Id: nsapi.c,v 1.86 2008/03/09 16:07:46 felipe Exp $ */
/*
* PHP includes
@@ -308,7 +308,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.85
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.86
$);
php_info_print_table_row(2, Server Software, system_version());
php_info_print_table_row(2, Sub-requests with nsapi_virtual(),
(nsapi_servact_service)?((zend_ini_long(zlib.output_compression,
sizeof(zlib.output_compression), 0))?not supported with
zlib.output_compression:enabled):not supported on this platform );
@@ -856,7 +856,7 @@
daemon_atrestart(php6_close, NULL);
- log_error(LOG_INFORM, pblock_findval(fn, pb), sn, rq, Initialized
PHP Module (%d threads exspected), threads);
+ log_error(LOG_INFORM, pblock_findval(fn, pb), sn, rq, Initialized
PHP Module (%d threads expected), threads);
return REQ_PROCEED;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date php_date.c
iliaa Sun Mar 9 18:09:53 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/date php_date.c
Log:
Initialize ts only after successful argument parsing
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.22r2=1.43.2.45.2.51.2.23diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.22
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.23
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.22 Fri Mar 7 02:04:40 2008
+++ php-src/ext/date/php_date.c Sun Mar 9 18:09:53 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.22 2008/03/07 02:04:40 iliaa Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.23 2008/03/09 18:09:53 iliaa Exp $ */
#include php.h
#include php_streams.h
@@ -899,12 +899,12 @@
longts;
char *string;
- if (ZEND_NUM_ARGS() == 1) {
- ts = time(NULL);
- }
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|l, format,
format_len, ts) == FAILURE) {
RETURN_FALSE;
}
+ if (ZEND_NUM_ARGS() == 1) {
+ ts = time(NULL);
+ }
string = php_format_date(format, format_len, ts, localtime TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c
iliaa Sun Mar 9 18:10:09 2008 UTC
Modified files:
/php-src/ext/date php_date.c
Log:
MFB: Initialize ts only after successful argument parsing
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.170r2=1.171diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.170 php-src/ext/date/php_date.c:1.171
--- php-src/ext/date/php_date.c:1.170 Fri Mar 7 02:05:48 2008
+++ php-src/ext/date/php_date.c Sun Mar 9 18:10:09 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.170 2008/03/07 02:05:48 iliaa Exp $ */
+/* $Id: php_date.c,v 1.171 2008/03/09 18:10:09 iliaa Exp $ */
#include php.h
#include php_streams.h
@@ -1013,12 +1013,12 @@
longts;
char *string;
- if (ZEND_NUM_ARGS() == 1) {
- ts = time(NULL);
- }
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|l, format,
format_len, ts) == FAILURE) {
RETURN_FALSE;
}
+ if (ZEND_NUM_ARGS() == 1) {
+ ts = time(NULL);
+ }
string = php_format_date(format, format_len, ts, localtime TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite sqlite.c
scottmacSun Mar 9 21:30:28 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite sqlite.c
Log:
Fix memory issues with statement being deleted twice
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.166.2.13.2.9.2.4r2=1.166.2.13.2.9.2.5diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.4
php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.5
--- php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.4 Sat Mar 8 04:18:29 2008
+++ php-src/ext/sqlite/sqlite.c Sun Mar 9 21:30:28 2008
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.166.2.13.2.9.2.4 2008/03/08 04:18:29 scottmac Exp $
+ $Id: sqlite.c,v 1.166.2.13.2.9.2.5 2008/03/09 21:30:28 scottmac Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -408,10 +408,10 @@
if (Z_TYPE_P(le) == le_sqlite_result) {
struct php_sqlite_result *res = (struct php_sqlite_result
*)le-ptr;
if (res-db-rsrc_id == ((struct php_sqlite_db*)db)-rsrc_id) {
- real_result_dtor(res TSRMLS_CC);
+ return ZEND_HASH_APPLY_REMOVE;
}
}
- return 0;
+ return ZEND_HASH_APPLY_KEEP;
}
static ZEND_RSRC_DTOR_FUNC(php_sqlite_result_dtor)
@@ -1139,7 +1139,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.166.2.13.2.9.2.4 2008/03/08
04:18:29 scottmac Exp $);
+ php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.166.2.13.2.9.2.5 2008/03/09
21:30:28 scottmac Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sqlite.c
scottmacSun Mar 9 21:32:38 2008 UTC
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
MFB: Fix memory issues with statement being deleted twice
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.207r2=1.208diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.207 php-src/ext/sqlite/sqlite.c:1.208
--- php-src/ext/sqlite/sqlite.c:1.207 Sat Mar 8 04:17:30 2008
+++ php-src/ext/sqlite/sqlite.c Sun Mar 9 21:32:38 2008
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.207 2008/03/08 04:17:30 scottmac Exp $
+ $Id: sqlite.c,v 1.208 2008/03/09 21:32:38 scottmac Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -454,10 +454,10 @@
if (Z_TYPE_P(le) == le_sqlite_result) {
struct php_sqlite_result *res = (struct php_sqlite_result
*)le-ptr;
if (res-db-rsrc_id == ((struct php_sqlite_db*)db)-rsrc_id) {
- real_result_dtor(res TSRMLS_CC);
+ return ZEND_HASH_APPLY_REMOVE;
}
}
- return 0;
+ return ZEND_HASH_APPLY_KEEP;
}
static ZEND_RSRC_DTOR_FUNC(php_sqlite_result_dtor)
@@ -1231,7 +1231,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.207 2008/03/08 04:17:30 scottmac
Exp $);
+ php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.208 2008/03/09 21:32:38 scottmac
Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /sapi/apache2filter config.m4 /sapi/apache2handler config.m4
Hi Hannes, and again I have to change my opinion. As stated in http://www.telana.com/peruser.php, peruser is - unlike its predecessor metux - non-threaded. So it is completely correct to build PHP without thread safety in cases of prefork, itk *and* peruser. cu, Lars Am Sonntag, den 09.03.2008, 12:08 +0100 schrieb Hannes Magnusson: 2008/3/9 Lars Strojny [EMAIL PROTECTED]: lstrojnySun Mar 9 01:10:13 2008 UTC Modified files: /php-src/sapi/apache2filter config.m4 /php-src/sapi/apache2handlerconfig.m4 Log: Adding itk and and peruser MPM to the list of threaded Apache MPMs http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.m4?r1=1.45r2=1.46diff_format=u Index: php-src/sapi/apache2filter/config.m4 diff -u php-src/sapi/apache2filter/config.m4:1.45 php-src/sapi/apache2filter/config.m4:1.46 --- php-src/sapi/apache2filter/config.m4:1.45 Wed Jul 11 23:10:14 2007 +++ php-src/sapi/apache2filter/config.m4Sun Mar 9 01:10:13 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.45 2007/07/11 23:10:14 jani Exp $ +dnl $Id: config.m4,v 1.46 2008/03/09 01:10:13 lstrojny Exp $ dnl PHP_ARG_WITH(apxs2filter,, @@ -110,7 +110,7 @@ `ln -s $APXS_BINDIR/httpd _APP_` EXTRA_LIBS=$EXTRA_LIBS _APP_ PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) -INSTALL_IT=$INSTALL_IT $SAPI_LIBTOOL +INSTALL_IT=$INSTALL_IT $SAPI_LIBTOOL ;; *) PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) @@ -118,7 +118,7 @@ ;; esac - if test $APXS_MPM != prefork; then + if test $APXS_MPM != prefork test $APXS_MPM != peruser test $APXS_MPM != itk; then PHP_BUILD_THREAD_SAFE peruser is threaded, itk is not. -Hannes signature.asc Description: Dies ist ein digital signierter Nachrichtenteil
