[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/ fpm_main.c
tony2001 Thu, 28 Jan 2010 10:38:14 + Revision: http://svn.php.net/viewvc?view=revisionrevision=294145 Log: fcgi_init() must be executed in the parent, so that every child would not initialize itself anew Changed paths: U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c === --- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c2010-01-28 08:39:58 UTC (rev 294144) +++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c2010-01-28 10:38:14 UTC (rev 294145) @@ -1529,6 +1529,8 @@ fcgi_request request; char *fpm_config = NULL; + fcgi_init(); + #if 0 defined(PHP_DEBUG) /* IIS is always making things more difficult. This allows * us to stop PHP and attach a debugger before much gets started */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ configure.in main/php_version.h
iliaaThu, 28 Jan 2010 12:44:45 + Revision: http://svn.php.net/viewvc?view=revisionrevision=294149 Log: 5.2.13RC1 Changed paths: U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/main/php_version.h Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2010-01-28 11:55:29 UTC (rev 294148) +++ php/php-src/branches/PHP_5_2/configure.in 2010-01-28 12:44:45 UTC (rev 294149) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=13 -PHP_EXTRA_VERSION=-dev +PHP_EXTRA_VERSION=RC1 PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_2/main/php_version.h === --- php/php-src/branches/PHP_5_2/main/php_version.h 2010-01-28 11:55:29 UTC (rev 294148) +++ php/php-src/branches/PHP_5_2/main/php_version.h 2010-01-28 12:44:45 UTC (rev 294149) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 13 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.2.13-dev +#define PHP_EXTRA_VERSION RC1 +#define PHP_VERSION 5.2.13RC1 #define PHP_VERSION_ID 50213 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS
iliaaThu, 28 Jan 2010 12:44:54 + Revision: http://svn.php.net/viewvc?view=revisionrevision=294150 Log: RC1 news Changed paths: U php/php-src/branches/PHP_5_2/NEWS Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2010-01-28 12:44:45 UTC (rev 294149) +++ php/php-src/branches/PHP_5_2/NEWS 2010-01-28 12:44:54 UTC (rev 294150) @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2010, PHP 5.2.13 +28 Jan 2010, PHP 5.2.13RC1 - Updated timezone database to version 2010.2. (Derick) - Upgraded bundled PCRE to version 8.01. (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/tags/
iliaaThu, 28 Jan 2010 12:48:53 + Revision: http://svn.php.net/viewvc?view=revisionrevision=294151 Log: 5.2.13RC1 Changed paths: A + php/php-src/tags/php_5_2_13RC1/ (from php/php-src/branches/PHP_5_2/:r294150) Property changes on: php/php-src/tags/php_5_2_13RC1 ___ Added: svn:ignore + Makefile.objects Makefile.fragments Makefile acconfig.h aclocal.m4 autom4te.cache bsd_converted buildmk.stamp buildconf.stamp config.h.in config.cache config.log config.status config_vars.mk configuration-parser.c configuration-parser.h configuration-parser.output configuration-scanner.c configure conftest conftest.c generated_lists meta_cc meta_ccld mkinstalldirs missing install-sh internal_functions.c libtool shlibtool php php5.spec stamp-h test.php3 *.lo *.la libs modules php-*.tar.gz want_dependencies deps config.nice php_version.h *.plg *.opt *.ncb Release Release_inline Debug Release_TS Release_TSDbg Release_TS_inline Debug_TS results.txt libs _libs include autom4te.cache FBCIndex FBCLockFolder debug.log confdefs.h configure.js config.nice.bat ZendEngine1 php_test_results_*.txt *.gcda *.gcno lcov_data lcov_html php_lcov.info tmp-php.ini Added: svn:mergeinfo + /php/php-src/branches/PHP_5_3:284120,288260,288273 /php/php-src/trunk:284726 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS configure.in main/php_version.h
iliaaThu, 28 Jan 2010 12:49:33 + Revision: http://svn.php.net/viewvc?view=revisionrevision=294152 Log: Back to dev Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/main/php_version.h Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2010-01-28 12:48:53 UTC (rev 294151) +++ php/php-src/branches/PHP_5_2/NEWS 2010-01-28 12:49:33 UTC (rev 294152) @@ -1,5 +1,7 @@ PHPNEWS ||| +?? Feb 2010, PHP 5.2.13 + 28 Jan 2010, PHP 5.2.13RC1 - Updated timezone database to version 2010.2. (Derick) - Upgraded bundled PCRE to version 8.01. (Ilia) Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2010-01-28 12:48:53 UTC (rev 294151) +++ php/php-src/branches/PHP_5_2/configure.in 2010-01-28 12:49:33 UTC (rev 294152) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=13 -PHP_EXTRA_VERSION=RC1 +PHP_EXTRA_VERSION=RC1-dev PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_2/main/php_version.h === --- php/php-src/branches/PHP_5_2/main/php_version.h 2010-01-28 12:48:53 UTC (rev 294151) +++ php/php-src/branches/PHP_5_2/main/php_version.h 2010-01-28 12:49:33 UTC (rev 294152) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 13 -#define PHP_EXTRA_VERSION RC1 -#define PHP_VERSION 5.2.13RC1 +#define PHP_EXTRA_VERSION RC1-dev +#define PHP_VERSION 5.2.13RC1-dev #define PHP_VERSION_ID 50213 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/file/fopen_variation17.phpt trunk/ext/standard/tests/file/fopen_variation17.phpt
pajoye Thu, 28 Jan 2010 21:29:00 + Revision: http://svn.php.net/viewvc?view=revisionrevision=294164 Log: - fix test Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/file/fopen_variation17.phpt U php/php-src/trunk/ext/standard/tests/file/fopen_variation17.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/fopen_variation17.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/file/fopen_variation17.phpt 2010-01-28 20:52:35 UTC (rev 294163) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/fopen_variation17.phpt 2010-01-28 21:29:00 UTC (rev 294164) @@ -37,7 +37,7 @@ mkdir($dir1.'/'.$extraDir); mkdir($extraDir); - $tmpfile = $extraDir.'/ basename(__FILE__, .php) . .tmp'; + $tmpfile = $extraDir . '/' . basename(__FILE__, .php) . .tmp; $h = fopen($tmpfile, w+, true); fwrite($h, (binary) This is the test file); fclose($h); Modified: php/php-src/trunk/ext/standard/tests/file/fopen_variation17.phpt === --- php/php-src/trunk/ext/standard/tests/file/fopen_variation17.phpt 2010-01-28 20:52:35 UTC (rev 294163) +++ php/php-src/trunk/ext/standard/tests/file/fopen_variation17.phpt 2010-01-28 21:29:00 UTC (rev 294164) @@ -37,7 +37,7 @@ mkdir($dir1.'/'.$extraDir); mkdir($extraDir); - $tmpfile = $extraDir.'/ basename(__FILE__, .php) . .tmp'; + $tmpfile = $extraDir . '/' . basename(__FILE__, .php) . .tmp; $h = fopen($tmpfile, w+, true); fwrite($h, (binary) This is the test file); fclose($h); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
