Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl config.m4

2008-04-10 Thread Hannes Magnusson
On Wed, Apr 9, 2008 at 11:53 PM, Marcus Boerger <[EMAIL PROTECTED]> wrote:
> helly   Wed Apr  9 21:53:00 2008 UTC
>
>   Modified files:  (Branch: PHP_5_3)
> /php-src/ext/splconfig.m4
>   Log:
>   - MFH SPL can no longer be disabld as discussed some time ago (checked back 
> with RM)

Finally! Thank you thank you thank you thank you! :)

-Hannes

-- 
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) /ext/spl config.m4

2008-04-10 Thread Jani Taskinen
On Thu, 2008-04-10 at 10:18 +0200, Hannes Magnusson wrote:
> On Wed, Apr 9, 2008 at 11:53 PM, Marcus Boerger <[EMAIL PROTECTED]> wrote:
> > helly   Wed Apr  9 21:53:00 2008 UTC
> >
> >   Modified files:  (Branch: PHP_5_3)
> > /php-src/ext/splconfig.m4
> >   Log:
> >   - MFH SPL can no longer be disabld as discussed some time ago (checked 
> > back with RM)
> 
> Finally! Thank you thank you thank you thank you! :)
> 
> -Hannes
> 

pff...shouldn't SPL be moved to PECL already?

-- 
Patches/Donations: http://pecl.php.net/~jani/



-- 
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/pdo/tests bug_43663.phpt bug_44159.phpt

2008-04-10 Thread Nuno Lopes
nlopess Thu Apr 10 18:50:42 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdo/tests  bug_43663.phpt bug_44159.phpt 
  Log:
  fix SKIPIFs
  # Patch by Christian Hoffmann
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/tests/bug_43663.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/pdo/tests/bug_43663.phpt
diff -u php-src/ext/pdo/tests/bug_43663.phpt:1.1.2.3 
php-src/ext/pdo/tests/bug_43663.phpt:1.1.2.4
--- php-src/ext/pdo/tests/bug_43663.phpt:1.1.2.3Mon Mar 17 17:19:48 2008
+++ php-src/ext/pdo/tests/bug_43663.phptThu Apr 10 18:50:41 2008
@@ -2,7 +2,7 @@
 PDO Common: Bug #43663 (__call on classes derived from PDO)
 --SKIPIF--
 
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/tests/bug_44159.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/pdo/tests/bug_44159.phpt
diff -u php-src/ext/pdo/tests/bug_44159.phpt:1.1.2.2 
php-src/ext/pdo/tests/bug_44159.phpt:1.1.2.3
--- php-src/ext/pdo/tests/bug_44159.phpt:1.1.2.2Fri Feb 22 02:15:42 2008
+++ php-src/ext/pdo/tests/bug_44159.phptThu Apr 10 18:50:42 2008
@@ -1,5 +1,9 @@
 --TEST--
 Bug #44159 (Crash: $pdo->setAttribute(PDO::STATEMENT_ATTR_CLASS, NULL))
+--SKIPIF--
+
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/pdo/tests bug_43663.phpt

2008-04-10 Thread Nuno Lopes
nlopess Thu Apr 10 18:51:54 2008 UTC

  Modified files:  
/php-src/ext/pdo/tests  bug_43663.phpt 
  Log:
  MFB
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/tests/bug_43663.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/pdo/tests/bug_43663.phpt
diff -u php-src/ext/pdo/tests/bug_43663.phpt:1.2 
php-src/ext/pdo/tests/bug_43663.phpt:1.3
--- php-src/ext/pdo/tests/bug_43663.phpt:1.2Tue Mar 18 06:39:06 2008
+++ php-src/ext/pdo/tests/bug_43663.phptThu Apr 10 18:51:54 2008
@@ -2,7 +2,7 @@
 PDO Common: Bug #43663 (__call on classes derived from PDO)
 --SKIPIF--
 
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo/tests bug_43663.phpt bug_44159.phpt

