Re: [PHP-CVS] svn: / SVNROOT/commit-email.php web/php-bugs/trunk/bug.php web/php-bugs/trunk/rpc.php
On 07/20/2009 07:16 PM, Rasmus Lerdorf wrote: Jani Taskinen wrote: This is all nice and that crap, but since you didn't merge it into pear/packages/Bugtracker, it will all be lost once that stuff is taken into action..so please merge this there too. :D It will be merged long before Bugtracker is ready. Define ready ? It's already ready, there's nothing missing in it.. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: / SVNROOT/commit-email.php web/php-bugs/trunk/bug.php web/php-bugs/trunk/rpc.php
Jani Taskinen wrote: On 07/20/2009 07:16 PM, Rasmus Lerdorf wrote: Jani Taskinen wrote: This is all nice and that crap, but since you didn't merge it into pear/packages/Bugtracker, it will all be lost once that stuff is taken into action..so please merge this there too. :D It will be merged long before Bugtracker is ready. Define ready ? It's already ready, there's nothing missing in it.. From the README: === Status === - Alpha - Likely implementation date: Q4 2009 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: / SVNROOT/commit-email.php web/php-bugs/trunk/bug.php web/php-bugs/trunk/rpc.php
On 07/21/2009 09:57 AM, Rasmus Lerdorf wrote: Jani Taskinen wrote: On 07/20/2009 07:16 PM, Rasmus Lerdorf wrote: Jani Taskinen wrote: This is all nice and that crap, but since you didn't merge it into pear/packages/Bugtracker, it will all be lost once that stuff is taken into action..so please merge this there too. :D It will be merged long before Bugtracker is ready. Define ready ? It's already ready, there's nothing missing in it.. From the README: === Status === - Alpha - Likely implementation date: Q4 2009 I wouldn't trust everything I read on some random README nobody has updated for ages. :D --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: / SVNROOT/commit-email.php web/php-bugs/trunk/bug.php web/php-bugs/trunk/rpc.php
Jani Taskinen wrote: On 07/21/2009 09:57 AM, Rasmus Lerdorf wrote: Jani Taskinen wrote: On 07/20/2009 07:16 PM, Rasmus Lerdorf wrote: Jani Taskinen wrote: This is all nice and that crap, but since you didn't merge it into pear/packages/Bugtracker, it will all be lost once that stuff is taken into action..so please merge this there too. :D It will be merged long before Bugtracker is ready. Define ready ? It's already ready, there's nothing missing in it.. From the README: === Status === - Alpha - Likely implementation date: Q4 2009 I wouldn't trust everything I read on some random README nobody has updated for ages. :D Then I suggest you guys update it and give us a status report. We aren't mind readers. -Rasmus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/proc_open.c branches/PHP_5_3/ext/standard/proc_open.h branches/PHP_5_3/ext/standard/tests/general_functions/proc_ope
On 07/20/2009 11:05 PM, Lukas Kahwe Smith wrote: On 20.07.2009, at 21:36, Nuno Lopes wrote: On Mon, Jul 20, 2009 at 12:19 PM, Jani Taskinenj...@php.net wrote: Excuse me but where/when was it agreed that this new feature can go into PHP_5_3? I thought it was supposed to go HEAD only.. It should not go in 5.3, Nuno please revert. Why not? Should we wait 2 years to implement these kind of little things? Or even to implement new things? Especially in a web-oriented language like PHP, you cannot afford to release new stuff only once in 2 years. It was decided that 5.3.1 would be reserved for bug fixes only for now. Then again when this was put into place we feared we might need a quick 5.3.1 to fix big issues in 5.3.0. It doesnt seem like this is the case and so 5.3.1 has not been scheduled yet nor is there a pressing need to ehhe..? There were quite a few quite bad bugs in 5.3.0, f.e. that one that causes segfaults if you didn't happen to have set the date.timezone for example. 5.3.1 should be released ASAP! --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: / SVNROOT/commit-email.php web/php-bugs/trunk/bug.php web/php-bugs/trunk/rpc.php
On 07/21/2009 10:13 AM, Rasmus Lerdorf wrote: Jani Taskinen wrote: On 07/21/2009 09:57 AM, Rasmus Lerdorf wrote: Jani Taskinen wrote: On 07/20/2009 07:16 PM, Rasmus Lerdorf wrote: Jani Taskinen wrote: This is all nice and that crap, but since you didn't merge it into pear/packages/Bugtracker, it will all be lost once that stuff is taken into action..so please merge this there too. :D It will be merged long before Bugtracker is ready. Define ready ? It's already ready, there's nothing missing in it.. From the README: === Status === - Alpha - Likely implementation date: Q4 2009 I wouldn't trust everything I read on some random README nobody has updated for ages. :D Then I suggest you guys update it and give us a status report. We aren't mind readers. pear2 (?) is gonna try it out first. We'll see if it works there and then convert current bugs.php.net to it. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
gwynne Tue, 21 Jul 2009 08:43:49 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284472
Log:
whoops, bug links go with the log message
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-21 08:33:19 UTC (rev 284471)
+++ SVNROOT/commit-email.php2009-07-21 08:43:49 UTC (rev 284472)
@@ -192,10 +192,10 @@
\r\n .
Log:\r\n .
{$commit_info['log_message']}\r\n .
+{$bugs_body}\r\n .
\r\n .
Changed paths:\r\n .
\t . implode(\r\n\t, $commit_info['changed_paths']) . \r\n .
-{$bugs_body}\r\n .
str_replace(\n, \r\n, $diffs_string);
if ($diffs_string === NULL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/phpruntests/trunk/src/ rtClassMap.php testcase/preconditions/rtIsSectionImplemented.php testcase/preconditions/rtIsValidSectionName.php testcase/rtTestConfiguration.php testcase/sec
zoe Tue, 21 Jul 2009 11:30:46 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284483
Log:
Added DESCRIPTION and STDIN sections
Changed paths:
U php/phpruntests/trunk/src/rtClassMap.php
U
php/phpruntests/trunk/src/testcase/preconditions/rtIsSectionImplemented.php
U
php/phpruntests/trunk/src/testcase/preconditions/rtIsValidSectionName.php
U php/phpruntests/trunk/src/testcase/rtTestConfiguration.php
A
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtStdinSection.php
U
php/phpruntests/trunk/src/testcase/sections/executablesections/rtFileSection.php
A
php/phpruntests/trunk/src/testcase/sections/informationsections/rtDescriptionSection.php
U php/phpruntests/trunk/src/testcase/sections/rtSection.phpModified: php/phpruntests/trunk/src/rtClassMap.php
===
--- php/phpruntests/trunk/src/rtClassMap.php 2009-07-21 10:02:26 UTC (rev 284482)
+++ php/phpruntests/trunk/src/rtClassMap.php 2009-07-21 11:30:46 UTC (rev 284483)
@@ -85,11 +85,13 @@
'rtIniSection' = 'testcase/sections/configurationsections/rtIniSection.php',
'rtPostRawSection' = 'testcase/sections/configurationsections/rtPostRawSection.php',
'rtPostSection'= 'testcase/sections/configurationsections/rtPostSection.php',
+'rtStdinSection' = 'testcase/sections/configurationsections/rtStdinSection.php',
'rtCleanSection' = 'testcase/sections/executablesections/rtCleanSection.php',
'rtFileExternalSection'= 'testcase/sections/executablesections/rtFileExternalSection.php',
'rtFileSection'= 'testcase/sections/executablesections/rtFileSection.php',
'rtSkipIfSection' = 'testcase/sections/executablesections/rtSkipIfSection.php',
'rtCreditsSection' = 'testcase/sections/informationsections/rtCreditsSection.php',
+'rtDescriptionSection' = 'testcase/sections/informationsections/rtDescriptionSection.php',
'rtTestHeaderSection' = 'testcase/sections/informationsections/rtTestHeaderSection.php',
'rtXfailSection' = 'testcase/sections/informationsections/rtXfailSection.php',
'rtExpectFSection' = 'testcase/sections/outputsections/rtExpectFSection.php',
Modified: php/phpruntests/trunk/src/testcase/preconditions/rtIsSectionImplemented.php
===
--- php/phpruntests/trunk/src/testcase/preconditions/rtIsSectionImplemented.php 2009-07-21 10:02:26 UTC (rev 284482)
+++ php/phpruntests/trunk/src/testcase/preconditions/rtIsSectionImplemented.php 2009-07-21 11:30:46 UTC (rev 284483)
@@ -17,6 +17,7 @@
{
private $sectionMap = array(
'TEST'= 'rtTestHeaderSection',
+'DESCRIPTION' = 'rtDescriptionSection',
'SKIPIF' = 'rtSkipIfSection',
'FILE'= 'rtFileSection',
'EXPECT' = 'rtExpectSection',
@@ -25,6 +26,7 @@
'INI' = 'rtIniSection',
'ARGS'= 'rtArgsSection',
'ENV' = 'rtEnvSection',
+'STDIN' = 'rtStdinSection',
'CREDITS' = 'rtCreditsSection',
'CLEAN' = 'rtCleanSection',
'XFAIL' = 'rtXfailSection',
Modified: php/phpruntests/trunk/src/testcase/preconditions/rtIsValidSectionName.php
===
--- php/phpruntests/trunk/src/testcase/preconditions/rtIsValidSectionName.php 2009-07-21 10:02:26 UTC (rev 284482)
+++ php/phpruntests/trunk/src/testcase/preconditions/rtIsValidSectionName.php 2009-07-21 11:30:46 UTC (rev 284483)
@@ -17,6 +17,7 @@
{
private $validSectionNames = array(
'TEST',
+'DESCRIPTION',
'SKIPIF',
'FILE',
'FILEEOF',
@@ -27,6 +28,7 @@
'INI',
'ARGS',
'ENV',
+'STDIN',
'XFAIL',
'STDIN',
'CREDITS',
Modified: php/phpruntests/trunk/src/testcase/rtTestConfiguration.php
===
--- php/phpruntests/trunk/src/testcase/rtTestConfiguration.php 2009-07-21 10:02:26 UTC (rev 284482)
+++ php/phpruntests/trunk/src/testcase/rtTestConfiguration.php 2009-07-21 11:30:46 UTC (rev 284483)
@@ -20,6 +20,7 @@
private $testCommandLineArguments;
private $phpExecutable;
private $inputFileString;
+private $stdin = null;
private $cgiTest = false;
private $cgiSections = array(
'GET',
@@ -45,6 +46,7 @@
$this-setTestCommandLineArguments($sections);
$this-setPhpExecutable($runConfiguration, $sectionHeadings);
[PHP-CVS] svn: php/phpruntests/trunk/QA/ QATESTS.tgz
zoe Tue, 21 Jul 2009 11:36:18 + Revision: http://svn.php.net/viewvc?view=revisionrevision=284484 Log: tidied test suite Changed paths: U php/phpruntests/trunk/QA/QATESTS.tgz Modified: php/phpruntests/trunk/QA/QATESTS.tgz === (Binary files differ) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
gwynne Tue, 21 Jul 2009 11:47:57 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284485
Log:
- fix bjori's newlines once and for all, I hope- a bit more reorganization of
the code- use easier-to-read-and-understand heredocs- allow a slightly longer
subject- give the diff attachment a more useful name- don't use inconsistent
tabbing anymore- a couple extra comments
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-21 11:36:18 UTC (rev 284484)
+++ SVNROOT/commit-email.php2009-07-21 11:47:57 UTC (rev 284485)
@@ -146,72 +146,89 @@
($diffs_length 8192 ? NULL : $commit_info['diffs']));
//
-
-// Build e-mail
-$boundary = sha1({$commit_info['author']}{$commit_info['date']});
-$messageid = {$commit_info['author']}-{$commit_info['date']}-{$REV}- .
mt_rand();
-$subject = svn: . ($parent_path === '' ? '/' : $parent_path);
-
-foreach ($commit_info['changed_paths'] as $changed_path) {
-$changed_path = trim(strstr($changed_path, ' '));
-if (substr($changed_path, -1) !== '/') {
-$subject .= ' ' . substr($changed_path, strlen($parent_path));
-}
-}
-$subject = substr($subject, 0, 950); // Max SMTP line length = 998. Some slop
in this value.
-
-$fullname = =?utf-8?q? . imap_8bit(str_replace(array('?', ' '), array('=3F',
'_'), $commit_info['author_name'])) . ?=;
-
-$msg_headers = From: {$fullname} {$commit_info['author']...@php.net\r\n .
- To: . implode(', ', $emails_to) . \r\n .
- Message-ID: svn{$message...@svn.php.net\r\n .
- Date: . date(DATE_RFC822, $commit_info['date']) . \r\n .
- Subject: {$subject}\r\n .
- MIME-Version: 1.0\r\n .
- Content-Type: multipart/mixed; boundary=\{$boundary}\\r\n;
-
+// Process bugs
$bugs_body = '';
if (isset($bug_list) count($bug_list) 0) {
-$bugs_body = count($bug_list) 1 ? Bugs: : Bug: ;
+$bugs_body = count($bug_list) 1 ? \nBugs: : \nBug: ;
foreach ($bug_list as $n = $bug) {
if (isset($bug['error'])) {
$status = '(error getting bug information)';
} else {
$status = ({$bug['status']}) {$bug['short_desc']};
}
-$bugs_body .= {$bug['url']} {$status}\r\n ;
+$bugs_body .= {$bug['url']} {$status}\n ;
}
}
-$msg_body = --{$boundary}\r\n .
-Content-Type: text/plain; charset=\utf-8\\r\n .
-Content-Transfer-Encoding: 8bit\r\n .
-\r\n .
-{$commit_info['author']}\t\t . date(DATE_RFC2822,
$commit_info['date']) . \r\n .
-\r\n .
-Revision:
http://svn.php.net/viewvc?view=revisionrevision={$REV}\r\n; .
-\r\n .
-Log:\r\n .
-{$commit_info['log_message']}\r\n .
-{$bugs_body}\r\n .
-\r\n .
-Changed paths:\r\n .
-\t . implode(\r\n\t, $commit_info['changed_paths']) . \r\n .
-str_replace(\n, \r\n, $diffs_string);
+//
-
+// Process changed paths
+$paths_list = $parent_path === '' ? '/' : $parent_path;
+foreach ($commit_info['changed_paths'] as $changed_path) {
+$changed_path = trim(strstr($changed_path, ' '));
+if (substr($changed_path, -1) !== '/') {
+$paths_list .= ' ' . substr($changed_path, strlen($parent_path));
+}
+}
+//
-
+// Build e-mail
+$boundary = sha1({$commit_info['author']}{$commit_info['date']});
+$messageid = {$commit_info['author']}-{$commit_info['date']}-{$REV}- .
mt_rand();
+$subject = substr(svn: {$paths_list}, 0, 970); // Max SMTP line length =
998. Some slop in this value.
+$email_date = date(DATE_RFC2822, $commit_info['date']);
+$fullname = =?utf-8?q? . imap_8bit(str_replace(array('?', ' '), array('=3F',
'_'), $commit_info['author_name'])) . ?=;
+$email_list = implode(', ', $emails_to);
+$readable_path_list = . implode(\n,
$commit_info['changed_paths']);
+$nspaces = str_repeat( , max(1, 72 - strlen($commit_info['author']) -
strlen($email_date)));
+
+$msg_body = MIMEBODY
+From: {$fullname} {$commit_info['author']...@php.net
+To: {$email_list}
+Message-ID: svn{$message...@svn.php.net
+Date: {$email_date}
+Subject: {$subject}
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary={$boundary}
+
+--{$boundary}
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+{$commit_info['author']}{$nspaces}{$email_date}
+
+Revision: http://svn.php.net/viewvc?view=revisionrevision={$REV}
+
+Log:
[PHP-CVS] svn: SVNROOT/ post-commit
gwynne Tue, 21 Jul 2009 11:52:10 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284486
Log:
oopsy. teehee... log messages need their newlines in order to grow up big and
strong
Changed paths:
U SVNROOT/post-commit
Modified: SVNROOT/post-commit
===
--- SVNROOT/post-commit 2009-07-21 11:47:57 UTC (rev 284485)
+++ SVNROOT/post-commit 2009-07-21 11:52:10 UTC (rev 284486)
@@ -52,7 +52,7 @@
'changed_paths' = run_svnlook('changed'),
'dirs_changed' = run_svnlook('dirs-changed'),
'author' = ($is_DEBUG getenv(DEBUGUSER)) ? getenv(DEBUGUSER) :
trim(implode('', run_svnlook('author'))),
-'log_message' = trim(implode('', run_svnlook('log'))),
+'log_message' = trim(implode(\n, run_svnlook('log'))),
'date' = strtotime(substr(trim(implode('', run_svnlook('date'))), 0,
strlen(-00-00 00:00:00 +))),
'diffs' = implode(\n, run_svnlook('diff')),
);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/phpruntests/trunk/src/testcase/sections/configurationsections/ rtStdinSection.php
zoe Tue, 21 Jul 2009 11:56:22 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284487
Log:
Fixed typo
Changed paths:
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtStdinSection.php
Modified:
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtStdinSection.php
===
---
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtStdinSection.php
2009-07-21 11:52:10 UTC (rev 284486)
+++
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtStdinSection.php
2009-07-21 11:56:22 UTC (rev 284487)
@@ -19,7 +19,7 @@
protected function init()
{
-$this-inputString = join($this-sectionContents, PHP_EOL) . clPHP_EOL;
+$this-inputString = join($this-sectionContents, PHP_EOL) . PHP_EOL;
}
public function getInputString() {
--
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/build/build.mk branches/PHP_5_3/build/build.mk trunk/build/build.mk
jani Tue, 21 Jul 2009 12:01:26 + Revision: http://svn.php.net/viewvc?view=revisionrevision=284488 Log: - Fixed problem with vcsclean which caused it not to really clean whole tree Changed paths: U php/php-src/branches/PHP_5_2/build/build.mk U php/php-src/branches/PHP_5_3/build/build.mk U php/php-src/trunk/build/build.mk Modified: php/php-src/branches/PHP_5_2/build/build.mk === --- php/php-src/branches/PHP_5_2/build/build.mk 2009-07-21 11:56:22 UTC (rev 284487) +++ php/php-src/branches/PHP_5_2/build/build.mk 2009-07-21 12:01:26 UTC (rev 284488) @@ -69,7 +69,7 @@ svnclean-work: @for i in `find . -type d -not -path '*/.svn/*' | grep -v '.svn'`; do \ - (cd `dirname $$i` 2/dev/null rm -rf `svn propget svn:ignore . | grep -v config.nice` *.o *.a *.lo *.la *.gcno *.gcda .libs || true); \ + (cd $$i 2/dev/null rm -rf `svn propget svn:ignore . | grep -v config.nice` *.o *.a *.lo *.la *.gcno *.gcda .libs || true); \ done gitclean-work: Modified: php/php-src/branches/PHP_5_3/build/build.mk === --- php/php-src/branches/PHP_5_3/build/build.mk 2009-07-21 11:56:22 UTC (rev 284487) +++ php/php-src/branches/PHP_5_3/build/build.mk 2009-07-21 12:01:26 UTC (rev 284488) @@ -69,7 +69,7 @@ svnclean-work: @for i in `find . -type d -not -path '*/.svn/*' | grep -v '.svn'`; do \ - (cd `dirname $$i` 2/dev/null rm -rf `svn propget svn:ignore . | grep -v config.nice` *.o *.a *.lo *.la *.gcno *.gcda .libs || true); \ + (cd $$i 2/dev/null rm -rf `svn propget svn:ignore . | grep -v config.nice` *.o *.a *.lo *.la *.gcno *.gcda .libs || true); \ done gitclean-work: Modified: php/php-src/trunk/build/build.mk === --- php/php-src/trunk/build/build.mk2009-07-21 11:56:22 UTC (rev 284487) +++ php/php-src/trunk/build/build.mk2009-07-21 12:01:26 UTC (rev 284488) @@ -69,7 +69,7 @@ svnclean-work: @for i in `find . -type d -not -path '*/.svn/*' | grep -v '.svn'`; do \ - (cd `dirname $$i` 2/dev/null rm -rf `svn propget svn:ignore . | grep -v config.nice` *.o *.a *.lo *.la *.gcno *.gcda .libs || true); \ + (cd $$i 2/dev/null rm -rf `svn propget svn:ignore . | grep -v config.nice` *.o *.a *.lo *.la *.gcno *.gcda .libs || true); \ done gitclean-work: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ global_avail
gwynne Tue, 21 Jul 2009 12:28:37 + Revision: http://svn.php.net/viewvc?view=revisionrevision=284489 Log: php-cmake module karma Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2009-07-21 12:01:26 UTC (rev 284488) +++ SVNROOT/global_avail2009-07-21 12:28:37 UTC (rev 284489) @@ -357,4 +357,7 @@ # phpruntests karma avail|zoe,spriebsch,g2|php/phpruntests +# cmake karma (GSOC 2008 project) +avail|gloob,pierre|php/cmake + # vim:set ft=conf sw=2 ts=2 et: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/
gwynne Tue, 21 Jul 2009 12:28:42 + Revision: http://svn.php.net/viewvc?view=revisionrevision=284490 Log: php-cmake module dirs Changed paths: A php/cmake/ A php/cmake/branches/ A php/cmake/tags/ -- 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/Makefile.global branches/PHP_5_3/Makefile.global trunk/Makefile.global
jani Tue, 21 Jul 2009 13:57:33 + Revision: http://svn.php.net/viewvc?view=revisionrevision=284537 Log: - There is only one Makefile that needs removing Changed paths: U php/php-src/branches/PHP_5_2/Makefile.global U php/php-src/branches/PHP_5_3/Makefile.global U php/php-src/trunk/Makefile.global Modified: php/php-src/branches/PHP_5_2/Makefile.global === --- php/php-src/branches/PHP_5_2/Makefile.global2009-07-21 13:47:16 UTC (rev 284536) +++ php/php-src/branches/PHP_5_2/Makefile.global2009-07-21 13:57:33 UTC (rev 284537) @@ -115,9 +115,8 @@ rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/* distclean: clean - rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php5.spec sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp + rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php5.spec sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp $(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*//'|xargs rm -f - find . -name Makefile | xargs rm -f .PHONY: all clean install distclean test .NOEXPORT: Modified: php/php-src/branches/PHP_5_3/Makefile.global === --- php/php-src/branches/PHP_5_3/Makefile.global2009-07-21 13:47:16 UTC (rev 284536) +++ php/php-src/branches/PHP_5_3/Makefile.global2009-07-21 13:57:33 UTC (rev 284537) @@ -115,9 +115,8 @@ rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/* distclean: clean - rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php5.spec sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp + rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php5.spec sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp $(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*//'|xargs rm -f - find . -name Makefile | xargs rm -f .PHONY: all clean install distclean test .NOEXPORT: Modified: php/php-src/trunk/Makefile.global === --- php/php-src/trunk/Makefile.global 2009-07-21 13:47:16 UTC (rev 284536) +++ php/php-src/trunk/Makefile.global 2009-07-21 13:57:33 UTC (rev 284537) @@ -115,9 +115,8 @@ rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/* distclean: clean - rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp + rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp $(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*//'|xargs rm -f - find . -name Makefile | xargs rm -f .PHONY: all clean install distclean test .NOEXPORT: -- 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/Zend/tests/function_exists_error.phpt branches/PHP_5_2/ext/pcre/tests/preg_split_basic.phpt branches/PHP_5_2/ext/posix/tests/posix_getcwd.phpt branches/PHP
zoe Tue, 21 Jul 2009 14:02:24 + Revision: http://svn.php.net/viewvc?view=revisionrevision=284538 Log: Remove empty sections. Fix bad use of --SKIP-- Changed paths: U php/php-src/branches/PHP_5_2/Zend/tests/function_exists_error.phpt U php/php-src/branches/PHP_5_2/ext/pcre/tests/preg_split_basic.phpt U php/php-src/branches/PHP_5_2/ext/posix/tests/posix_getcwd.phpt U php/php-src/branches/PHP_5_2/ext/posix/tests/posix_getgrnam.phpt U php/php-src/branches/PHP_5_2/ext/posix/tests/posix_getpwnam.phpt U php/php-src/branches/PHP_5_2/ext/posix/tests/posix_getrlimit.phpt U php/php-src/branches/PHP_5_2/ext/posix/tests/posix_initgroups.phpt U php/php-src/branches/PHP_5_2/ext/posix/tests/posix_isatty.phpt U php/php-src/branches/PHP_5_2/ext/posix/tests/posix_mknod.phpt U php/php-src/branches/PHP_5_2/ext/standard/tests/array/bug40709.phpt U php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_basic.phpt U php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_error.phpt U php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_variation1.phpt U php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_variation2.phpt U php/php-src/branches/PHP_5_2/ext/standard/tests/strings/addslashes_variation3.phpt U php/php-src/branches/PHP_5_2/ext/standard/tests/strings/join_variation6.phpt U php/php-src/branches/PHP_5_2/ext/standard/tests/strings/stripcslashes_variation1.phpt U php/php-src/branches/PHP_5_2/ext/standard/tests/strings/ucwords_basic.phpt U php/php-src/branches/PHP_5_2/ext/standard/tests/strings/ucwords_error.phpt U php/php-src/branches/PHP_5_2/ext/standard/tests/strings/wordwrap_variation3.phpt U php/php-src/branches/PHP_5_3/Zend/tests/function_exists_error.phpt U php/php-src/branches/PHP_5_3/ext/pcre/tests/preg_split_basic.phpt U php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getcwd.phpt U php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getgrnam.phpt U php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getpwnam.phpt U php/php-src/branches/PHP_5_3/ext/posix/tests/posix_getrlimit.phpt U php/php-src/branches/PHP_5_3/ext/posix/tests/posix_initgroups.phpt U php/php-src/branches/PHP_5_3/ext/posix/tests/posix_isatty.phpt U php/php-src/branches/PHP_5_3/ext/posix/tests/posix_mknod.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/array/bug40709.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_basic.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_error.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_variation1.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_variation2.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/addslashes_variation3.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/join_variation6.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripcslashes_variation1.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/ucwords_basic.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/ucwords_error.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/wordwrap_variation3.phpt U php/php-src/branches/PHP_5_3/tests/classes/arrayobject_001.phpt U php/php-src/branches/PHP_5_3/tests/security/open_basedir.inc U php/php-src/branches/PHP_5_3/tests/security/open_basedir_copy.phpt U php/php-src/trunk/Zend/tests/function_exists_error.phpt U php/php-src/trunk/ext/pcre/tests/preg_split_basic.phpt U php/php-src/trunk/ext/posix/tests/posix_getcwd.phpt U php/php-src/trunk/ext/posix/tests/posix_getgrnam.phpt U php/php-src/trunk/ext/posix/tests/posix_getpwnam.phpt U php/php-src/trunk/ext/posix/tests/posix_getrlimit.phpt U php/php-src/trunk/ext/posix/tests/posix_initgroups.phpt U php/php-src/trunk/ext/posix/tests/posix_isatty.phpt U php/php-src/trunk/ext/posix/tests/posix_mknod.phpt U php/php-src/trunk/ext/standard/tests/array/bug40709.phpt U php/php-src/trunk/ext/standard/tests/strings/addslashes_basic.phpt U php/php-src/trunk/ext/standard/tests/strings/addslashes_error.phpt U php/php-src/trunk/ext/standard/tests/strings/addslashes_variation1.phpt U php/php-src/trunk/ext/standard/tests/strings/addslashes_variation2.phpt U php/php-src/trunk/ext/standard/tests/strings/join_variation6.phpt U php/php-src/trunk/ext/standard/tests/strings/stripcslashes_variation1.phpt U php/php-src/trunk/ext/standard/tests/strings/wordwrap_variation3.phpt U php/php-src/trunk/tests/classes/arrayobject_001.phpt Modified: php/php-src/branches/PHP_5_2/Zend/tests/function_exists_error.phpt
[PHP-CVS] svn: php/phpruntests/trunk/QA/ BaselineLinuxResults LinuxQAJuly18 QATESTS.tgz
zoe Tue, 21 Jul 2009 14:44:58 + Revision: http://svn.php.net/viewvc?view=revisionrevision=284545 Log: Final cleaned up tests Changed paths: A php/phpruntests/trunk/QA/BaselineLinuxResults D php/phpruntests/trunk/QA/LinuxQAJuly18 U php/phpruntests/trunk/QA/QATESTS.tgz Added: php/phpruntests/trunk/QA/BaselineLinuxResults === --- php/phpruntests/trunk/QA/BaselineLinuxResults (rev 0) +++ php/phpruntests/trunk/QA/BaselineLinuxResults 2009-07-21 14:44:58 UTC (rev 284545) @@ -0,0 +1,24 @@ + + +In the new code (phpruntests)... + Number of Warnings: 0 + Number of Notices: 0 + Number of Fatal: 0 + + = 1 tests fail in phpruntests and do not fail in run-tests +ext/standard/tests/general_functions/phpinfo.phpt + + = 1 tests fail in run-tests and do not fail in phpruntests +ext/standard/tests/mail/mail_variation2.phpt + + = 4 tests bork in phpruntests and do not bork in run-tests +ext/pdo_sqlite/tests/common.phpt +ext/sqlite/tests/pdo/common.phpt +tests/lang/bug35382.phpt +tests/lang/comments2.phpt + + = 0 tests bork in run-tests and do not bork in phpruntests + + = 0 tests skip in phpruntests and do not skip in run-tests + + = 0 tests skip in run-tests and do not skip in phpruntests Deleted: php/phpruntests/trunk/QA/LinuxQAJuly18 === --- php/phpruntests/trunk/QA/LinuxQAJuly18 2009-07-21 14:44:43 UTC (rev 284544) +++ php/phpruntests/trunk/QA/LinuxQAJuly18 2009-07-21 14:44:58 UTC (rev 284545) @@ -1,46 +0,0 @@ - - -In the new code (phpruntests)... - Number of Warnings: 0 - Number of Notices: 0 - Number of Fatal: 0 - - = 2 tests fail in phpruntests and do not fail in run-tests -ext/phar/tests/zip/phar_stub.phpt -ext/standard/tests/general_functions/phpinfo.phpt - - = 0 tests fail in run-tests and do not fail in phpruntests - - = 25 tests bork in phpruntests and do not bork in run-tests -ext/pdo_sqlite/tests/common.phpt -ext/posix/tests/posix_access.phpt -ext/posix/tests/posix_access_error_modes.phpt -ext/posix/tests/posix_access_error_wrongparams.phpt -ext/posix/tests/posix_ctermid.phpt -ext/posix/tests/posix_getcwd.phpt -ext/posix/tests/posix_getgrnam.phpt -ext/posix/tests/posix_getpwnam.phpt -ext/posix/tests/posix_getrlimit.phpt -ext/posix/tests/posix_getsid.phpt -ext/posix/tests/posix_getsid_error.phpt -ext/posix/tests/posix_initgroups.phpt -ext/posix/tests/posix_isatty.phpt -ext/posix/tests/posix_mkfifo_safemode.phpt -ext/posix/tests/posix_mknod.phpt -ext/posix/tests/posix_times.phpt -ext/posix/tests/posix_ttyname.phpt -ext/posix/tests/posix_ttyname_error_wrongparams.phpt -ext/posix/tests/posix_uname.phpt -ext/sqlite/tests/pdo/common.phpt -ext/standard/tests/general_functions/phpcredits2.phpt -ext/standard/tests/misc/time_nanosleep_error4.phpt -tests/lang/bug35382.phpt -tests/lang/comments2.phpt -tests/run-test/test010.phpt - - = 0 tests bork in run-tests and do not bork in phpruntests - - = 0 tests skip in phpruntests and do not skip in run-tests - - = 1 tests skip in run-tests and do not skip in phpruntests -ext/posix/tests/posix_ttyname_error_wrongparams.phpt Modified: php/phpruntests/trunk/QA/QATESTS.tgz === (Binary files differ) -- 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
iliaaTue, 21 Jul 2009 15:56:08 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284546
Log:
Fixed bug #48962 (cURL does not upload files with specified filename).
Bug: http://bugs.php.net/48962 (Assigned) cURL does not upload files with
specified filename
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-21 14:44:58 UTC (rev 284545)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-07-21 15:56:08 UTC (rev 284546)
@@ -5,6 +5,8 @@
defined as a file handle. (Ilia)
- Fixed bug #48980 (Crash when compiling with pdo_firebird). (Felipe)
+- Fixed bug #48962 (cURL does not upload files with specified filename).
+ (Ilia)
- Fixed bug #48929 (Double \r\n after HTTP headers when header context
option is an array). (David Zülke)
- Fixed bug #48913 (Too long error code strings in pdo_odbc driver).
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-21 14:44:58 UTC
(rev 284545)
+++ php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-07-21 15:56:08 UTC
(rev 284546)
@@ -1573,33 +1573,33 @@
* must be explicitly cast to long in
curl_formadd
* use since curl needs a long not an
int. */
if (*postval == '@') {
- char *type;
+ char *type, *filename;
++postval;
if ((type =
php_memnstr(postval, ;type=, sizeof(;type=) - 1, postval +
Z_STRLEN_PP(current {
*type = '\0';
}
+ if ((filename =
php_memnstr(postval, ;filename=, sizeof(;filename=) - 1, postval +
Z_STRLEN_PP(current {
+ *filename = '\0';
+ }
/* safe_mode / open_basedir
check */
if
(php_check_open_basedir(postval TSRMLS_CC) || (PG(safe_mode)
!php_checkuid(postval, rb+, CHECKUID_CHECK_MODE_PARAM))) {
RETVAL_FALSE;
return 1;
}
+ error = curl_formadd(first,
last,
+
CURLFORM_COPYNAME, string_key,
+
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
+
CURLFORM_FILENAME, filename ? filename : postval,
+
CURLFORM_CONTENTTYPE, type ? type + sizeof(;type=) - 1 :
application/octet-stream,
+
CURLFORM_FILE, postval,
+
CURLFORM_END);
if (type) {
- error =
curl_formadd(first, last,
-
CURLFORM_COPYNAME, string_key,
-
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
-
CURLFORM_FILE, postval,
-
CURLFORM_CONTENTTYPE, type + sizeof(;type=) - 1,
-
CURLFORM_END);
*type = ';';
- } else {
- error =
curl_formadd(first, last,
-
CURLFORM_COPYNAME, string_key,
-
[PHP-CVS] svn: php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/curl/interface.c branches/PHP_5_2/ext/curl/php_curl.h branches/PHP_5_2/ext/curl/tests/curl_copy_handle_basic_007.phpt branches/PH
srinatar Tue, 21 Jul 2009 20:32:32 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284557
Log:
- Fixed bug #48774 (SIGSEGVs when using curl_copy_handle()).
Bug: http://bugs.php.net/48774 (Assigned) SIGSEGVs when using curl_copy_handle()
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_2/ext/curl/php_curl.h
A
php/php-src/branches/PHP_5_2/ext/curl/tests/curl_copy_handle_basic_007.phpt
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/branches/PHP_5_3/ext/curl/php_curl.h
A
php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_007.phpt
U php/php-src/trunk/NEWS
U php/php-src/trunk/ext/curl/interface.c
U php/php-src/trunk/ext/curl/php_curl.h
A php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_007.phpt
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2009-07-21 20:11:28 UTC (rev 284556)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-07-21 20:32:32 UTC (rev 284557)
@@ -51,6 +51,8 @@
(markril at hotmail dot com, Pierre)
- Fixed bug #45280 (Reflection of instantiated COM classes causes PHP to crash)
(Paul Richards, Kalle)
+- Fixed bug #48774 (SIGSEGVs when using curl_copy_handle()).
+ (Sriram Natarajan)
17 Jun 2009, PHP 5.2.10
- Updated timezone database to version 2009.9 (2009i) (Derick)
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-21 20:11:28 UTC (rev 284556)
+++ php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-07-21 20:32:32 UTC (rev 284557)
@@ -1160,6 +1160,9 @@
ch-uses = 0;
+ MAKE_STD_ZVAL(clone);
+ ch-clone = clone;
+
curl_easy_setopt(ch-cp, CURLOPT_NOPROGRESS,1);
curl_easy_setopt(ch-cp, CURLOPT_VERBOSE, 0);
curl_easy_setopt(ch-cp, CURLOPT_ERRORBUFFER, ch-err.str);
@@ -1193,6 +1196,7 @@
PHP_FUNCTION(curl_copy_handle)
{
CURL *cp;
+ zval *clone;
zval **zid;
php_curl *ch, *dupch;
@@ -1255,6 +1259,10 @@
zend_llist_copy(dupch-to_free.slist, ch-to_free.slist);
zend_llist_copy(dupch-to_free.post, ch-to_free.post);
+ /* Keep track of cloned copies to avoid invoking curl destructors for every clone */
+ Z_ADDREF_P(ch-clone);
+ dupch-clone = ch-clone;
+
ZEND_REGISTER_RESOURCE(return_value, dupch, le_curl);
dupch-id = Z_LVAL_P(return_value);
}
@@ -2073,9 +2081,20 @@
#if LIBCURL_VERSION_NUM 0x071101
zend_llist_clean(ch-to_free.str);
#endif
- zend_llist_clean(ch-to_free.slist);
- zend_llist_clean(ch-to_free.post);
+ /* cURL destructors should be invoked only by last curl handle */
+ 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);
+ } else {
+ Z_DELREF_P(ch-clone);
+ ch-to_free.slist.dtor = NULL;
+ ch-to_free.post.dtor = NULL;
+ zend_llist_clean(ch-to_free.slist);
+ zend_llist_clean(ch-to_free.post);
+ }
+
if (ch-handlers-write-buf.len 0) {
smart_str_free(ch-handlers-write-buf);
}
Modified: php/php-src/branches/PHP_5_2/ext/curl/php_curl.h
===
--- php/php-src/branches/PHP_5_2/ext/curl/php_curl.h 2009-07-21 20:11:28 UTC (rev 284556)
+++ php/php-src/branches/PHP_5_2/ext/curl/php_curl.h 2009-07-21 20:32:32 UTC (rev 284557)
@@ -132,6 +132,7 @@
long id;
unsigned int uses;
zend_boolin_callback;
+ zval *clone;
} php_curl;
typedef struct {
Added: 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 (rev 0)
+++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_copy_handle_basic_007.phpt 2009-07-21 20:32:32 UTC (rev 284557)
@@ -0,0 +1,44 @@
+--TEST--
+Test curl_copy_handle() with simple POST
+--SKIPIF--
+?php if (!extension_loaded(curl) || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print skip; ?
+--FILE--
+?php
+ $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+
+ echo '*** Testing curl copy handle with simple POST using array as arguments ***' . \n;
+
+ $url = {$host}/get.php?test=getpost;
+ $ch = curl_init();
+
+ ob_start(); // start output buffering
+ 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_URL, $url); //set the url we want to use
+
+ $copy = curl_copy_handle($ch);
+ curl_close($ch);
+
+ $curl_content = curl_exec($copy);
+
[PHP-CVS] svn: php/php-src/ branches/PHP_5_2/ext/standard/strnatcmp.c branches/PHP_5_2/ext/standard/tests/array/bug44929.phpt branches/PHP_5_3/ext/standard/strnatcmp.c branches/PHP_5_3/ext/standard/te
rasmus Tue, 21 Jul 2009 21:15:48 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284559
Log:
Fix bug #49003 by tweaking the fix to bug #44929 slightly.
A 0 followed by any punctuation is now significant instead
of just 0's in front of a period.
Bugs: http://bugs.php.net/49003 (Analyzed) natsort: sort sequence has changed
http://bugs.php.net/49003 (Analyzed) natsort: sort sequence has changed
Changed paths:
U php/php-src/branches/PHP_5_2/ext/standard/strnatcmp.c
U php/php-src/branches/PHP_5_2/ext/standard/tests/array/bug44929.phpt
U php/php-src/branches/PHP_5_3/ext/standard/strnatcmp.c
U php/php-src/branches/PHP_5_3/ext/standard/tests/array/bug44929.phpt
U php/php-src/trunk/ext/standard/strnatcmp.c
U php/php-src/trunk/ext/standard/tests/array/bug44929.phpt
Modified: php/php-src/branches/PHP_5_2/ext/standard/strnatcmp.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/strnatcmp.c 2009-07-21
21:03:18 UTC (rev 284558)
+++ php/php-src/branches/PHP_5_2/ext/standard/strnatcmp.c 2009-07-21
21:15:48 UTC (rev 284559)
@@ -116,10 +116,10 @@
ca = *ap; cb = *bp;
/* skip over leading spaces or zeros */
- while (isspace((int)(unsigned char)ca) || (ca == '0' (ap+1
aend) (*(ap+1)!='.')))
+ while (isspace((int)(unsigned char)ca) || (ca == '0' (ap+1
aend) !ispunct(*(ap+1
ca = *++ap;
- while (isspace((int)(unsigned char)cb) || (cb == '0' (bp+1
bend) (*(bp+1)!='.')))
+ while (isspace((int)(unsigned char)cb) || (cb == '0' (bp+1
bend) !ispunct(*(bp+1
cb = *++bp;
/* process run of digits */
Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/array/bug44929.phpt
===
--- php/php-src/branches/PHP_5_2/ext/standard/tests/array/bug44929.phpt
2009-07-21 21:03:18 UTC (rev 284558)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/array/bug44929.phpt
2009-07-21 21:15:48 UTC (rev 284559)
@@ -2,20 +2,24 @@
Bug #44929 (natsort doesn't handle leading zeros well)
--FILE--
?php
-$a = array('001','008','005','00011','03','14','-123','0.002','00','0');
+$a =
array('001','008','005','00011','03','14','-123','0.002','00','0','0_0','0-0');
natsort($a);
var_dump($a);
?
--EXPECT--
-array(10) {
+array(12) {
[6]=
string(4) -123
[8]=
string(2) 00
[9]=
string(1) 0
+ [11]=
+ string(3) 0-0
[7]=
string(5) 0.002
+ [10]=
+ string(3) 0_0
[0]=
string(3) 001
[4]=
Modified: php/php-src/branches/PHP_5_3/ext/standard/strnatcmp.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/strnatcmp.c 2009-07-21
21:03:18 UTC (rev 284558)
+++ php/php-src/branches/PHP_5_3/ext/standard/strnatcmp.c 2009-07-21
21:15:48 UTC (rev 284559)
@@ -116,10 +116,10 @@
ca = *ap; cb = *bp;
/* skip over leading spaces or zeros */
- while (isspace((int)(unsigned char)ca) || (ca == '0' (ap+1
aend) (*(ap+1)!='.')))
+ while (isspace((int)(unsigned char)ca) || (ca == '0' (ap+1
aend) !ispunct(*(ap+1
ca = *++ap;
- while (isspace((int)(unsigned char)cb) || (cb == '0' (bp+1
bend) (*(bp+1)!='.')))
+ while (isspace((int)(unsigned char)cb) || (cb == '0' (bp+1
bend) !ispunct(*(bp+1
cb = *++bp;
/* process run of digits */
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/array/bug44929.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/array/bug44929.phpt
2009-07-21 21:03:18 UTC (rev 284558)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/array/bug44929.phpt
2009-07-21 21:15:48 UTC (rev 284559)
@@ -2,20 +2,24 @@
Bug #44929 (natsort doesn't handle leading zeros well)
--FILE--
?php
-$a =
array(b'001',b'008',b'005',b'00011',b'03',b'14',b'-123',b'0.002',b'00',b'0');
+$a =
array(b'001',b'008',b'005',b'00011',b'03',b'14',b'-123',b'0.002',b'00',b'0',b'0_0',b'0-0');
natsort($a);
var_dump($a);
?
--EXPECT--
-array(10) {
+array(12) {
[6]=
string(4) -123
[8]=
string(2) 00
[9]=
string(1) 0
+ [11]=
+ string(3) 0-0
[7]=
string(5) 0.002
+ [10]=
+ string(3) 0_0
[0]=
string(3) 001
[4]=
Modified: php/php-src/trunk/ext/standard/strnatcmp.c
===
--- php/php-src/trunk/ext/standard/strnatcmp.c 2009-07-21 21:03:18 UTC (rev
284558)
+++ php/php-src/trunk/ext/standard/strnatcmp.c 2009-07-21 21:15:48 UTC (rev
284559)
@@ -112,10 +112,10 @@
ca = a[ai]; cb = b[bi];
/*
[PHP-CVS] svn: SVNROOT/ commit-bugs.php
rasmus Tue, 21 Jul 2009 21:33:54 + Revision: http://svn.php.net/viewvc?view=revisionrevision=284563 Log: This gets urlencoded later Changed paths: U SVNROOT/commit-bugs.php Modified: SVNROOT/commit-bugs.php === --- SVNROOT/commit-bugs.php 2009-07-21 21:23:31 UTC (rev 284562) +++ SVNROOT/commit-bugs.php 2009-07-21 21:33:54 UTC (rev 284563) @@ -13,7 +13,7 @@ '' = 'http://bugs.php.net', ); $bug_rpc_url = 'http://bugs.php.net/rpc.php'; -$viewvc_url_prefix = 'http://svn.php.net/viewvc/?view=revisionamp;revision='; +$viewvc_url_prefix = 'http://svn.php.net/viewvc/?view=revisionrevision='; // - // Get the list of mentioned bugs from the commit log -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-bugs.php
rasmus Tue, 21 Jul 2009 21:57:58 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284564
Log:
This fixes the duplicate bugs as seen in http://news.php.net/php.cvs/59633
in the version of PHP running on y1.
/me ducks
Changed paths:
U SVNROOT/commit-bugs.php
Modified: SVNROOT/commit-bugs.php
===
--- SVNROOT/commit-bugs.php 2009-07-21 21:33:54 UTC (rev 284563)
+++ SVNROOT/commit-bugs.php 2009-07-21 21:57:58 UTC (rev 284564)
@@ -40,7 +40,7 @@
//
-
// Make an RPC call for each bug
include __DIR__ . '/secret.inc';
-foreach ($bug_list as $bug) {
+foreach ($bug_list as $k=$bug) {
// Only do this for core PHP bugs
if ($bug['project'] !== '') {
continue;
@@ -81,14 +81,14 @@
$result = curl_exec($ch);
if ($result === FALSE) {
-$bug['error'] = curl_error($ch);
+$bug_list[$k]['error'] = curl_error($ch);
} else {
$bug_server_data = json_decode($result, TRUE);
if (isset($bug_server_data['result']['status'])) {
-$bug['status'] = $bug_server_data['result']['status']['status'];
-$bug['short_desc'] = $bug_server_data['result']['status']['sdesc'];
+$bug_list[$k]['status'] =
$bug_server_data['result']['status']['status'];
+$bug_list[$k]['short_desc'] =
$bug_server_data['result']['status']['sdesc'];
} else {
-$bug['error'] = $bug_server_data['result']['error'];
+$bug_list[$k]['error'] = $bug_server_data['result']['error'];
}
}
curl_close($ch);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: SVNROOT/ commit-bugs.php
Rasmus Lerdorf wrote:
rasmus Tue, 21 Jul 2009 21:57:58 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284564
Log:
This fixes the duplicate bugs as seen in http://news.php.net/php.cvs/59633
in the version of PHP running on y1.
/me ducks
Changed paths:
U SVNROOT/commit-bugs.php
Modified: SVNROOT/commit-bugs.php
===
--- SVNROOT/commit-bugs.php 2009-07-21 21:33:54 UTC (rev 284563)
+++ SVNROOT/commit-bugs.php 2009-07-21 21:57:58 UTC (rev 284564)
@@ -40,7 +40,7 @@
//
-
// Make an RPC call for each bug
include __DIR__ . '/secret.inc';
-foreach ($bug_list as $bug) {
+foreach ($bug_list as $k=$bug) {
// Only do this for core PHP bugs
if ($bug['project'] !== '') {
continue;
@@ -81,14 +81,14 @@
$result = curl_exec($ch);
if ($result === FALSE) {
-$bug['error'] = curl_error($ch);
+$bug_list[$k]['error'] = curl_error($ch);
} else {
$bug_server_data = json_decode($result, TRUE);
if (isset($bug_server_data['result']['status'])) {
-$bug['status'] = $bug_server_data['result']['status']['status'];
-$bug['short_desc'] = $bug_server_data['result']['status']['sdesc'];
+$bug_list[$k]['status'] =
$bug_server_data['result']['status']['status'];
+$bug_list[$k]['short_desc'] =
$bug_server_data['result']['status']['sdesc'];
} else {
-$bug['error'] = $bug_server_data['result']['error'];
+$bug_list[$k]['error'] = $bug_server_data['result']['error'];
}
}
curl_close($ch);
unset($bug); after the foreach should have fixed that..?
--Jani
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: SVNROOT/ commit-bugs.php
Jani Taskinen wrote: unset($bug); after the foreach should have fixed that..? I didn't see another $bug use there, but yes, you are right, in commit-email.php it is re-used. I usually avoid using a reference in a foreach like that for that reason. Too easy to forget to get rid of the reference. -Rasmus -- 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/ interface.c
jani Tue, 21 Jul 2009 22:57:08 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284567
Log:
- Fix badly applied patch (bug #48774)
Bug: http://bugs.php.net/48774 (Assigned) SIGSEGVs when using curl_copy_handle()
Changed paths:
U php/php-src/branches/PHP_5_2/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-21 22:50:41 UTC
(rev 284566)
+++ php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-07-21 22:57:08 UTC
(rev 284567)
@@ -1131,6 +1131,7 @@
{
php_curl*ch;
zval**url;
+ zval*clone;
CURL*cp;
int argc = ZEND_NUM_ARGS();
@@ -1196,7 +1197,6 @@
PHP_FUNCTION(curl_copy_handle)
{
CURL*cp;
- zval*clone;
zval**zid;
php_curl*ch, *dupch;
--
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/ interface.c
jani Tue, 21 Jul 2009 23:06:18 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284568
Log:
- PHP_5_2 branch does not have these macros
Changed paths:
U php/php-src/branches/PHP_5_2/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-21 22:57:08 UTC
(rev 284567)
+++ php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-07-21 23:06:18 UTC
(rev 284568)
@@ -1260,7 +1260,7 @@
zend_llist_copy(dupch-to_free.post, ch-to_free.post);
/* Keep track of cloned copies to avoid invoking curl destructors for
every clone */
- Z_ADDREF_P(ch-clone);
+ ch-clone-refcount++;
dupch-clone = ch-clone;
ZEND_REGISTER_RESOURCE(return_value, dupch, le_curl);
@@ -2083,12 +2083,12 @@
#endif
/* cURL destructors should be invoked only by last curl handle */
- if (Z_REFCOUNT_P(ch-clone) = 1) {
+ if (ch-clone-refcount = 1) {
zend_llist_clean(ch-to_free.slist);
zend_llist_clean(ch-to_free.post);
zval_ptr_dtor(ch-clone);
} else {
- Z_DELREF_P(ch-clone);
+ ch-clone-refcount--;
ch-to_free.slist.dtor = NULL;
ch-to_free.post.dtor = NULL;
zend_llist_clean(ch-to_free.slist);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-bugs.php
rasmus Tue, 21 Jul 2009 23:56:57 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284570
Log:
Restore the the changed path check to figure out which
bug project this bug reference is for to avoid the problem
seen in http://news.php.net/php.pear.cvs/56698
Changed paths:
U SVNROOT/commit-bugs.php
Modified: SVNROOT/commit-bugs.php
===
--- SVNROOT/commit-bugs.php 2009-07-21 23:11:29 UTC (rev 284569)
+++ SVNROOT/commit-bugs.php 2009-07-21 23:56:57 UTC (rev 284570)
@@ -23,11 +23,19 @@
}
//
-
+// Pick the default bug project out the of the path in the first changed dir
+switch (substr(trim($commit_info['dirs_changed'][0]),4)) {
+case 'pear': $bug_project_default = 'pear'; break;
+case 'pecl': $bug_project_default = 'pecl'; break;
+default: $bug_project_default = '';
+}
+
+//
-
// Process the matches
$bug_list = array();
foreach ($matched_bugs as $matched_bug) {
$bug = array();
-$bug['project'] = isset($matched_bug[1]) ? $matched_bug[1] : '';
+$bug['project'] = isset($matched_bug[1]) ? $matched_bug[1] :
$bug_project_default;
$bug['number'] = intval($matched_bug[2]);
$bugid = $bug['project'] . $bug['number'];
$bug['url_prefix'] = isset($bug_url_prefixes[$bug['project']]) ?
$bug_url_prefixes[$bug['project']] : $bug_url_prefixes[''];
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-bugs.php
gwynne Wed, 22 Jul 2009 01:16:33 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284572
Log:
ws, cs, and fixing Rasmus' substr() bug
Changed paths:
U SVNROOT/commit-bugs.php
Modified: SVNROOT/commit-bugs.php
===
--- SVNROOT/commit-bugs.php 2009-07-22 00:58:57 UTC (rev 284571)
+++ SVNROOT/commit-bugs.php 2009-07-22 01:16:33 UTC (rev 284572)
@@ -24,11 +24,16 @@
//
-
// Pick the default bug project out the of the path in the first changed dir
-switch (substr(trim($commit_info['dirs_changed'][0]),4)) {
-case 'pear': $bug_project_default = 'pear'; break;
-case 'pecl': $bug_project_default = 'pecl'; break;
-default: $bug_project_default = '';
-}
+switch (substr($commit_info['dirs_changed'][0], 0, 4)) {
+case 'pear':
+$bug_project_default = 'pear';
+break;
+case 'pecl':
+$bug_project_default = 'pecl';
+break;
+default:
+$bug_project_default = '';
+}
//
-
// Process the matches
@@ -48,7 +53,7 @@
//
-
// Make an RPC call for each bug
include __DIR__ . '/secret.inc';
-foreach ($bug_list as $k=$bug) {
+foreach ($bug_list as $k = $bug) {
// Only do this for core PHP bugs
if ($bug['project'] !== '') {
continue;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-bugs.php
gwynne Wed, 22 Jul 2009 03:05:15 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284576
Log:
first match is always set. check it for empty string instead
Changed paths:
U SVNROOT/commit-bugs.php
Modified: SVNROOT/commit-bugs.php
===
--- SVNROOT/commit-bugs.php 2009-07-22 02:58:19 UTC (rev 284575)
+++ SVNROOT/commit-bugs.php 2009-07-22 03:05:15 UTC (rev 284576)
@@ -40,7 +40,7 @@
$bug_list = array();
foreach ($matched_bugs as $matched_bug) {
$bug = array();
-$bug['project'] = isset($matched_bug[1]) ? $matched_bug[1] :
$bug_project_default;
+$bug['project'] = $matched_bug[1] === ? $bug_project_default :
$matched_bug[1];
$bug['number'] = intval($matched_bug[2]);
$bugid = $bug['project'] . $bug['number'];
$bug['url_prefix'] = isset($bug_url_prefixes[$bug['project']]) ?
$bug_url_prefixes[$bug['project']] : $bug_url_prefixes[''];
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
