[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/gd/config.w32
Commit:45351eaab4d8f065c5948de5f28df975b36d592c Author:Anatoliy Belsky Tue, 2 Oct 2012 09:40:42 +0200 Parents: 60a280936e52b3ab20f0ece06e80088a5bd8fd0c 0165eec1ea63d4b4a063d68e7b78947f038d67ba Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=45351eaab4d8f065c5948de5f28df975b36d592c Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: fixed include checks for libpng under win Changed paths: MM ext/gd/config.w32 Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fixed include checks for libpng under win: ext/gd/config.w32
Commit:0165eec1ea63d4b4a063d68e7b78947f038d67ba Author:Anatoliy Belsky Tue, 2 Oct 2012 09:39:34 +0200 Parents: 4f860a44126bf4cd87e7eb4eaa0ea4d44f96abc5 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0165eec1ea63d4b4a063d68e7b78947f038d67ba Log: fixed include checks for libpng under win Changed paths: M ext/gd/config.w32 Diff: diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 8f1c13f..af9aa83 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -9,7 +9,8 @@ if (PHP_GD != "no") { CHECK_LIB("freetype_a.lib;freetype.lib", "gd", PHP_GD) && CHECK_LIB("libpng_a.lib;libpng.lib", "gd", PHP_GD) && CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd") && - CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng12") && + (CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng") || + CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng12")) && (CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) && CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", PHP_GD) )) || -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: reverted the previous fix for libpng include: ext/gd/config.w32
Commit:92a46fe07e4407d52eb384c48aec5a3538731341 Author:Anatoliy Belsky Tue, 2 Oct 2012 09:57:44 +0200 Parents: 0165eec1ea63d4b4a063d68e7b78947f038d67ba Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=92a46fe07e4407d52eb384c48aec5a3538731341 Log: reverted the previous fix for libpng include Changed paths: M ext/gd/config.w32 Diff: diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index af9aa83..8f1c13f 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -9,8 +9,7 @@ if (PHP_GD != "no") { CHECK_LIB("freetype_a.lib;freetype.lib", "gd", PHP_GD) && CHECK_LIB("libpng_a.lib;libpng.lib", "gd", PHP_GD) && CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd") && - (CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng") || - CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng12")) && + CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng12") && (CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) && CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", PHP_GD) )) || -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/gd/config.w32
Commit:26e492f2f3d3e26f7320957172e37ee49f6e6112 Author:Anatoliy Belsky Tue, 2 Oct 2012 10:00:09 +0200 Parents: 45351eaab4d8f065c5948de5f28df975b36d592c 92a46fe07e4407d52eb384c48aec5a3538731341 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=26e492f2f3d3e26f7320957172e37ee49f6e6112 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: reverted the previous fix for libpng include Changed paths: MM ext/gd/config.w32 Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: 5.4.8RC1: NEWS configure.in main/php_version.h
Commit:3ff75ba85803e96df5ac5c6d77220c5c520f5304 Author:Stanislav Malyshev Tue, 2 Oct 2012 23:23:22 -0700 Parents: 26e492f2f3d3e26f7320957172e37ee49f6e6112 Branches: PHP-5.4.8 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3ff75ba85803e96df5ac5c6d77220c5c520f5304 Log: 5.4.8RC1 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index 83c8e23..2f895c4 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2012, PHP 5.4.8 +04 Oct 2012, PHP 5.4.8 RC1 - CLI server: . Changed response to unknown HTTP method to 501 according to RFC. diff --git a/configure.in b/configure.in index b03f6cc..833716d 100644 --- a/configure.in +++ b/configure.in @@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=4 PHP_RELEASE_VERSION=8 -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` diff --git a/main/php_version.h b/main/php_version.h index 0efdef1..bf7ae11 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 8 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.4.8-dev" +#define PHP_EXTRA_VERSION "RC1" +#define PHP_VERSION "5.4.8RC1" #define PHP_VERSION_ID 50408 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] tag php-src: create tag php-5.4.8RC1
Tag php-5.4.8RC1 in php-src.git was created Tag: 29592db52d05253430d2956de58f25a920eb05ad Tagger: Stanislav Malyshev Tue Oct 2 23:24:42 2012 -0700 Log: 5.4.8 RC1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (Darwin) iF4EABEIAAYFAlBr2jAACgkQL3lWvF2gS13xWAD+LpwVwBLxV8lnTXijcmATUqOK yjc6ZoTEJJaztNDWR04A/110uJ6v4SVtGCp5V87q8ue2EU/TyBlXQjxXccE9hd1G =CZmE -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=29592db52d05253430d2956de58f25a920eb05ad Target: 3ff75ba85803e96df5ac5c6d77220c5c520f5304 Author: Stanislav Malyshev Tue, 2 Oct 2012 23:23:22 -0700 Parents: 26e492f2f3d3e26f7320957172e37ee49f6e6112 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3ff75ba85803e96df5ac5c6d77220c5c520f5304 Target log: 5.4.8RC1 Changed paths: M NEWS M configure.in M main/php_version.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php