2008-04-10 Thread Nuno Lopes
nlopess Thu Apr 10 19:09:49 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pdo/tests  bug_43663.phpt bug_44159.phpt 
  Log:
  MFB5.3: fix SKIPIF
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/tests/bug_43663.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/pdo/tests/bug_43663.phpt
diff -u php-src/ext/pdo/tests/bug_43663.phpt:1.1.4.2 
php-src/ext/pdo/tests/bug_43663.phpt:1.1.4.3
--- php-src/ext/pdo/tests/bug_43663.phpt:1.1.4.2Sun Dec 30 17:59:31 2007
+++ php-src/ext/pdo/tests/bug_43663.phptThu Apr 10 19:09:49 2008
@@ -1,9 +1,8 @@
 --TEST--
 PDO Common: Bug #43663 (__call on classes derived from PDO)
---FILE--
 --SKIPIF--
 
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/tests/bug_44159.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u
Index: php-src/ext/pdo/tests/bug_44159.phpt
diff -u php-src/ext/pdo/tests/bug_44159.phpt:1.1.4.3 
php-src/ext/pdo/tests/bug_44159.phpt:1.1.4.4
--- php-src/ext/pdo/tests/bug_44159.phpt:1.1.4.3Fri Feb 22 02:45:37 2008
+++ php-src/ext/pdo/tests/bug_44159.phptThu Apr 10 19:09:49 2008
@@ -1,5 +1,9 @@
 --TEST--
 Bug #44159 (Crash: $pdo->setAttribute(PDO::STATEMENT_ATTR_CLASS, NULL))
+--SKIPIF--
+
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/general_functions bug44394_2.phpt

2008-04-10 Thread Nuno Lopes
nlopess Thu Apr 10 19:13:59 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/general_functions   bug44394_2.phpt 
  Log:
  add SKIPIF
  # Patch by Christian Hoffmann
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug44394_2.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/general_functions/bug44394_2.phpt
diff -u php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.1.2.1 
php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.1.2.2
--- php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.1.2.1
Wed Mar 12 02:40:57 2008
+++ php-src/ext/standard/tests/general_functions/bug44394_2.phptThu Apr 
10 19:13:59 2008
@@ -1,5 +1,7 @@
 --TEST--
 Bug #44394 (Last two bytes missing from output) with session.use_trans_id
+--SKIPIF--
+
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions bug44394_2.phpt

2008-04-10 Thread Nuno Lopes
nlopess Thu Apr 10 19:14:23 2008 UTC

  Modified files:  
/php-src/ext/standard/tests/general_functions   bug44394_2.phpt 
  Log:
  MFB
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug44394_2.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/general_functions/bug44394_2.phpt
diff -u php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.2 
php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.3
--- php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.2Wed Mar 
12 02:45:15 2008
+++ php-src/ext/standard/tests/general_functions/bug44394_2.phptThu Apr 
10 19:14:23 2008
@@ -1,5 +1,7 @@
 --TEST--
 Bug #44394 (Last two bytes missing from output) with session.use_trans_id
+--SKIPIF--
+
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/general_functions bug44394_2.phpt

2008-04-10 Thread Nuno Lopes
nlopess Thu Apr 10 19:16:00 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/general_functions   bug44394_2.phpt 
  Log:
  MFB53
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug44394_2.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/standard/tests/general_functions/bug44394_2.phpt
diff -u php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.2.2.2 
php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.2.2.3
--- php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.2.2.2
Wed Mar 12 11:27:42 2008
+++ php-src/ext/standard/tests/general_functions/bug44394_2.phptThu Apr 
10 19:16:00 2008
@@ -1,5 +1,7 @@
 --TEST--
 Bug #44394 (Last two bytes missing from output) with session.use_trans_id
+--SKIPIF--
+
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/pcre config0.m4

2008-04-10 Thread Marcus Boerger
helly   Thu Apr 10 19:41:24 2008 UTC

  Modified files:  
/php-src/ext/pcre   config0.m4 
  Log:
  - No longer allow to disable pcre
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config0.m4?r1=1.50&r2=1.51&diff_format=u
Index: php-src/ext/pcre/config0.m4
diff -u php-src/ext/pcre/config0.m4:1.50 php-src/ext/pcre/config0.m4:1.51
--- php-src/ext/pcre/config0.m4:1.50Tue Sep 11 16:19:14 2007
+++ php-src/ext/pcre/config0.m4 Thu Apr 10 19:41:24 2008
@@ -1,15 +1,16 @@
 dnl
