[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
jani Wed, 16 Sep 2009 06:56:37 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288364 Log: - What a mess.. Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-09-16 06:44:01 UTC (rev 288363) +++ php/php-src/branches/PHP_5_3/NEWS 2009-09-16 06:56:37 UTC (rev 288364) @@ -1,18 +1,21 @@ PHPNEWS ||| ?? ??? 2009, PHP 5.3.2 -- Implement FR #49253 (add support for libcurl's CERTINFO option). +- Implemented FR #49253 (added support for libcurl's CERTINFO option). (Linus Nielsen Feltzing li...@haxx.se) -?? ??? 2009, PHP 5.3.1RC? + +?? ??? 2009, PHP 5.3.1RC? - WHY IS THIS HERE? Gonna be released after 5.3.1 or what?? - Upgraded bundled sqlite to version 3.6.18. (Ilia) +- Restored shebang line check to CGI sapi (not checked by scanner anymore). + (Jani) + - Fixed certificate validation inside php_openssl_apply_verification_policy (Ryan Sleevi, Ilia) -- Restored shebang line check to CGI sapi (not checked by scanner anymore). - (Jani) - Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters). (Ilia) + ?? ??? 2009, PHP 5.3.1 - Upgraded bundled sqlite to version 3.6.17. (Scott) @@ -196,6 +199,7 @@ - Fixed bug #49447 (php engine need to correctly check for socket API return status on windows). (Sriram Natarajan) + 30 Jun 2009, PHP 5.3.0 - Upgraded bundled PCRE to version 7.9. (Nuno) - Upgraded bundled sqlite to version 3.6.15. (Scott) -- 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_2/ext/date/php_date.c trunk/ext/date/php_date.c
Is there still something to be fixed or why is the bug still open?
--Jani
Rasmus Lerdorf wrote:
rasmus Tue, 15 Sep 2009 20:34:54 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288356
Log:
Fix for bug #49558 for 5.2 and HEAD as well.
Bug: http://bugs.php.net/49558 (Open) Sunrise Problems around 91 degree zenith
Changed paths:
U php/php-src/branches/PHP_5_2/ext/date/php_date.c
U php/php-src/trunk/ext/date/php_date.c
Modified: php/php-src/branches/PHP_5_2/ext/date/php_date.c
===
--- php/php-src/branches/PHP_5_2/ext/date/php_date.c2009-09-15 20:33:10 UTC
(rev 288355)
+++ php/php-src/branches/PHP_5_2/ext/date/php_date.c2009-09-15 20:34:54 UTC
(rev 288356)
@@ -2456,7 +2456,7 @@
}
timelib_unixtime2local(t, time);
- rs = timelib_astro_rise_set_altitude(t, longitude, latitude, altitude, altitude -1 ? 1 :
0, h_rise, h_set, rise, set, transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, altitude, calc_sunset?0:1,
h_rise, h_set, rise, set, transit);
timelib_time_dtor(t);
if (rs != 0) {
Modified: php/php-src/trunk/ext/date/php_date.c
===
--- php/php-src/trunk/ext/date/php_date.c 2009-09-15 20:33:10 UTC (rev
288355)
+++ php/php-src/trunk/ext/date/php_date.c 2009-09-15 20:34:54 UTC (rev
288356)
@@ -4049,7 +4049,7 @@
}
timelib_unixtime2local(t, time);
- rs = timelib_astro_rise_set_altitude(t, longitude, latitude, altitude, altitude -1 ? 1 :
0, h_rise, h_set, rise, set, transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, altitude, calc_sunset?0:1,
h_rise, h_set, rise, set, transit);
timelib_time_dtor(t);
if (rs != 0) {
--
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_3/ NEWS
hi Jani, The 5.3.1 part will be merged once 5.3.1 has been released, from PHP_5_3_1. Cheers, On Wed, Sep 16, 2009 at 8:56 AM, Jani Taskinen j...@php.net wrote: jani Wed, 16 Sep 2009 06:56:37 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288364 Log: - What a mess.. +?? ??? 2009, PHP 5.3.1RC? - WHY IS THIS HERE? Gonna be released after 5.3.1 or what?? Cheers, -- Pierre 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/trunk/ext/tidy/tests/ 030.phpt
patrickallaert Wed, 16 Sep 2009 12:35:54 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288371 Log: Minor change to improve code coverage Changed paths: U php/php-src/trunk/ext/tidy/tests/030.phpt Modified: php/php-src/trunk/ext/tidy/tests/030.phpt === --- php/php-src/trunk/ext/tidy/tests/030.phpt 2009-09-16 10:53:40 UTC (rev 288370) +++ php/php-src/trunk/ext/tidy/tests/030.phpt 2009-09-16 12:35:54 UTC (rev 288371) @@ -11,19 +11,19 @@ $buffer = 'html/html'; $config = array( 'indent' = true, // AutoBool - 'indent-attributes' = true, // Boolean + 'markup' = false, // Boolean 'indent-spaces' = 3, // Integer 'language' = 'de'); // String $tidy = new tidy(); $tidy-parseString($buffer, $config); $c = $tidy-getConfig(); var_dump($c['indent']); -var_dump($c['indent-attributes']); +var_dump($c['markup']); var_dump($c['indent-spaces']); var_dump($c['language']); ? --EXPECTF-- int(1) -bool(true) +bool(false) int(3) %s(2) de -- 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_2/ NEWS configure.in main/php_version.h
iliaaWed, 16 Sep 2009 12:54:51 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288372 Log: 5.2.11 Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/main/php_version.h Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-09-16 12:35:54 UTC (rev 288371) +++ php/php-src/branches/PHP_5_2/NEWS 2009-09-16 12:54:51 UTC (rev 288372) @@ -1,6 +1,6 @@ PHPNEWS ||| -?? Sep 2009, PHP 5.2.11 +17 Sep 2009, PHP 5.2.11 - Fixed certificate validation inside php_openssl_apply_verification_policy. (Ryan Sleevi, Ilia) Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2009-09-16 12:35:54 UTC (rev 288371) +++ php/php-src/branches/PHP_5_2/configure.in 2009-09-16 12:54:51 UTC (rev 288372) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=11 -PHP_EXTRA_VERSION=RC4-dev +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` Modified: php/php-src/branches/PHP_5_2/main/php_version.h === --- php/php-src/branches/PHP_5_2/main/php_version.h 2009-09-16 12:35:54 UTC (rev 288371) +++ php/php-src/branches/PHP_5_2/main/php_version.h 2009-09-16 12:54:51 UTC (rev 288372) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 11 -#define PHP_EXTRA_VERSION RC4-dev -#define PHP_VERSION 5.2.11RC4-dev +#define PHP_EXTRA_VERSION +#define PHP_VERSION 5.2.11 #define PHP_VERSION_ID 50211 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/tags/
iliaaWed, 16 Sep 2009 12:55:12 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288373 Log: 5.2.11 Changed paths: A + php/php-src/tags/php_5_2_11/ (from php/php-src/branches/PHP_5_2/:r288372) Property changes on: php/php-src/tags/php_5_2_11 ___ 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 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 ZendEngine1 php_test_results_*.txt *.gcda *.gcno lcov_data lcov_html php_lcov.info tmp-php.ini Added: svn:mergeinfo + /php/php-src/branches/PHP_5_3:284120 /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/branches/PHP_5_2/ NEWS configure.in main/php_version.h
iliaaWed, 16 Sep 2009 12:55:51 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288374 Log: Back to dev Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/main/php_version.h Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-09-16 12:55:12 UTC (rev 288373) +++ php/php-src/branches/PHP_5_2/NEWS 2009-09-16 12:55:51 UTC (rev 288374) @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? , PHP 5.2.12 + 17 Sep 2009, PHP 5.2.11 - Fixed certificate validation inside php_openssl_apply_verification_policy. (Ryan Sleevi, Ilia) Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2009-09-16 12:55:12 UTC (rev 288373) +++ php/php-src/branches/PHP_5_2/configure.in 2009-09-16 12:55:51 UTC (rev 288374) @@ -41,8 +41,8 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 -PHP_RELEASE_VERSION=11 -PHP_EXTRA_VERSION= +PHP_RELEASE_VERSION=12 +PHP_EXTRA_VERSION=-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_2/main/php_version.h === --- php/php-src/branches/PHP_5_2/main/php_version.h 2009-09-16 12:55:12 UTC (rev 288373) +++ php/php-src/branches/PHP_5_2/main/php_version.h 2009-09-16 12:55:51 UTC (rev 288374) @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 -#define PHP_RELEASE_VERSION 11 -#define PHP_EXTRA_VERSION -#define PHP_VERSION 5.2.11 -#define PHP_VERSION_ID 50211 +#define PHP_RELEASE_VERSION 12 +#define PHP_EXTRA_VERSION -dev +#define PHP_VERSION 5.2.12-dev +#define PHP_VERSION_ID 50212 -- 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/ext/mysql/tests/mysql_mysqlnd_read_timeout_long.phpt branches/PHP_5_3/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt branches/PHP_5_3/ext/mysqli/tests/
uw Wed, 16 Sep 2009 15:00:54 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288378
Log:
Fix and tests for bug #49511 . mysqlnd and the MySQL Client Library (libmysql)
use different networking APIs. mysqlnd does use PHP streams whereas libmysql
uses its own wrapper of the operating level network calls. PHP sets by default
a read timeout of 60s for streams - php.ini, default_socket_timeout. This
default applies to all streams that set no other timeout value. mysqlnd has not
set any other value and therefore it connections of long running queries can
have been cut off after default_socket_timeout seconds resulting in a 2006 -
MySQL Server has gone away error message. The MySQL Client Library sets a
default timeout of 365 * 24 * 3600 seconds (1year) and waits for other timeouts
to happen, e.g. TCP/IP timeouts. mysqlnd now uses the same very long timeout.
The value is configurable through a new php.ini setting:
mysqlnd.net_read_timeout. mysqlnd.net_read_timeout gets used by any extension
(ext/mysql, ext/mysqli, PDO_MySQL) that uses mysqlnd. mysqlnd tells PHP Streams!
to use mysqlnd.net_read_timeout. Please note that there may be subtle
differences between MYSQL_OPT_READ_TIMEOUT from the MySQL Client Library and
PHP Streams. E.g. MYSQL_OPT_READ_TIMEOUT is documented to work only for TCP/IP
connections and, prior to MySQL 5.1.2, only for Windows. PHP streams may not
have this limitation. Please check the streams documentation, if in doubt.
Bug: http://bugs.php.net/49511 (Assigned) mysqlnd timeout seems fixed at 60 secs
Changed paths:
A
php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_mysqlnd_read_timeout_long.phpt
A
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt
A
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
A
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c
A php/php-src/trunk/ext/mysql/tests/mysql_mysqlnd_read_timeout_long.phpt
A php/php-src/trunk/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt
A php/php-src/trunk/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
A php/php-src/trunk/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
U php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd.h
U php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c
Added: php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_mysqlnd_read_timeout_long.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_mysqlnd_read_timeout_long.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_mysqlnd_read_timeout_long.phpt 2009-09-16 15:00:54 UTC (rev 288378)
@@ -0,0 +1,37 @@
+--TEST--
+mysqlnd.net_read_timeout default_socket_timeout
+--SKIPIF--
+?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+require_once('connect.inc');
+?
+--INI--
+default_socket_timeout=1
+mysqlnd.net_read_timeout=12
+max_execution_time=12
+--FILE--
+?php
+ set_time_limit(12);
+ include (connect.inc);
+
+ if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket)) {
+ printf([001] Connect failed, [%d] %s\n, mysql_errno(), mysqlerror());
+ }
+
+ if (!$res = mysql_query(SELECT SLEEP(6), $link))
+ printf([002] [%d] %s\n, mysql_errno($link), mysql_error($link));
+
+ var_dump(mysql_fetch_assoc($res));
+
+ mysql_free_result($res);
+ mysql_close($link);
+
+ print done!;
+?
+--EXPECTF--
+array(1) {
+ [%u|b%SLEEP(6)]=
+ %unicode|string%(1) 0
+}
+done!
\ No newline at end of file
Added: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt 2009-09-16 15:00:54 UTC (rev 288378)
@@ -0,0 +1,36 @@
+--TEST--
+mysqlnd.net_read_timeout limit check
+--SKIPIF--
+?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+require_once('connect.inc');
+if (!$IS_MYSQLND)
+ /* The libmysql read_timeout limit default is 365 * 24 * 3600 seconds. It cannot be altered through PHP API calls */
+ die(skip mysqlnd only test);
+?
+--INI--
+default_socket_timeout=60
+max_execution_time=60
+mysqlnd.net_read_timeout=1
+--FILE--
+?php
+ include (connect.inc);
+
+ if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
+ printf([001] Connect failed, [%d] %s\n, mysqli_connect_errno(), mysqli_connect_error());
+ }
+
+ if (!$res = mysqli_query($link, SELECT SLEEP(5)))
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysql/tests/mysql_mysqlnd_read_timeout_long.phpt branches/PHP_5_3/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt branches/PHP_5_3/ext/mysqli/
woot! Thanks a lot! Cheers, On Wed, Sep 16, 2009 at 5:00 PM, Ulf Wendel u...@php.net wrote: uw Wed, 16 Sep 2009 15:00:54 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288378 Log: Fix and tests for bug #49511 . -- Pierre 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/ext/mysqli/tests/bug49442.phpt branches/PHP_5_3/ext/mysqlnd/mysqlnd.h branches/PHP_5_3/ext/mysqlnd/mysqlnd_priv.h branches/PHP_5_3/ext/mysqlnd/mysqlnd_wir
uw Wed, 16 Sep 2009 17:03:44 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288379
Log:
Fix (by Andrey) and test for bug #49442 . Don't use efree() for memory
allocated with malloc()... If a connection gets created by mysqli_init(),
mysqlnd makes it 'persistent'. 'Persistent' means that mysqlnd uses malloc().
mysqlnd does use malloc() instead of ealloc() because it is unknown if the
connection will become a true persistent connection in the sense of ext/mysqli.
It is unknown if the user wants a persistent connection or not until the user
calls mysqli_real_connect(). To avoid tricky conversions mysqlnd uses malloc(),
which sets a private persistent flag in the mysqlnd structures. A precondition
for the crash to happen was that the private persistent flag is set. The flag
is also set when creating a real persistent connection (in the sense of
ext/mysqli) and so the bug can happen with mysql_init()/mysqli_real_connect()
and mysql_connect('p:host', ...). Therefore we test both cases. Note the
(tricky?) difference between the implementation detail'mysqlnd private !
persistent flag = use malloc()' and persistent connections from a user
perspective. Although mysqlnd will always set its private persistent flag and
use malloc() for connections created with mysqli_init() it is still up to the
user to decide in mysqli_real_connect() if the connection shall become a (true)
persistent connection or not.
Bug: http://bugs.php.net/49442 (Assigned) Some queries crash PHP with
mysqli_real_connect()
Changed paths:
A php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug49442.phpt
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_priv.h
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
A php/php-src/trunk/ext/mysqli/tests/bug49442.phpt
U php/php-src/trunk/ext/mysqlnd/mysqlnd.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_priv.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
Added: php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug49442.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug49442.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug49442.phpt 2009-09-16 17:03:44 UTC (rev 288379)
@@ -0,0 +1,119 @@
+--TEST--
+Bug #49422 (mysqlnd: mysqli_real_connect() and LOAD DATA INFILE crash)
+--SKIPIF--
+?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?
+--INI--
+mysqli.allow_local_infile=1
+mysqli.allow_persistent=1
+mysqli.max_persistent=1
+--FILE--
+?php
+ include (connect.inc);
+
+ $link = mysqli_init();
+ if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) {
+ printf([001] Connect failed, [%d] %s\n, mysqli_connect_errno(), mysqli_connect_error());
+ }
+
+ if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
+ printf([002] Failed to drop old test table: [%d] %s\n, mysqli_errno($link), mysqli_error($link));
+ }
+
+ if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY KEY(id)) ENGINE=' . $engine)) {
+ printf([003] Failed to create test table: [%d] %s\n, mysqli_errno($link), mysqli_error($link));
+ }
+
+ include(local_infile_tools.inc);
+ $file = create_standard_csv(4);
+
+ if (!...@mysqli_query($link, sprintf(LOAD DATA LOCAL INFILE '%s'
+ INTO TABLE test
+ FIELDS TERMINATED BY ';' OPTIONALLY ENCLOSED BY '\''
+ LINES TERMINATED BY '\n',
+ mysqli_real_escape_string($link, $file {
+ printf([005] [%d] %s\n, mysqli_errno($link), mysqli_error($link));
+ }
+
+ if (!$res = mysqli_query($link, SELECT * FROM test ORDER BY id))
+ printf([006] [%d] %s\n, mysqli_errno($link), mysqli_error($link));
+
+ $rows = array();
+ while ($row = mysqli_fetch_assoc($res)) {
+ var_dump($row);
+ $rows[] = $row;
+ }
+
+ mysqli_free_result($res);
+
+ mysqli_query($link, DELETE FROM test);
+ mysqli_close($link);
+
+ if ($IS_MYSQLND) {
+ /*
+ mysqlnd makes a connection created through mysql_init()/mysqli_real_connect() always a 'persistent' one.
+ At this point 'persistent' is not to be confused with what a user calls a 'persistent' - in this case
+ 'persistent' means that mysqlnd uses malloc() instead of emalloc(). nothing else. ext/mysqli will
+ not consider it as a 'persistent' connection in a user sense, ext/mysqli will not appy max_persistent etc.
+ Its only about malloc() vs. emalloc().
+
+ However, the bug is about malloc() and efree(). You can make make mysqlnd use malloc() by either using
+ pconnect or mysql_init() - so we should test pconnect as well..
+ */
+ $host = 'p:' . $host;
+ if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
+ printf([007] Connect failed, [%d] %s\n, mysqli_connect_errno(), mysqli_connect_error());
+ }
+
+ /* bug happened during query processing */
+ if
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/reflection/php_reflection.c branches/PHP_5_3/ext/reflection/tests/ReflectionMethod_setAccessible.phpt trunk/NEWS
sebastianWed, 16 Sep 2009 17:24:46 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288380
Log:
Merge ReflectionMethod::setAccessible() to PHP 5.3.2, approved by Johannes.
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
A +
php/php-src/branches/PHP_5_3/ext/reflection/tests/ReflectionMethod_setAccessible.phpt
(from
php/php-src/trunk/ext/reflection/tests/ReflectionMethod_setAccessible.phpt:r288379)
U php/php-src/trunk/NEWS
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-09-16 17:03:44 UTC (rev 288379)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-09-16 17:24:46 UTC (rev 288380)
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 2009, PHP 5.3.2
+- Added ReflectionMethod::setAccessible() for invoking non-public methods
+ through the Reflection API. (Sebastian)
- Implemented FR #49253 (added support for libcurl's CERTINFO option).
(Linus Nielsen Feltzing li...@haxx.se)
Modified: php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
===
--- php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c 2009-09-16 17:03:44 UTC (rev 288379)
+++ php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c 2009-09-16 17:24:46 UTC (rev 288380)
@@ -176,7 +176,6 @@
typedef struct _property_reference {
zend_class_entry *ce;
zend_property_info prop;
- unsigned int ignore_visibility:1;
} property_reference;
/* Struct for parameters */
@@ -201,6 +200,7 @@
reflection_type_t ref_type;
zval *obj;
zend_class_entry *ce;
+ unsigned int ignore_visibility:1;
} reflection_object;
static zend_object_handlers reflection_object_handlers;
@@ -1290,10 +1290,10 @@
reference = (property_reference*) emalloc(sizeof(property_reference));
reference-ce = ce;
reference-prop = *prop;
- reference-ignore_visibility = 0;
intern-ptr = reference;
intern-ref_type = REF_TYPE_PROPERTY;
intern-ce = ce;
+ intern-ignore_visibility = 0;
zend_hash_update(Z_OBJPROP_P(object), name, sizeof(name), (void **) name, sizeof(zval *), NULL);
zend_hash_update(Z_OBJPROP_P(object), class, sizeof(class), (void **) classname, sizeof(zval *), NULL);
}
@@ -2561,8 +2561,9 @@
GET_REFLECTION_OBJECT_PTR(mptr);
- if (!(mptr-common.fn_flags ZEND_ACC_PUBLIC)
- || (mptr-common.fn_flags ZEND_ACC_ABSTRACT))
+ if ((!(mptr-common.fn_flags ZEND_ACC_PUBLIC)
+ || (mptr-common.fn_flags ZEND_ACC_ABSTRACT))
+ intern-ignore_visibility == 0)
{
if (mptr-common.fn_flags ZEND_ACC_ABSTRACT) {
zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC,
@@ -2669,8 +2670,9 @@
return;
}
- if (!(mptr-common.fn_flags ZEND_ACC_PUBLIC)
- || (mptr-common.fn_flags ZEND_ACC_ABSTRACT))
+ if ((!(mptr-common.fn_flags ZEND_ACC_PUBLIC)
+ || (mptr-common.fn_flags ZEND_ACC_ABSTRACT))
+ intern-ignore_visibility == 0)
{
if (mptr-common.fn_flags ZEND_ACC_ABSTRACT) {
zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC,
@@ -2959,6 +2961,27 @@
}
/* }}} */
+/* {{{ proto public void ReflectionMethod::setAccessible()
+ Sets whether non-public methods can be invoked */
+ZEND_METHOD(reflection_method, setAccessible)
+{
+ reflection_object *intern;
+ zend_bool visible;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, b, visible) == FAILURE) {
+ return;
+ }
+
+ intern = (reflection_object *) zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ if (intern == NULL) {
+ return;
+ }
+
+ intern-ignore_visibility = visible;
+}
+/* }}} */
+
/* {{{ proto public static mixed ReflectionClass::export(mixed argument [, bool return]) throws ReflectionException
Exports a reflection object. Returns the output if TRUE is specified for return, printing it otherwise. */
ZEND_METHOD(reflection_class, export)
@@ -4375,10 +4398,10 @@
reference-prop = *property_info;
}
reference-ce = ce;
- reference-ignore_visibility = 0;
intern-ptr = reference;
intern-ref_type = REF_TYPE_PROPERTY;
intern-ce = ce;
+ intern-ignore_visibility = 0;
}
/* }}} */
@@ -4491,7 +4514,7 @@
METHOD_NOTSTATIC(reflection_property_ptr);
GET_REFLECTION_OBJECT_PTR(ref);
- if (!(ref-prop.flags (ZEND_ACC_PUBLIC | ZEND_ACC_IMPLICIT_PUBLIC)) ref-ignore_visibility == 0) {
+ if (!(ref-prop.flags (ZEND_ACC_PUBLIC | ZEND_ACC_IMPLICIT_PUBLIC)) intern-ignore_visibility == 0) {
_default_get_entry(getThis(), name, sizeof(name), name TSRMLS_CC);
zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC,
Cannot access non-public member %s::%s, intern-ce-name, Z_STRVAL(name));
@@ -4543,7 +4566,7 @@
METHOD_NOTSTATIC(reflection_property_ptr);
GET_REFLECTION_OBJECT_PTR(ref);
- if
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/curl/interface.c trunk/ext/curl/interface.c
felipe Wed, 16 Sep 2009 18:01:10 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288384
Log:
- Fixed ZTS build
Changed paths:
U php/php-src/branches/PHP_5_3/ext/curl/interface.c
U php/php-src/trunk/ext/curl/interface.c
Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c
===
--- php/php-src/branches/PHP_5_3/ext/curl/interface.c 2009-09-16 17:54:16 UTC
(rev 288383)
+++ php/php-src/branches/PHP_5_3/ext/curl/interface.c 2009-09-16 18:01:10 UTC
(rev 288384)
@@ -1347,7 +1347,6 @@
*/
static void split_certinfo(char *string, zval *hash)
{
- int i;
char *org = estrdup(string);
char *s = org;
char *split;
@@ -1377,13 +1376,12 @@
/* {{{ create_certinfo
*/
-static void create_certinfo(struct curl_certinfo *ci, zval *listcode)
+static void create_certinfo(struct curl_certinfo *ci, zval *listcode TSRMLS_DC)
{
int i;
if(ci) {
zval *certhash = NULL;
- char *tmp;
for(i=0; ici-num_of_certs; i++) {
struct curl_slist *slist;
@@ -2271,7 +2269,7 @@
if (curl_easy_getinfo(ch-cp, CURLINFO_CERTINFO, ci) ==
CURLE_OK) {
MAKE_STD_ZVAL(listcode);
array_init(listcode);
- create_certinfo(ci, listcode);
+ create_certinfo(ci, listcode TSRMLS_CC);
CAAZ(certinfo, listcode);
}
#endif
@@ -2341,7 +2339,7 @@
array_init(return_value);
if (curl_easy_getinfo(ch-cp,
CURLINFO_CERTINFO, ci) == CURLE_OK) {
- create_certinfo(ci, return_value);
+ create_certinfo(ci, return_value
TSRMLS_CC);
} else {
RETURN_FALSE;
}
Modified: php/php-src/trunk/ext/curl/interface.c
===
--- php/php-src/trunk/ext/curl/interface.c 2009-09-16 17:54:16 UTC (rev
288383)
+++ php/php-src/trunk/ext/curl/interface.c 2009-09-16 18:01:10 UTC (rev
288384)
@@ -1350,7 +1350,6 @@
*/
static void split_certinfo(char *string, zval *hash)
{
- int i;
char *org = estrdup(string);
char *s = org;
char *split;
@@ -1380,13 +1379,12 @@
/* {{{ create_certinfo
*/
-static void create_certinfo(struct curl_certinfo *ci, zval *listcode)
+static void create_certinfo(struct curl_certinfo *ci, zval *listcode TSRMLS_DC)
{
int i;
if(ci) {
zval *certhash = NULL;
- char *tmp;
for(i=0; ici-num_of_certs; i++) {
struct curl_slist *slist;
@@ -2337,7 +2335,7 @@
if (curl_easy_getinfo(ch-cp, CURLINFO_CERTINFO, ci) ==
CURLE_OK) {
MAKE_STD_ZVAL(listcode);
array_init(listcode);
- create_certinfo(ci, listcode);
+ create_certinfo(ci, listcode TSRMLS_CC);
CAAZ(certinfo, listcode);
}
#endif
@@ -2407,7 +2405,7 @@
array_init(return_value);
if (curl_easy_getinfo(ch-cp,
CURLINFO_CERTINFO, ci) == CURLE_OK) {
- create_certinfo(ci, return_value);
+ create_certinfo(ci, return_value
TSRMLS_CC);
} else {
RETURN_FALSE;
}
--
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_2/ NEWS
iliaaWed, 16 Sep 2009 22:46:37 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288387 Log: 5.2.11 news cleanup Changed paths: U php/php-src/branches/PHP_5_2/NEWS Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-09-16 22:16:59 UTC (rev 288386) +++ php/php-src/branches/PHP_5_2/NEWS 2009-09-16 22:46:37 UTC (rev 288387) @@ -5,78 +5,61 @@ 17 Sep 2009, PHP 5.2.11 - Fixed certificate validation inside php_openssl_apply_verification_policy. (Ryan Sleevi, Ilia) - - -10 Sep 2009, PHP 5.2.11RC3 - Updated timezone database to version 2009.13 (2009m) (Derick) - -- Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters). (Ilia) -- Fixed bug #49447 (php engine needs to correctly check for socket API return - status on windows). (Sriram Natarajan) -- Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo) - - -03 Sep 2009, PHP 5.2.11RC2 - Added missing sanity checks around exif processing. (Ilia) - - Fixed sanity check for the color index in imagecolortransparent. (Pierre) - Fixed zlib.deflate compress filter to actually accept level parameter. (Jani) - Fixed leak on error in popen/exec (and related functions) on Windows. (Pierre) +- Fixed regression in cURL extension that prevented flush of data to output + defined as a file handle. (Ilia) +- Fixed memory leak in stream_is_local(). (Felipe, Tony) -- Fixed bug #49361 (wordwrap() wraps incorrectly on end of line boundaries). +- Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters). (Ilia) +- Fixed bug #49447 (php engine needs to correctly check for socket API return + status on windows). (Sriram Natarajan) +- Fixed bug #49372 (segfault in php_curl_option_curl). (Pierre) +- Fixed bug #49361 (wordwrap() wraps incorrectly on end of line boundaries). (Ilia, code-it at mail dot ru) - Fixed bug #49289 (bcmath module doesn't compile with phpize configure). (Jani) - Fixed bug #49286 (php://input (php_stream_input_read) is broken). (Jani) -- Fixed bug #49269 (Ternary operator fails on Iterator object when used inside - foreach declaration). (Etienne, Dmitry) +- Fixed bug #49269 (Ternary operator fails on Iterator object when used + inside foreach declaration). (Etienne, Dmitry) - Fixed bug #49236 (Missing PHP_SUBST(PDO_MYSQL_SHARED_LIBADD)). (Jani) - Fixed bug #49144 (Import of schema from different host transmits original authentication details). (Dmitry) -- Fixed bug #49000 (PHP CLI in Interactive mode (php -a) crashes when including - files from function). (Stas) -- Fixed bug #48696 (ldap_read() segfaults with invalid parameters). (Felipe) -- Fixed bug #47273 (Encoding bug in SoapServer-fault). (Dmitry) -- Fixed bug #28038 (Sent incorrect RCPT TO commands to SMTP server) (Garrett) - - -13 Aug 2009, PHP 5.2.11RC1 -- Fixed regression in cURL extension that prevented flush of data to output - defined as a file handle. (Ilia) -- Fixed memory leak in stream_is_local(). (Felipe, Tony) - -- Fixed bug #49372 (segfault in php_curl_option_curl). (Pierre) - Fixed bug #49132 (posix_times returns false without error). (phpbugs at gunnu dot us) - Fixed bug #49125 (Error in dba_exists C code). (jdornan at stanford dot edu) - Fixed bug #49095 (proc_get_status['exitcode'] fails on win32). (Felipe) - Fixed bug #49074 (private class static fields can be modified by using reflection). (Jani) -- Fixed bug #49072 (feof never returns true for damaged file in zip). (Pierre) +- Fixed bug #49072 (feof never returns true for damaged file in zip). + (Pierre) - Fixed bug #49052 (context option headers freed too early when using --with-curlwrappers). (Jani) - Fixed bug #49032 (SplFileObject::fscanf() variables passed by reference). (Jani) - Fixed bug #49026 (proc_open() can bypass safe_mode_protected_env_vars restrictions). (Ilia) -- Fixed bug #48994 (zlib.output_compression does not output HTTP headers when - set to a string value). (Jani) +- Fixed bug #49000 (PHP CLI in Interactive mode (php -a) crashes when + including files from function). (Stas) +- Fixed bug #48994 (zlib.output_compression does not output HTTP headers + when set to a string value). (Jani) - Fixed bug #48980 (Crash when compiling with pdo_firebird). (Felipe) -- Fixed bug #48962 (cURL does not upload files with specified filename). - (Ilia) +- Fixed bug #48962 (cURL does not upload files with specified filename). (Ilia) - Fixed bug #48929 (Double \r\n after HTTP headers when header context option is an array). (David Zülke) - Fixed bug #48913 (Too long error code strings in pdo_odbc driver). (naf at altlinux dot ru, Felipe) - Fixed bug #48802 (printf() returns incorrect outputted length). (Jani) - Fixed bug #48801 (Problem with imagettfbbox). (Takeshi Abe) -- Fixed bug #48788 (RecursiveDirectoryIterator doesn't descend into symlinked - directories).
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/main/streams/memory.c branches/PHP_5_3/NEWS branches/PHP_5_3/main/streams/memory.c trunk/main/streams/memory.c
srinatar Thu, 17 Sep 2009 02:45:25 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288393 Log: - Fixed bug #49572 (use of C++ style comments causes build failure) Bug: http://bugs.php.net/49572 (Assigned) use of C++ style comments causes build failure Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/main/streams/memory.c U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/main/streams/memory.c U php/php-src/trunk/main/streams/memory.c Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-09-17 02:44:10 UTC (rev 288392) +++ php/php-src/branches/PHP_5_2/NEWS 2009-09-17 02:45:25 UTC (rev 288393) @@ -125,6 +125,8 @@ - Fixed bug #42434 (ImageLine w/ antialias = 1px shorter). (wojjie at gmail dot com, Kalle) - Fixed bug #28038 (Sent incorrect RCPT TO commands to SMTP server) (Garrett) +- Fixed bug #49572 (use of C++ style comments causes build failure). + (Sriram Natarajan) 17 Jun 2009, PHP 5.2.10 - Added ignore_errors option to http fopen wrapper. (David Zulke, Sara) Modified: php/php-src/branches/PHP_5_2/main/streams/memory.c === --- php/php-src/branches/PHP_5_2/main/streams/memory.c 2009-09-17 02:44:10 UTC (rev 288392) +++ php/php-src/branches/PHP_5_2/main/streams/memory.c 2009-09-17 02:45:25 UTC (rev 288393) @@ -563,7 +563,7 @@ stream = php_stream_alloc_rel(php_stream_temp_ops, self, 0, mode TEMP_STREAM_READONLY ? rb : w+b); stream-flags |= PHP_STREAM_FLAG_NO_BUFFER; self-innerstream = php_stream_memory_create_rel(mode); - php_stream_auto_cleanup(self-innerstream); // do not warn if innerstream is GC'ed before stream + php_stream_auto_cleanup(self-innerstream); /* do not warn if innerstream is GC'ed before stream */ ((php_stream_memory_data*)self-innerstream-abstract)-owner_ptr = self-innerstream; return stream; Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-09-17 02:44:10 UTC (rev 288392) +++ php/php-src/branches/PHP_5_3/NEWS 2009-09-17 02:45:25 UTC (rev 288393) @@ -16,6 +16,8 @@ (Ryan Sleevi, Ilia) - Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters). (Ilia) +- Fixed bug #49572 (use of C++ style comments causes build failure). + (Sriram Natarajan) ?? ??? 2009, PHP 5.3.1 Modified: php/php-src/branches/PHP_5_3/main/streams/memory.c === --- php/php-src/branches/PHP_5_3/main/streams/memory.c 2009-09-17 02:44:10 UTC (rev 288392) +++ php/php-src/branches/PHP_5_3/main/streams/memory.c 2009-09-17 02:45:25 UTC (rev 288393) @@ -563,7 +563,7 @@ stream = php_stream_alloc_rel(php_stream_temp_ops, self, 0, mode TEMP_STREAM_READONLY ? rb : w+b); stream-flags |= PHP_STREAM_FLAG_NO_BUFFER; self-innerstream = php_stream_memory_create_rel(mode); - php_stream_auto_cleanup(self-innerstream); // do not warn if innerstream is GC'ed before stream + php_stream_auto_cleanup(self-innerstream); /* do not warn if innerstream is GC'ed before stream */ ((php_stream_memory_data*)self-innerstream-abstract)-owner_ptr = self-innerstream; return stream; Modified: php/php-src/trunk/main/streams/memory.c === --- php/php-src/trunk/main/streams/memory.c 2009-09-17 02:44:10 UTC (rev 288392) +++ php/php-src/trunk/main/streams/memory.c 2009-09-17 02:45:25 UTC (rev 288393) @@ -563,7 +563,7 @@ stream = php_stream_alloc_rel(php_stream_temp_ops, self, 0, mode TEMP_STREAM_READONLY ? rb : w+b); stream-flags |= PHP_STREAM_FLAG_NO_BUFFER; self-innerstream = php_stream_memory_create_rel(mode); - php_stream_auto_cleanup(self-innerstream); // do not warn if innerstream is GC'ed before stream + php_stream_auto_cleanup(self-innerstream); /* do not warn if innerstream is GC'ed before stream */ ((php_stream_memory_data*)self-innerstream-abstract)-owner_ptr = self-innerstream; return stream; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
