[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/win32/build/config.w32 trunk/win32/build/config.w32

2011-07-13 Thread Pierre Joye
pajoye   Wed, 13 Jul 2011 06:42:39 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=313197

Log:
- bind to the available crt version

Changed paths:
U   php/php-src/branches/PHP_5_4/win32/build/config.w32
U   php/php-src/trunk/win32/build/config.w32

Modified: php/php-src/branches/PHP_5_4/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_4/win32/build/config.w32 2011-07-13 05:41:40 UTC 
(rev 313196)
+++ php/php-src/branches/PHP_5_4/win32/build/config.w32 2011-07-13 06:42:39 UTC 
(rev 313197)
@@ -151,6 +151,7 @@
// Set some debug/release specific options
ADD_FLAG('CFLAGS', ' /RTC1 ');
}
+   ADD_FLAG('CFLAGS', ' /D_BIND_TO_CURRENT_CRT_VERSION =1 ');
 }

 ARG_WITH('mp', 'Tell VC9+ use up to [n,auto,disable] processes for 
compilation', 'auto');

Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w322011-07-13 05:41:40 UTC (rev 
313196)
+++ php/php-src/trunk/win32/build/config.w322011-07-13 06:42:39 UTC (rev 
313197)
@@ -151,6 +151,7 @@
// Set some debug/release specific options
ADD_FLAG('CFLAGS', ' /RTC1 ');
}
+   ADD_FLAG('CFLAGS', ' /D_BIND_TO_CURRENT_CRT_VERSION =1 ');
 }

 ARG_WITH('mp', 'Tell VC9+ use up to [n,auto,disable] processes for 
compilation', 'auto');

-- 
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_4/ext/date/tests/examine_diff.inc trunk/ext/date/tests/examine_diff.inc

2011-07-13 Thread Daniel Convissor
danielc  Wed, 13 Jul 2011 16:08:03 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=313208

Log:
Use datetime examine diff file from 5.3 in 5.4 and trunk.

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/date/tests/examine_diff.inc
U   php/php-src/trunk/ext/date/tests/examine_diff.inc

Modified: php/php-src/branches/PHP_5_4/ext/date/tests/examine_diff.inc
===
--- php/php-src/branches/PHP_5_4/ext/date/tests/examine_diff.inc
2011-07-13 15:13:10 UTC (rev 313207)
+++ php/php-src/branches/PHP_5_4/ext/date/tests/examine_diff.inc
2011-07-13 16:08:03 UTC (rev 313208)
@@ -1,17 +1,23 @@
 ?php

 /**
- * Helper for the DateTime_diff_add_sub* tests
+ * Helper for the DateTime diff/days/math tests
  *
  * @author Daniel Convissor dani...@analysisandsolutions.com
  */

+/**#@+
+ * Which test segments should be displayed?
+ */
+define('PHPT_DATETIME_SHOW_DIFF', 1);
+define('PHPT_DATETIME_SHOW_DAYS', 2);
+define('PHPT_DATETIME_SHOW_ADD', 3);
+define('PHPT_DATETIME_SHOW_SUB', 4);
+/**#@-*/
+
 /**
- * Provides a consistent interface for executing date diff tests
+ * Provides a consistent interface for executing date diff/add/sub tests
  *
- * Tests the diff() method then passes the resulting
- * interval to the add()/sub() method as a double check
- *
  * @param string|DateTime $end_date  the end date in -MM-DD format
  *(can include time HH:MM:SS) or a DateTime object
  * @param string|DateTime $start_date  the start date in -MM-DD format
@@ -41,38 +47,33 @@
}
$end_date = $end-format('Y-m-d H:i:s T');

-   $force_sub = false;
-   if ($absolute) {
-   $tmp_interval = $start-diff($end);
-   if ($tmp_interval-format('%r')) {
-   $force_sub = true;
-   }
+   $expect_interval = new DateInterval('P' . substr($expect_spec, 2));
+   if (substr($expect_spec, 1, 1) == '-') {
+   $expect_interval-invert = true;
}

-   $result_interval = $start-diff($end, $absolute);
-   $result_spec = $result_interval-format('P%R%yY%mM%dDT%hH%iM%sS');
-   $result_days = $result_interval-format('%a');
-
-   // Also make sure add()/sub() works the same way as diff().
-   if ($force_sub) {
-   $start-sub($result_interval);
-   $sign = '-';
-   } else {
-   $start-add($result_interval);
-   $sign = '+';
+   if (PHPT_DATETIME_SHOW == PHPT_DATETIME_SHOW_DIFF) {
+   $result_interval = $start-diff($end, $absolute);
+   $result_spec = 
$result_interval-format('P%R%yY%mM%dDT%hH%iM%sS');
+   echo DIFF: $end_date - $start_date = **$result_spec**\n;
+   // echo DIFF: $end_date - $start_date = **$expect_spec**\n;
}
-
-   $result_end_date = $start-format('Y-m-d H:i:s T');
-
-   // Leaving this here for making adjustments later.
-   $expect_full = FWD: $end_date - $start_date = **$expect_spec** | 
-   . BACK: $start_date $sign $expect_spec = **$end_date** | 
-   . DAYS: **$expect_days**;
-   // echo $expect_full\n;
-   // return;
-
-   $result_full = FWD: $end_date - $start_date = **$result_spec** | 
-   . BACK: $start_date $sign $result_spec = **$result_end_date** 
| 
-   . DAYS: **$result_days**;
-   echo $result_full\n;
+   if (PHPT_DATETIME_SHOW == PHPT_DATETIME_SHOW_DAYS) {
+   $result_interval = $start-diff($end, $absolute);
+   $result_days = $result_interval-format('%a');
+   echo DAYS: **$result_days**\n;
+   // echo DAYS: **$expect_days**\n;
+   }
+   if (PHPT_DATETIME_SHOW == PHPT_DATETIME_SHOW_ADD) {
+   $start-add($expect_interval);
+   $result_end_date = $start-format('Y-m-d H:i:s T');
+   echo ADD: $start_date + $expect_spec = **$result_end_date**\n;
+   // echo ADD: $start_date + $expect_spec = **$end_date**\n;
+   }
+   if (PHPT_DATETIME_SHOW == PHPT_DATETIME_SHOW_SUB) {
+   $end-sub($expect_interval);
+   $result_start_date = $end-format('Y-m-d H:i:s T');
+   echo SUB: $end_date - $expect_spec = **$result_start_date**\n;
+   // echo SUB: $end_date - $expect_spec = **$start_date**\n;
+   }
 }

Modified: php/php-src/trunk/ext/date/tests/examine_diff.inc
===
--- php/php-src/trunk/ext/date/tests/examine_diff.inc   2011-07-13 15:13:10 UTC 
(rev 313207)
+++ php/php-src/trunk/ext/date/tests/examine_diff.inc   2011-07-13 16:08:03 UTC 
(rev 313208)
@@ -1,17 +1,23 @@
 ?php

 /**
- * Helper for the DateTime_diff_add_sub* tests
+ * Helper for the DateTime diff/days/math tests
  *
  * @author Daniel Convissor dani...@analysisandsolutions.com
  */

+/**#@+

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/date/tests/DateTime_construct-dst-overlap.phpt branches/PHP_5_4/ext/date/tests/DateTime_construct-dst-overlap.phpt trunk/ext/date/tests/DateTime_const

2011-07-13 Thread Daniel Convissor
danielc  Wed, 13 Jul 2011 16:21:10 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=313209

Log:
Add test for constructing times during the dst/st conversion.

Changed paths:
A   
php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_construct-dst-overlap.phpt
A   
php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_construct-dst-overlap.phpt
A   php/php-src/trunk/ext/date/tests/DateTime_construct-dst-overlap.phpt

Added: 
php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_construct-dst-overlap.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_construct-dst-overlap.phpt 
(rev 0)
+++ 
php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_construct-dst-overlap.phpt 
2011-07-13 16:21:10 UTC (rev 313209)
@@ -0,0 +1,15 @@
+--TEST--
+DateTime::__construct() -- fall daylight/standard overlap
+--CREDITS--
+Daniel Convissor dani...@php.net
+--FILE--
+?php
+
+date_default_timezone_set('America/New_York');
+// PHP defaults to Daylight Saving Time.  Ensure consistency in future.
+$d = new DateTime('2011-11-06 01:30:00');
+echo $d-format('P') . \n;
+
+?
+--EXPECT--
+-04:00

Added: 
php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_construct-dst-overlap.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_construct-dst-overlap.phpt 
(rev 0)
+++ 
php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_construct-dst-overlap.phpt 
2011-07-13 16:21:10 UTC (rev 313209)
@@ -0,0 +1,15 @@
+--TEST--
+DateTime::__construct() -- fall daylight/standard overlap
+--CREDITS--
+Daniel Convissor dani...@php.net
+--FILE--
+?php
+
+date_default_timezone_set('America/New_York');
+// PHP defaults to Daylight Saving Time.  Ensure consistency in future.
+$d = new DateTime('2011-11-06 01:30:00');
+echo $d-format('P') . \n;
+
+?
+--EXPECT--
+-04:00

Added: php/php-src/trunk/ext/date/tests/DateTime_construct-dst-overlap.phpt
===
--- php/php-src/trunk/ext/date/tests/DateTime_construct-dst-overlap.phpt
(rev 0)
+++ php/php-src/trunk/ext/date/tests/DateTime_construct-dst-overlap.phpt
2011-07-13 16:21:10 UTC (rev 313209)
@@ -0,0 +1,15 @@
+--TEST--
+DateTime::__construct() -- fall daylight/standard overlap
+--CREDITS--
+Daniel Convissor dani...@php.net
+--FILE--
+?php
+
+date_default_timezone_set('America/New_York');
+// PHP defaults to Daylight Saving Time.  Ensure consistency in future.
+$d = new DateTime('2011-11-06 01:30:00');
+echo $d-format('P') . \n;
+
+?
+--EXPECT--
+-04:00

-- 
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_4/ NEWS

2011-07-13 Thread Stanislav Malyshev
stas Wed, 13 Jul 2011 20:12:14 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=313214

Log:
integrate 5.3 NEWS

Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2011-07-13 19:41:13 UTC (rev 313213)
+++ php/php-src/branches/PHP_5_4/NEWS   2011-07-13 20:12:14 UTC (rev 313214)
@@ -266,6 +266,59 @@
 - Fixed PDO objects binary incompatibility. (Dmitry)
 - Fixed bug #52211 (iconv() returns part of string on error). (Felipe)

+?? ??? 2011, PHP 5.3.7
+- Zend Engine:
+  . Fixed bug #55156 (ReflectionClass::getDocComment() returns comment even
+though the class has none). (Felipe)
+
+- Core
+  . Fixed bug #55014 (Compile failure due to improper use of ctime_r()). (Ilia)
+  . Fixed bug #54332 (Crash in zend_mm_check_ptr // Heap corruption). (Dmitry)
+  . Fixed bug #54305 (Crash in gc_remove_zval_from_buffer). (Dmitry)
+  . Fixed bug #53727 (Inconsistent behavior of is_subclass_of with interfaces)
+(Ralph Schindler, Dmitry)
+  . Fixed buffer overflow on overlog salt in crypt(). (Clément LECIGNE, Stas)
+  . Fixed bug #52935 (call exit in user_error_handler cause stream relate
+core). (Gustavo)
+
+- MCrypt
+  . Change E_ERROR to E_WARNING in mcrypt_create_iv when not enough data
+has been fetched (Windows). (Pierre)
+  . Fixed bug #55169 (mcrypt_create_iv always fails to gather sufficient random
+data on Windows). (Pierre)
+
+- PDO DBlib:
+  . Fixed bug #54329 (MSSql extension memory leak).
+(dotslashpok at gmail dot com)
+
+30 Jun 2011, PHP 5.3.7 RC2
+- Core:
+  . Fixed crash in error_log(). (Felipe) Reported by Mateusz Kocielski.
+  . Fixed bug #55082 (var_export() doesn't escape properties properly).
+(Gustavo)
+
+- DateTime extension:
+  . Fixed bug where the DateTime object got changed while using date_diff().
+(Derick)
+
+- DBA extension:
+  . Supress warning on non-existent file open with Berkeley DB 5.2 (Chris 
Jones)
+
+- PDO ODBC driver:
+  . Fixed data type usage in 64bit. (leocsilva at gmail dot com)
+
+- PHP-FPM SAPI:
+  . Implemented FR #54499 (FPM ping and status_path should handle HEAD 
request). (fat)
+  . Implemented FR #54172 (Overriding the pid file location of php-fpm). (fat)
+  . Fixed missing Expires and Cache-Control headers for ping and status pages.
+(fat)
+  . Fixed memory leak. (fat) Reported and fixed by Giovanni Giacobbi.
+  . Fixed wrong value of log_level when invoking fpm with -tt. (fat)
+
+- SPL extension:
+  . Fixed bug #54971 (Wrong result when using iterator_to_array with use_keys
+on true). (Pierrick)
+
 16 Jun 2011, PHP 5.3.7 RC1
 - Upgraded bundled SQLite to version 3.7.6.3. (Scott)
 - Upgraded bundled PCRE to version 8.12. (Scott)
@@ -429,7 +482,18 @@
 - Phar extension:
   . Fixed bug #54395 (Phar::mount() crashes when calling with wrong 
parameters).
 (Felipe)
-
+
+- PHP-FPM SAPI:
+  . Added xml format to the status page. (fat)
+  . Removed timestamp in logs written by children processes. (fat)
+  . Fixed exit at FPM startup on fpm_resources_prepare() errors. (fat)
+  . Added master rlimit_files and rlimit_core in the global configuration
+settings. (fat)
+  . Removed pid in debug logs written by chrildren processes. (fat)
+  . Added custom access log (also added per request %CPU and memory
+mesurement). (fat)
+  . Added a real scoreboard and several improvements to the status page. (fat)
+
 - Reflection extension:
   . Fixed bug #54347 (reflection_extension does not lowercase module function
 name). (Felipe, laruence at yahoo dot com dot cn)

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

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS

2011-07-13 Thread Pierre Joye
how so?

On Wed, Jul 13, 2011 at 10:12 PM, Stanislav Malyshev s...@php.net wrote:
 stas                                     Wed, 13 Jul 2011 20:12:14 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=313214

 Log:
 integrate 5.3 NEWS

 Changed paths:
    U   php/php-src/branches/PHP_5_4/NEWS

 Modified: php/php-src/branches/PHP_5_4/NEWS
 ===
 --- php/php-src/branches/PHP_5_4/NEWS   2011-07-13 19:41:13 UTC (rev 313213)
 +++ php/php-src/branches/PHP_5_4/NEWS   2011-07-13 20:12:14 UTC (rev 313214)
 @@ -266,6 +266,59 @@
  - Fixed PDO objects binary incompatibility. (Dmitry)
  - Fixed bug #52211 (iconv() returns part of string on error). (Felipe)

 +?? ??? 2011, PHP 5.3.7
 +- Zend Engine:
 +  . Fixed bug #55156 (ReflectionClass::getDocComment() returns comment even
 +    though the class has none). (Felipe)
 +
 +- Core
 +  . Fixed bug #55014 (Compile failure due to improper use of ctime_r()). 
 (Ilia)
 +  . Fixed bug #54332 (Crash in zend_mm_check_ptr // Heap corruption). 
 (Dmitry)
 +  . Fixed bug #54305 (Crash in gc_remove_zval_from_buffer). (Dmitry)
 +  . Fixed bug #53727 (Inconsistent behavior of is_subclass_of with 
 interfaces)
 +    (Ralph Schindler, Dmitry)
 +  . Fixed buffer overflow on overlog salt in crypt(). (Clément LECIGNE, Stas)
 +  . Fixed bug #52935 (call exit in user_error_handler cause stream relate
 +    core). (Gustavo)
 +
 +- MCrypt
 +  . Change E_ERROR to E_WARNING in mcrypt_create_iv when not enough data
 +    has been fetched (Windows). (Pierre)
 +  . Fixed bug #55169 (mcrypt_create_iv always fails to gather sufficient 
 random
 +    data on Windows). (Pierre)
 +
 +- PDO DBlib:
 +  . Fixed bug #54329 (MSSql extension memory leak).
 +    (dotslashpok at gmail dot com)
 +
 +30 Jun 2011, PHP 5.3.7 RC2
 +- Core:
 +  . Fixed crash in error_log(). (Felipe) Reported by Mateusz Kocielski.
 +  . Fixed bug #55082 (var_export() doesn't escape properties properly).
 +    (Gustavo)
 +
 +- DateTime extension:
 +  . Fixed bug where the DateTime object got changed while using date_diff().
 +    (Derick)
 +
 +- DBA extension:
 +  . Supress warning on non-existent file open with Berkeley DB 5.2 (Chris 
 Jones)
 +
 +- PDO ODBC driver:
 +  . Fixed data type usage in 64bit. (leocsilva at gmail dot com)
 +
 +- PHP-FPM SAPI:
 +  . Implemented FR #54499 (FPM ping and status_path should handle HEAD 
 request). (fat)
 +  . Implemented FR #54172 (Overriding the pid file location of php-fpm). 
 (fat)
 +  . Fixed missing Expires and Cache-Control headers for ping and status 
 pages.
 +    (fat)
 +  . Fixed memory leak. (fat) Reported and fixed by Giovanni Giacobbi.
 +  . Fixed wrong value of log_level when invoking fpm with -tt. (fat)
 +
 +- SPL extension:
 +  . Fixed bug #54971 (Wrong result when using iterator_to_array with use_keys
 +    on true). (Pierrick)
 +
  16 Jun 2011, PHP 5.3.7 RC1
  - Upgraded bundled SQLite to version 3.7.6.3. (Scott)
  - Upgraded bundled PCRE to version 8.12. (Scott)
 @@ -429,7 +482,18 @@
  - Phar extension:
   . Fixed bug #54395 (Phar::mount() crashes when calling with wrong 
 parameters).
     (Felipe)
 -
 +
 +- PHP-FPM SAPI:
 +  . Added xml format to the status page. (fat)
 +  . Removed timestamp in logs written by children processes. (fat)
 +  . Fixed exit at FPM startup on fpm_resources_prepare() errors. (fat)
 +  . Added master rlimit_files and rlimit_core in the global configuration
 +    settings. (fat)
 +  . Removed pid in debug logs written by chrildren processes. (fat)
 +  . Added custom access log (also added per request %CPU and memory
 +    mesurement). (fat)
 +  . Added a real scoreboard and several improvements to the status page. 
 (fat)
 +
  - Reflection extension:
   . Fixed bug #54347 (reflection_extension does not lowercase module function
     name). (Felipe, laruence at yahoo dot com dot cn)


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




-- 
Pierre

@pierrejoye | http://blog.thepimp.net | http://www.libgd.org

--
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/build/build.mk branches/PHP_5_4/build/build.mk trunk/build/build.mk

2011-07-13 Thread Jérôme Loyet
fat  Wed, 13 Jul 2011 23:28:48 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=313218

Log:
find option '-not' is not POSIX compliant

Changed paths:
U   php/php-src/branches/PHP_5_3/build/build.mk
U   php/php-src/branches/PHP_5_4/build/build.mk
U   php/php-src/trunk/build/build.mk

Modified: php/php-src/branches/PHP_5_3/build/build.mk
===
--- php/php-src/branches/PHP_5_3/build/build.mk 2011-07-13 22:51:39 UTC (rev 
313217)
+++ php/php-src/branches/PHP_5_3/build/build.mk 2011-07-13 23:28:48 UTC (rev 
313218)
@@ -68,7 +68,7 @@
done

 svnclean-work:
-   @for i in `find . -type d -not -path '*/.svn/*' | grep -v '.svn'`; do \
+   @for i in `find . -type d ! -path '*/.svn/*' | grep -v '.svn'`; do \
(cd $$i 2/dev/null  rm -rf `svn propget svn:ignore . | grep 
-v config.nice` *.o *.a *.lo *.la *.gcno *.gcda .libs || true); \
done


Modified: php/php-src/branches/PHP_5_4/build/build.mk
===
--- php/php-src/branches/PHP_5_4/build/build.mk 2011-07-13 22:51:39 UTC (rev 
313217)
+++ php/php-src/branches/PHP_5_4/build/build.mk 2011-07-13 23:28:48 UTC (rev 
313218)
@@ -67,7 +67,7 @@
done

 svnclean-work:
-   @for i in `find . -type d -not -path '*/.svn/*' | grep -v '.svn'`; do \
+   @for i in `find . -type d ! -path '*/.svn/*' | grep -v '.svn'`; do \
(cd $$i 2/dev/null  rm -rf `svn propget svn:ignore . | grep 
-v config.nice` *.o *.a *.lo *.la *.gcno *.gcda .libs || true); \
done


Modified: php/php-src/trunk/build/build.mk
===
--- php/php-src/trunk/build/build.mk2011-07-13 22:51:39 UTC (rev 313217)
+++ php/php-src/trunk/build/build.mk2011-07-13 23:28:48 UTC (rev 313218)
@@ -67,7 +67,7 @@
done

 svnclean-work:
-   @for i in `find . -type d -not -path '*/.svn/*' | grep -v '.svn'`; do \
+   @for i in `find . -type d ! -path '*/.svn/*' | grep -v '.svn'`; do \
(cd $$i 2/dev/null  rm -rf `svn propget svn:ignore . | grep 
-v config.nice` *.o *.a *.lo *.la *.gcno *.gcda .libs || true); \
done


-- 
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_4/ NEWS configure.in main/php_version.h

2011-07-13 Thread Stanislav Malyshev
stas Thu, 14 Jul 2011 05:37:40 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=313223

Log:
5.4.0 alpha2

Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/configure.in
U   php/php-src/branches/PHP_5_4/main/php_version.h

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2011-07-14 05:37:29 UTC (rev 313222)
+++ php/php-src/branches/PHP_5_4/NEWS   2011-07-14 05:37:40 UTC (rev 313223)
@@ -1,6 +1,6 @@
 PHP
NEWS
 |||
-?? ??? 2011, PHP 5.4.0 Alpha 2
+14 Jul 2011, PHP 5.4.0 Alpha 2
 - General improvements:
   . Zend Signal Handling. (Lucas Nealan,Arnaud Le Blanc,Brian Shire, Ilia)


Modified: php/php-src/branches/PHP_5_4/configure.in
===
--- php/php-src/branches/PHP_5_4/configure.in   2011-07-14 05:37:29 UTC (rev 
313222)
+++ php/php-src/branches/PHP_5_4/configure.in   2011-07-14 05:37:40 UTC (rev 
313223)
@@ -120,7 +120,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=4
 PHP_RELEASE_VERSION=0
-PHP_EXTRA_VERSION=alpha2-dev
+PHP_EXTRA_VERSION=alpha2
 
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_4/main/php_version.h
===
--- php/php-src/branches/PHP_5_4/main/php_version.h 2011-07-14 05:37:29 UTC 
(rev 313222)
+++ php/php-src/branches/PHP_5_4/main/php_version.h 2011-07-14 05:37:40 UTC 
(rev 313223)
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 4
 #define PHP_RELEASE_VERSION 0
-#define PHP_EXTRA_VERSION alpha2-dev
-#define PHP_VERSION 5.4.0alpha2-dev
+#define PHP_EXTRA_VERSION alpha2
+#define PHP_VERSION 5.4.0alpha2
 #define PHP_VERSION_ID 50400

-- 
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_4/ NEWS configure.in main/php_version.h

2011-07-13 Thread Stanislav Malyshev
stas Thu, 14 Jul 2011 05:39:29 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=313224

Log:
Back to -dev

Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/configure.in
U   php/php-src/branches/PHP_5_4/main/php_version.h

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2011-07-14 05:37:40 UTC (rev 313223)
+++ php/php-src/branches/PHP_5_4/NEWS   2011-07-14 05:39:29 UTC (rev 313224)
@@ -1,5 +1,7 @@
 PHP
NEWS
 |||
+?? ??? 2011, PHP 5.4.0 Alpha 3
+
 14 Jul 2011, PHP 5.4.0 Alpha 2
 - General improvements:
   . Zend Signal Handling. (Lucas Nealan,Arnaud Le Blanc,Brian Shire, Ilia)

Modified: php/php-src/branches/PHP_5_4/configure.in
===
--- php/php-src/branches/PHP_5_4/configure.in   2011-07-14 05:37:40 UTC (rev 
313223)
+++ php/php-src/branches/PHP_5_4/configure.in   2011-07-14 05:39:29 UTC (rev 
313224)
@@ -120,7 +120,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=4
 PHP_RELEASE_VERSION=0
-PHP_EXTRA_VERSION=alpha2
+PHP_EXTRA_VERSION=alpha3-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_4/main/php_version.h
===
--- php/php-src/branches/PHP_5_4/main/php_version.h 2011-07-14 05:37:40 UTC 
(rev 313223)
+++ php/php-src/branches/PHP_5_4/main/php_version.h 2011-07-14 05:39:29 UTC 
(rev 313224)
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 4
 #define PHP_RELEASE_VERSION 0
-#define PHP_EXTRA_VERSION alpha2
-#define PHP_VERSION 5.4.0alpha2
+#define PHP_EXTRA_VERSION alpha3
+#define PHP_VERSION 5.4.0alpha3-dev
 #define PHP_VERSION_ID 50400

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

[PHP-CVS] svn: /php/php-src/tags/

2011-07-13 Thread Stanislav Malyshev
stas Thu, 14 Jul 2011 05:41:08 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=313225

Log:
5.4.0alpha2

Changed paths:
A + php/php-src/tags/php_5_4_0alpha2@/
(from php/php-src/branches/PHP_5_4/:r313223)


Property changes on: php/php-src/tags/php_5_4_0alpha2@
___
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
configure.bat
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
configure.bat
ZendEngine1
php_test_results_*.txt
*.gcda
*.gcno
lcov_data
lcov_html
php_lcov.info
tmp-php.ini
diff
x64

Added: svn:mergeinfo
   + /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/tags/

2011-07-13 Thread Stanislav Malyshev
stas Thu, 14 Jul 2011 05:41:29 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=313226

Log:
5.4.0alpha2

Changed paths:
A + php/php-src/tags/php_5_4_0alpha2/
(from php/php-src/branches/PHP_5_4/:r313223)


Property changes on: php/php-src/tags/php_5_4_0alpha2
___
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
configure.bat
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
configure.bat
ZendEngine1
php_test_results_*.txt
*.gcda
*.gcno
lcov_data
lcov_html
php_lcov.info
tmp-php.ini
diff
x64

Added: svn:mergeinfo
   + /php/php-src/trunk:284726

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