-dnl $Id: config0.m4,v 1.50 2007/09/11 16:19:14 nlopess Exp $
+dnl $Id: config0.m4,v 1.51 2008/04/10 19:41:24 helly Exp $
 dnl
 
 dnl By default we'll compile and link against the bundled PCRE library
 dnl if DIR is supplied, we'll use that for linking
 
 PHP_ARG_WITH(pcre-regex,for PCRE support,
-[  --without-pcre-regexDo not include Perl Compatible Regular Expressions 
support.
+[  --with-pcre-regex=DIR   Include Perl Compatible Regular Expressions support.
   DIR is the PCRE install prefix [BUNDLED]], yes)
 
-if test "$PHP_PCRE_REGEX" != "no"; then
+ext_shared=no
+
   if test "$PHP_PCRE_REGEX" = "yes"; then
 PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c 
pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c 
pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c 
pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c 
pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c 
pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c 
pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c 
php_pcre.c, $ext_shared,,[EMAIL PROTECTED]@/pcrelib)
 PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
@@ -54,6 +55,3 @@
 PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h])
 PHP_SUBST(PCRE_SHARED_LIBADD)
   fi
-else 
-  PHP_PCRE=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) /ext/pcre config0.m4

2008-04-10 Thread Marcus Boerger
helly   Thu Apr 10 19:42:32 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pcre   config0.m4 
  Log:
  - MFH No longer allow to disable pcre
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config0.m4?r1=1.38.2.3.2.10&r2=1.38.2.3.2.10.2.1&diff_format=u
Index: php-src/ext/pcre/config0.m4
diff -u php-src/ext/pcre/config0.m4:1.38.2.3.2.10 
php-src/ext/pcre/config0.m4:1.38.2.3.2.10.2.1
--- php-src/ext/pcre/config0.m4:1.38.2.3.2.10   Tue Sep 11 16:17:33 2007
+++ php-src/ext/pcre/config0.m4 Thu Apr 10 19:42:32 2008
@@ -1,15 +1,16 @@
 dnl
-dnl $Id: config0.m4,v 1.38.2.3.2.10 2007/09/11 16:17:33 nlopess Exp $
+dnl $Id: config0.m4,v 1.38.2.3.2.10.2.1 2008/04/10 19:42:32 helly Exp $
 dnl
 
 dnl By default we'll compile and link against the bundled PCRE library
 dnl if DIR is supplied, we'll use that for linking
 
 PHP_ARG_WITH(pcre-regex,for PCRE support,
-[  --without-pcre-regexDo not include Perl Compatible Regular Expressions 
support.
+[  --with-pcre-regex=DIR   Include Perl Compatible Regular Expressions support.
   DIR is the PCRE install prefix [BUNDLED]], yes)
 
-if test "$PHP_PCRE_REGEX" != "no"; then
+ext_shared=no
+
   if test "$PHP_PCRE_REGEX" = "yes"; then
 PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c 
pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c 
pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c 
pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c 
pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c 
pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c 
pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c 
php_pcre.c, $ext_shared,,[EMAIL PROTECTED]@/pcrelib)
 PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
@@ -53,6 +54,3 @@
 PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h])
 PHP_SUBST(PCRE_SHARED_LIBADD)
   fi
-else 
-  PHP_PCRE=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) /ext/oci8 oci8.c

2008-04-10 Thread Christopher Jones
sixdThu Apr 10 21:53:47 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/oci8   oci8.c 
  Log:
  Bump OCI8 version to 1.2.5 (This change is for 5.2 branch only)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.42&r2=1.269.2.16.2.43&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.42 
php-src/ext/oci8/oci8.c:1.269.2.16.2.43
--- php-src/ext/oci8/oci8.c:1.269.2.16.2.42 Thu Jan 24 14:10:21 2008
+++ php-src/ext/oci8/oci8.c Thu Apr 10 21:53:46 2008
@@ -26,7 +26,7 @@
+--+
 */
 
-/* $Id: oci8.c,v 1.269.2.16.2.42 2008/01/24 14:10:21 rrichards Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.43 2008/04/10 21:53:46 sixd Exp $ */
 /* TODO
  *
  * file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty() 
with OCI_ATTR_LOBEMPTY
@@ -377,7 +377,7 @@
PHP_RINIT(oci),   /* per-request startup function */
PHP_RSHUTDOWN(oci),   /* per-request shutdown function */
PHP_MINFO(oci),   /* information function */
-   "1.2.4",
+   "1.2.5",
 #if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1) || (PHP_MAJOR_VERSION > 
