[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/curl/streams.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/curl/streams.c trunk/ext/curl/streams.c
jani Sat, 25 Jul 2009 13:00:25 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284747
Log:
- Fixed bug #49052 (context option headers freed too early when using
--with-curlwrappers)
Bug: http://bugs.php.net/49052 (Assigned) context option headers freed too
early when using --with-curlwrappers
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/curl/streams.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/curl/streams.c
U php/php-src/trunk/ext/curl/streams.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2009-07-25 12:53:41 UTC (rev 284746)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-07-25 13:00:25 UTC (rev 284747)
@@ -4,6 +4,8 @@
- Fixed regression in cURL extension that prevented flush of data to output
defined as a file handle. (Ilia)
+- 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 #48980 (Crash when compiling with pdo_firebird). (Felipe)
Modified: php/php-src/branches/PHP_5_2/ext/curl/streams.c
===
--- php/php-src/branches/PHP_5_2/ext/curl/streams.c 2009-07-25 12:53:41 UTC
(rev 284746)
+++ php/php-src/branches/PHP_5_2/ext/curl/streams.c 2009-07-25 13:00:25 UTC
(rev 284747)
@@ -469,8 +469,7 @@
#else
php_error_docref(NULL TSRMLS_CC, E_WARNING, There was
an error mcode=%d, m);
#endif
- php_stream_close(stream);
- return NULL;
+ goto exit_fail;
}
/* we have only one curl handle here, even though we use multi
syntax,
@@ -488,14 +487,23 @@
}
}
if (msg_found) {
- php_stream_close(stream);
- return NULL;
+ goto exit_fail;
}
}
+
+ /* context headers are not needed anymore */
if (slist) {
+ curl_easy_setopt(curlstream-curl, CURLOPT_HTTPHEADER, NULL);
curl_slist_free_all(slist);
}
return stream;
+
+exit_fail:
+ php_stream_close(stream);
+ if (slist) {
+ curl_slist_free_all(slist);
+ }
+ return NULL;
}
static php_stream_wrapper_ops php_curl_wrapper_ops = {
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-07-25 12:53:41 UTC (rev 284746)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-07-25 13:00:25 UTC (rev 284747)
@@ -7,6 +7,8 @@
Stas)
- Fixed signature generation/validation for zip archives in ext/phar. (Greg)
+- 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 #49012 (phar tar signature algorithm reports as Unknown (0) in
Modified: php/php-src/branches/PHP_5_3/ext/curl/streams.c
===
--- php/php-src/branches/PHP_5_3/ext/curl/streams.c 2009-07-25 12:53:41 UTC
(rev 284746)
+++ php/php-src/branches/PHP_5_3/ext/curl/streams.c 2009-07-25 13:00:25 UTC
(rev 284747)
@@ -474,8 +474,7 @@
#else
php_error_docref(NULL TSRMLS_CC, E_WARNING, There was
an error mcode=%d, m);
#endif
- php_stream_close(stream);
- return NULL;
+ goto exit_fail;
}
/* we have only one curl handle here, even though we use multi
syntax,
@@ -493,14 +492,23 @@
}
}
if (msg_found) {
- php_stream_close(stream);
- return NULL;
+ goto exit_fail;
}
}
+
+ /* context headers are not needed anymore */
if (slist) {
+ curl_easy_setopt(curlstream-curl, CURLOPT_HTTPHEADER, NULL);
curl_slist_free_all(slist);
}
return stream;
+
+exit_fail:
+ php_stream_close(stream);
+ if (slist) {
+ curl_slist_free_all(slist);
+ }
+ return NULL;
}
static php_stream_wrapper_ops php_curl_wrapper_ops = {
Modified: php/php-src/trunk/ext/curl/streams.c
===
--- php/php-src/trunk/ext/curl/streams.c2009-07-25 12:53:41 UTC (rev
284746)
+++ php/php-src/trunk/ext/curl/streams.c2009-07-25 13:00:25 UTC (rev
284747)
@@ -474,8 +474,7 @@
#else
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ext/curl/ streams.c
jani Sat, 25 Jul 2009 13:09:03 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284748
Log:
- Merge from PHP_5_3:
r280810 | kalle: Fixed compiler warnings
r276286 | iliaa: Fixed bug #47477 (php_curl_stream_read() unnecessarily sleeps
15 secs under heavy load)
Bug: http://bugs.php.net/47477 (Closed) [PATCH] php_curl_stream_read()
unnecessarily sleeps 15 secs under heavy load
Changed paths:
U php/php-src/branches/PHP_5_2/ext/curl/streams.c
Modified: php/php-src/branches/PHP_5_2/ext/curl/streams.c
===
--- php/php-src/branches/PHP_5_2/ext/curl/streams.c 2009-07-25 13:00:25 UTC
(rev 284747)
+++ php/php-src/branches/PHP_5_2/ext/curl/streams.c 2009-07-25 13:09:03 UTC
(rev 284748)
@@ -129,7 +129,7 @@
/* our notification system only works in a single direction; we should
detect which
* direction is important and use the correct values in this call */
- php_stream_notify_progress(stream-context, dlnow, dltotal);
+ php_stream_notify_progress(stream-context, (size_t) dlnow, (size_t)
dltotal);
return 0;
}
@@ -167,7 +167,8 @@
tv.tv_sec = 15; /* TODO: allow this to be configured
from the script */
/* wait for data */
- switch (select(curlstream-maxfd + 1,
curlstream-readfds, curlstream-writefds, curlstream-excfds, tv)) {
+ switch ((curlstream-maxfd 0) ? 1 :
+ select(curlstream-maxfd + 1,
curlstream-readfds, curlstream-writefds, curlstream-excfds, tv)) {
case -1:
/* error */
return 0;
@@ -180,7 +181,8 @@
curlstream-mcode =
curl_multi_perform(curlstream-multi, curlstream-pending);
} while (curlstream-mcode ==
CURLM_CALL_MULTI_PERFORM);
}
- } while (curlstream-readbuffer.readpos =
curlstream-readbuffer.writepos curlstream-pending 0);
+ } while (curlstream-maxfd = 0
+ curlstream-readbuffer.readpos =
curlstream-readbuffer.writepos curlstream-pending 0);
}
--
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/ext/curl/tests/bug48207.phpt branches/PHP_5_3/ext/curl/tests/bug48207.phpt trunk/ext/curl/tests/bug48207.phpt
jani Sat, 25 Jul 2009 14:20:38 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284749
Log:
- Fix test
Changed paths:
U php/php-src/branches/PHP_5_2/ext/curl/tests/bug48207.phpt
U php/php-src/branches/PHP_5_3/ext/curl/tests/bug48207.phpt
U php/php-src/trunk/ext/curl/tests/bug48207.phpt
Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/bug48207.phpt
===
--- php/php-src/branches/PHP_5_2/ext/curl/tests/bug48207.phpt 2009-07-25
13:09:03 UTC (rev 284748)
+++ php/php-src/branches/PHP_5_2/ext/curl/tests/bug48207.phpt 2009-07-25
14:20:38 UTC (rev 284749)
@@ -14,10 +14,11 @@
*/
// Figure out what handler to use
-if(!empty($_ENV['PHP_CURL_HTTP_REMOTE_SERVER'])) {
+$host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+if(!empty($host)) {
// Use the set Environment variable
-$url = $_ENV['PHP_CURL_HTTP_REMOTE_SERVER'];
+$url = $host/get.php;
} else {
@@ -42,4 +43,5 @@
?
--EXPECTF--
Warning: curl_setopt(): the provided file handle is not writable in %s on line
%d
-%S
+Hello World!
+Hello World!
Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/bug48207.phpt
===
--- php/php-src/branches/PHP_5_3/ext/curl/tests/bug48207.phpt 2009-07-25
13:09:03 UTC (rev 284748)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/bug48207.phpt 2009-07-25
14:20:38 UTC (rev 284749)
@@ -14,10 +14,11 @@
*/
// Figure out what handler to use
-if(!empty($_ENV['PHP_CURL_HTTP_REMOTE_SERVER'])) {
+$host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+if(!empty($host)) {
// Use the set Environment variable
-$url = $_ENV['PHP_CURL_HTTP_REMOTE_SERVER'];
+$url = $host/get.php;
} else {
@@ -42,4 +43,5 @@
?
--EXPECTF--
Warning: curl_setopt(): the provided file handle is not writable in %s on line
%d
-%S
+Hello World!
+Hello World!
Modified: php/php-src/trunk/ext/curl/tests/bug48207.phpt
===
--- php/php-src/trunk/ext/curl/tests/bug48207.phpt 2009-07-25 13:09:03 UTC
(rev 284748)
+++ php/php-src/trunk/ext/curl/tests/bug48207.phpt 2009-07-25 14:20:38 UTC
(rev 284749)
@@ -14,10 +14,11 @@
*/
// Figure out what handler to use
-if(!empty($_ENV['PHP_CURL_HTTP_REMOTE_SERVER'])) {
+$host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+if(!empty($host)) {
// Use the set Environment variable
-$url = $_ENV['PHP_CURL_HTTP_REMOTE_SERVER'];
+$url = $host/get.php;
} else {
@@ -42,4 +43,5 @@
?
--EXPECTF--
Warning: curl_setopt(): the provided file handle is not writable in %s on line
%d
-%S
+Hello World!
+Hello World!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /
gwynne Sat, 25 Jul 2009 14:28:54 + Revision: http://svn.php.net/viewvc?view=revisionrevision=284750 Log: preparing for PEAR2 import Changed paths: A pear2/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pre-commit
gwynne Sat, 25 Jul 2009 14:42:05 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286303
Log:
correctly match /pear2 as well as /pear for the use of PEAR semantics
Changed paths:
U SVNROOT/pre-commit
Modified: SVNROOT/pre-commit
===
--- SVNROOT/pre-commit 2009-07-22 15:10:15 UTC (rev 286302)
+++ SVNROOT/pre-commit 2009-07-25 14:42:05 UTC (rev 286303)
@@ -59,7 +59,7 @@
// Check commit against it
$exit_val = 0;
foreach ($commit_info['changed_paths'] as $changed_path = $path_actions) {
-if (strncmp($changed_path, pear/, strlen(pear/)) === 0) {
+if (strncmp($changed_path, pear, strlen(pear)) === 0) {
$avail_lines = $pear_avail_db;
debug(Using PEAR avail.);
} else {
@@ -112,11 +112,11 @@
}
if ($exit_val) {
-if (strncmp($last_path, pear/, strlen(pear/)) === 0) {
+if (strncmp($last_path, pear, strlen(pear)) === 0) {
$access_contact_email = 'pear-gr...@php.net';
-} else if (strncmp($last_path, pecl/, strlen(pecl/)) === 0) {
+} else if (strncmp($last_path, pecl, strlen(pecl)) === 0) {
$access_contact_email = 'pecl-gr...@php.net';
-} else if (strncmp($last_path, phpdoc/, strlen(phpdoc/)) === 0) {
+} else if (strncmp($last_path, phpdoc, strlen(phpdoc)) === 0) {
$access_contact_email = 'php...@lists.php.net';
} else {
$access_contact_email = 'gr...@php.net';
--
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/ext/curl/tests/curl_CURLOPT_READDATA.phpt branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt trunk/ext/curl/tests/curl_CURLOPT_READDATA.phpt
jani Sat, 25 Jul 2009 14:49:17 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286304
Log:
- Fix test when responder is something like lighttpd
Changed paths:
U php/php-src/branches/PHP_5_2/ext/curl/tests/curl_CURLOPT_READDATA.phpt
U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt
U php/php-src/trunk/ext/curl/tests/curl_CURLOPT_READDATA.phpt
Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_CURLOPT_READDATA.phpt
===
--- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_CURLOPT_READDATA.phpt
2009-07-25 14:42:05 UTC (rev 286303)
+++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_CURLOPT_READDATA.phpt
2009-07-25 14:49:17 UTC (rev 286304)
@@ -4,16 +4,16 @@
Mattijs Hoitink mattijshoit...@gmail.com
#Testfest Utrecht 2009
--SKIPIF--
-?php if (!extension_loaded(curl) ||
empty($_ENV['PHP_CURL_HTTP_REMOTE_SERVER'])) print skip; ?
+?php if (!extension_loaded(curl) || false ===
getenv('PHP_CURL_HTTP_REMOTE_SERVER'])) print skip; ?
--FILE--
?php
// The URL to POST to
-$url = $_ENV['PHP_CURL_HTTP_REMOTE_SERVER'] . '/get.php?test=post';
+$url = getenv('PHP_CURL_HTTP_REMOTE_SERVER') . '/get.php?test=post';
// Create a temporary file to read the data from
$tempname = tempnam(sys_get_temp_dir(), 'CURL_DATA');
-file_put_contents($tempname, hello=worldsmurf=blue);
+$datalen = file_put_contents($tempname, hello=worldsmurf=blue);
ob_start();
@@ -22,7 +22,7 @@
curl_setopt($ch, CURLOPT_POST, true);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_READDATA, fopen($tempname, 'rb'));
-curl_setopt($ch, CURLOPT_HTTPHEADER, array('Transfer-Encoding: chunked'));
+curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:', Content-Length:
{$datalen}));
if (false === $response = curl_exec($ch)) {
echo 'Error #' . curl_errno($ch) . ': ' . curl_error($ch);
Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt
===
--- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt
2009-07-25 14:42:05 UTC (rev 286303)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt
2009-07-25 14:49:17 UTC (rev 286304)
@@ -4,16 +4,16 @@
Mattijs Hoitink mattijshoit...@gmail.com
#Testfest Utrecht 2009
--SKIPIF--
-?php if (!extension_loaded(curl) ||
empty($_ENV['PHP_CURL_HTTP_REMOTE_SERVER'])) print skip; ?
+?php if (!extension_loaded(curl) || false ===
getenv('PHP_CURL_HTTP_REMOTE_SERVER'])) print skip; ?
--FILE--
?php
// The URL to POST to
-$url = $_ENV['PHP_CURL_HTTP_REMOTE_SERVER'] . '/get.php?test=post';
+$url = getenv('PHP_CURL_HTTP_REMOTE_SERVER') . '/get.php?test=post';
// Create a temporary file to read the data from
$tempname = tempnam(sys_get_temp_dir(), 'CURL_DATA');
-file_put_contents($tempname, hello=worldsmurf=blue);
+$datalen = file_put_contents($tempname, hello=worldsmurf=blue);
ob_start();
@@ -22,7 +22,7 @@
curl_setopt($ch, CURLOPT_POST, true);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_READDATA, fopen($tempname, 'rb'));
-curl_setopt($ch, CURLOPT_HTTPHEADER, array('Transfer-Encoding: chunked'));
+curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:', Content-Length:
{$datalen}));
if (false === $response = curl_exec($ch)) {
echo 'Error #' . curl_errno($ch) . ': ' . curl_error($ch);
Modified: php/php-src/trunk/ext/curl/tests/curl_CURLOPT_READDATA.phpt
===
--- php/php-src/trunk/ext/curl/tests/curl_CURLOPT_READDATA.phpt 2009-07-25
14:42:05 UTC (rev 286303)
+++ php/php-src/trunk/ext/curl/tests/curl_CURLOPT_READDATA.phpt 2009-07-25
14:49:17 UTC (rev 286304)
@@ -4,16 +4,16 @@
Mattijs Hoitink mattijshoit...@gmail.com
#Testfest Utrecht 2009
--SKIPIF--
-?php if (!extension_loaded(curl) ||
empty($_ENV['PHP_CURL_HTTP_REMOTE_SERVER'])) print skip; ?
+?php if (!extension_loaded(curl) || false ===
getenv('PHP_CURL_HTTP_REMOTE_SERVER'])) print skip; ?
--FILE--
?php
// The URL to POST to
-$url = $_ENV['PHP_CURL_HTTP_REMOTE_SERVER'] . '/get.php?test=post';
+$url = getenv('PHP_CURL_HTTP_REMOTE_SERVER') . '/get.php?test=post';
// Create a temporary file to read the data from
$tempname = tempnam(sys_get_temp_dir(), 'CURL_DATA');
-file_put_contents($tempname, hello=worldsmurf=blue);
+$datalen = file_put_contents($tempname, hello=worldsmurf=blue);
ob_start();
@@ -22,7 +22,7 @@
curl_setopt($ch, CURLOPT_POST, true);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_READDATA, fopen($tempname, 'rb'));
-curl_setopt($ch, CURLOPT_HTTPHEADER, array('Transfer-Encoding: chunked'));
+curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:', Content-Length:
{$datalen}));
if (false === $response = curl_exec($ch)) {
echo 'Error #' . curl_errno($ch) . ': ' .
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/curl/tests/curl_setopt_array_basic.phpt branches/PHP_5_3/ext/curl/tests/curl_setopt_array_basic.phpt trunk/ext/curl/tests/curl_setopt_array_basic.phpt
jani Sat, 25 Jul 2009 14:52:52 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286305
Log:
- Fix bad environment usage
Changed paths:
U php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_array_basic.phpt
U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_array_basic.phpt
U php/php-src/trunk/ext/curl/tests/curl_setopt_array_basic.phpt
Modified:
php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_array_basic.phpt
===
--- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_array_basic.phpt
2009-07-25 14:49:17 UTC (rev 286304)
+++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_array_basic.phpt
2009-07-25 14:52:52 UTC (rev 286305)
@@ -15,9 +15,9 @@
*/
// Figure out what handler to use
-if(!empty($_ENV['PHP_CURL_HTTP_REMOTE_SERVER'])) {
+$host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+if (!empty($host)) {
// Use the set Environment variable
-$host = $_ENV['PHP_CURL_HTTP_REMOTE_SERVER'];
$url = {$host}/get.php?test=get;
} else {
// Create a temporary file for the test
Modified:
php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_array_basic.phpt
===
--- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_array_basic.phpt
2009-07-25 14:49:17 UTC (rev 286304)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_array_basic.phpt
2009-07-25 14:52:52 UTC (rev 286305)
@@ -15,9 +15,9 @@
*/
// Figure out what handler to use
-if(!empty($_ENV['PHP_CURL_HTTP_REMOTE_SERVER'])) {
+$host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+if (!empty($host)) {
// Use the set Environment variable
-$host = $_ENV['PHP_CURL_HTTP_REMOTE_SERVER'];
$url = {$host}/get.php?test=get;
} else {
// Create a temporary file for the test
Modified: php/php-src/trunk/ext/curl/tests/curl_setopt_array_basic.phpt
===
--- php/php-src/trunk/ext/curl/tests/curl_setopt_array_basic.phpt
2009-07-25 14:49:17 UTC (rev 286304)
+++ php/php-src/trunk/ext/curl/tests/curl_setopt_array_basic.phpt
2009-07-25 14:52:52 UTC (rev 286305)
@@ -15,9 +15,9 @@
*/
// Figure out what handler to use
-if(!empty($_ENV['PHP_CURL_HTTP_REMOTE_SERVER'])) {
+$host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+if (!empty($host)) {
// Use the set Environment variable
-$host = $_ENV['PHP_CURL_HTTP_REMOTE_SERVER'];
$url = {$host}/get.php?test=get;
} else {
// Create a temporary file for the test
--
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/date/lib/ timezonedb.h
derick Sat, 25 Jul 2009 15:14:23 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286306
Log:
- Updated to version 2009.11 (2009k)
Changed paths:
U php/php-src/trunk/ext/date/lib/timezonedb.h
Modified: php/php-src/trunk/ext/date/lib/timezonedb.h
===
--- php/php-src/trunk/ext/date/lib/timezonedb.h 2009-07-25 14:52:52 UTC (rev 286305)
+++ php/php-src/trunk/ext/date/lib/timezonedb.h 2009-07-25 15:14:23 UTC (rev 286306)
@@ -238,330 +238,330 @@
{ Asia/Chungking, 0x0192D9 },
{ Asia/Colombo , 0x019388 },
{ Asia/Dacca, 0x019424 },
- { Asia/Damascus , 0x0194C5 },
- { Asia/Dhaka, 0x019815 },
- { Asia/Dili , 0x0198B6 },
- { Asia/Dubai, 0x01993F },
- { Asia/Dushanbe , 0x019994 },
- { Asia/Gaza , 0x019A97 },
- { Asia/Harbin , 0x019DE0 },
- { Asia/Ho_Chi_Minh , 0x019EC7 },
- { Asia/Hong_Kong, 0x019F3F },
- { Asia/Hovd , 0x01A0F5 },
- { Asia/Irkutsk , 0x01A26D },
- { Asia/Istanbul , 0x01A554 },
- { Asia/Jakarta , 0x01A941 },
- { Asia/Jayapura , 0x01A9EB },
- { Asia/Jerusalem, 0x01AA6F },
- { Asia/Kabul, 0x01AD9E },
- { Asia/Kamchatka, 0x01ADEF },
- { Asia/Karachi , 0x01B0D4 },
- { Asia/Kashgar , 0x01B189 },
- { Asia/Kathmandu, 0x01B25A },
- { Asia/Katmandu , 0x01B2C0 },
- { Asia/Kolkata , 0x01B326 },
- { Asia/Krasnoyarsk , 0x01B39F },
- { Asia/Kuala_Lumpur , 0x01B688 },
- { Asia/Kuching , 0x01B745 },
- { Asia/Kuwait , 0x01B833 },
- { Asia/Macao, 0x01B888 },
- { Asia/Macau, 0x01B9C3 },
- { Asia/Magadan , 0x01BAFE },
- { Asia/Makassar , 0x01BDE1 },
- { Asia/Manila , 0x01BE9A },
- { Asia/Muscat , 0x01BF1F },
- { Asia/Nicosia , 0x01BF74 },
- { Asia/Novosibirsk , 0x01C25C },
- { Asia/Omsk , 0x01C550 },
- { Asia/Oral , 0x01C838 },
- { Asia/Phnom_Penh , 0x01CA08 },
- { Asia/Pontianak, 0x01CA80 },
- { Asia/Pyongyang, 0x01CB41 },
- { Asia/Qatar, 0x01CBAE },
- { Asia/Qyzylorda, 0x01CC14 },
- { Asia/Rangoon , 0x01CDEA },
- { Asia/Riyadh , 0x01CE62 },
- { Asia/Saigon , 0x01CEB7 },
- { Asia/Sakhalin , 0x01CF2F },
- { Asia/Samarkand, 0x01D22F },
- { Asia/Seoul, 0x01D365 },
- { Asia/Shanghai , 0x01D409 },
- { Asia/Singapore, 0x01D4E9 },
- { Asia/Taipei , 0x01D5A0 },
- { Asia/Tashkent , 0x01D6B8 },
- { Asia/Tbilisi , 0x01D7E9 },
- { Asia/Tehran , 0x01D9A3 },
- { Asia/Tel_Aviv , 0x01DC11 },
- { Asia/Thimbu , 0x01DF40 },
- { Asia/Thimphu , 0x01DFA6 },
- { Asia/Tokyo, 0x01E00C },
- { Asia/Ujung_Pandang, 0x01E095 },
- { Asia/Ulaanbaatar , 0x01E111 },
- { Asia/Ulan_Bator , 0x01E26C },
- { Asia/Urumqi , 0x01E3B9 },
- { Asia/Vientiane, 0x01E480 },
- { Asia/Vladivostok , 0x01E4F8 },
- { Asia/Yakutsk , 0x01E7E5 },
- { Asia/Yekaterinburg, 0x01EACB },
- { Asia/Yerevan , 0x01EDD7 },
- { Atlantic/Azores , 0x01F0DB },
- { Atlantic/Bermuda , 0x01F5DE },
- { Atlantic/Canary , 0x01F8BF },
- { Atlantic/Cape_Verde , 0x01FB95 },
- { Atlantic/Faeroe , 0x01FC0E },
- { Atlantic/Faroe, 0x01FEB2 },
- { Atlantic/Jan_Mayen, 0x020156 },
- { Atlantic/Madeira , 0x020488 },
- { Atlantic/Reykjavik, 0x020991 },
- { Atlantic/South_Georgia, 0x020B4A },
- { Atlantic/St_Helena, 0x020E62 },
- { Atlantic/Stanley , 0x020B8E },
- { Australia/ACT , 0x020EB7 },
- { Australia/Adelaide, 0x0211D4 },
- { Australia/Brisbane, 0x021500 },
- { Australia/Broken_Hill , 0x0215C7 },
- {
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/date/lib/ timezonedb.h
derick Sat, 25 Jul 2009 15:14:28 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286307
Log:
- Updated to version 2009.11 (2009k)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/date/lib/timezonedb.h
Modified: php/php-src/branches/PHP_5_3/ext/date/lib/timezonedb.h
===
--- php/php-src/branches/PHP_5_3/ext/date/lib/timezonedb.h 2009-07-25 15:14:23 UTC (rev 286306)
+++ php/php-src/branches/PHP_5_3/ext/date/lib/timezonedb.h 2009-07-25 15:14:28 UTC (rev 286307)
@@ -238,330 +238,330 @@
{ Asia/Chungking, 0x0192D9 },
{ Asia/Colombo , 0x019388 },
{ Asia/Dacca, 0x019424 },
- { Asia/Damascus , 0x0194C5 },
- { Asia/Dhaka, 0x019815 },
- { Asia/Dili , 0x0198B6 },
- { Asia/Dubai, 0x01993F },
- { Asia/Dushanbe , 0x019994 },
- { Asia/Gaza , 0x019A97 },
- { Asia/Harbin , 0x019DE0 },
- { Asia/Ho_Chi_Minh , 0x019EC7 },
- { Asia/Hong_Kong, 0x019F3F },
- { Asia/Hovd , 0x01A0F5 },
- { Asia/Irkutsk , 0x01A26D },
- { Asia/Istanbul , 0x01A554 },
- { Asia/Jakarta , 0x01A941 },
- { Asia/Jayapura , 0x01A9EB },
- { Asia/Jerusalem, 0x01AA6F },
- { Asia/Kabul, 0x01AD9E },
- { Asia/Kamchatka, 0x01ADEF },
- { Asia/Karachi , 0x01B0D4 },
- { Asia/Kashgar , 0x01B189 },
- { Asia/Kathmandu, 0x01B25A },
- { Asia/Katmandu , 0x01B2C0 },
- { Asia/Kolkata , 0x01B326 },
- { Asia/Krasnoyarsk , 0x01B39F },
- { Asia/Kuala_Lumpur , 0x01B688 },
- { Asia/Kuching , 0x01B745 },
- { Asia/Kuwait , 0x01B833 },
- { Asia/Macao, 0x01B888 },
- { Asia/Macau, 0x01B9C3 },
- { Asia/Magadan , 0x01BAFE },
- { Asia/Makassar , 0x01BDE1 },
- { Asia/Manila , 0x01BE9A },
- { Asia/Muscat , 0x01BF1F },
- { Asia/Nicosia , 0x01BF74 },
- { Asia/Novosibirsk , 0x01C25C },
- { Asia/Omsk , 0x01C550 },
- { Asia/Oral , 0x01C838 },
- { Asia/Phnom_Penh , 0x01CA08 },
- { Asia/Pontianak, 0x01CA80 },
- { Asia/Pyongyang, 0x01CB41 },
- { Asia/Qatar, 0x01CBAE },
- { Asia/Qyzylorda, 0x01CC14 },
- { Asia/Rangoon , 0x01CDEA },
- { Asia/Riyadh , 0x01CE62 },
- { Asia/Saigon , 0x01CEB7 },
- { Asia/Sakhalin , 0x01CF2F },
- { Asia/Samarkand, 0x01D22F },
- { Asia/Seoul, 0x01D365 },
- { Asia/Shanghai , 0x01D409 },
- { Asia/Singapore, 0x01D4E9 },
- { Asia/Taipei , 0x01D5A0 },
- { Asia/Tashkent , 0x01D6B8 },
- { Asia/Tbilisi , 0x01D7E9 },
- { Asia/Tehran , 0x01D9A3 },
- { Asia/Tel_Aviv , 0x01DC11 },
- { Asia/Thimbu , 0x01DF40 },
- { Asia/Thimphu , 0x01DFA6 },
- { Asia/Tokyo, 0x01E00C },
- { Asia/Ujung_Pandang, 0x01E095 },
- { Asia/Ulaanbaatar , 0x01E111 },
- { Asia/Ulan_Bator , 0x01E26C },
- { Asia/Urumqi , 0x01E3B9 },
- { Asia/Vientiane, 0x01E480 },
- { Asia/Vladivostok , 0x01E4F8 },
- { Asia/Yakutsk , 0x01E7E5 },
- { Asia/Yekaterinburg, 0x01EACB },
- { Asia/Yerevan , 0x01EDD7 },
- { Atlantic/Azores , 0x01F0DB },
- { Atlantic/Bermuda , 0x01F5DE },
- { Atlantic/Canary , 0x01F8BF },
- { Atlantic/Cape_Verde , 0x01FB95 },
- { Atlantic/Faeroe , 0x01FC0E },
- { Atlantic/Faroe, 0x01FEB2 },
- { Atlantic/Jan_Mayen, 0x020156 },
- { Atlantic/Madeira , 0x020488 },
- { Atlantic/Reykjavik, 0x020991 },
- { Atlantic/South_Georgia, 0x020B4A },
- { Atlantic/St_Helena, 0x020E62 },
- { Atlantic/Stanley , 0x020B8E },
- { Australia/ACT , 0x020EB7 },
- { Australia/Adelaide, 0x0211D4 },
- { Australia/Brisbane, 0x021500 },
- {
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ext/date/lib/ timezonedb.h
derick Sat, 25 Jul 2009 15:14:33 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286308
Log:
- Updated to version 2009.11 (2009k)
Changed paths:
U php/php-src/branches/PHP_5_2/ext/date/lib/timezonedb.h
Modified: php/php-src/branches/PHP_5_2/ext/date/lib/timezonedb.h
===
--- php/php-src/branches/PHP_5_2/ext/date/lib/timezonedb.h 2009-07-25 15:14:28 UTC (rev 286307)
+++ php/php-src/branches/PHP_5_2/ext/date/lib/timezonedb.h 2009-07-25 15:14:33 UTC (rev 286308)
@@ -238,330 +238,330 @@
{ Asia/Chungking, 0x0192D9 },
{ Asia/Colombo , 0x019388 },
{ Asia/Dacca, 0x019424 },
- { Asia/Damascus , 0x0194C5 },
- { Asia/Dhaka, 0x019815 },
- { Asia/Dili , 0x0198B6 },
- { Asia/Dubai, 0x01993F },
- { Asia/Dushanbe , 0x019994 },
- { Asia/Gaza , 0x019A97 },
- { Asia/Harbin , 0x019DE0 },
- { Asia/Ho_Chi_Minh , 0x019EC7 },
- { Asia/Hong_Kong, 0x019F3F },
- { Asia/Hovd , 0x01A0F5 },
- { Asia/Irkutsk , 0x01A26D },
- { Asia/Istanbul , 0x01A554 },
- { Asia/Jakarta , 0x01A941 },
- { Asia/Jayapura , 0x01A9EB },
- { Asia/Jerusalem, 0x01AA6F },
- { Asia/Kabul, 0x01AD9E },
- { Asia/Kamchatka, 0x01ADEF },
- { Asia/Karachi , 0x01B0D4 },
- { Asia/Kashgar , 0x01B189 },
- { Asia/Kathmandu, 0x01B25A },
- { Asia/Katmandu , 0x01B2C0 },
- { Asia/Kolkata , 0x01B326 },
- { Asia/Krasnoyarsk , 0x01B39F },
- { Asia/Kuala_Lumpur , 0x01B688 },
- { Asia/Kuching , 0x01B745 },
- { Asia/Kuwait , 0x01B833 },
- { Asia/Macao, 0x01B888 },
- { Asia/Macau, 0x01B9C3 },
- { Asia/Magadan , 0x01BAFE },
- { Asia/Makassar , 0x01BDE1 },
- { Asia/Manila , 0x01BE9A },
- { Asia/Muscat , 0x01BF1F },
- { Asia/Nicosia , 0x01BF74 },
- { Asia/Novosibirsk , 0x01C25C },
- { Asia/Omsk , 0x01C550 },
- { Asia/Oral , 0x01C838 },
- { Asia/Phnom_Penh , 0x01CA08 },
- { Asia/Pontianak, 0x01CA80 },
- { Asia/Pyongyang, 0x01CB41 },
- { Asia/Qatar, 0x01CBAE },
- { Asia/Qyzylorda, 0x01CC14 },
- { Asia/Rangoon , 0x01CDEA },
- { Asia/Riyadh , 0x01CE62 },
- { Asia/Saigon , 0x01CEB7 },
- { Asia/Sakhalin , 0x01CF2F },
- { Asia/Samarkand, 0x01D22F },
- { Asia/Seoul, 0x01D365 },
- { Asia/Shanghai , 0x01D409 },
- { Asia/Singapore, 0x01D4E9 },
- { Asia/Taipei , 0x01D5A0 },
- { Asia/Tashkent , 0x01D6B8 },
- { Asia/Tbilisi , 0x01D7E9 },
- { Asia/Tehran , 0x01D9A3 },
- { Asia/Tel_Aviv , 0x01DC11 },
- { Asia/Thimbu , 0x01DF40 },
- { Asia/Thimphu , 0x01DFA6 },
- { Asia/Tokyo, 0x01E00C },
- { Asia/Ujung_Pandang, 0x01E095 },
- { Asia/Ulaanbaatar , 0x01E111 },
- { Asia/Ulan_Bator , 0x01E26C },
- { Asia/Urumqi , 0x01E3B9 },
- { Asia/Vientiane, 0x01E480 },
- { Asia/Vladivostok , 0x01E4F8 },
- { Asia/Yakutsk , 0x01E7E5 },
- { Asia/Yekaterinburg, 0x01EACB },
- { Asia/Yerevan , 0x01EDD7 },
- { Atlantic/Azores , 0x01F0DB },
- { Atlantic/Bermuda , 0x01F5DE },
- { Atlantic/Canary , 0x01F8BF },
- { Atlantic/Cape_Verde , 0x01FB95 },
- { Atlantic/Faeroe , 0x01FC0E },
- { Atlantic/Faroe, 0x01FEB2 },
- { Atlantic/Jan_Mayen, 0x020156 },
- { Atlantic/Madeira , 0x020488 },
- { Atlantic/Reykjavik, 0x020991 },
- { Atlantic/South_Georgia, 0x020B4A },
- { Atlantic/St_Helena, 0x020E62 },
- { Atlantic/Stanley , 0x020B8E },
- { Australia/ACT , 0x020EB7 },
- { Australia/Adelaide, 0x0211D4 },
- { Australia/Brisbane, 0x021500 },
- {
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/win32/build/ confutils.js
derick Sat, 25 Jul 2009 15:51:02 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286311
Log:
- MF53: Added - to the list of unsafe characters so that the pecl dir can
have the - character in the name.
Changed paths:
U php/php-src/branches/PHP_5_2/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_2/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_2/win32/build/confutils.js 2009-07-25
15:18:19 UTC (rev 286310)
+++ php/php-src/branches/PHP_5_2/win32/build/confutils.js 2009-07-25
15:51:02 UTC (rev 286311)
@@ -1150,12 +1150,12 @@
* as either a child or a sibling */
if (obj_dir == null) {
var build_dir = dir.replace(new RegExp(^..), );
- var mangle_dir = build_dir.replace(new RegExp([/.], g),
_);
+ var mangle_dir = build_dir.replace(new RegExp([/.-],
g), _);
var bd_flags_name = CFLAGS_BD_ + mangle_dir.toUpperCase();
}
else {
var build_dir = obj_dir.replace(new RegExp(^..), );
- var mangle_dir = build_dir.replace(new RegExp([/.], g),
_);
+ var mangle_dir = build_dir.replace(new RegExp([/.-],
g), _);
var bd_flags_name = CFLAGS_BD_ + mangle_dir.toUpperCase();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/win32/build/ confutils.js
derick Sat, 25 Jul 2009 15:51:16 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286312
Log:
- MF53: Added - to the list of unsafe characters so that the pecl dir can
have the - character in the name.
Changed paths:
U php/php-src/trunk/win32/build/confutils.js
Modified: php/php-src/trunk/win32/build/confutils.js
===
--- php/php-src/trunk/win32/build/confutils.js 2009-07-25 15:51:02 UTC (rev
286311)
+++ php/php-src/trunk/win32/build/confutils.js 2009-07-25 15:51:16 UTC (rev
286312)
@@ -1291,12 +1291,12 @@
* as either a child or a sibling */
if (obj_dir == null) {
var build_dir = dir.replace(new RegExp(^..), );
- var mangle_dir = build_dir.replace(new RegExp([/.], g),
_);
+ var mangle_dir = build_dir.replace(new RegExp([/.-],
g), _);
var bd_flags_name = CFLAGS_BD_ + mangle_dir.toUpperCase();
}
else {
var build_dir = obj_dir.replace(new RegExp(^..), );
- var mangle_dir = build_dir.replace(new RegExp([/.], g),
_);
+ var mangle_dir = build_dir.replace(new RegExp([/.-],
g), _);
var bd_flags_name = CFLAGS_BD_ + mangle_dir.toUpperCase();
}
--
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/win32/build/ confutils.js
hi,
Thanks for this fix :)
Please try to commit in all branches at once (don't forget to merge to 5.3).
Cheers,
On Sat, Jul 25, 2009 at 5:51 PM, Derick Rethansder...@php.net wrote:
derick Sat, 25 Jul 2009 15:51:02 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286311
Log:
- MF53: Added - to the list of unsafe characters so that the pecl dir can
have the - character in the name.
Changed paths:
U php/php-src/branches/PHP_5_2/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_2/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_2/win32/build/confutils.js 2009-07-25
15:18:19 UTC (rev 286310)
+++ php/php-src/branches/PHP_5_2/win32/build/confutils.js 2009-07-25
15:51:02 UTC (rev 286311)
@@ -1150,12 +1150,12 @@
* as either a child or a sibling */
if (obj_dir == null) {
var build_dir = dir.replace(new RegExp(^..), );
- var mangle_dir = build_dir.replace(new RegExp([/.],
g), _);
+ var mangle_dir = build_dir.replace(new RegExp([/.-],
g), _);
var bd_flags_name = CFLAGS_BD_ + mangle_dir.toUpperCase();
}
else {
var build_dir = obj_dir.replace(new RegExp(^..), );
- var mangle_dir = build_dir.replace(new RegExp([/.],
g), _);
+ var mangle_dir = build_dir.replace(new RegExp([/.-],
g), _);
var bd_flags_name = CFLAGS_BD_ + mangle_dir.toUpperCase();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
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
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_2/win32/build/ confutils.js
On Sat, 25 Jul 2009, Pierre Joye wrote: Thanks for this fix :) Please try to commit in all branches at once (don't forget to merge to 5.3). I added it to 5.3 some days ago already. regards, Derick -- http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org twitter: @derickr -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pear_avail
cellog Sat, 25 Jul 2009 16:30:41 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286313 Log: give the global folks and global pear folks access to pear2 as well Changed paths: U SVNROOT/pear_avail Modified: SVNROOT/pear_avail === --- SVNROOT/pear_avail 2009-07-25 15:51:16 UTC (rev 286312) +++ SVNROOT/pear_avail 2009-07-25 16:30:41 UTC (rev 286313) @@ -16,12 +16,12 @@ # The PHP Developers have full access to the full source trees for # PHP and PEAR, as well as the documentation. -avail|mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,jani,kguest,rquadling,saltybea! gle|pear/packages,pear/peardoc +avail|mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,jani,kguest,rquadling,saltybea! gle|pear/packages,pear/peardoc,pear2 # The PEAR Team has access to the full PEAR tree, the PEAR portion of # the PHP tree, the PEAR website, and the PEAR documentation. -avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino,neufeind,didou,schst,alain,mrcool,mroch,mike,vgoebbels,mixtli,farell,pmjones,jw,darknoise,! tarjei,toby,danielc,ieure,metz,gurugeek,rich_y,asnagy,muesli,hcebay,khassani,zamana,aidan,dufuz,sergiosgc,kouber,enemerson,iridium,ortega,guillaume,koyama,scottmattocks,eric,wenz,goetsch,tacker,aph,bolk,cweiske,amt,jinxidoru,cbleek,nosey,abaker,jayeshsh,fredericpoeydome,sean,toggg,navin,pfischer,davidc,markus,cross,crafics,roychri,kore,troehr,sfrausch,bdunlap,drewish,firman,epte,timj,taak,ssuceveanu,bate,anant,hirose31,amistry,thesee,jausions,ostborn,wiesemann,amir,clockwerx|pear/packages,pear/peardoc
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/curl/interface.c branches/PHP_5_3/ext/curl/interface.c trunk/ext/curl/interface.c
felipe Sat, 25 Jul 2009 20:39:01 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286322
Log:
- Making Valgrind happy
Changed paths:
U php/php-src/branches/PHP_5_2/ext/curl/interface.c
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_2/ext/curl/interface.c
===
--- php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-07-25 20:13:25 UTC
(rev 286321)
+++ php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-07-25 20:39:01 UTC
(rev 286322)
@@ -2086,7 +2086,7 @@
if (ch-clone-refcount = 1) {
zend_llist_clean(ch-to_free.slist);
zend_llist_clean(ch-to_free.post);
- zval_ptr_dtor(ch-clone);
+ FREE_ZVAL(ch-clone);
} else {
ch-clone-refcount--;
ch-to_free.slist.dtor = NULL;
Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c
===
--- php/php-src/branches/PHP_5_3/ext/curl/interface.c 2009-07-25 20:13:25 UTC
(rev 286321)
+++ php/php-src/branches/PHP_5_3/ext/curl/interface.c 2009-07-25 20:39:01 UTC
(rev 286322)
@@ -2311,7 +2311,7 @@
if (Z_REFCOUNT_P(ch-clone) = 1) {
zend_llist_clean(ch-to_free.slist);
zend_llist_clean(ch-to_free.post);
- zval_ptr_dtor(ch-clone);
+ FREE_ZVAL(ch-clone);
} else {
Z_DELREF_P(ch-clone);
ch-to_free.slist.dtor = NULL;
Modified: php/php-src/trunk/ext/curl/interface.c
===
--- php/php-src/trunk/ext/curl/interface.c 2009-07-25 20:13:25 UTC (rev
286321)
+++ php/php-src/trunk/ext/curl/interface.c 2009-07-25 20:39:01 UTC (rev
286322)
@@ -2377,7 +2377,7 @@
if (Z_REFCOUNT_P(ch-clone) = 1) {
zend_llist_clean(ch-to_free.slist);
zend_llist_clean(ch-to_free.post);
- zval_ptr_dtor(ch-clone);
+ FREE_ZVAL(ch-clone);
} else {
Z_DELREF_P(ch-clone);
ch-to_free.slist.dtor = NULL;
--
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 branches/PHP_5_2/ext/curl/interface.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/curl/interface.c trunk/ext/curl/interface.c
jani Sat, 25 Jul 2009 20:44:19 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286323
Log:
- Fixed bug #48637 (file wrapper is overwritten when using
--with-curlwrappers)
# Also fixes bug #48603, basically same issue.
Bugs: http://bugs.php.net/48637 (Assigned) file wrapper is overwritten when
using --with-curlwrappers
http://bugs.php.net/48603 (Open) Using --with-curlwrappers and
open_basedir causes problems
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/curl/interface.c
U php/php-src/branches/PHP_5_3/NEWS
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_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2009-07-25 20:39:01 UTC (rev 286322)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-07-25 20:44:19 UTC (rev 286323)
@@ -29,6 +29,8 @@
- Fixed bug #48693 (Double declaration of __lambda_func when lambda wrongly
formatted). (peter at lvp-media dot com, Felipe)
- Fixed bug #48661 (phpize is broken with non-bash shells). (Jani)
+- Fixed bug #48637 (file fopen wrapper is overwritten when using
+ --with-curlwrappers). (Jani)
- Fixed bug #48636 (Error compiling of ext/date on netware). (guenter at
php.net, Ilia)
- Fixed bug #48629 (get_defined_constants() ignores categorize parameter).
Modified: php/php-src/branches/PHP_5_2/ext/curl/interface.c
===
--- php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-07-25 20:39:01 UTC
(rev 286322)
+++ php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-07-25 20:44:19 UTC
(rev 286323)
@@ -696,13 +696,24 @@
char **p = (char **)info-protocols;
while (*p != NULL) {
- php_register_url_stream_wrapper(*p++, php_curl_wrapper
TSRMLS_CC);
+ /* Do not enable cURL file protocol and make sure
cURL is always used when --with-curlwrappers is enabled */
+ if (strncasecmp(*p, file, sizeof(file)-1) != 0) {
+ php_unregister_url_stream_wrapper(*p);
+ php_register_url_stream_wrapper(*p,
php_curl_wrapper TSRMLS_CC);
+ }
+ (void) *p++;
}
}
# else
+ php_unregister_url_stream_wrapper(http);
php_register_url_stream_wrapper(http, php_curl_wrapper TSRMLS_CC);
+ php_unregister_url_stream_wrapper(https);
php_register_url_stream_wrapper(https, php_curl_wrapper TSRMLS_CC);
+ php_unregister_url_stream_wrapper(ftp);
php_register_url_stream_wrapper(ftp, php_curl_wrapper TSRMLS_CC);
+ php_unregister_url_stream_wrapper(ftps);
+ php_register_url_stream_wrapper(ftps, php_curl_wrapper TSRMLS_CC);
+ php_unregister_url_stream_wrapper(ldap);
php_register_url_stream_wrapper(ldap, php_curl_wrapper TSRMLS_CC);
# endif
#endif
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-07-25 20:39:01 UTC (rev 286322)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-07-25 20:44:19 UTC (rev 286323)
@@ -46,6 +46,8 @@
components). (Ilia)
- Fixed bug #48681 (openssl signature verification for tar archives broken).
(Greg)
+- Fixed bug #48637 (file fopen wrapper is overwritten when using
+ --with-curlwrappers). (Jani)
- Fixed bug #48377 (error message unclear on converting phar with existing
file).
(Greg)
- Fixed bug #48247 (Infinite loop and possible crash during startup with
Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c
===
--- php/php-src/branches/PHP_5_3/ext/curl/interface.c 2009-07-25 20:39:01 UTC
(rev 286322)
+++ php/php-src/branches/PHP_5_3/ext/curl/interface.c 2009-07-25 20:44:19 UTC
(rev 286323)
@@ -818,13 +818,24 @@
char **p = (char **)info-protocols;
while (*p != NULL) {
- php_register_url_stream_wrapper(*p++, php_curl_wrapper
TSRMLS_CC);
+ /* Do not enable cURL file protocol and make sure
cURL is always used when --with-curlwrappers is enabled */
+ if (strncasecmp(*p, file, sizeof(file)-1) != 0) {
+ php_unregister_url_stream_wrapper(*p);
+ php_register_url_stream_wrapper(*p,
php_curl_wrapper TSRMLS_CC);
+ }
+ (void) *p++;
}
}
# else
+ php_unregister_url_stream_wrapper(http);
php_register_url_stream_wrapper(http, php_curl_wrapper TSRMLS_CC);
+ php_unregister_url_stream_wrapper(https);
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/curl/config.m4 branches/PHP_5_3/ext/curl/config.m4 trunk/ext/curl/config.m4
jani Sat, 25 Jul 2009 20:58:51 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286324 Log: - Add missing EXPERIMENTAL note (this thing REALLY is experimental at best..) Changed paths: U php/php-src/branches/PHP_5_2/ext/curl/config.m4 U php/php-src/branches/PHP_5_3/ext/curl/config.m4 U php/php-src/trunk/ext/curl/config.m4 Modified: php/php-src/branches/PHP_5_2/ext/curl/config.m4 === --- php/php-src/branches/PHP_5_2/ext/curl/config.m4 2009-07-25 20:44:19 UTC (rev 286323) +++ php/php-src/branches/PHP_5_2/ext/curl/config.m4 2009-07-25 20:58:51 UTC (rev 286324) @@ -7,7 +7,7 @@ dnl Temporary option while we develop this aspect of the extension PHP_ARG_WITH(curlwrappers, if we should use cURL for url streams, -[ --with-curlwrappers Use cURL for url streams], no, no) +[ --with-curlwrappers EXPERIMENTAL: Use cURL for url streams], no, no) if test $PHP_CURL != no; then if test -r $PHP_CURL/include/curl/easy.h; then Modified: php/php-src/branches/PHP_5_3/ext/curl/config.m4 === --- php/php-src/branches/PHP_5_3/ext/curl/config.m4 2009-07-25 20:44:19 UTC (rev 286323) +++ php/php-src/branches/PHP_5_3/ext/curl/config.m4 2009-07-25 20:58:51 UTC (rev 286324) @@ -7,7 +7,7 @@ dnl Temporary option while we develop this aspect of the extension PHP_ARG_WITH(curlwrappers, if we should use cURL for url streams, -[ --with-curlwrappers Use cURL for url streams], no, no) +[ --with-curlwrappers EXPERIMENTAL: Use cURL for url streams], no, no) if test $PHP_CURL != no; then if test -r $PHP_CURL/include/curl/easy.h; then Modified: php/php-src/trunk/ext/curl/config.m4 === --- php/php-src/trunk/ext/curl/config.m42009-07-25 20:44:19 UTC (rev 286323) +++ php/php-src/trunk/ext/curl/config.m42009-07-25 20:58:51 UTC (rev 286324) @@ -7,7 +7,7 @@ dnl Temporary option while we develop this aspect of the extension PHP_ARG_WITH(curlwrappers, if we should use cURL for url streams, -[ --with-curlwrappers Use cURL for url streams], no, no) +[ --with-curlwrappers EXPERIMENTAL: Use cURL for url streams], no, no) if test $PHP_CURL != no; then if test -r $PHP_CURL/include/curl/easy.h; then -- 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/sapi/cgi/tests/006.phpt branches/PHP_5_3/sapi/cgi/tests/006.phpt trunk/sapi/cgi/tests/006.phpt
jani Sat, 25 Jul 2009 21:07:02 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286325 Log: - Fix this again :) Changed paths: U php/php-src/branches/PHP_5_2/sapi/cgi/tests/006.phpt U php/php-src/branches/PHP_5_3/sapi/cgi/tests/006.phpt U php/php-src/trunk/sapi/cgi/tests/006.phpt Modified: php/php-src/branches/PHP_5_2/sapi/cgi/tests/006.phpt === --- php/php-src/branches/PHP_5_2/sapi/cgi/tests/006.phpt2009-07-25 20:58:51 UTC (rev 286324) +++ php/php-src/branches/PHP_5_2/sapi/cgi/tests/006.phpt2009-07-25 21:07:02 UTC (rev 286325) @@ -2,6 +2,8 @@ syntax check --SKIPIF-- ?php include skipif.inc; ? +--INI-- +display_errors=stdout --FILE-- ?php include include.inc; @@ -42,7 +44,7 @@ file_put_contents($filename, $code); -var_dump(`$php -n -l $filename`); +var_dump(`$php -n -l $filename 2/dev/null`); @unlink($filename); Modified: php/php-src/branches/PHP_5_3/sapi/cgi/tests/006.phpt === --- php/php-src/branches/PHP_5_3/sapi/cgi/tests/006.phpt2009-07-25 20:58:51 UTC (rev 286324) +++ php/php-src/branches/PHP_5_3/sapi/cgi/tests/006.phpt2009-07-25 21:07:02 UTC (rev 286325) @@ -2,6 +2,8 @@ syntax check --SKIPIF-- ?php include skipif.inc; ? +--INI-- +display_errors=stdout --FILE-- ?php include include.inc; @@ -42,7 +44,7 @@ file_put_contents($filename, $code); -var_dump(`$php -n -l $filename`); +var_dump(`$php -n -l $filename 2/dev/null`); @unlink($filename); Modified: php/php-src/trunk/sapi/cgi/tests/006.phpt === --- php/php-src/trunk/sapi/cgi/tests/006.phpt 2009-07-25 20:58:51 UTC (rev 286324) +++ php/php-src/trunk/sapi/cgi/tests/006.phpt 2009-07-25 21:07:02 UTC (rev 286325) @@ -2,6 +2,8 @@ syntax check --SKIPIF-- ?php include skipif.inc; ? +--INI-- +display_errors=stdout --FILE-- ?php include include.inc; @@ -42,7 +44,7 @@ file_put_contents($filename, $code); -var_dump(`$php -n -l $filename`); +var_dump(`$php -n -l $filename 2/dev/null`); @unlink($filename); -- 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/ext/curl/tests/curl_CURLOPT_READDATA.phpt branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt trunk/ext/curl/tests/curl_CURLOPT_READDATA.phpt
rasmus Sat, 25 Jul 2009 21:37:04 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286326
Log:
Fix dumb typo in the skipif
Changed paths:
U php/php-src/branches/PHP_5_2/ext/curl/tests/curl_CURLOPT_READDATA.phpt
U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt
U php/php-src/trunk/ext/curl/tests/curl_CURLOPT_READDATA.phpt
Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_CURLOPT_READDATA.phpt
===
--- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_CURLOPT_READDATA.phpt
2009-07-25 21:07:02 UTC (rev 286325)
+++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_CURLOPT_READDATA.phpt
2009-07-25 21:37:04 UTC (rev 286326)
@@ -4,7 +4,7 @@
Mattijs Hoitink mattijshoit...@gmail.com
#Testfest Utrecht 2009
--SKIPIF--
-?php if (!extension_loaded(curl) || false ===
getenv('PHP_CURL_HTTP_REMOTE_SERVER'])) print skip; ?
+?php if (!extension_loaded(curl) || false ===
getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print skip; ?
--FILE--
?php
Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt
===
--- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt
2009-07-25 21:07:02 UTC (rev 286325)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt
2009-07-25 21:37:04 UTC (rev 286326)
@@ -4,7 +4,7 @@
Mattijs Hoitink mattijshoit...@gmail.com
#Testfest Utrecht 2009
--SKIPIF--
-?php if (!extension_loaded(curl) || false ===
getenv('PHP_CURL_HTTP_REMOTE_SERVER'])) print skip; ?
+?php if (!extension_loaded(curl) || false ===
getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print skip; ?
--FILE--
?php
Modified: php/php-src/trunk/ext/curl/tests/curl_CURLOPT_READDATA.phpt
===
--- php/php-src/trunk/ext/curl/tests/curl_CURLOPT_READDATA.phpt 2009-07-25
21:07:02 UTC (rev 286325)
+++ php/php-src/trunk/ext/curl/tests/curl_CURLOPT_READDATA.phpt 2009-07-25
21:37:04 UTC (rev 286326)
@@ -4,7 +4,7 @@
Mattijs Hoitink mattijshoit...@gmail.com
#Testfest Utrecht 2009
--SKIPIF--
-?php if (!extension_loaded(curl) || false ===
getenv('PHP_CURL_HTTP_REMOTE_SERVER'])) print skip; ?
+?php if (!extension_loaded(curl) || false ===
getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print skip; ?
--FILE--
?php
--
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/ext/curl/tests/curl_setopt_basic002.phpt branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt trunk/ext/curl/tests/curl_setopt_basic002.phpt
felipe Sat, 25 Jul 2009 21:52:33 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286327 Log: - Fix test Changed paths: U php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_basic002.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt U php/php-src/trunk/ext/curl/tests/curl_setopt_basic002.phpt Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_basic002.phpt === --- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_basic002.phpt 2009-07-25 21:37:04 UTC (rev 286326) +++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_basic002.phpt 2009-07-25 21:52:33 UTC (rev 286327) @@ -46,6 +46,6 @@ ? --EXPECTF-- *** Testing curl_setopt with CURLOPT_STDERR +string(%d) %s string(%d) %S string(%d) %S -string(%d) %S Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt === --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt 2009-07-25 21:37:04 UTC (rev 286326) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt 2009-07-25 21:52:33 UTC (rev 286327) @@ -46,6 +46,6 @@ ? --EXPECTF-- *** Testing curl_setopt with CURLOPT_STDERR +string(%d) %s string(%d) %S string(%d) %S -string(%d) %S Modified: php/php-src/trunk/ext/curl/tests/curl_setopt_basic002.phpt === --- php/php-src/trunk/ext/curl/tests/curl_setopt_basic002.phpt 2009-07-25 21:37:04 UTC (rev 286326) +++ php/php-src/trunk/ext/curl/tests/curl_setopt_basic002.phpt 2009-07-25 21:52:33 UTC (rev 286327) @@ -46,6 +46,6 @@ ? --EXPECTF-- *** Testing curl_setopt with CURLOPT_STDERR +string(%d) %s string(%d) %S string(%d) %S -string(%d) %S -- 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/ext/curl/tests/curl_setopt_basic002.phpt branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt trunk/ext/curl/tests/curl_setopt_basic002.phpt
felipe Sat, 25 Jul 2009 21:56:31 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286328 Log: - Opss, fix the fix... Changed paths: U php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_basic002.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt U php/php-src/trunk/ext/curl/tests/curl_setopt_basic002.phpt Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_basic002.phpt === --- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_basic002.phpt 2009-07-25 21:52:33 UTC (rev 286327) +++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_basic002.phpt 2009-07-25 21:56:31 UTC (rev 286328) @@ -46,6 +46,6 @@ ? --EXPECTF-- *** Testing curl_setopt with CURLOPT_STDERR -string(%d) %s +string(%d) %s%w string(%d) %S string(%d) %S Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt === --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt 2009-07-25 21:52:33 UTC (rev 286327) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt 2009-07-25 21:56:31 UTC (rev 286328) @@ -46,6 +46,6 @@ ? --EXPECTF-- *** Testing curl_setopt with CURLOPT_STDERR -string(%d) %s +string(%d) %s%w string(%d) %S string(%d) %S Modified: php/php-src/trunk/ext/curl/tests/curl_setopt_basic002.phpt === --- php/php-src/trunk/ext/curl/tests/curl_setopt_basic002.phpt 2009-07-25 21:52:33 UTC (rev 286327) +++ php/php-src/trunk/ext/curl/tests/curl_setopt_basic002.phpt 2009-07-25 21:56:31 UTC (rev 286328) @@ -46,6 +46,6 @@ ? --EXPECTF-- *** Testing curl_setopt with CURLOPT_STDERR -string(%d) %s +string(%d) %s%w string(%d) %S string(%d) %S -- 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/ext/curl/tests/curl_CURLOPT_READDATA.phpt branches/PHP_5_2/ext/curl/tests/curl_copy_handle_basic_006.phpt branches/PHP_5_2/ext/curl/tests/curl_copy_handle
jani Sat, 25 Jul 2009 22:20:18 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286329
Log:
- Fix tests to be more comptatible AND to test what they are supposed to test
Changed paths:
U php/php-src/branches/PHP_5_2/ext/curl/tests/curl_CURLOPT_READDATA.phpt
U
php/php-src/branches/PHP_5_2/ext/curl/tests/curl_copy_handle_basic_006.phpt
U
php/php-src/branches/PHP_5_2/ext/curl/tests/curl_copy_handle_basic_007.phpt
U php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_basic002.phpt
U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt
U
php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_006.phpt
U
php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_007.phpt
U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt
U php/php-src/trunk/ext/curl/tests/curl_CURLOPT_READDATA.phpt
U php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_006.phpt
U php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_007.phpt
U php/php-src/trunk/ext/curl/tests/curl_setopt_basic002.phpt
Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_CURLOPT_READDATA.phpt
===
--- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_CURLOPT_READDATA.phpt 2009-07-25 21:56:31 UTC (rev 286328)
+++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_CURLOPT_READDATA.phpt 2009-07-25 22:20:18 UTC (rev 286329)
@@ -33,7 +33,7 @@
curl_close($ch);
// Clean the temporary file
-unset($tempname);
+...@unlink($tempname);
--EXPECT--
array(2) {
Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_copy_handle_basic_006.phpt
===
--- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_copy_handle_basic_006.phpt 2009-07-25 21:56:31 UTC (rev 286328)
+++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_copy_handle_basic_006.phpt 2009-07-25 22:20:18 UTC (rev 286329)
@@ -21,15 +21,17 @@
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
$copy = curl_copy_handle($ch);
- curl_close($ch);
-
- $curl_content = curl_exec($copy);
+
+ var_dump( curl_exec($ch) );
+ var_dump( curl_exec($copy) );
+
+ curl_close($ch); // can not close original handle before curl_exec($copy) since it causes char * inputs to be invalid (see also: http://curl.haxx.se/libcurl/c/curl_easy_duphandle.html)
curl_close($copy);
- var_dump( $curl_content );
?
===DONE===
--EXPECTF--
*** Testing curl copy handle with User Agent ***
string(9) cURL phpt
-===DONE===
\ No newline at end of file
+string(9) cURL phpt
+===DONE===
Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_copy_handle_basic_007.phpt
===
--- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_copy_handle_basic_007.phpt 2009-07-25 21:56:31 UTC (rev 286328)
+++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_copy_handle_basic_007.phpt 2009-07-25 22:20:18 UTC (rev 286329)
@@ -15,6 +15,7 @@
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_POST, 1);
curl_setopt($ch, CURLOPT_POSTFIELDS, array(Hello = World, Foo = Bar, Person = John Doe));
+ curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:')); // Disable Expect: header (lighttpd does not support it :)
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
$copy = curl_copy_handle($ch);
Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_basic002.phpt
===
--- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_basic002.phpt 2009-07-25 21:56:31 UTC (rev 286328)
+++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_setopt_basic002.phpt 2009-07-25 22:20:18 UTC (rev 286329)
@@ -13,7 +13,8 @@
// start testing
echo *** Testing curl_setopt with CURLOPT_STDERR\n;
-$temp_file = tempnam(sys_get_temp_dir(), '');
+$temp_file = tempnam(sys_get_temp_dir(), 'CURL_STDERR');
+
$handle = fopen($temp_file, 'w');
$url = {$host}/;
@@ -21,31 +22,29 @@
curl_setopt($ch, CURLOPT_VERBOSE, 1);
curl_setopt($ch, CURLOPT_STDERR, $handle);
-
$curl_content = curl_exec($ch);
+
fclose($handle);
+unset($handle);
+var_dump( file_get_contents($temp_file) );
+...@unlink($temp_file);
-var_dump( curl_error($ch) );
-var_dump( file_get_contents($temp_file));
-
-...@unlink ($temp_file);
-$handle = fopen($temp_file, 'w');
-
ob_start(); // start output buffering
-curl_setopt($ch, CURLOPT_VERBOSE, 1);
-curl_setopt($ch, CURLOPT_STDERR, $handle);
+$handle = fopen($temp_file, 'w');
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-
+curl_setopt($ch, CURLOPT_STDERR, $handle);
$data = curl_exec($ch);
-fclose($handle);
ob_end_clean();
-var_dump(file_get_contents($temp_file));
-curl_close($ch);
+fclose($handle);
+unset($handle);
+var_dump(
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/interbase/ ibase_query.c
kalleSat, 25 Jul 2009 23:37:47 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286330
Log:
Fixed bug #48189 (ibase_execute error in return param)
Bug: http://bugs.php.net/48189 (Assigned) ibase_execute error in return param
Changed paths:
U php/php-src/branches/PHP_5_3/ext/interbase/ibase_query.c
Modified: php/php-src/branches/PHP_5_3/ext/interbase/ibase_query.c
===
--- php/php-src/branches/PHP_5_3/ext/interbase/ibase_query.c2009-07-25
22:20:18 UTC (rev 286329)
+++ php/php-src/branches/PHP_5_3/ext/interbase/ibase_query.c2009-07-25
23:37:47 UTC (rev 286330)
@@ -1031,8 +1031,7 @@
if (affected_rows) {
RETVAL_LONG(affected_rows);
} else {
- /* this return value evaluates to
bool(true) and to int(0) */
- RETVAL_STRINGL(0 ,2,1);
+ RETVAL_TRUE;
}
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: / pecl/phar/trunk/tests/zip/files/frontcontroller12.phar.inc pecl/phar/trunk/tests/zip/files/frontcontroller12.phar.zip pecl/phar/trunk/tests/zip/files/frontcontroller3.phar.inc pecl/ph
cellog Sun, 26 Jul 2009 00:39:40 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286337
Log:
fix zip front controller tests for php6
Changed paths:
U pecl/phar/trunk/tests/zip/files/frontcontroller12.phar.inc
U pecl/phar/trunk/tests/zip/files/frontcontroller12.phar.zip
U pecl/phar/trunk/tests/zip/files/frontcontroller3.phar.inc
U pecl/phar/trunk/tests/zip/files/frontcontroller3.phar.zip
U pecl/phar/trunk/tests/zip/files/frontcontroller4.phar.inc
U pecl/phar/trunk/tests/zip/files/frontcontroller4.phar.zip
U pecl/phar/trunk/tests/zip/frontcontroller21.phar.phpt
U
php/php-src/branches/PHP_5_3/ext/phar/tests/zip/files/frontcontroller12.phar.inc
U
php/php-src/branches/PHP_5_3/ext/phar/tests/zip/files/frontcontroller12.phar.zip
U
php/php-src/branches/PHP_5_3/ext/phar/tests/zip/files/frontcontroller3.phar.inc
U
php/php-src/branches/PHP_5_3/ext/phar/tests/zip/files/frontcontroller3.phar.zip
U
php/php-src/branches/PHP_5_3/ext/phar/tests/zip/files/frontcontroller4.phar.inc
U
php/php-src/branches/PHP_5_3/ext/phar/tests/zip/files/frontcontroller4.phar.zip
U
php/php-src/branches/PHP_5_3/ext/phar/tests/zip/frontcontroller21.phar.phpt
U php/php-src/trunk/ext/phar/tests/zip/files/frontcontroller12.phar.inc
U php/php-src/trunk/ext/phar/tests/zip/files/frontcontroller12.phar.zip
U php/php-src/trunk/ext/phar/tests/zip/files/frontcontroller3.phar.inc
U php/php-src/trunk/ext/phar/tests/zip/files/frontcontroller3.phar.zip
U php/php-src/trunk/ext/phar/tests/zip/files/frontcontroller4.phar.inc
U php/php-src/trunk/ext/phar/tests/zip/files/frontcontroller4.phar.zip
U php/php-src/trunk/ext/phar/tests/zip/frontcontroller21.phar.phpt
Modified: pecl/phar/trunk/tests/zip/files/frontcontroller12.phar.inc
===
--- pecl/phar/trunk/tests/zip/files/frontcontroller12.phar.inc 2009-07-26 00:35:17 UTC (rev 286336)
+++ pecl/phar/trunk/tests/zip/files/frontcontroller12.phar.inc 2009-07-26 00:39:40 UTC (rev 286337)
@@ -3,13 +3,13 @@
$a = new Phar(dirname(__FILE__) . '/frontcontroller12.phar.zip');
$a['index.php'] = '?php
var_dump($_SERVER[PHP_SELF]);
-var_dump($_SERVER[SCRIPT_NAME]);
-var_dump($_SERVER[SCRIPT_FILENAME]);
-var_dump($_SERVER[REQUEST_URI]);
-var_dump($_SERVER[PHAR_PHP_SELF]);
-var_dump($_SERVER[PHAR_SCRIPT_NAME]);
-var_dump($_SERVER[PHAR_SCRIPT_FILENAME]);
-var_dump($_SERVER[PHAR_REQUEST_URI]);
+var_dump($_SERVER[bSCRIPT_NAME]);
+var_dump($_SERVER[bSCRIPT_FILENAME]);
+var_dump($_SERVER[bREQUEST_URI]);
+var_dump($_SERVER[bPHAR_PHP_SELF]);
+var_dump($_SERVER[bPHAR_SCRIPT_NAME]);
+var_dump($_SERVER[bPHAR_SCRIPT_FILENAME]);
+var_dump($_SERVER[bPHAR_REQUEST_URI]);
';
$a-setStub('?php
Phar::mungServer(array(PHP_SELF, SCRIPT_NAME, SCRIPT_FILENAME, REQUEST_URI));
Modified: pecl/phar/trunk/tests/zip/files/frontcontroller12.phar.zip
===
(Binary files differ)
Modified: pecl/phar/trunk/tests/zip/files/frontcontroller3.phar.inc
===
--- pecl/phar/trunk/tests/zip/files/frontcontroller3.phar.inc 2009-07-26 00:35:17 UTC (rev 286336)
+++ pecl/phar/trunk/tests/zip/files/frontcontroller3.phar.inc 2009-07-26 00:39:40 UTC (rev 286337)
@@ -7,7 +7,7 @@
$a-setStub('?php
function s($a)
{
-static $b = array(/hi = a.phps);
+static $b = array(b/hi = ba.phps);
if (isset($b[$a])) return $b[$a];
return $a;
}
Modified: pecl/phar/trunk/tests/zip/files/frontcontroller3.phar.zip
===
(Binary files differ)
Modified: pecl/phar/trunk/tests/zip/files/frontcontroller4.phar.inc
===
--- pecl/phar/trunk/tests/zip/files/frontcontroller4.phar.inc 2009-07-26 00:35:17 UTC (rev 286336)
+++ pecl/phar/trunk/tests/zip/files/frontcontroller4.phar.inc 2009-07-26 00:39:40 UTC (rev 286337)
@@ -7,7 +7,7 @@
$a-setStub('?php
function s($a)
{
-static $b = array(/hi = false);
+static $b = array(b/hi = false);
if (isset($b[$a])) return $b[$a];
return $a;
}
Modified: pecl/phar/trunk/tests/zip/files/frontcontroller4.phar.zip
===
(Binary files differ)
Modified: pecl/phar/trunk/tests/zip/frontcontroller21.phar.phpt
===
--- pecl/phar/trunk/tests/zip/frontcontroller21.phar.phpt 2009-07-26 00:35:17 UTC (rev 286336)
+++ pecl/phar/trunk/tests/zip/frontcontroller21.phar.phpt 2009-07-26 00:39:40 UTC (rev 286337)
@@ -15,8 +15,8 @@
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
+%unicode|string%(10) /index.php
string(10) /index.php
-string(10) /index.php
string(%d)
[PHP-CVS] svn: / pecl/phar/trunk/phar.c pecl/phar/trunk/phar_internal.h pecl/phar/trunk/phar_object.c pecl/phar/trunk/tar.c pecl/phar/trunk/zip.c php/php-src/branches/PHP_5_3/ext/phar/phar.c php/php-s
cellog Sun, 26 Jul 2009 01:03:47 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286338
Log:
re-organize slightly, fix more php6-only compile warnings in
php_stream_copy_to_mem
Changed paths:
U pecl/phar/trunk/phar.c
U pecl/phar/trunk/phar_internal.h
U pecl/phar/trunk/phar_object.c
U pecl/phar/trunk/tar.c
U pecl/phar/trunk/zip.c
U php/php-src/branches/PHP_5_3/ext/phar/phar.c
U php/php-src/branches/PHP_5_3/ext/phar/phar_internal.h
U php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
U php/php-src/branches/PHP_5_3/ext/phar/tar.c
U php/php-src/branches/PHP_5_3/ext/phar/zip.c
U php/php-src/trunk/ext/phar/phar.c
U php/php-src/trunk/ext/phar/phar_internal.h
U php/php-src/trunk/ext/phar/phar_object.c
U php/php-src/trunk/ext/phar/tar.c
U php/php-src/trunk/ext/phar/zip.c
Modified: pecl/phar/trunk/phar.c
===
--- pecl/phar/trunk/phar.c 2009-07-26 00:39:40 UTC (rev 286337)
+++ pecl/phar/trunk/phar.c 2009-07-26 01:03:47 UTC (rev 286338)
@@ -2647,7 +2647,11 @@
len = -len;
}
user_stub = 0;
+#if PHP_MAJOR_VERSION = 6
+ if (!(len = php_stream_copy_to_mem(stubfile, (void **) user_stub, len, 0)) || !user_stub) {
+#else
if (!(len = php_stream_copy_to_mem(stubfile, user_stub, len, 0)) || !user_stub) {
+#endif
if (closeoldfile) {
php_stream_close(oldfile);
}
Modified: pecl/phar/trunk/phar_internal.h
===
--- pecl/phar/trunk/phar_internal.h 2009-07-26 00:39:40 UTC (rev 286337)
+++ pecl/phar/trunk/phar_internal.h 2009-07-26 01:03:47 UTC (rev 286338)
@@ -546,6 +546,38 @@
b = ZSTR(a);
#define PHAR_STR_FREE(a) \
efree(a);
+static inline int phar_make_unicode(zstr *c_var, char *arKey, uint nKeyLength TSRMLS_DC)
+{
+ int c_var_len;
+ UConverter *conv = ZEND_U_CONVERTER(UG(runtime_encoding_conv));
+
+ c_var-u = NULL;
+ if (zend_string_to_unicode(conv, c_var-u, c_var_len, arKey, nKeyLength TSRMLS_CC) == FAILURE) {
+
+ if (c_var-u) {
+ efree(c_var-u);
+ }
+ return 0;
+
+ }
+ return c_var_len;
+}
+static inline int phar_find_key(HashTable *_SERVER, char *key, int len, void **stuff TSRMLS_DC)
+{
+ if (SUCCESS == zend_hash_find(_SERVER, key, len, stuff)) {
+ return 1;
+ } else {
+ int s = len;
+ zstr var;
+ s = phar_make_unicode(var, key, len TSRMLS_CC);
+ if (SUCCESS == zend_u_hash_find(_SERVER, IS_UNICODE, var, s, stuff)) {
+ efree(var.u);
+ return 1;
+ }
+ efree(var.u);
+ return 0;
+ }
+}
#else
typedef char *phar_zstr;
#define PHAR_STR(a, b) \
Modified: pecl/phar/trunk/phar_object.c
===
--- pecl/phar/trunk/phar_object.c 2009-07-26 00:39:40 UTC (rev 286337)
+++ pecl/phar/trunk/phar_object.c 2009-07-26 01:03:47 UTC (rev 286338)
@@ -56,40 +56,6 @@
}
/* }}} */
-#if PHP_MAJOR_VERSION = 6
-static inline int phar_make_unicode(zstr *c_var, char *arKey, uint nKeyLength TSRMLS_DC)
-{
- int c_var_len;
- UConverter *conv = ZEND_U_CONVERTER(UG(runtime_encoding_conv));
-
- c_var-u = NULL;
- if (zend_string_to_unicode(conv, c_var-u, c_var_len, arKey, nKeyLength TSRMLS_CC) == FAILURE) {
-
- if (c_var-u) {
- efree(c_var-u);
- }
- return 0;
-
- }
- return c_var_len;
-}
-static inline int phar_find_key(HashTable *_SERVER, char *key, int len, void **stuff TSRMLS_DC)
-{
- if (SUCCESS == zend_hash_find(_SERVER, key, len, stuff)) {
- return 1;
- } else {
- int s = len;
- zstr var;
- s = phar_make_unicode(var, key, len TSRMLS_CC);
- if (SUCCESS == zend_u_hash_find(_SERVER, IS_UNICODE, var, s, stuff)) {
- efree(var.u);
- return 1;
- }
- efree(var.u);
- return 0;
- }
-}
-#endif
static void phar_mung_server_vars(char *fname, char *entry, int entry_len, char *basename, int request_uri_len TSRMLS_DC) /* {{{ */
{
#if PHP_MAJOR_VERSION = 6
Modified: pecl/phar/trunk/tar.c
===
--- pecl/phar/trunk/tar.c 2009-07-26 00:39:40 UTC (rev 286337)
+++ pecl/phar/trunk/tar.c 2009-07-26 01:03:47 UTC (rev 286338)
@@ -928,7 +928,11 @@
len = -len;
}
user_stub = 0;
+#if PHP_MAJOR_VERSION = 6
+ if (!(len = php_stream_copy_to_mem(stubfile, (void **) user_stub, len, 0)) || !user_stub) {
+#else
if (!(len = php_stream_copy_to_mem(stubfile, user_stub, len, 0)) || !user_stub) {
+#endif
if (error) {
spprintf(error, 0, unable to read resource to copy stub to new tar-based phar \%s\, phar-fname);
}
Modified: pecl/phar/trunk/zip.c
===
--- pecl/phar/trunk/zip.c 2009-07-26 00:39:40 UTC (rev 286337)
+++ pecl/phar/trunk/zip.c 2009-07-26 01:03:47 UTC (rev 286338)
@@ -600,7 +600,11 @@
php_stream_filter_append(fp-readfilters, filter);
+#if PHP_MAJOR_VERSION = 6
+if (!(entry.uncompressed_filesize =
[PHP-CVS] svn: / pecl/phar/trunk/stream.c pecl/phar/trunk/tests/create_new_and_modify.phpt pecl/phar/trunk/tests/phar_ctx_001.phpt pecl/phar/trunk/tests/readfile_edgecases.phpt pecl/phar/trunk/tests/r
cellog Sun, 26 Jul 2009 01:24:12 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286339
Log:
fix basic phar test issues, failing tests phar_oo_009.phpt and
phar_buildfromiterator10.phpt are due to bugs in Spl
Changed paths:
U pecl/phar/trunk/stream.c
U pecl/phar/trunk/tests/create_new_and_modify.phpt
U pecl/phar/trunk/tests/phar_ctx_001.phpt
U pecl/phar/trunk/tests/readfile_edgecases.phpt
A pecl/phar/trunk/tests/readfile_edgecasesU.phpt
U php/php-src/branches/PHP_5_3/ext/phar/stream.c
U php/php-src/branches/PHP_5_3/ext/phar/tests/create_new_and_modify.phpt
U php/php-src/branches/PHP_5_3/ext/phar/tests/phar_ctx_001.phpt
U php/php-src/branches/PHP_5_3/ext/phar/tests/readfile_edgecases.phpt
A php/php-src/branches/PHP_5_3/ext/phar/tests/readfile_edgecasesU.phpt
U php/php-src/trunk/ext/phar/stream.c
U php/php-src/trunk/ext/phar/tests/create_new_and_modify.phpt
U php/php-src/trunk/ext/phar/tests/phar_ctx_001.phpt
U php/php-src/trunk/ext/phar/tests/readfile_edgecases.phpt
Modified: pecl/phar/trunk/stream.c
===
--- pecl/phar/trunk/stream.c 2009-07-26 01:03:47 UTC (rev 286338)
+++ pecl/phar/trunk/stream.c 2009-07-26 01:24:12 UTC (rev 286339)
@@ -207,18 +207,30 @@
fpf = php_stream_alloc(phar_ops, idata, NULL, mode);
php_url_free(resource);
efree(internal_file);
+#if PHP_MAJOR_VERSION = 6
+ if (context context-options phar_find_key(HASH_OF(context-options), phar, sizeof(phar), (void**)pzoption TSRMLS_CC)) {
+#else
if (context context-options zend_hash_find(HASH_OF(context-options), phar, sizeof(phar), (void**)pzoption) == SUCCESS) {
+#endif
pharcontext = HASH_OF(*pzoption);
if (idata-internal_file-uncompressed_filesize == 0
idata-internal_file-compressed_filesize == 0
+#if PHP_MAJOR_VERSION = 6
+ phar_find_key(pharcontext, compress, sizeof(compress), (void**)pzoption TSRMLS_CC)
+#else
zend_hash_find(pharcontext, compress, sizeof(compress), (void**)pzoption) == SUCCESS
+#endif
Z_TYPE_PP(pzoption) == IS_LONG
(Z_LVAL_PP(pzoption) ~PHAR_ENT_COMPRESSION_MASK) == 0
) {
idata-internal_file-flags = ~PHAR_ENT_COMPRESSION_MASK;
idata-internal_file-flags |= Z_LVAL_PP(pzoption);
}
+#if PHP_MAJOR_VERSION = 6
+ if (phar_find_key(pharcontext, metadata, sizeof(metadata), (void**)pzoption TSRMLS_CC)) {
+#else
if (zend_hash_find(pharcontext, metadata, sizeof(metadata), (void**)pzoption) == SUCCESS) {
+#endif
if (idata-internal_file-metadata) {
zval_ptr_dtor(idata-internal_file-metadata);
idata-internal_file-metadata = NULL;
Modified: pecl/phar/trunk/tests/create_new_and_modify.phpt
===
--- pecl/phar/trunk/tests/create_new_and_modify.phpt 2009-07-26 01:03:47 UTC (rev 286338)
+++ pecl/phar/trunk/tests/create_new_and_modify.phpt 2009-07-26 01:24:12 UTC (rev 286339)
@@ -27,9 +27,9 @@
$phar = new Phar($fname);
$sig2 = $phar-getSignature();
-var_dump($sig1['hash']);
-var_dump($sig2['hash']);
-var_dump($sig1['hash'] != $sig2['hash']);
+var_dump($sig1[b'hash']);
+var_dump($sig2[b'hash']);
+var_dump($sig1[b'hash'] != $sig2[b'hash']);
include $pname . '/a.php';
include $pname . '/b.php';
Modified: pecl/phar/trunk/tests/phar_ctx_001.phpt
===
--- pecl/phar/trunk/tests/phar_ctx_001.phpt 2009-07-26 01:03:47 UTC (rev 286338)
+++ pecl/phar/trunk/tests/phar_ctx_001.phpt 2009-07-26 01:24:12 UTC (rev 286339)
@@ -28,7 +28,7 @@
var_dump(file_get_contents($pname . '/c'));
var_dump($phar['c']-isCompressed());
-$context = stream_context_create(array('phar'= array('compress'=Phar::GZ, 'metadata' = array(2, 'hi' = 3;
+$context = stream_context_create(array('phar'= array('compress'=Phar::GZ, 'metadata' = array(2, b'hi' = 3;
$context2 = stream_context_create(array('phar' = array('metadata' = array(4;
file_put_contents($pname . '/a', b'new a', 0); // no compression
Modified: pecl/phar/trunk/tests/readfile_edgecases.phpt
===
--- pecl/phar/trunk/tests/readfile_edgecases.phpt 2009-07-26 01:03:47 UTC (rev 286338)
+++ pecl/phar/trunk/tests/readfile_edgecases.phpt 2009-07-26 01:24:12 UTC (rev 286339)
@@ -2,6 +2,7 @@
Phar: test edge cases of readfile() function interception
--SKIPIF--
?php if (!extension_loaded(phar)) die(skip);?
+?php if (version_compare(PHP_VERSION, 6.0, =)) die(skip requires php older than 6.0); ?
--INI--
phar.readonly=0
--FILE--
Added: pecl/phar/trunk/tests/readfile_edgecasesU.phpt
===
--- pecl/phar/trunk/tests/readfile_edgecasesU.phpt (rev 0)
+++ pecl/phar/trunk/tests/readfile_edgecasesU.phpt 2009-07-26 01:24:12 UTC (rev 286339)
@@ -0,0 +1,61 @@
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/curl/tests/bug46739.phpt branches/PHP_5_3/ext/curl/tests/bug46739.phpt trunk/ext/curl/interface.c
rasmus Sun, 26 Jul 2009 02:12:38 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286340
Log:
The test for bug #46739 doesn't actually need the remote
responder, so get rid of the skipif in PHP 5, and it was
broken in PHP 6 because the keys in the curl_info array
were not unicode. All internally-generated arrays should
have unicode keys.
Bug: http://bugs.php.net/46739 (Closed) array returned by curl_getinfo should
contain content_type key
Changed paths:
U php/php-src/branches/PHP_5_2/ext/curl/tests/bug46739.phpt
U php/php-src/branches/PHP_5_3/ext/curl/tests/bug46739.phpt
U php/php-src/trunk/ext/curl/interface.c
Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/bug46739.phpt
===
--- php/php-src/branches/PHP_5_2/ext/curl/tests/bug46739.phpt 2009-07-26
01:24:12 UTC (rev 286339)
+++ php/php-src/branches/PHP_5_2/ext/curl/tests/bug46739.phpt 2009-07-26
02:12:38 UTC (rev 286340)
@@ -5,9 +5,6 @@
if (!extension_loaded(curl)) {
exit(skip curl extension not loaded);
}
-if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) {
- exit(skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined);
-}
?
--FILE--
?php
Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/bug46739.phpt
===
--- php/php-src/branches/PHP_5_3/ext/curl/tests/bug46739.phpt 2009-07-26
01:24:12 UTC (rev 286339)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/bug46739.phpt 2009-07-26
02:12:38 UTC (rev 286340)
@@ -5,9 +5,6 @@
if (!extension_loaded(curl)) {
exit(skip curl extension not loaded);
}
-if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) {
- exit(skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined);
-}
?
--FILE--
?php
Modified: php/php-src/trunk/ext/curl/interface.c
===
--- php/php-src/trunk/ext/curl/interface.c 2009-07-26 01:24:12 UTC (rev
286339)
+++ php/php-src/trunk/ext/curl/interface.c 2009-07-26 02:12:38 UTC (rev
286340)
@@ -152,10 +152,10 @@
#define SAVE_CURL_ERROR(__handle, __err) (__handle)-err.no = (int) __err;
-#define CAAL(s, v) add_assoc_long_ex(return_value, s, sizeof(s), (long) v);
-#define CAAD(s, v) add_assoc_double_ex(return_value, s, sizeof(s), (double) v);
+#define CAAL(s, v) add_ascii_assoc_long_ex(return_value, s, sizeof(s), (long)
v);
+#define CAAD(s, v) add_ascii_assoc_double_ex(return_value, s, sizeof(s),
(double) v);
#define CAAS(s, v) add_ascii_assoc_string(return_value, s, (v ? v : ), 1);
-#define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v);
+#define CAAZ(s, v) add_ascii_assoc_zval_ex(return_value, s, sizeof(s), (zval
*) v);
#if defined(PHP_WIN32) || defined(__GNUC__)
# define php_curl_ret(__ret) RETVAL_FALSE; return __ret;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: / pecl/phar/trunk/phar_object.c pecl/phar/trunk/tests/tar/phar_convert_phar4.phpt php/php-src/branches/PHP_5_3/ext/phar/phar_object.c php/php-src/branches/PHP_5_3/ext/phar/tests/tar/pha
cellog Sun, 26 Jul 2009 02:18:50 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286341
Log:
fix generation of phar.phar in php 6, fix remaining tests broken by PHP 6 (and
not by spl/other stuff in php6)
Changed paths:
U pecl/phar/trunk/phar_object.c
U pecl/phar/trunk/tests/tar/phar_convert_phar4.phpt
U php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
U php/php-src/branches/PHP_5_3/ext/phar/tests/tar/phar_convert_phar4.phpt
U php/php-src/trunk/ext/phar/Makefile.frag
U php/php-src/trunk/ext/phar/phar/clicommand.inc
U php/php-src/trunk/ext/phar/phar/pharcommand.inc
U php/php-src/trunk/ext/phar/phar_object.c
A php/php-src/trunk/ext/phar/tests/readfile_edgecasesU.phpt
U php/php-src/trunk/ext/phar/tests/tar/phar_convert_phar4.phpt
Modified: pecl/phar/trunk/phar_object.c
===
--- pecl/phar/trunk/phar_object.c 2009-07-26 02:12:38 UTC (rev 286340)
+++ pecl/phar/trunk/phar_object.c 2009-07-26 02:18:50 UTC (rev 286341)
@@ -990,7 +990,9 @@
}
}
+#if PHP_MAJOR_VERSION = 6
notfound:
+#endif
if (!mime_type) {
code = phar_file_type(PHAR_G(mime_types), entry, mime_type TSRMLS_CC);
}
Modified: pecl/phar/trunk/tests/tar/phar_convert_phar4.phpt
===
--- pecl/phar/trunk/tests/tar/phar_convert_phar4.phpt 2009-07-26 02:12:38 UTC (rev 286340)
+++ pecl/phar/trunk/tests/tar/phar_convert_phar4.phpt 2009-07-26 02:18:50 UTC (rev 286341)
@@ -14,7 +14,7 @@
$phar = new Phar($fname);
$phar['a.txt'] = 'some text';
-$phar-setMetadata('hi');
+$phar-setMetadata(b'hi');
$phar-stopBuffering();
var_dump($phar-isFileFormat(Phar::TAR));
var_dump(strlen($phar-getStub()));
Modified: php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
===
--- php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2009-07-26 02:12:38 UTC (rev 286340)
+++ php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2009-07-26 02:18:50 UTC (rev 286341)
@@ -990,7 +990,9 @@
}
}
+#if PHP_MAJOR_VERSION = 6
notfound:
+#endif
if (!mime_type) {
code = phar_file_type(PHAR_G(mime_types), entry, mime_type TSRMLS_CC);
}
Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/tar/phar_convert_phar4.phpt
===
--- php/php-src/branches/PHP_5_3/ext/phar/tests/tar/phar_convert_phar4.phpt 2009-07-26 02:12:38 UTC (rev 286340)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/tar/phar_convert_phar4.phpt 2009-07-26 02:18:50 UTC (rev 286341)
@@ -14,7 +14,7 @@
$phar = new Phar($fname);
$phar['a.txt'] = 'some text';
-$phar-setMetadata('hi');
+$phar-setMetadata(b'hi');
$phar-stopBuffering();
var_dump($phar-isFileFormat(Phar::TAR));
var_dump(strlen($phar-getStub()));
Modified: php/php-src/trunk/ext/phar/Makefile.frag
===
--- php/php-src/trunk/ext/phar/Makefile.frag 2009-07-26 02:12:38 UTC (rev 286340)
+++ php/php-src/trunk/ext/phar/Makefile.frag 2009-07-26 02:18:50 UTC (rev 286341)
@@ -37,7 +37,7 @@
-...@echo Generating phar.phar
-...@rm -f $(builddir)/phar.phar
-...@rm -f $(srcdir)/phar.phar
- @$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b $(PHP_PHARCMD_BANG) $(srcdir)/phar/
+ @$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x /\\.svn/ -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b $(PHP_PHARCMD_BANG) $(srcdir)/phar/
-...@chmod +x $(builddir)/phar.phar
install-pharcmd: pharcmd
Modified: php/php-src/trunk/ext/phar/phar/clicommand.inc
===
--- php/php-src/trunk/ext/phar/phar/clicommand.inc 2009-07-26 02:12:38 UTC (rev 286340)
+++ php/php-src/trunk/ext/phar/phar/clicommand.inc 2009-07-26 02:18:50 UTC (rev 286341)
@@ -58,15 +58,15 @@
}
}
- if (isset($this-args[''])) {
+ if (isset($this-args[b''])) {
if ($i = $argc) {
- if (isset($this-args['']['require']) $this-args['']['require']) {
+ if (isset($this-args[b'']['require']) $this-args[b'']['require']) {
self::error(Missing default trailing arguments to command $command, check ${argv[0]} help\n);
}
} else {
- $this-args['']['val'] = array();
+ $this-args[b'']['val'] = array();
while($i $argc) {
- $this-args['']['val'][] = $argv[$i++];
+ $this-args[b'']['val'][] = $argv[$i++];
}
}
} else if ($i $argc) {
@@ -122,10 +122,10 @@
$func = $prefix . $sub . '_' . $what;
$what = str_replace('_', '-', $what);
if ($r-hasMethod($func)) {
- if (!isset($a[$what])) {
- $a[$what] = array();
+ if
[PHP-CVS] svn: /php/php-src/trunk/ext/phar/ config.m4 config.w32
cellog Sun, 26 Jul 2009 02:19:58 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286342
Log:
re-enable phar now that compile and building phar.phar works
Changed paths:
U php/php-src/trunk/ext/phar/config.m4
U php/php-src/trunk/ext/phar/config.w32
Modified: php/php-src/trunk/ext/phar/config.m4
===
--- php/php-src/trunk/ext/phar/config.m42009-07-26 02:18:50 UTC (rev
286341)
+++ php/php-src/trunk/ext/phar/config.m42009-07-26 02:19:58 UTC (rev
286342)
@@ -2,7 +2,7 @@
dnl config.m4 for extension phar
PHP_ARG_ENABLE(phar, for phar archive support,
-[ --enable-phar Enable phar support])
+[ --disable-phar Disable phar support], yes)
if test $PHP_PHAR != no; then
PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c
dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared)
Modified: php/php-src/trunk/ext/phar/config.w32
===
--- php/php-src/trunk/ext/phar/config.w32 2009-07-26 02:18:50 UTC (rev
286341)
+++ php/php-src/trunk/ext/phar/config.w32 2009-07-26 02:19:58 UTC (rev
286342)
@@ -1,7 +1,7 @@
// $Id$
// vim:ft=javascript
-ARG_ENABLE(phar, enable phar support, no);
+ARG_ENABLE(phar, disable phar support, yes);
ARG_ENABLE(phar-native-ssl, enable phar with native OpenSSL support, no);
if (PHP_PHAR_NATIVE_SSL != no) {
--
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/curl/tests/ curl_basic_016.phpt curl_setopt_basic001.phpt
rasmus Sun, 26 Jul 2009 02:25:17 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286343
Log:
Fix 2 more curl tests in PHP 6
Changed paths:
U php/php-src/trunk/ext/curl/tests/curl_basic_016.phpt
U php/php-src/trunk/ext/curl/tests/curl_setopt_basic001.phpt
Modified: php/php-src/trunk/ext/curl/tests/curl_basic_016.phpt
===
--- php/php-src/trunk/ext/curl/tests/curl_basic_016.phpt2009-07-26
02:19:58 UTC (rev 286342)
+++ php/php-src/trunk/ext/curl/tests/curl_basic_016.phpt2009-07-26
02:25:17 UTC (rev 286343)
@@ -15,43 +15,43 @@
array(20) {
[%u|b%url]=
string(0)
- [content_type]=
+ [ucontent_type]=
NULL
- [http_code]=
+ [uhttp_code]=
int(0)
- [header_size]=
+ [uheader_size]=
int(0)
- [request_size]=
+ [urequest_size]=
int(0)
- [filetime]=
+ [ufiletime]=
int(0)
- [ssl_verify_result]=
+ [ussl_verify_result]=
int(0)
- [redirect_count]=
+ [uredirect_count]=
int(0)
- [total_time]=
+ [utotal_time]=
float(0)
- [namelookup_time]=
+ [unamelookup_time]=
float(0)
- [connect_time]=
+ [uconnect_time]=
float(0)
- [pretransfer_time]=
+ [upretransfer_time]=
float(0)
- [size_upload]=
+ [usize_upload]=
float(0)
- [size_download]=
+ [usize_download]=
float(0)
- [speed_download]=
+ [uspeed_download]=
float(0)
- [speed_upload]=
+ [uspeed_upload]=
float(0)
- [download_content_length]=
+ [udownload_content_length]=
float(0)
- [upload_content_length]=
+ [uupload_content_length]=
float(%f)
- [starttransfer_time]=
+ [ustarttransfer_time]=
float(%f)
- [redirect_time]=
+ [uredirect_time]=
float(0)
}
===DONE===
Modified: php/php-src/trunk/ext/curl/tests/curl_setopt_basic001.phpt
===
--- php/php-src/trunk/ext/curl/tests/curl_setopt_basic001.phpt 2009-07-26
02:19:58 UTC (rev 286342)
+++ php/php-src/trunk/ext/curl/tests/curl_setopt_basic001.phpt 2009-07-26
02:25:17 UTC (rev 286343)
@@ -27,9 +27,6 @@
var_dump( $curl_content );
?
--EXPECTF--
-PHP Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in
Unknown on line 0
+PHP Warning: Directive 'safe_mode' is no longer supported in PHP 6 and
greater in Unknown on line 0
*** Testing curl_setopt with CURLOPT_FOLLOWLOCATION in safemode
-
-Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when in
safe_mode or an open_basedir is set in %s on line %d
bool(false)
-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: / pecl/phar/trunk/phar_object.c pecl/phar/trunk/tests/phar_buildfromiterator10.phpt php/php-src/branches/PHP_5_3/ext/phar/phar_object.c php/php-src/branches/PHP_5_3/ext/phar/tests/phar_
cellog Sun, 26 Jul 2009 02:43:14 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286344
Log:
fix buildFromIterator with filesystem iterator in php 6
Changed paths:
U pecl/phar/trunk/phar_object.c
U pecl/phar/trunk/tests/phar_buildfromiterator10.phpt
U php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
U
php/php-src/branches/PHP_5_3/ext/phar/tests/phar_buildfromiterator10.phpt
U php/php-src/trunk/ext/phar/phar_object.c
U php/php-src/trunk/ext/phar/tests/phar_buildfromiterator10.phpt
Modified: pecl/phar/trunk/phar_object.c
===
--- pecl/phar/trunk/phar_object.c 2009-07-26 02:25:17 UTC (rev 286343)
+++ pecl/phar/trunk/phar_object.c 2009-07-26 02:43:14 UTC (rev 286344)
@@ -1669,7 +1669,21 @@
case SPL_FS_INFO:
case SPL_FS_FILE:
#if PHP_VERSION_ID = 6
- fname = expand_filepath(intern-file_name.s, NULL TSRMLS_CC);
+ if (intern-file_name_type == IS_UNICODE) {
+ zval zv;
+
+ INIT_ZVAL(zv);
+ Z_UNIVAL(zv) = intern-file_name;
+ Z_UNILEN(zv) = intern-file_name_len;
+ Z_TYPE(zv) = IS_UNICODE;
+
+ zval_copy_ctor(zv);
+ zval_unicode_to_string(zv TSRMLS_CC);
+ fname = expand_filepath(Z_STRVAL(zv), NULL TSRMLS_CC);
+ ezfree(Z_UNIVAL(zv));
+ } else {
+ fname = expand_filepath(intern-file_name.s, NULL TSRMLS_CC);
+ }
#else
fname = expand_filepath(intern-file_name, NULL TSRMLS_CC);
#endif
Modified: pecl/phar/trunk/tests/phar_buildfromiterator10.phpt
===
--- pecl/phar/trunk/tests/phar_buildfromiterator10.phpt 2009-07-26 02:25:17 UTC (rev 286343)
+++ pecl/phar/trunk/tests/phar_buildfromiterator10.phpt 2009-07-26 02:43:14 UTC (rev 286344)
@@ -31,74 +31,74 @@
--EXPECTF--
array(35) {
[phar_ctx_001.phpt]=
- %unicode|string%(%d) %sphar_ctx_001.phpt
+ string(%d) %sphar_ctx_001.phpt
[phar_get_supported_signatures_001.phpt]=
- %unicode|string%(%d) %sphar_get_supported_signatures_001.phpt
+ string(%d) %sphar_get_supported_signatures_001.phpt
[phar_get_supported_signatures_002.phpt]=
- %unicode|string%(%d) %sphar_get_supported_signatures_002.phpt
+ string(%d) %sphar_get_supported_signatures_002.phpt
[phar_oo_001.phpt]=
- %unicode|string%(%d) %sphar_oo_001.phpt
+ string(%d) %sphar_oo_001.phpt
[phar_oo_002.phpt]=
- %unicode|string%(%d) %sphar_oo_002.phpt
+ string(%d) %sphar_oo_002.phpt
[phar_oo_003.phpt]=
- %unicode|string%(%d) %sphar_oo_003.phpt
+ string(%d) %sphar_oo_003.phpt
[phar_oo_004.phpt]=
- %unicode|string%(%d) %sphar_oo_004.phpt
+ string(%d) %sphar_oo_004.phpt
[phar_oo_005.phpt]=
- %unicode|string%(%d) %sphar_oo_005.phpt
+ string(%d) %sphar_oo_005.phpt
[phar_oo_006.phpt]=
- %unicode|string%(%d) %sphar_oo_006.phpt
+ string(%d) %sphar_oo_006.phpt
[phar_oo_007.phpt]=
- %unicode|string%(%d) %sphar_oo_007.phpt
+ string(%d) %sphar_oo_007.phpt
[phar_oo_008.phpt]=
- %unicode|string%(%d) %sphar_oo_008.phpt
+ string(%d) %sphar_oo_008.phpt
[phar_oo_009.phpt]=
- %unicode|string%(%d) %sphar_oo_009.phpt
+ string(%d) %sphar_oo_009.phpt
[phar_oo_010.phpt]=
- %unicode|string%(%d) %sphar_oo_010.phpt
+ string(%d) %sphar_oo_010.phpt
[phar_oo_011.phpt]=
- %unicode|string%(%d) %sphar_oo_011.phpt
+ string(%d) %sphar_oo_011.phpt
[phar_oo_012.phpt]=
- %unicode|string%(%d) %sphar_oo_012.phpt
+ string(%d) %sphar_oo_012.phpt
[phar_oo_compressed_001.phpt]=
- %unicode|string%(%d) %sphar_oo_compressed_001.phpt
+ string(%d) %sphar_oo_compressed_001.phpt
[phar_oo_compressed_002.phpt]=
- %unicode|string%(%d) %sphar_oo_compressed_002.phpt
+ string(%d) %sphar_oo_compressed_002.phpt
[phpinfo_001.phpt]=
- %unicode|string%(%d) %sphpinfo_001.phpt
+ string(%d) %sphpinfo_001.phpt
[phpinfo_002.phpt]=
- %unicode|string%(%d) %sphpinfo_002.phpt
+ string(%d) %sphpinfo_002.phpt
[phpinfo_003.phpt]=
- %unicode|string%(%d) %sphpinfo_003.phpt
+ string(%d) %sphpinfo_003.phpt
[phpinfo_004.phpt]=
- %unicode|string%(%d) %sphpinfo_004.phpt
+ string(%d) %sphpinfo_004.phpt
[tar/tar_001.phpt]=
- %unicode|string%(%d) %star%ctar_001.phpt
+ string(%d) %star%ctar_001.phpt
[tar/tar_002.phpt]=
- %unicode|string%(%d) %star%ctar_002.phpt
+ string(%d) %star%ctar_002.phpt
[tar/tar_003.phpt]=
- %unicode|string%(%d) %star%ctar_003.phpt
+ string(%d) %star%ctar_003.phpt
[tar/tar_004.phpt]=
- %unicode|string%(%d) %star%ctar_004.phpt
+ string(%d) %star%ctar_004.phpt
[zip/corrupt_001.phpt]=
- %unicode|string%(%d) %szip%ccorrupt_001.phpt
+ string(%d) %szip%ccorrupt_001.phpt
[zip/corrupt_002.phpt]=
- %unicode|string%(%d) %szip%ccorrupt_002.phpt
+ string(%d) %szip%ccorrupt_002.phpt
[zip/corrupt_003.phpt]=
- %unicode|string%(%d) %szip%ccorrupt_003.phpt
+ string(%d) %szip%ccorrupt_003.phpt
[zip/corrupt_004.phpt]=
- %unicode|string%(%d)
[PHP-CVS] svn: / pecl/phar/trunk/phar_object.c pecl/phar/trunk/tests/cache_list/copyonwrite17.phar.phpt pecl/phar/trunk/tests/cache_list/copyonwrite19.phar.phpt pecl/phar/trunk/tests/cache_list/files/
cellog Sun, 26 Jul 2009 03:07:23 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286345
Log:
make cache_list tests pass in php 6
Changed paths:
U pecl/phar/trunk/phar_object.c
U pecl/phar/trunk/tests/cache_list/copyonwrite17.phar.phpt
U pecl/phar/trunk/tests/cache_list/copyonwrite19.phar.phpt
U pecl/phar/trunk/tests/cache_list/files/frontcontroller12.phar
U pecl/phar/trunk/tests/cache_list/files/frontcontroller12.phar.inc
U pecl/phar/trunk/tests/cache_list/files/frontcontroller14.phar
U pecl/phar/trunk/tests/cache_list/files/frontcontroller14.phar.inc
U pecl/phar/trunk/tests/cache_list/files/frontcontroller3.phar
U pecl/phar/trunk/tests/cache_list/files/frontcontroller3.phar.inc
U pecl/phar/trunk/tests/cache_list/files/frontcontroller4.phar
U pecl/phar/trunk/tests/cache_list/files/frontcontroller4.phar.inc
U pecl/phar/trunk/tests/cache_list/files/frontcontroller8.phar
U pecl/phar/trunk/tests/cache_list/files/frontcontroller8.phar.inc
U pecl/phar/trunk/tests/cache_list/files/write24.phar
U pecl/phar/trunk/tests/cache_list/files/write24.phar.inc
U pecl/phar/trunk/tests/cache_list/frontcontroller21.phpt
U pecl/phar/trunk/tests/cache_list/frontcontroller22.phpt
U php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
U
php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/copyonwrite17.phar.phpt
U
php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/copyonwrite19.phar.phpt
U
php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller12.phar
U
php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc
U
php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller14.phar
U
php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc
U
php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller3.phar
U
php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller3.phar.inc
U
php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller4.phar
U
php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller4.phar.inc
U
php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller8.phar
U
php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/frontcontroller8.phar.inc
U
php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/write24.phar
U
php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/write24.phar.inc
U
php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/frontcontroller21.phpt
U
php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/frontcontroller22.phpt
U php/php-src/trunk/ext/phar/phar_object.c
U php/php-src/trunk/ext/phar/tests/cache_list/copyonwrite17.phar.phpt
U php/php-src/trunk/ext/phar/tests/cache_list/copyonwrite19.phar.phpt
U php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller12.phar
U
php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc
U php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller14.phar
U
php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc
U php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller3.phar
U
php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller3.phar.inc
U php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller4.phar
U
php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller4.phar.inc
U php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller8.phar
U
php/php-src/trunk/ext/phar/tests/cache_list/files/frontcontroller8.phar.inc
U php/php-src/trunk/ext/phar/tests/cache_list/files/write24.phar
U php/php-src/trunk/ext/phar/tests/cache_list/files/write24.phar.inc
U php/php-src/trunk/ext/phar/tests/cache_list/frontcontroller21.phpt
U php/php-src/trunk/ext/phar/tests/cache_list/frontcontroller22.phpt
Modified: pecl/phar/trunk/phar_object.c
===
--- pecl/phar/trunk/phar_object.c 2009-07-26 02:43:14 UTC (rev 286344)
+++ pecl/phar/trunk/phar_object.c 2009-07-26 03:07:23 UTC (rev 286345)
@@ -941,19 +941,7 @@
++ext;
#if PHP_MAJOR_VERSION = 6
- if (FAILURE == zend_hash_find(Z_ARRVAL_P(mimeoverride), ext, strlen(ext)+1, (void **) val)) {
-/* try unicode extension */
-zstr zext;
-zspprintf(IS_UNICODE, zext, 0, %s, ext);
-if (SUCCESS == zend_u_hash_find(Z_ARRVAL_P(mimeoverride), IS_UNICODE, zext, strlen(ext)+1, (void **) val)) {
- ezfree(zext);
- goto unicode_found;
-}
-ezfree(zext);
-goto notfound;
- }
-unicode_found:
- { /* this prevents parse error */
+ if (phar_find_key(Z_ARRVAL_P(mimeoverride),
[PHP-CVS] svn: /SVNROOT/ hook-common.inc.php pre-commit
gwynne Sun, 26 Jul 2009 04:00:55 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286349
Log:
minor whitespace quirk in debug output fixed. More importantly, the creation of
tags/ directories is now allowed subject to location-in-repo restrictions
Changed paths:
U SVNROOT/hook-common.inc.php
U SVNROOT/pre-commit
Modified: SVNROOT/hook-common.inc.php
===
--- SVNROOT/hook-common.inc.php 2009-07-26 03:46:22 UTC (rev 286348)
+++ SVNROOT/hook-common.inc.php 2009-07-26 04:00:55 UTC (rev 286349)
@@ -75,7 +75,7 @@
}
$final_paths[$actual_path] = $path_actions;
}
-debug(print_r($final_paths, 1));
+debug(trim(print_r($final_paths, 1)));
return $final_paths;
}
Modified: SVNROOT/pre-commit
===
--- SVNROOT/pre-commit 2009-07-26 03:46:22 UTC (rev 286348)
+++ SVNROOT/pre-commit 2009-07-26 04:00:55 UTC (rev 286349)
@@ -35,19 +35,39 @@
fail(Commits to archived modules are not allowed.\n);
}
-// path contains /tags/ AND
-// path was not added OR
-// path was not copied OR
-// path is not a directory OR
-// path's immediate ancestor is not tags/
-if (strpos($changed_path, '/tags/') !== FALSE
-(!in_array('added', $path_actions) ||
-!in_array('copied', $path_actions) ||
-substr($changed_path, -1) !== '/' ||
-substr(dirname($changed_path), -5) !== '/tags'))
-{
-fail(Committing to a tag is not allowed.\n);
+// path contains /tags/
+if (($tags_loc = strpos($changed_path, '/tags/')) !== FALSE) {
+$allowed_tag = FALSE;
+
+// path was added AND
+// path was copied AND
+// path is a directory AND
+// path's immediate ancestor is tags/
+if (in_array('added', $path_actions)
+in_array('copied', $path_actions)
+substr($changed_path, -1) === '/'
+substr(dirname($changed_path), -5) === '/tags')
+{
+debug(Tag {$changed_path} passes checks for tag creation.);
+$allowed_tag = TRUE;
+}
+// path was added AND
+// path does not contain any other structure directories AND
+// the first occurrence of /tags/ in path is at the end
+else if (in_array('added', $path_actions)
+ strpos($changed_path, /branches/) === FALSE
+ strpos($changed_path, /trunk/) === FALSE
+ $tags_loc === strlen($changed_path) - 6)
+{
+debug(Path {$changed_path} passes checks for tags directory
creation.);
+$allowed_tag = TRUE;
+}
+
+if (!$allowed_tag) {
+fail(Committing to a tag is not allowed.\n);
+}
}
+
}
//
-
--
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/curl/tests/ curl_write_callback.phpt curl_write_file.phpt curl_write_return.phpt curl_write_stdout.phpt
rasmus Sun, 26 Jul 2009 03:46:22 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286348 Log: Down to a single curl test failure now Changed paths: U php/php-src/trunk/ext/curl/tests/curl_write_callback.phpt U php/php-src/trunk/ext/curl/tests/curl_write_file.phpt U php/php-src/trunk/ext/curl/tests/curl_write_return.phpt U php/php-src/trunk/ext/curl/tests/curl_write_stdout.phpt Modified: php/php-src/trunk/ext/curl/tests/curl_write_callback.phpt === --- php/php-src/trunk/ext/curl/tests/curl_write_callback.phpt 2009-07-26 03:33:41 UTC (rev 286347) +++ php/php-src/trunk/ext/curl/tests/curl_write_callback.phpt 2009-07-26 03:46:22 UTC (rev 286348) @@ -19,7 +19,7 @@ $log_file = tempnam(sys_get_temp_dir(), 'php-curl-test'); $fp = fopen($log_file, 'w+'); -fwrite($fp, test); +fwrite($fp, btest); fclose($fp); $ch = curl_init(); Modified: php/php-src/trunk/ext/curl/tests/curl_write_file.phpt === --- php/php-src/trunk/ext/curl/tests/curl_write_file.phpt 2009-07-26 03:33:41 UTC (rev 286347) +++ php/php-src/trunk/ext/curl/tests/curl_write_file.phpt 2009-07-26 03:46:22 UTC (rev 286348) @@ -14,7 +14,7 @@ $log_file = tempnam(sys_get_temp_dir(), 'php-curl-test'); $fp = fopen($log_file, 'w+'); -fwrite($fp, test); +fwrite($fp, btest); fclose($fp); $testfile_fp = fopen($test_file, 'w+'); Modified: php/php-src/trunk/ext/curl/tests/curl_write_return.phpt === --- php/php-src/trunk/ext/curl/tests/curl_write_return.phpt 2009-07-26 03:33:41 UTC (rev 286347) +++ php/php-src/trunk/ext/curl/tests/curl_write_return.phpt 2009-07-26 03:46:22 UTC (rev 286348) @@ -14,7 +14,7 @@ $log_file = tempnam(sys_get_temp_dir(), 'php-curl-test'); $fp = fopen($log_file, 'w+'); -fwrite($fp, test); +fwrite($fp, btest); fclose($fp); $ch = curl_init(); Modified: php/php-src/trunk/ext/curl/tests/curl_write_stdout.phpt === --- php/php-src/trunk/ext/curl/tests/curl_write_stdout.phpt 2009-07-26 03:33:41 UTC (rev 286347) +++ php/php-src/trunk/ext/curl/tests/curl_write_stdout.phpt 2009-07-26 03:46:22 UTC (rev 286348) @@ -13,7 +13,7 @@ $log_file = tempnam(sys_get_temp_dir(), 'php-curl-test'); $fp = fopen($log_file, 'w+'); -fwrite($fp, test); +fwrite($fp, btest); fclose($fp); $ch = curl_init(); -- 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/zip/tests/ oo_stream.phpt
rasmus Sun, 26 Jul 2009 04:40:36 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286351 Log: I don't see why a unicode string would appear here, and in fact it doesn't. Changed paths: U php/php-src/trunk/ext/zip/tests/oo_stream.phpt Modified: php/php-src/trunk/ext/zip/tests/oo_stream.phpt === --- php/php-src/trunk/ext/zip/tests/oo_stream.phpt 2009-07-26 04:02:50 UTC (rev 286350) +++ php/php-src/trunk/ext/zip/tests/oo_stream.phpt 2009-07-26 04:40:36 UTC (rev 286351) @@ -42,7 +42,7 @@ ? --EXPECTF-- resource(%d) of type (stream) -unicode(5) foo +string(5) foo string(5) foo -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
