[PHP-CVS] tag php-src: create tag php-5.4.9
Tag php-5.4.9 in php-src.git was created Tag: 267db1cae5db34bc607101dad5a2def9dea80f75 Tagger: Stanislav Malyshev Tue Nov 20 21:14:17 2012 -0800 Log: 5.4.9 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (Darwin) iF4EABEIAAYFAlCsYy0ACgkQL3lWvF2gS12dggD/QlmpkZSx1NhzG36cUv5BrcsT kgW5xwmbqFVHoTfUt3wA/iF8/+vFhE3GkL57W9kDfpgdWC2D+tzBUu5TmFFJhRVO =gmnJ -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=267db1cae5db34bc607101dad5a2def9dea80f75 Target: bab156de79969108024c9715bbb98e3d1568e501 Author: Stanislav Malyshev Tue, 20 Nov 2012 21:12:20 -0800 Parents: 1b2b624e5a12565590b39a98be88ec8498c5bc1e Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bab156de79969108024c9715bbb98e3d1568e501 Target log: fix NEWS Changed paths: M NEWS -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fix NEWS: NEWS
Commit:bab156de79969108024c9715bbb98e3d1568e501 Author:Stanislav Malyshev Tue, 20 Nov 2012 21:12:20 -0800 Parents: 1b2b624e5a12565590b39a98be88ec8498c5bc1e Branches: PHP-5.4.9 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bab156de79969108024c9715bbb98e3d1568e501 Log: fix NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index b2da3ee..7a7b1aa 100644 --- a/NEWS +++ b/NEWS @@ -37,10 +37,22 @@ PHP NEWS (Dmitry, Laruence) . Fixed bug #63284 (Upgrade PCRE to 8.31). (Anatoliy) +- PDO: + . Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec). +(Martin Osvald, Remi) + +- PDO_pgsql: + . Fixed bug #62593 (Emulate prepares behave strangely with PARAM_BOOL). +(Will Fitch) + - Phar: . Fixed bug #63297 (Phar fails to write an openssl based signature). (Anatoliy) +- Streams: + . Fixed bug #63240 (stream_get_line() return contains delimiter string). +(Tjerk, Gustavo) + - Reflection: . Fixed bug #63399 (ReflectionClass::getTraitAliases() incorrectly resolves traitnames). (Laruence) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: 5.4.9: NEWS configure.in main/php_version.h
Commit:1b2b624e5a12565590b39a98be88ec8498c5bc1e Author:Stanislav Malyshev Sun, 18 Nov 2012 18:44:40 -0800 Parents: a235033abb39708096cf8484dce82ad4954ce822 Branches: PHP-5.4.9 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1b2b624e5a12565590b39a98be88ec8498c5bc1e Log: 5.4.9 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index 0a9e2cc..b2da3ee 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -08 Nov 2012, PHP 5.4.9 RC1 +22 Nov 2012, PHP 5.4.9 - Core: . Fixed bug #63305 (zend_mm_heap corrupted with traits). (Dmitry, Laruence) diff --git a/configure.in b/configure.in index a497435..dbf3db3 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=9 -PHP_EXTRA_VERSION="RC1" +PHP_EXTRA_VERSION="" 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 c226d78..e8fbaef 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 9 -#define PHP_EXTRA_VERSION "RC1" -#define PHP_VERSION "5.4.9RC1" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.4.9" #define PHP_VERSION_ID 50409 -- 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.4' into PHP-5.5: ext/curl/interface.c
Commit:6b0299aafce5180ae5d9c9e778b22cb8ca3a67c0
Author:Xinchen Hui Wed, 21 Nov 2012 12:30:54
+0800
Parents: aba80d09e6462a5799208deb70b8d4671360
e54970aaf125c5ee3b3faef5ba0cfaabc5e050d6
Branches: PHP-5.5
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=6b0299aafce5180ae5d9c9e778b22cb8ca3a67c0
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Changed paths:
MM ext/curl/interface.c
Diff:
diff --cc ext/curl/interface.c
index eb7ed8d,dbe4896..9e5d06b
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@@ -2163,84 -1783,71 +2163,80 @@@ static int _php_curl_setopt(php_curl *c
#endif
error = curl_easy_setopt(ch->cp, option,
Z_LVAL_PP(zvalue));
break;
-#if LIBCURL_VERSION_NUM > 0x070f04
- case CURLOPT_MAX_RECV_SPEED_LARGE:
- case CURLOPT_MAX_SEND_SPEED_LARGE:
- convert_to_long_ex(zvalue);
- error = curl_easy_setopt(ch->cp, option,
(curl_off_t)Z_LVAL_PP(zvalue));
- break;
-#endif
- case CURLOPT_FOLLOWLOCATION:
- convert_to_long_ex(zvalue);
- if (PG(open_basedir) && *PG(open_basedir)) {
- if (Z_LVAL_PP(zvalue) != 0) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, "CURLOPT_FOLLOWLOCATION cannot be activated when an open_basedir is
set");
- RETVAL_FALSE;
- return 1;
- }
- }
- error = curl_easy_setopt(ch->cp, option,
Z_LVAL_PP(zvalue));
- break;
-#if LIBCURL_VERSION_NUM > 0x071301
- case CURLOPT_POSTREDIR:
- convert_to_long_ex(zvalue);
- error = curl_easy_setopt(ch->cp, CURLOPT_POSTREDIR,
Z_LVAL_PP(zvalue) & CURL_REDIR_POST_ALL);
- break;
-#endif
+
+ /* String options */
+ case CURLOPT_CAINFO:
+ case CURLOPT_CAPATH:
+ case CURLOPT_COOKIE:
+ case CURLOPT_CUSTOMREQUEST:
+ case CURLOPT_EGDSOCKET:
+ case CURLOPT_FTPPORT:
+ case CURLOPT_INTERFACE:
case CURLOPT_PRIVATE:
- case CURLOPT_URL:
case CURLOPT_PROXY:
- case CURLOPT_USERPWD:
case CURLOPT_PROXYUSERPWD:
case CURLOPT_RANGE:
- case CURLOPT_CUSTOMREQUEST:
- case CURLOPT_USERAGENT:
- case CURLOPT_FTPPORT:
- case CURLOPT_COOKIE:
case CURLOPT_REFERER:
- case CURLOPT_INTERFACE:
- case CURLOPT_KRB4LEVEL:
- case CURLOPT_EGDSOCKET:
- case CURLOPT_CAINFO:
- case CURLOPT_CAPATH:
- case CURLOPT_SSL_CIPHER_LIST:
- case CURLOPT_SSLKEY:
- case CURLOPT_SSLKEYTYPE:
- case CURLOPT_SSLKEYPASSWD:
+ case CURLOPT_SSLCERTTYPE:
case CURLOPT_SSLENGINE:
case CURLOPT_SSLENGINE_DEFAULT:
- case CURLOPT_SSLCERTTYPE:
+ case CURLOPT_SSLKEY:
+ case CURLOPT_SSLKEYPASSWD:
+ case CURLOPT_SSLKEYTYPE:
+ case CURLOPT_SSL_CIPHER_LIST:
+ case CURLOPT_URL:
+ case CURLOPT_USERAGENT:
+ case CURLOPT_USERPWD:
+#if LIBCURL_VERSION_NUM >= 0x070d00 /* Available since 7.13.0 */
+ case CURLOPT_FTP_ACCOUNT:
+#endif
+#if LIBCURL_VERSION_NUM >= 0x070e01 /* Available since 7.14.1 */
+ case CURLOPT_COOKIELIST:
+#endif
+#if LIBCURL_VERSION_NUM >= 0x070f05 /* Available since 7.15.5 */
+ case CURLOPT_FTP_ALTERNATIVE_TO_USER:
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071004 /* Available since 7.16.4 */
+ case CURLOPT_KRBLEVEL:
+#else
+ case CURLOPT_KRB4LEVEL:
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071101 /* Available since 7.17.1 */
+ case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5:
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071301 /* Available since 7.19.1 */
+ case CURLOPT_PASSWORD:
+ case CURLOPT_PROXYPASSWORD:
+ case CURLOPT_PROXYUSERNAME:
+ case CURLOPT_USERNAME:
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071304 /* Available since 7.19.4 */
+ case CURLOPT_SOCKS5_GSSAPI_SERVICE:
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071400 /* Available since 7.20.0 */
+ case CURLOPT_MAIL_FROM:
+ case CURLOPT_RTSP_SESSION_ID:
+ case CURLOPT_RTSP_STREAM_URI:
+ case CURLOPT_RTSP_TRANSPORT:
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071504 /* Available since 7.21.4 */
+ case CURLOPT_TLSAUTH_PASSWORD:
+
[PHP-CVS] com php-src: Unused variable copystr: ext/curl/interface.c
Commit:e54970aaf125c5ee3b3faef5ba0cfaabc5e050d6
Author:Xinchen Hui Wed, 21 Nov 2012 12:30:03
+0800
Parents: 111aa9fd2ecbfcc1d8048dca96932b3b954614bf
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=e54970aaf125c5ee3b3faef5ba0cfaabc5e050d6
Log:
Unused variable copystr
copystr is declared again blow
Changed paths:
M ext/curl/interface.c
Diff:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 00dbfd3..dbe4896 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1836,10 +1836,6 @@ static int _php_curl_setopt(php_curl *ch, long option,
zval **zvalue, zval *retu
case CURLOPT_SSH_PRIVATE_KEYFILE:
#endif
{
-#if LIBCURL_VERSION_NUM < 0x071100
- char *copystr = NULL;
-#endif
-
convert_to_string_ex(zvalue);
#if LIBCURL_VERSION_NUM >= 0x071300
if (
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Update credits for 5.5: ext/standard/credits_ext.h ext/standard/credits_sapi.h
Commit:aba80d09e6462a5799208deb70b8d4671360
Author:Xinchen Hui Wed, 21 Nov 2012 12:17:41
+0800
Parents: f909e058352aa2b725bc4cb2053c6e3ef8e98c14
Branches: PHP-5.5
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=aba80d09e6462a5799208deb70b8d4671360
Log:
Update credits for 5.5
Changed paths:
M ext/standard/credits_ext.h
M ext/standard/credits_sapi.h
Diff:
diff --git a/ext/standard/credits_ext.h b/ext/standard/credits_ext.h
index 22ac822..382e70e 100644
--- a/ext/standard/credits_ext.h
+++ b/ext/standard/credits_ext.h
@@ -42,12 +42,12 @@ CREDIT_LINE("MS SQL", "Frank M. Kromann");
CREDIT_LINE("Multibyte String Functions", "Tsukada Takuya, Rui Hirokawa");
CREDIT_LINE("MySQL driver for PDO", "George Schlossnagle, Wez Furlong, Ilia
Alshanetsky, Johannes Schlueter");
CREDIT_LINE("MySQLi", "Zak Greant, Georg Richter, Andrey Hristov, Ulf Wendel");
-CREDIT_LINE("MySQLnd", "Georg Richter, Andrey Hristov, Ulf Wendel");
+CREDIT_LINE("MySQLnd", "Andrey Hristov, Ulf Wendel, Georg Richter");
CREDIT_LINE("MySQL", "Zeev Suraski, Zak Greant, Georg Richter");
CREDIT_LINE("OCI8", "Stig Bakken, Thies C. Arntzen, Andy Sautins, David
Benson, Maxim Maletsky, Harald Radi, Antony Dovgal, Andi Gutmans, Wez Furlong,
Christopher Jones, Oracle Corporation");
CREDIT_LINE("ODBC driver for PDO", "Wez Furlong");
CREDIT_LINE("ODBC", "Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel
R. Kalowsky");
-CREDIT_LINE("OpenSSL", "Stig Venaas, Wez Furlong, Sascha Kettler");
+CREDIT_LINE("OpenSSL", "Stig Venaas, Wez Furlong, Sascha Kettler, Scott
MacVicar");
CREDIT_LINE("Oracle (OCI) driver for PDO", "Wez Furlong");
CREDIT_LINE("pcntl", "Jason Greene, Arnaud Le Blanc");
CREDIT_LINE("Perl Compatible Regexps", "Andrei Zmievski");
@@ -64,11 +64,11 @@ CREDIT_LINE("Reflection", "Marcus Boerger, Timm Friebe,
George Schlossnagle, And
CREDIT_LINE("Sessions", "Sascha Schumann, Andrei Zmievski");
CREDIT_LINE("Shared Memory Operations", "Slava Poliakov, Ilia Alshanetsky");
CREDIT_LINE("SimpleXML", "Sterling Hughes, Marcus Boerger, Rob Richards");
-CREDIT_LINE("SNMP", "Rasmus Lerdorf, Harrie Hazewinkel, Mike Jackson, Steven
Lawrance, Johann Hanne");
+CREDIT_LINE("SNMP", "Rasmus Lerdorf, Harrie Hazewinkel, Mike Jackson, Steven
Lawrance, Johann Hanne, Boris Lytochkin");
CREDIT_LINE("SOAP", "Brad Lafountain, Shane Caraveo, Dmitry Stogov");
CREDIT_LINE("Sockets", "Chris Vandomelen, Sterling Hughes, Daniel Beulshausen,
Jason Greene");
CREDIT_LINE("SPL", "Marcus Boerger, Etienne Kneuss");
-CREDIT_LINE("SQLite3", "Scott MacVicar, Ilia Alshanetsky");
+CREDIT_LINE("SQLite3", "Scott MacVicar, Ilia Alshanetsky, Brad Dewar");
CREDIT_LINE("SQLite 3.x driver for PDO", "Wez Furlong");
CREDIT_LINE("Sybase-CT", "Zeev Suraski, Tom May, Timm Friebe");
CREDIT_LINE("System V Message based IPC", "Wez Furlong");
diff --git a/ext/standard/credits_sapi.h b/ext/standard/credits_sapi.h
index 9cc7e6e..d147d8d 100644
--- a/ext/standard/credits_sapi.h
+++ b/ext/standard/credits_sapi.h
@@ -17,7 +17,7 @@ CREDIT_LINE("Apache 2.0 Filter", "Sascha Schumann, Aaron
Bannert");
CREDIT_LINE("Apache 2.0 Handler", "Ian Holsman, Justin Erenkrantz (based on
Apache 2.0 Filter code)");
CREDIT_LINE("Caudium / Roxen", "David Hedbor");
CREDIT_LINE("CGI / FastCGI", "Rasmus Lerdorf, Stig Bakken, Shane Caraveo,
Dmitry Stogov");
-CREDIT_LINE("CLI", "Edin Kadribasic, Marcus Boerger, Johannes Schlueter");
+CREDIT_LINE("CLI", "Edin Kadribasic, Marcus Boerger, Johannes Schlueter,
Moriyoshi Koizumi, Xinchen Hui");
CREDIT_LINE("Continuity", "Alex Leigh (based on nsapi code)");
CREDIT_LINE("Embed", "Edin Kadribasic");
CREDIT_LINE("FastCGI Process Manager", "Andrei Nigmatulin, dreamcat4, Antony
Dovgal, Jerome Loyet");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Add the new password functions to UPGRADING.: UPGRADING
Commit:f909e058352aa2b725bc4cb2053c6e3ef8e98c14 Author:Adam Harvey Wed, 21 Nov 2012 09:25:05 +0800 Parents: 8f65c76d2e0e4b13c8419627b65c3c9688c4bbbd Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f909e058352aa2b725bc4cb2053c6e3ef8e98c14 Log: Add the new password functions to UPGRADING. As a public service announcement on behalf of the documentation team, please remember to update UPGRADING as well as NEWS when adding features to master or an alpha branch. :) Changed paths: M UPGRADING Diff: diff --git a/UPGRADING b/UPGRADING index f7f88ac..18ab6bf 100755 --- a/UPGRADING +++ b/UPGRADING @@ -119,6 +119,10 @@ PHP 5.5 UPGRADE NOTES - Core: - boolval() + - password_get_info() + - password_hash() + - password_needs_rehash() + - password_verify() - Hash: - hash_pbkdf2() -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #63468 (wrong called method as callback with inheritance): NEWS Zend/tests/bug63468.phpt Zend/zend_API.c
Commit:396c1e990a0e513cf2e8510e9b6f82ab425c9e3a
Author:Dmitry Stogov Tue, 20 Nov 2012 12:51:55
+0400
Parents: d412152f31f145bf07b243465cdffa84ceba70be
Branches: PHP-5.3 PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=396c1e990a0e513cf2e8510e9b6f82ab425c9e3a
Log:
Fixed bug #63468 (wrong called method as callback with inheritance)
Bugs:
https://bugs.php.net/63468
Changed paths:
M NEWS
A Zend/tests/bug63468.phpt
M Zend/zend_API.c
Diff:
diff --git a/NEWS b/NEWS
index 4f89d07..717a382 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ PHP
NEWS
- Zend Engine:
. Fixed bug #63512 (parse_ini_file() with INI_SCANNER_RAW removes quotes
from value). (Pierrick)
+ . Fixed bug #63468 (wrong called method as callback with inheritance).
+(Laruence)
- Core:
. Fixed bug #63451 (config.guess file does not have AIX 7 defined,
shared objects are not created). (kemcline at au1 dot ibm dot com)
diff --git a/Zend/tests/bug63468.phpt b/Zend/tests/bug63468.phpt
new file mode 100644
index 000..00b5a41
--- /dev/null
+++ b/Zend/tests/bug63468.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Bug #63468 (wrong called method as callback with inheritance)
+--FILE--
+run());
+--EXPECT--
+string(3) "Bar"
+
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index d529775..c1b501b 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2520,7 +2520,7 @@ static int zend_is_callable_check_func(int check_flags,
zval *callable, zend_fca
} else if (zend_hash_find(ftable, lmname, mlen+1,
(void**)&fcc->function_handler) == SUCCESS) {
retval = 1;
if ((fcc->function_handler->op_array.fn_flags &
ZEND_ACC_CHANGED) &&
- EG(scope) &&
+ !strict_class && EG(scope) &&
instanceof_function(fcc->function_handler->common.scope,
EG(scope) TSRMLS_CC)) {
zend_function *priv_fbc;
--
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: NEWS Zend/zend_API.c
Commit:111aa9fd2ecbfcc1d8048dca96932b3b954614bf Author:Dmitry Stogov Tue, 20 Nov 2012 12:54:40 +0400 Parents: 75746d60b6e6a45512842e222429c127be58b733 396c1e990a0e513cf2e8510e9b6f82ab425c9e3a Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=111aa9fd2ecbfcc1d8048dca96932b3b954614bf Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed bug #63468 (wrong called method as callback with inheritance) Conflicts: NEWS Bugs: https://bugs.php.net/63468 Changed paths: MM NEWS MM Zend/zend_API.c Diff: diff --cc NEWS index 3672fe0,717a382..d02a8c9 --- a/NEWS +++ b/NEWS @@@ -1,11 -1,27 +1,13 @@@ PHP NEWS ||| -?? ??? 2ß12, PHP 5.3.20 +?? ??? 2012, PHP 5.4.9 -- Zend Engine: - . Fixed bug #63512 (parse_ini_file() with INI_SCANNER_RAW removes quotes -from value). (Pierrick) +- Core: + . Fixed bug #63468 (wrong called method as callback with inheritance). + (Laruence) -- Core: - . Fixed bug #63451 (config.guess file does not have AIX 7 defined, -shared objects are not created). (kemcline at au1 dot ibm dot com) -- Apache2 Handler SAPI: - . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy) - - -?? ??? 2012, PHP 5.3.19 - -! -ADD NEWS ONLY ABOVE IN 5.3.20 SECTION -! -RM will merge 5.3.19 entries when merging to release branch - -- Core + . Fixed bug #63305 (zend_mm_heap corrupted with traits). (Dmitry, Laruence) + . Fixed bug #63369 ((un)serialize() leaves dangling pointers, causes crashes). +(Tony, Andrew Sitnikov) . Fixed bug #63241 (PHP fails to open Windows deduplicated files). (daniel dot stelter-gliese at innogames dot de) . Fixed bug #62444 (Handle leak in is_readable on windows). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