5)
PHP_MODULE_GLOBALS(oci),  /* globals descriptor */
PHP_GINIT(oci),   /* globals ctor */
@@ -673,8 +673,8 @@
 
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
-   php_info_print_table_row(2, "Version", "1.2.4");
-   php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.42 $");
+   php_info_print_table_row(2, "Version", "1.2.5");
+   php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.43 $");
 
snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);



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

2008-04-10 Thread Ilia Alshanetsky
iliaa   Thu Apr 10 22:24:05 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS configure.in 
/php-src/main   php_version.h 
  Log:
  
  5.2.6RC5
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1139&r2=1.2027.2.547.2.1140&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1139 php-src/NEWS:1.2027.2.547.2.1140
--- php-src/NEWS:1.2027.2.547.2.1139Wed Apr  9 21:40:12 2008
+++ php-src/NEWSThu Apr 10 22:24:04 2008
@@ -1,6 +1,6 @@
 PHPNEWS
 |||
-?? Apr 2008, PHP 5.2.6
+10 Apr 2008, PHP 5.2.6RC5
 - Fixed incorrect heredoc handling when label is used within the block.
   (Matt Wilmas)
 - Fixed bug #44673 (With CGI argv/argc starts from arguments, not from script)
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.94&r2=1.579.2.52.2.95&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.94 
php-src/configure.in:1.579.2.52.2.95
--- php-src/configure.in:1.579.2.52.2.94Fri Apr  4 07:26:41 2008
+++ php-src/configure.inThu Apr 10 22:24:05 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.94 2008/04/04 07:26:41 derick Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.95 2008/04/10 22:24:05 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
 PHP_RELEASE_VERSION=6
-PHP_EXTRA_VERSION="RC5-dev"
+PHP_EXTRA_VERSION="RC5"
 
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`
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.65&r2=1.112.2.37.2.66&diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.37.2.65 
php-src/main/php_version.h:1.112.2.37.2.66
--- php-src/main/php_version.h:1.112.2.37.2.65  Fri Apr  4 00:16:53 2008
+++ php-src/main/php_version.h  Thu Apr 10 22:24:05 2008
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 6
-#define PHP_EXTRA_VERSION "RC5-dev"
-#define PHP_VERSION "5.2.6RC5-dev"
+#define PHP_EXTRA_VERSION "RC5"
+#define PHP_VERSION "5.2.6RC5"
 #define PHP_VERSION_ID 50206



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

2008-04-10 Thread Ilia Alshanetsky
iliaa   Thu Apr 10 22:31:10 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS configure.in 
/php-src/main   php_version.h 
  Log:
  
  Back to dev
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1140&r2=1.2027.2.547.2.1141&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1140 php-src/NEWS:1.2027.2.547.2.1141
--- php-src/NEWS:1.2027.2.547.2.1140Thu Apr 10 22:24:04 2008
+++ php-src/NEWSThu Apr 10 22:31:09 2008
@@ -1,5 +1,7 @@
 PHPNEWS
 |||
+?? Apr 2008, PHP 5.2.6
+
 10 Apr 2008, PHP 5.2.6RC5
 - Fixed incorrect heredoc handling when label is used within the block.
   (Matt Wilmas)
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.95&r2=1.579.2.52.2.96&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.95 
php-src/configure.in:1.579.2.52.2.96
--- php-src/configure.in:1.579.2.52.2.95Thu Apr 10 22:24:05 2008
+++ php-src/configure.inThu Apr 10 22:31:09 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.95 2008/04/10 22:24:05 iliaa Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.96 2008/04/10 22:31:09 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
 PHP_RELEASE_VERSION=6
-PHP_EXTRA_VERSION="RC5"
+PHP_EXTRA_VERSION="RC6-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`
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.66&r2=1.112.2.37.2.67&diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.37.2.66 
php-src/main/php_version.h:1.112.2.37.2.67
--- php-src/main/php_version.h:1.112.2.37.2.66  Thu Apr 10 22:24:05 2008
+++ php-src/main/php_version.h  Thu Apr 10 22:31:09 2008
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 6
-#define PHP_EXTRA_VERSION "RC5"
-#define PHP_VERSION "5.2.6RC5"
+#define PHP_EXTRA_VERSION "RC6-dev"
+#define PHP_VERSION "5.2.6RC6-dev"
 #define PHP_VERSION_ID 50206



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