From 20ce3f280ae5a490589f9d6473ee9b51eba918f6 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Thu, 11 Feb 2010 12:35:44 +0000 Subject: Back to dev --- NEWS | 2 ++ configure.in | 2 +- main/php_version.h | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 640ec8324e..0e45222420 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +?? Feb 2010, PHP 5.2.13 + 11 Feb 2010, PHP 5.2.13RC2 - Downgrade bundled PCRE to version 7.9. (Ilia) - Fixed safe_mode validation inside tempnam() when the directory path does diff --git a/configure.in b/configure.in index ba4dea5bbc..f78dc091cc 100644 --- a/configure.in +++ b/configure.in @@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h) PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=13 -PHP_EXTRA_VERSION="RC2" +PHP_EXTRA_VERSION="RC3-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index dc09eaa38a..5fad15df6c 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 13 -#define PHP_EXTRA_VERSION "RC2" -#define PHP_VERSION "5.2.13RC2" +#define PHP_EXTRA_VERSION "RC3-dev" +#define PHP_VERSION "5.2.13RC3-dev" #define PHP_VERSION_ID 50213 -- cgit v1.2.1 From 149908c561b4c281e938c7672de59c7b975dbcb9 Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Thu, 11 Feb 2010 22:37:50 +0000 Subject: - fix php_date_llabs declaration --- ext/date/php_date.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 5803ad05e7..68fcc7463a 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -31,10 +31,12 @@ #include #ifdef PHP_WIN32 -# include "win32/php_stdint.h" -#endif - +static __inline __int64 php_date_llabs( __int64 i ) { return i >= 0? i: -i; } +#elif defined(__GNUC__) && __GNUC__ < 3 +static __inline __int64_t php_date_llabs( __int64_t i ) { return i >= 0 ? i : -i; } +#else static __inline long long php_date_llabs( long long i ) { return i >= 0 ? i : -i; } +#endif /* {{{ arginfo */ static -- cgit v1.2.1 From f11c2a21d53ded20a8ffd002b6b40d26bf549705 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Fri, 12 Feb 2010 00:00:26 +0000 Subject: 5.2.13RC2 --- NEWS | 2 -- configure.in | 2 +- main/php_version.h | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 0e45222420..640ec8324e 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,5 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? Feb 2010, PHP 5.2.13 - 11 Feb 2010, PHP 5.2.13RC2 - Downgrade bundled PCRE to version 7.9. (Ilia) - Fixed safe_mode validation inside tempnam() when the directory path does diff --git a/configure.in b/configure.in index f78dc091cc..ba4dea5bbc 100644 --- a/configure.in +++ b/configure.in @@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h) PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=13 -PHP_EXTRA_VERSION="RC3-dev" +PHP_EXTRA_VERSION="RC2" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index 5fad15df6c..dc09eaa38a 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 13 -#define PHP_EXTRA_VERSION "RC3-dev" -#define PHP_VERSION "5.2.13RC3-dev" +#define PHP_EXTRA_VERSION "RC2" +#define PHP_VERSION "5.2.13RC2" #define PHP_VERSION_ID 50213 -- cgit v1.2.1