[PHP-CVS] svn: SVNROOT/ commit-bugs.php
gwynne Mon, 20 Jul 2009 04:44:42 + Revision: http://svn.php.net/viewvc?view=revision&revision=284415 Changed paths: U SVNROOT/commit-bugs.php Log: gah, blasted debugging issues Modified: SVNROOT/commit-bugs.php === --- SVNROOT/commit-bugs.php 2009-07-20 04:42:01 UTC (rev 284414) +++ SVNROOT/commit-bugs.php 2009-07-20 04:44:42 UTC (rev 284415) @@ -77,7 +77,7 @@ } $ch = curl_init(); -curl_setopt_array(array( +curl_setopt_array($ch, array( CURLOPT_URL => $bug_rpc_url, CURLOPT_RETURNTRANSFER => TRUE, CURLOPT_POST => TRUE, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-svnroot.php
gwynne Mon, 20 Jul 2009 04:42:01 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284414
Changed paths:
U SVNROOT/commit-svnroot.php
Log:
oops, stderr->STDERR
Modified: SVNROOT/commit-svnroot.php
===
--- SVNROOT/commit-svnroot.php 2009-07-20 04:40:31 UTC (rev 284413)
+++ SVNROOT/commit-svnroot.php 2009-07-20 04:42:01 UTC (rev 284414)
@@ -25,7 +25,7 @@
}
chdir(__DIR__);
exec('exec svn update', $output, $status);
-fwrite(stderr, implode("\n", $output) . "\n");
+fwrite(STDERR, implode("\n", $output) . "\n");
if ($status != 0) {
fail("svn update on SVNROOT failed with exit code {$status}!\n");
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-bugs.php commit-email.php commit-svnroot.php post-commit
gwynne Mon, 20 Jul 2009 04:40:31 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284413
Changed paths:
A SVNROOT/commit-bugs.php
U SVNROOT/commit-email.php
A SVNROOT/commit-svnroot.php
U SVNROOT/post-commit
Log:
- reorganized the post-commit hook quite a bit to load common information and
call sub-hooks for various tasks
- added a catch-all email for php/php-src/ to ensure some emails get where
they're going
- moved Rasmus' bug stuff to its own file
- moved the SVNROOT check to its own file as well
- make a passing attempt to marshal back to the client the results of SVNROOT
updates
- actually show the client an error when SMTP connection fails
- use ===/!== instead of ==/!= in a couple places as a matter of style
Added: SVNROOT/commit-bugs.php
===
--- SVNROOT/commit-bugs.php (rev 0)
+++ SVNROOT/commit-bugs.php 2009-07-20 04:40:31 UTC (rev 284413)
@@ -0,0 +1,107 @@
+ 'http://pear.php.net/bugs',
+'pecl' => 'http://pecl.php.net/bugs',
+'' => 'http://bugs.php.net',
+);
+$bug_rpc_url = 'http://bugs.php.net/rpc.php';
+$viewvc_url_prefix = 'http://svn.php.net/viewvc/?view=revision&revision=';
+
+// -
+// Get the list of mentioned bugs from the commit log
+if (preg_match_all($bug_pattern, $commit_info['log_message'], $matched_bugs, PREG_SET_ORDER) < 1) {
+// If no bugs matched, we don't have to do anything.
+return;
+}
+
+// -
+// Process the matches
+$bug_list = array();
+foreach ($matched_bugs as $matched_bug) {
+$bug = array();
+$bug['project'] = isset($matched_bug[1]) ? $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[''];
+$bug['url'] = $bug['url_prefix'] . '/' . $bug['number'];
+$bug['status'] = 'unknown';
+$bug['short_desc'] = '';
+$bug_list[$bugid] = $bug;
+}
+
+// -
+// Make an RPC call for each bug
+if (!$is_DEBUG) {
+include __DIR__ . '/secret.inc';
+}
+foreach ($bug_list as &$bug) {
+// Only do this for core PHP bugs
+if ($bug['project'] !== '') {
+continue;
+}
+
+$comment = "Automatic comment from SVN on behalf of {$commit_info['author']}\n" .
+ "Revision: {$viewvc_url_prefix}{$REV}\n" .
+ "Log: {$commit_info['log_message']}\n";
+
+$postdata = array(
+'user' => $commit_info['author'],
+'id' => $bug['number'],
+'ncomment' => $comment,
+'MAGIC_COOKIE' => $is_DEBUG ? 'nonsense' : $SVN_MAGIC_COOKIE,
+);
+array_walk($postdata, create_function('&$v, $k', '$v = rawurlencode($k) . "=" . rawurlencode($v);'));
+$postdata = implode('&', $postdata);
+
+if ($is_DEBUG) {
+print "DEBUG: Bug #{$bug['number']}: Would have posted this rawurlencoded string to {$bug_rpc_url}:\n{$postdata}\n";
+if (mt_rand(0, 1) === 1) {
+$bug['error'] = 'DEBUG-some kind of error';
+} else {
+$bug['status'] = 'DEBUG-unknown';
+$bug['short_desc'] = "DEBUG-Bug #{$bug['number']}";
+}
+continue;
+}
+// Hook an env var so emails can be resent without messing with bugs
+if (getenv('NOBUG')) {
+continue;
+}
+
+$ch = curl_init();
+curl_setopt_array(array(
+CURLOPT_URL => $bug_rpc_url,
+CURLOPT_RETURNTRANSFER => TRUE,
+CURLOPT_POST => TRUE,
+CURLOPT_CONNECTTIMEOUT => 5,
+CURLOPT_TIMEOUT => 5,
+CURLOPT_POSTFIELDS => $postdata,
+));
+
+$result = curl_exec($ch);
+
+if ($result === FALSE) {
+$bug['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'];
+} else {
+$bug['error'] = $bug_server_data['result']['error'];
+}
+}
+curl_close($ch);
+}
+unset($SVN_MAGIC_COOKIE);
+
+// $bug_list is now available to later-running hooks
+?>
Property changes on: SVNROOT/commit-bugs.php
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Modified: SVNROOT/commit-email.php
=
[PHP-CVS] svn: php/php-src/branches/PHP_5_3/ext/standard/ proc_open.c
kalle Mon, 20 Jul 2009 04:31:07 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284412
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/proc_open.c
Log:
Fix Windows build
Modified: php/php-src/branches/PHP_5_3/ext/standard/proc_open.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/proc_open.c 2009-07-20
04:30:38 UTC (rev 284411)
+++ php/php-src/branches/PHP_5_3/ext/standard/proc_open.c 2009-07-20
04:31:07 UTC (rev 284412)
@@ -279,9 +279,9 @@
wait_pid = waitpid(proc->child, &wstatus, 0);
} while (wait_pid == -1 && errno == EINTR);
- if (wait_pid == -1)
+ if (wait_pid == -1) {
FG(pclose_ret) = -1;
- else {
+ } else {
if (WIFEXITED(wstatus))
wstatus = WEXITSTATUS(wstatus);
FG(pclose_ret) = wstatus;
@@ -291,7 +291,9 @@
FG(pclose_ret) = -1;
#endif
_php_free_envp(proc->env, proc->is_persistent);
+#if !defined(PHP_WIN32) && !defined(NETWARE)
_php_free_argv(proc->argv, proc->is_persistent);
+#endif
pefree(proc->command, proc->is_persistent);
pefree(proc, proc->is_persistent);
--
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/standard/ proc_open.c
kalle Mon, 20 Jul 2009 04:30:38 + Revision: http://svn.php.net/viewvc?view=revision&revision=284411 Changed paths: U php/php-src/trunk/ext/standard/proc_open.c Log: Fix Windows build Modified: php/php-src/trunk/ext/standard/proc_open.c === --- php/php-src/trunk/ext/standard/proc_open.c 2009-07-20 03:48:55 UTC (rev 284410) +++ php/php-src/trunk/ext/standard/proc_open.c 2009-07-20 04:30:38 UTC (rev 284411) @@ -291,7 +291,9 @@ FG(pclose_ret) = -1; #endif _php_free_envp(proc->env, proc->is_persistent); +#if !defined(PHP_WIN32) && !defined(NETWARE) _php_free_argv(proc->argv, proc->is_persistent); +#endif pefree(proc->command, proc->is_persistent); pefree(proc, proc->is_persistent); -- 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/gd/tests/truecolor.phpt branches/PHP_5_3/ext/gd/tests/truecolor.phpt trunk/ext/gd/tests/truecolor.phpt
rdohms Mon, 20 Jul 2009 03:48:55 + Revision: http://svn.php.net/viewvc?view=revision&revision=284410 Changed paths: D php/php-src/branches/PHP_5_2/ext/gd/tests/truecolor.phpt D php/php-src/branches/PHP_5_3/ext/gd/tests/truecolor.phpt D php/php-src/trunk/ext/gd/tests/truecolor.phpt Log: Removing deprecated test replaced by individual tests for imageistruecolor and imagetruecolortopalette Deleted: php/php-src/branches/PHP_5_2/ext/gd/tests/truecolor.phpt === --- php/php-src/branches/PHP_5_2/ext/gd/tests/truecolor.phpt2009-07-20 03:47:29 UTC (rev 284409) +++ php/php-src/branches/PHP_5_2/ext/gd/tests/truecolor.phpt2009-07-20 03:48:55 UTC (rev 284410) @@ -1,19 +0,0 @@ ---TEST-- -imageistruecolor, truecolortopalette ---SKIPIF-- - ---FILE-- - ---EXPECTF-- -ok -ok -ok Deleted: php/php-src/branches/PHP_5_3/ext/gd/tests/truecolor.phpt === --- php/php-src/branches/PHP_5_3/ext/gd/tests/truecolor.phpt2009-07-20 03:47:29 UTC (rev 284409) +++ php/php-src/branches/PHP_5_3/ext/gd/tests/truecolor.phpt2009-07-20 03:48:55 UTC (rev 284410) @@ -1,19 +0,0 @@ ---TEST-- -imageistruecolor, truecolortopalette ---SKIPIF-- - ---FILE-- - ---EXPECTF-- -ok -ok -ok Deleted: php/php-src/trunk/ext/gd/tests/truecolor.phpt === --- php/php-src/trunk/ext/gd/tests/truecolor.phpt 2009-07-20 03:47:29 UTC (rev 284409) +++ php/php-src/trunk/ext/gd/tests/truecolor.phpt 2009-07-20 03:48:55 UTC (rev 284410) @@ -1,19 +0,0 @@ ---TEST-- -imageistruecolor, truecolortopalette ---SKIPIF-- - ---FILE-- - ---EXPECTF-- -ok -ok -ok -- 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/gd/tests/imageistruecolor_basic.phpt branches/PHP_5_2/ext/gd/tests/imageistruecolor_error1.phpt branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_b
rdohms Mon, 20 Jul 2009 03:47:29 + Revision: http://svn.php.net/viewvc?view=revision&revision=284409 Changed paths: A php/php-src/branches/PHP_5_2/ext/gd/tests/imageistruecolor_basic.phpt A php/php-src/branches/PHP_5_2/ext/gd/tests/imageistruecolor_error1.phpt A php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_basic.phpt A php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_error1.phpt A php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_error2.phpt A php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_error3.phpt A php/php-src/branches/PHP_5_3/ext/gd/tests/imageistruecolor_basic.phpt A php/php-src/branches/PHP_5_3/ext/gd/tests/imageistruecolor_error1.phpt A php/php-src/branches/PHP_5_3/ext/gd/tests/imagetruecolortopalette_basic.phpt A php/php-src/branches/PHP_5_3/ext/gd/tests/imagetruecolortopalette_error1.phpt A php/php-src/branches/PHP_5_3/ext/gd/tests/imagetruecolortopalette_error2.phpt A php/php-src/branches/PHP_5_3/ext/gd/tests/imagetruecolortopalette_error3.phpt A php/php-src/trunk/ext/gd/tests/imageistruecolor_basic.phpt A php/php-src/trunk/ext/gd/tests/imageistruecolor_error1.phpt A php/php-src/trunk/ext/gd/tests/imagetruecolortopalette_basic.phpt A php/php-src/trunk/ext/gd/tests/imagetruecolortopalette_error1.phpt A php/php-src/trunk/ext/gd/tests/imagetruecolortopalette_error2.phpt A php/php-src/trunk/ext/gd/tests/imagetruecolortopalette_error3.phpt Log: Separating and complementing imageistruecolor and imagetruecolortopalette tests Added: php/php-src/branches/PHP_5_2/ext/gd/tests/imageistruecolor_basic.phpt === --- php/php-src/branches/PHP_5_2/ext/gd/tests/imageistruecolor_basic.phpt (rev 0) +++ php/php-src/branches/PHP_5_2/ext/gd/tests/imageistruecolor_basic.phpt 2009-07-20 03:47:29 UTC (rev 284409) @@ -0,0 +1,17 @@ +--TEST-- +Testing imageistruecolor() of GD library +--CREDITS-- +Rafael Dohms +--SKIPIF-- + +--FILE-- + +--EXPECT-- +bool(true) \ No newline at end of file Added: php/php-src/branches/PHP_5_2/ext/gd/tests/imageistruecolor_error1.phpt === --- php/php-src/branches/PHP_5_2/ext/gd/tests/imageistruecolor_error1.phpt (rev 0) +++ php/php-src/branches/PHP_5_2/ext/gd/tests/imageistruecolor_error1.phpt 2009-07-20 03:47:29 UTC (rev 284409) @@ -0,0 +1,24 @@ +--TEST-- +Testing imageistruecolor(): wrong parameters +--CREDITS-- +Rafael Dohms +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +Warning: imageistruecolor(): supplied argument is not a valid Image resource in %s on line %d + +Warning: imageistruecolor(): supplied resource is not a valid Image resource in %s on line %d + +Warning: imageistruecolor(): supplied argument is not a valid Image resource in %s on line %d \ No newline at end of file Added: php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_basic.phpt === --- php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_basic.phpt (rev 0) +++ php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_basic.phpt 2009-07-20 03:47:29 UTC (rev 284409) @@ -0,0 +1,31 @@ +--TEST-- +Testing imagetruecolortopalette() of GD library +--CREDITS-- +Rafael Dohms +--SKIPIF-- + +--FILE-- + +--EXPECT-- +bool(true) +0843f63ab2f9fddedd69b0b421686bc5 \ No newline at end of file Added: php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_error1.phpt === --- php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_error1.phpt (rev 0) +++ php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_error1.phpt 2009-07-20 03:47:29 UTC (rev 284409) @@ -0,0 +1,26 @@ +--TEST-- +Testing imagetruecolortopalette(): wrong parameters for parameter 1 +--CREDITS-- +Rafael Dohms +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +Warning: imagetruecolortopalette(): supplied resource is not a valid Image resource in %s on line %d + +Warning: imagetruecolortopalette(): supplied argument is not a valid Image resource in %s on line %d + +Warning: imagetruecolortopalette(): supplied argument is not a valid Image resource in %s on line %d + +Warning: imagetruecolortopalette(): supplied argument is not a valid Image resource in %s on line %d \ No newline at end of file Added: php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_error2.phpt === --- php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_error2.phpt (rev 0) +++ php/php-src/branches/PHP_5_2/ext/gd/tes
Re: [PHP-CVS] svn: php/php-src/trunk/ NEWS Zend/zend.c Zend/zend_dtrace.c
Hi!
+ char dtrace_error_buffer[1024];
TSRMLS_FETCH();
/* Obtain relevant filename and lineno */
@@ -1581,6 +1591,12 @@
va_start(args, format);
+ if(DTRACE_ERROR_ENABLED()) {
+ vsprintf(dtrace_error_buffer, format, args);
+ }
This doesn't look good. I don't see a check anywhere that format doesn't
run over 1024 chars.
--
Stanislav Malyshev, Zend Software Architect
s...@zend.com http://www.zend.com/
(408)253-8829 MSN: s...@zend.com
--
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/pdo_firebird/firebird_statement.c branches/PHP_5_3/ext/pdo_firebird/firebird_statement.c trunk/ext/pdo_firebird/firebird_statemen
felipe Mon, 20 Jul 2009 00:17:24 + Revision: http://svn.php.net/viewvc?view=revision&revision=284404 Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_statement.c U php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_statement.c U php/php-src/trunk/ext/pdo_firebird/firebird_statement.c Log: - Fixed bug #48057 (Only the date fields of the first row are fetched, others are empty) patch by: info at programmiernutte dot net Bug: http://bugs.php.net/48057 (Open) Only the date fields of the first row are fetched, others are empty Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-07-20 00:09:16 UTC (rev 284403) +++ php/php-src/branches/PHP_5_2/NEWS 2009-07-20 00:17:24 UTC (rev 284404) @@ -4,6 +4,7 @@ - Fixed regression in cURL extension that prevented flush of data to output defined as a file handle. (Ilia) +- Fixed bug #48980 (Crash when compiling with pdo_firebird). (Felipe) - Fixed bug #48913 (Too long error code strings in pdo_odbc driver). (naf at altlinux dot ru, Felipe) - Fixed bug #48788 (RecursiveDirectoryIterator doesn't descend into symlinked @@ -37,6 +38,8 @@ errors when errors are logged). (Jani) - Fixed bug #48116 (Fixed build with Openssl 1.0). (Pierre, Al dot Smith at aeschi dot ch dot eu dot org) +- Fixed bug #48057 (Only the date fields of the first row are fetched, + others are empty). (info at programmiernutte dot net) - Fixed bug #47481 (natcasesort() does not sort extended ASCII characters correctly). (Herman Radtke) - Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John) Modified: php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_statement.c === --- php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_statement.c 2009-07-20 00:09:16 UTC (rev 284403) +++ php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_statement.c 2009-07-20 00:17:24 UTC (rev 284404) @@ -417,7 +417,8 @@ } /* convert the timestamp into a string */ - *ptr = FETCH_BUF(S->fetch_buf[colno], char, *len = 80, NULL); + *len = 80; + *ptr = FETCH_BUF(S->fetch_buf[colno], char, *len, NULL); *len = strftime(*ptr, *len, fmt, &t); break; case SQL_BLOB: Modified: php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_statement.c === --- php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_statement.c 2009-07-20 00:09:16 UTC (rev 284403) +++ php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_statement.c 2009-07-20 00:17:24 UTC (rev 284404) @@ -363,7 +363,8 @@ fmt = S->H->timestamp_format ? S->H->timestamp_format : PDO_FB_DEF_TIMESTAMP_FMT; } /* convert the timestamp into a string */ - *ptr = FETCH_BUF(S->fetch_buf[colno], char, *len = 80, NULL); + *len = 80; + *ptr = FETCH_BUF(S->fetch_buf[colno], char, *len, NULL); *len = strftime(*ptr, *len, fmt, &t); break; case SQL_BLOB: Modified: php/php-src/trunk/ext/pdo_firebird/firebird_statement.c === --- php/php-src/trunk/ext/pdo_firebird/firebird_statement.c 2009-07-20 00:09:16 UTC (rev 284403) +++ php/php-src/trunk/ext/pdo_firebird/firebird_statement.c 2009-07-20 00:17:24 UTC (rev 284404) @@ -359,7 +359,8 @@ } /* convert the timestamp into a string */ - *ptr = FETCH_BUF(S->fetch_buf[colno], char, *len = 80, NULL); + *len = 80; + *ptr = FETCH_BUF(S->fetch_buf[colno], char, *len, NULL); *len = strftime(*ptr, *len, fmt, &t); break; case SQL_BLOB: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ global_avail
gwynne Sun, 19 Jul 2009 23:59:45 + Revision: http://svn.php.net/viewvc?view=revision&revision=284402 Changed paths: U SVNROOT/global_avail Log: fix Nuno's username Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2009-07-19 23:58:43 UTC (rev 284401) +++ SVNROOT/global_avail2009-07-19 23:59:45 UTC (rev 284402) @@ -348,7 +348,7 @@ avail|pajoye,guilhermeblanco,auroraeosrose,rrichards,kalle|web/php-windows # php-benchmarks karma -avail|nlopes,pbiggar,olafurw,hjalle|php/php-benchmarks +avail|nlopess,pbiggar,olafurw,hjalle|php/php-benchmarks # phpruntests karma avail|zoe,spriebsch,g2|php/phpruntests -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
rasmus Sun, 19 Jul 2009 23:48:04 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284400
Changed paths:
U SVNROOT/commit-email.php
Log:
Last WS fix
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-19 23:33:50 UTC (rev 284399)
+++ SVNROOT/commit-email.php2009-07-19 23:48:04 UTC (rev 284400)
@@ -219,7 +219,7 @@
$bugs_body = '';
if ($bugs) {
include '/home/svn/SVNROOT/secret.inc';
-$bugs_body = (count($bugs_array[1])>1) ? "\r\nBugs: " : "\r\nBug: ";
+$bugs_body = (count($bugs_array[1])>1) ? "Bugs: " : "Bug: ";
foreach ($bugs_array[1] as $k=>$bug_id) {
$bug_sdesc = '';
$bug_status = '';
--
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/pdo_firebird/pdo_firebird.c branches/PHP_5_3/ext/pdo_firebird/pdo_firebird.c trunk/ext/pdo_firebird/pdo_firebird.c
felipe Sun, 19 Jul 2009 23:33:50 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284399
Changed paths:
U php/php-src/branches/PHP_5_2/ext/pdo_firebird/pdo_firebird.c
U php/php-src/branches/PHP_5_3/ext/pdo_firebird/pdo_firebird.c
U php/php-src/trunk/ext/pdo_firebird/pdo_firebird.c
Log:
- Fixed bug #48980 (Crash when compiling with pdo_firebird)
Bug: http://bugs.php.net/48980 (Assigned) Crash when compiling with pdo_firebird
Modified: php/php-src/branches/PHP_5_2/ext/pdo_firebird/pdo_firebird.c
===
--- php/php-src/branches/PHP_5_2/ext/pdo_firebird/pdo_firebird.c
2009-07-19 23:32:31 UTC (rev 284398)
+++ php/php-src/branches/PHP_5_2/ext/pdo_firebird/pdo_firebird.c
2009-07-19 23:33:50 UTC (rev 284399)
@@ -35,8 +35,23 @@
};
/* }}} */
+/* {{{ pdo_firebird_deps
+ */
+#if ZEND_MODULE_API_NO >= 20050922
+static const zend_module_dep pdo_firebird_deps[] = {
+ ZEND_MOD_REQUIRED("pdo")
+ {NULL, NULL, NULL}
+};
+#endif
+/* }}} */
+
zend_module_entry pdo_firebird_module_entry = { /* {{{ */
+#if ZEND_MODULE_API_NO >= 20050922
+ STANDARD_MODULE_HEADER_EX, NULL,
+ pdo_firebird_deps,
+#else
STANDARD_MODULE_HEADER,
+#endif
"PDO_Firebird",
pdo_firebird_functions,
PHP_MINIT(pdo_firebird),
Modified: php/php-src/branches/PHP_5_3/ext/pdo_firebird/pdo_firebird.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo_firebird/pdo_firebird.c
2009-07-19 23:32:31 UTC (rev 284398)
+++ php/php-src/branches/PHP_5_3/ext/pdo_firebird/pdo_firebird.c
2009-07-19 23:33:50 UTC (rev 284399)
@@ -35,8 +35,23 @@
};
/* }}} */
+/* {{{ pdo_firebird_deps
+ */
+#if ZEND_MODULE_API_NO >= 20050922
+static const zend_module_dep pdo_firebird_deps[] = {
+ ZEND_MOD_REQUIRED("pdo")
+ {NULL, NULL, NULL}
+};
+#endif
+/* }}} */
+
zend_module_entry pdo_firebird_module_entry = { /* {{{ */
+#if ZEND_MODULE_API_NO >= 20050922
+ STANDARD_MODULE_HEADER_EX, NULL,
+ pdo_firebird_deps,
+#else
STANDARD_MODULE_HEADER,
+#endif
"PDO_Firebird",
pdo_firebird_functions,
PHP_MINIT(pdo_firebird),
Modified: php/php-src/trunk/ext/pdo_firebird/pdo_firebird.c
===
--- php/php-src/trunk/ext/pdo_firebird/pdo_firebird.c 2009-07-19 23:32:31 UTC
(rev 284398)
+++ php/php-src/trunk/ext/pdo_firebird/pdo_firebird.c 2009-07-19 23:33:50 UTC
(rev 284399)
@@ -35,8 +35,23 @@
};
/* }}} */
+/* {{{ pdo_firebird_deps
+ */
+#if ZEND_MODULE_API_NO >= 20050922
+static const zend_module_dep pdo_firebird_deps[] = {
+ ZEND_MOD_REQUIRED("pdo")
+ {NULL, NULL, NULL}
+};
+#endif
+/* }}} */
+
zend_module_entry pdo_firebird_module_entry = { /* {{{ */
+#if ZEND_MODULE_API_NO >= 20050922
+ STANDARD_MODULE_HEADER_EX, NULL,
+ pdo_firebird_deps,
+#else
STANDARD_MODULE_HEADER,
+#endif
"PDO_Firebird",
pdo_firebird_functions,
PHP_MINIT(pdo_firebird),
--
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/pdo/pdo.c branches/PHP_5_3/ext/pdo/pdo.c trunk/ext/pdo/pdo.c
felipe Sun, 19 Jul 2009 22:46:03 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284394
Changed paths:
U php/php-src/branches/PHP_5_2/ext/pdo/pdo.c
U php/php-src/branches/PHP_5_3/ext/pdo/pdo.c
U php/php-src/trunk/ext/pdo/pdo.c
Log:
- Revert my mistake
Modified: php/php-src/branches/PHP_5_2/ext/pdo/pdo.c
===
--- php/php-src/branches/PHP_5_2/ext/pdo/pdo.c 2009-07-19 22:32:22 UTC (rev
284393)
+++ php/php-src/branches/PHP_5_2/ext/pdo/pdo.c 2009-07-19 22:46:03 UTC (rev
284394)
@@ -180,7 +180,7 @@
driver->driver_name, driver->api_version,
PDO_DRIVER_API);
return FAILURE;
}
- if (!zend_hash_exists(&module_registry, "PDO", sizeof("PDO"))) {
+ if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
zend_error(E_ERROR, "You MUST load PDO before loading any PDO
drivers");
return FAILURE; /* NOTREACHED */
}
@@ -191,7 +191,7 @@
PDO_API void php_pdo_unregister_driver(pdo_driver_t *driver)
{
- if (!zend_hash_exists(&module_registry, "PDO", sizeof("PDO"))) {
+ if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
return;
}
Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo/pdo.c 2009-07-19 22:32:22 UTC (rev
284393)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo.c 2009-07-19 22:46:03 UTC (rev
284394)
@@ -185,7 +185,7 @@
driver->driver_name, driver->api_version,
PDO_DRIVER_API);
return FAILURE;
}
- if (!zend_hash_exists(&module_registry, "PDO", sizeof("PDO"))) {
+ if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
zend_error(E_ERROR, "You MUST load PDO before loading any PDO
drivers");
return FAILURE; /* NOTREACHED */
}
@@ -196,7 +196,7 @@
PDO_API void php_pdo_unregister_driver(pdo_driver_t *driver)
{
- if (!zend_hash_exists(&module_registry, "PDO", sizeof("PDO"))) {
+ if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
return;
}
Modified: php/php-src/trunk/ext/pdo/pdo.c
===
--- php/php-src/trunk/ext/pdo/pdo.c 2009-07-19 22:32:22 UTC (rev 284393)
+++ php/php-src/trunk/ext/pdo/pdo.c 2009-07-19 22:46:03 UTC (rev 284394)
@@ -185,7 +185,7 @@
driver->driver_name, driver->api_version,
PDO_DRIVER_API);
return FAILURE;
}
- if (!zend_hash_exists(&module_registry, "PDO", sizeof("PDO"))) {
+ if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
zend_error(E_ERROR, "You MUST load PDO before loading any PDO
drivers");
return FAILURE; /* NOTREACHED */
}
@@ -196,7 +196,7 @@
PDO_API void php_pdo_unregister_driver(pdo_driver_t *driver)
{
- if (!zend_hash_exists(&module_registry, "PDO", sizeof("PDO"))) {
+ if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
rasmus Sun, 19 Jul 2009 22:32:22 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284393
Changed paths:
U SVNROOT/commit-email.php
Log:
Whitespace tweaks
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-19 22:23:38 UTC (rev 284392)
+++ SVNROOT/commit-email.php2009-07-19 22:32:22 UTC (rev 284393)
@@ -219,7 +219,7 @@
$bugs_body = '';
if ($bugs) {
include '/home/svn/SVNROOT/secret.inc';
-$bugs_body = (count($bugs_array[1])>1) ? "Bugs: " : "Bug: ";
+$bugs_body = (count($bugs_array[1])>1) ? "\r\nBugs: " : "\r\nBug: ";
foreach ($bugs_array[1] as $k=>$bug_id) {
$bug_sdesc = '';
$bug_status = '';
@@ -238,8 +238,8 @@
if($ret !== false ) {
$json = json_decode($ret,true);
if(isset($json['result']['status'])) {
-$bug_status = '('.$json['result']['status']['status'].')';
-$bug_sdesc = $json['result']['status']['sdesc'];
+$bug_status = ' ('.$json['result']['status']['status'].')';
+$bug_sdesc = ' '.$json['result']['status']['sdesc'];
}
}
curl_close($ch);
@@ -256,14 +256,13 @@
"{$commit_user}\t\t" . date(DATE_RFC2822, $commit_date) . "\r\n" .
"\r\n" .
"Revision:
http://svn.php.net/viewvc?view=revision&revision={$REV}\r\n"; .
-"\r\n". $bugs_body .
"\r\n" .
"Changed paths:\r\n" .
"\t" . implode("\r\n\t", $changed_paths) . "\r\n" .
"\r\n" .
"Log:\r\n" .
$commit_log . "\r\n" .
-"\r\n" .
+"$bugs_body\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/php-src/ branches/PHP_5_2/ext/gd/tests/imagecolorallocate_variation3.phpt branches/PHP_5_2/ext/gd/tests/imagecolorallocate_variation4.phpt trunk/ext/gd/tests/imagecolorallocate_vari
rdohms Sun, 19 Jul 2009 22:16:35 + Revision: http://svn.php.net/viewvc?view=revision&revision=284390 Changed paths: U php/php-src/branches/PHP_5_2/ext/gd/tests/imagecolorallocate_variation3.phpt U php/php-src/branches/PHP_5_2/ext/gd/tests/imagecolorallocate_variation4.phpt U php/php-src/trunk/ext/gd/tests/imagecolorallocate_variation3.phpt Log: Adjusting tests to use EXPECTF (faster testing) and adjusting 5_2 version to lack of parameter validation Modified: php/php-src/branches/PHP_5_2/ext/gd/tests/imagecolorallocate_variation3.phpt === --- php/php-src/branches/PHP_5_2/ext/gd/tests/imagecolorallocate_variation3.phpt 2009-07-19 22:16:35 UTC (rev 284389) +++ php/php-src/branches/PHP_5_2/ext/gd/tests/imagecolorallocate_variation3.phpt 2009-07-19 22:16:35 UTC (rev 284390) @@ -55,8 +55,8 @@ // float data 'float 10.5' => 10.5, 'float -10.5' => -10.5, - 'float 10.1234567e10' => 10.1234567e10, - 'float 10.7654321E-10' => 10.7654321E-10, + 'float 10.1234567e5' => 10.1234567e5, + 'float 10.7654321E-5' => 10.7654321E-5, 'float .5' => .5, // array data @@ -114,10 +114,10 @@ --float -10.5-- int(652810) ---float 10.1234567e10-- -int(217143306) +--float 10.1234567e5-- +int(259815690) ---float 10.7654321E-10-- +--float 10.7654321E-5-- int(655370) --float .5-- Modified: php/php-src/branches/PHP_5_2/ext/gd/tests/imagecolorallocate_variation4.phpt === --- php/php-src/branches/PHP_5_2/ext/gd/tests/imagecolorallocate_variation4.phpt 2009-07-19 22:16:35 UTC (rev 284389) +++ php/php-src/branches/PHP_5_2/ext/gd/tests/imagecolorallocate_variation4.phpt 2009-07-19 22:16:35 UTC (rev 284390) @@ -114,7 +114,7 @@ int(657910) --float 10.1234567e10-- -bool(false) +int(657919) --float 10.7654321E-10-- int(657920) Modified: php/php-src/trunk/ext/gd/tests/imagecolorallocate_variation3.phpt === --- php/php-src/trunk/ext/gd/tests/imagecolorallocate_variation3.phpt 2009-07-19 22:16:35 UTC (rev 284389) +++ php/php-src/trunk/ext/gd/tests/imagecolorallocate_variation3.phpt 2009-07-19 22:16:35 UTC (rev 284390) @@ -55,8 +55,8 @@ // float data 'float 10.5' => 10.5, 'float -10.5' => -10.5, - 'float 10.1234567e10' => 10.1234567e10, - 'float 10.7654321E-10' => 10.7654321E-10, + 'float 10.1234567e5' => 10.1234567e5, + 'float 10.7654321E-5' => 10.7654321E-5, 'float .5' => .5, // array data @@ -105,110 +105,110 @@ }; ?> ===DONE=== ---EXPECTREGEX-- -\*\*\* Testing imagecolorallocate\(\) : usage variations \*\*\* +--EXPECTF-- +*** Testing imagecolorallocate() : usage variations *** --float 10.5-- -int\(657930\) +int(657930) --float -10.5-- -int\(652810\) +int(652810) ---float 10.1234567e10-- -int\(655114\)|int\(217143306\) +--float 10.1234567e5-- +int(259815690) ---float 10.7654321E-10-- -int\(655370\) +--float 10.7654321E-5-- +int(655370) --float .5-- -int\(655370\) +int(655370) --empty array-- -Warning: imagecolorallocate\(\) expects parameter 3 to be long, array given in (\w*|\/|\.)* on line \d+ +Warning: imagecolorallocate() expects parameter 3 to be long, array given in %s on line %d NULL --int indexed array-- -Warning: imagecolorallocate\(\) expects parameter 3 to be long, array given in (\w*|\/|\.)* on line \d+ +Warning: imagecolorallocate() expects parameter 3 to be long, array given in %s on line %d NULL --associative array-- -Warning: imagecolorallocate\(\) expects parameter 3 to be long, array given in (\w*|\/|\.)* on line \d+ +Warning: imagecolorallocate() expects parameter 3 to be long, array given in %s on line %d NULL --nested arrays-- -Warning: imagecolorallocate\(\) expects parameter 3 to be long, array given in (\w*|\/|\.)* on line \d+ +Warning: imagecolorallocate() expects parameter 3 to be long, array given in %s on line %d NULL --uppercase NULL-- -int\(655370\) +int(655370) --lowercase null-- -int\(655370\) +int(655370) --lowercase true-- -int\(655626\) +int(655626) --lowercase false-- -int\(655370\) +int(655370) --uppercase TRUE-- -int\(655626\) +int(655626) --uppercase FALSE-- -int\(655370\) +int(655370) --empty string DQ-- -Warning: imagecolorallocate\(\) expects parameter 3 to be long, Unicode string given in (\w*|\/|\.)* on line \d+ +Warning: imagecolorallocate() expects parameter 3 to be long, Unicode string given in %s on line %d NULL --empty string SQ-- -Warning: imagecolorallocate\(\) expects parameter 3 to be long, Unicode string given in (\w*|\/|\.)* on line \d+ +Warning: imagecolorallocate() expects parameter 3 to be long, Unicode string given in %s on line %d NULL --string DQ-- -Warning: imagecolorallocate\(\) expects parameter 3 to be long, Unicode string
[PHP-CVS] svn: / SVNROOT/commit-email.php web/php-bugs/trunk/rpc.php
rasmus Sun, 19 Jul 2009 22:16:35 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284389
Changed paths:
U SVNROOT/commit-email.php
U web/php-bugs/trunk/rpc.php
Log:
Tweaks
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-19 22:14:12 UTC (rev 284388)
+++ SVNROOT/commit-email.php2009-07-19 22:16:35 UTC (rev 284389)
@@ -123,7 +123,6 @@
$commit_date = strtotime(substr($commit_info[1], 0, strlen("-00-00
00:00:00 +")));
$commit_log = implode("\n", array_slice($commit_info, 3));
// Support bug#1234 bug url extraction
-$bugs = preg_match_all("/(?:bug|#)[\\s#:]*([0-9]+)/i", $commit_log,
$bugs_array);
$bugs = preg_match_all("/(?:pecl|pear|)\\s*(?:bug|#)[\\s#:]*([0-9]+)/i",
$commit_log, $bugs_array);
//
-
@@ -220,7 +219,7 @@
$bugs_body = '';
if ($bugs) {
include '/home/svn/SVNROOT/secret.inc';
-$bugs_body = (count($bugs_array[1])>1) ? "Bug: " : "Bugs: ";
+$bugs_body = (count($bugs_array[1])>1) ? "Bugs: " : "Bug: ";
foreach ($bugs_array[1] as $k=>$bug_id) {
$bug_sdesc = '';
$bug_status = '';
@@ -257,7 +256,7 @@
"{$commit_user}\t\t" . date(DATE_RFC2822, $commit_date) . "\r\n" .
"\r\n" .
"Revision:
http://svn.php.net/viewvc?view=revision&revision={$REV}\r\n"; .
-$bugs_body .
+"\r\n". $bugs_body .
"\r\n" .
"Changed paths:\r\n" .
"\t" . implode("\r\n\t", $changed_paths) . "\r\n" .
Modified: web/php-bugs/trunk/rpc.php
===
--- web/php-bugs/trunk/rpc.php 2009-07-19 22:14:12 UTC (rev 284388)
+++ web/php-bugs/trunk/rpc.php 2009-07-19 22:16:35 UTC (rev 284389)
@@ -50,6 +50,7 @@
$success = @mysql_query($query);
if($success) {
echo json_encode(array('result'=>array('status'=>$bug)));
+exit;
} else {
echo json_encode(array('result'=>array('error'=>mysql_error(;
exit;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: / SVNROOT/commit-email.php web/php-bugs/trunk/bug.php web/php-bugs/trunk/rpc.php
rasmus Sun, 19 Jul 2009 21:08:22 +
URL: http://svn.php.net/viewvc?view=revision&revision=284386
Changed paths:
U SVNROOT/commit-email.php
U web/php-bugs/trunk/bug.php
A web/php-bugs/trunk/rpc.php
Log:
Bugs mentioned in commit messages now update the bug db and also
pull the status of the bug back into the commit email.
(I'm pretty sure this won't work on the first try)
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-19 20:53:26 UTC (rev 284385)
+++ SVNROOT/commit-email.php2009-07-19 21:08:22 UTC (rev 284386)
@@ -9,6 +9,7 @@
// Constants
$version = substr('$Revision$', strlen('$Revision: '), -2);
$smtp_server = '127.0.0.1';
+
$commit_email_list = array(
// FastCGI ISAPI
'|^php/fastcgi-isapi|' => array('sh...@php.net', 'w...@php.net',
'ed...@php.net'),
@@ -218,8 +219,34 @@
$bugs_body = '';
if ($bugs) {
+include '/home/svn/SVNROOT/secret.inc';
+$bugs_body = (count($bugs_array[1])>1) ? "Bug: " : "Bugs: ";
foreach ($bugs_array[1] as $k=>$bug_id) {
-$bugs_body .= ' '.$bug_urls[$k]."/$bug_id\r\n";
+$bug_sdesc = '';
+$bug_status = '';
+if($bug_urls[$k]=='http://bugs.php.net') {
+$ch = curl_init('http://bugs.php.net/rpc.php');
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+curl_setopt($ch, CURLOPT_POST, 1);
+$ncomment = "Automatic comment from SVN on behalf of {$from[0]}\n"
.
+"Log: $commit_log\n" .
+"Revision:
http://svn.php.net/viewvc?view=revision&revision={$REV}\n";;
+curl_setopt($ch, CURLOPT_POSTFIELDS, "user=" .
rawurlencode($from[0]) .
+ "&id={$bug_id}" .
+ "&ncomment=" . rawurlencode($ncomment) .
+ "&MAGIC_COOKIE=$SVN_MAGIC_COOKIE");
+$ret = curl_exec($ch);
+if($ret !== false ) {
+$json = json_decode($ret,true);
+if(isset($json['result']['status'])) {
+$bug_status = '('.$json['result']['status']['status'].')';
+$bug_sdesc = $json['result']['status']['sdesc'];
+}
+}
+curl_close($ch);
+}
+if($k) $bugs_body .= ' ';
+$bugs_body .= $bug_urls[$k]."/$bug_id{$bug_status}{$bug_sdesc}\r\n";
}
}
@@ -229,7 +256,7 @@
"\r\n" .
"{$commit_user}\t\t" . date(DATE_RFC2822, $commit_date) . "\r\n" .
"\r\n" .
-"URL: http://svn.php.net/viewvc?view=revision&revision={$REV}\r\n";
.
+"Revision:
http://svn.php.net/viewvc?view=revision&revision={$REV}\r\n"; .
$bugs_body .
"\r\n" .
"Changed paths:\r\n" .
Modified: web/php-bugs/trunk/bug.php
===
--- web/php-bugs/trunk/bug.php 2009-07-19 20:53:26 UTC (rev 284385)
+++ web/php-bugs/trunk/bug.php 2009-07-19 21:08:22 UTC (rev 284386)
@@ -124,7 +124,7 @@
if (!$errors) {
$query = "INSERT INTO bugdb_comments (bug,email,ts,comment)
VALUES"
- . " ('$id','" . $in['commentemail'] .
"',NOW(),'$ncomment')";
+ . " ('$id','" .
mysql_real_escape_string($in['commentemail']) .
"',NOW(),'".mysql_real_escape_string($ncomment)."')";
$success = @mysql_query($query);
}
$from = stripslashes($in['commentemail']);
@@ -160,12 +160,12 @@
if (!$errors && !($errors = incoming_details_are_valid($in))) {
/* update bug record */
- $query = "UPDATE bugdb SET sdesc='" . $in['sdesc'] .
"',status='" . $in['status'] . "', bug_type='" . $in['bug_type'] . "',
php_version='" . $in['php_version'] . "', php_os='" . $in['php_os'] . "',
ts2=NOW(), email='$from' WHERE id=$id";
+ $query = "UPDATE bugdb SET sdesc='" .
mysql_real_escape_string($in['sdesc']) . "',status='" .
mysql_real_escape_string($in['status']) . "', bug_type='" .
mysql_real_escape_string($in['bug_type']) . "', php_version='" .
mysql_real_escape_string($in['php_version']) . "', php_os='" .
mysql_real_escape_string($in['php_os']) . "', ts2=NOW(),
email='".mysql_real_escape_string($from)."' WHERE id=$id";
$success = @mysql_query($query);
/* add comment */
if ($success && !empty($ncomment)) {
- $query = "INSERT INTO bugdb_comments (bug, email, ts,
comment) VALUES ($id,'$from',NOW(),'$ncomment')";
+ $query = "INSERT INTO bugdb_comments (bug, email, ts,
comment) VALUES
($id,'".mysql_real_escape_string($from)."',NOW(),'".mysql_real_escape_string($ncomment)."')";
$success = @mysql_query($query);
}
}
@@ -215,11 +215,11 @@
if
[PHP-CVS] svn: php/php-src/ branches/PHP_5_2/ext/pdo/pdo.c branches/PHP_5_3/ext/pdo/pdo.c trunk/ext/pdo/pdo.c
felipe Sun, 19 Jul 2009 20:53:26 +
URL: http://svn.php.net/viewvc?view=revision&revision=284385
http://bugs.php.net/48785
Changed paths:
U php/php-src/branches/PHP_5_2/ext/pdo/pdo.c
U php/php-src/branches/PHP_5_3/ext/pdo/pdo.c
U php/php-src/trunk/ext/pdo/pdo.c
Log:
- Fixed module check (Related to bug #48785)
Modified: php/php-src/branches/PHP_5_2/ext/pdo/pdo.c
===
--- php/php-src/branches/PHP_5_2/ext/pdo/pdo.c 2009-07-19 18:55:31 UTC (rev
284384)
+++ php/php-src/branches/PHP_5_2/ext/pdo/pdo.c 2009-07-19 20:53:26 UTC (rev
284385)
@@ -180,7 +180,7 @@
driver->driver_name, driver->api_version,
PDO_DRIVER_API);
return FAILURE;
}
- if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
+ if (!zend_hash_exists(&module_registry, "PDO", sizeof("PDO"))) {
zend_error(E_ERROR, "You MUST load PDO before loading any PDO
drivers");
return FAILURE; /* NOTREACHED */
}
@@ -191,7 +191,7 @@
PDO_API void php_pdo_unregister_driver(pdo_driver_t *driver)
{
- if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
+ if (!zend_hash_exists(&module_registry, "PDO", sizeof("PDO"))) {
return;
}
Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo/pdo.c 2009-07-19 18:55:31 UTC (rev
284384)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo.c 2009-07-19 20:53:26 UTC (rev
284385)
@@ -185,7 +185,7 @@
driver->driver_name, driver->api_version,
PDO_DRIVER_API);
return FAILURE;
}
- if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
+ if (!zend_hash_exists(&module_registry, "PDO", sizeof("PDO"))) {
zend_error(E_ERROR, "You MUST load PDO before loading any PDO
drivers");
return FAILURE; /* NOTREACHED */
}
@@ -196,7 +196,7 @@
PDO_API void php_pdo_unregister_driver(pdo_driver_t *driver)
{
- if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
+ if (!zend_hash_exists(&module_registry, "PDO", sizeof("PDO"))) {
return;
}
Modified: php/php-src/trunk/ext/pdo/pdo.c
===
--- php/php-src/trunk/ext/pdo/pdo.c 2009-07-19 18:55:31 UTC (rev 284384)
+++ php/php-src/trunk/ext/pdo/pdo.c 2009-07-19 20:53:26 UTC (rev 284385)
@@ -185,7 +185,7 @@
driver->driver_name, driver->api_version,
PDO_DRIVER_API);
return FAILURE;
}
- if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
+ if (!zend_hash_exists(&module_registry, "PDO", sizeof("PDO"))) {
zend_error(E_ERROR, "You MUST load PDO before loading any PDO
drivers");
return FAILURE; /* NOTREACHED */
}
@@ -196,7 +196,7 @@
PDO_API void php_pdo_unregister_driver(pdo_driver_t *driver)
{
- if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
+ if (!zend_hash_exists(&module_registry, "PDO", sizeof("PDO"))) {
return;
}
--
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/pdo_sqlite/tests/bug48773.phpt branches/PHP_5_3/ext/pdo_sqlite/tests/bug48773.phpt trunk/ext/pdo/pdo_dbh.c trunk/ext/pdo_sqlite/tests/bug48773.phpt
felipe Sun, 19 Jul 2009 18:55:31 +
URL: http://svn.php.net/viewvc?view=revision&revision=284384
http://bugs.php.net/48773
Changed paths:
A php/php-src/branches/PHP_5_2/ext/pdo_sqlite/tests/bug48773.phpt
A php/php-src/branches/PHP_5_3/ext/pdo_sqlite/tests/bug48773.phpt
U php/php-src/trunk/ext/pdo/pdo_dbh.c
A php/php-src/trunk/ext/pdo_sqlite/tests/bug48773.phpt
Log:
- Fixed bug #48773 (Incorrect error when setting PDO::ATTR_STATEMENT_CLASS with
ctor_args)
[HEAD only]
Added: php/php-src/branches/PHP_5_2/ext/pdo_sqlite/tests/bug48773.phpt
===
--- php/php-src/branches/PHP_5_2/ext/pdo_sqlite/tests/bug48773.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_2/ext/pdo_sqlite/tests/bug48773.phpt
2009-07-19 18:55:31 UTC (rev 284384)
@@ -0,0 +1,34 @@
+--TEST--
+Bug #48773 (Incorrect error when setting PDO::ATTR_STATEMENT_CLASS with
ctor_args)
+--SKIPIF--
+
+--FILE--
+setAttribute(PDO::ATTR_STATEMENT_CLASS,
array($this->statementClass, array($this)));
+ }
+}
+
+$db = new foo('sqlite::memory:', '', '');
+$stmt = $db->query('SELECT 1');
+var_dump($stmt);
+
+?>
+--EXPECTF--
+object(bar)#%d (1) {
+ [%u|b%"queryString"]=>
+ %unicode|string%(8) "SELECT 1"
+}
Property changes on:
php/php-src/branches/PHP_5_2/ext/pdo_sqlite/tests/bug48773.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Added: php/php-src/branches/PHP_5_3/ext/pdo_sqlite/tests/bug48773.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pdo_sqlite/tests/bug48773.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/pdo_sqlite/tests/bug48773.phpt
2009-07-19 18:55:31 UTC (rev 284384)
@@ -0,0 +1,34 @@
+--TEST--
+Bug #48773 (Incorrect error when setting PDO::ATTR_STATEMENT_CLASS with
ctor_args)
+--SKIPIF--
+
+--FILE--
+setAttribute(PDO::ATTR_STATEMENT_CLASS,
array($this->statementClass, array($this)));
+ }
+}
+
+$db = new foo('sqlite::memory:', '', '');
+$stmt = $db->query('SELECT 1');
+var_dump($stmt);
+
+?>
+--EXPECTF--
+object(bar)#%d (1) {
+ [%u|b%"queryString"]=>
+ %unicode|string%(8) "SELECT 1"
+}
Property changes on:
php/php-src/branches/PHP_5_3/ext/pdo_sqlite/tests/bug48773.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Modified: php/php-src/trunk/ext/pdo/pdo_dbh.c
===
--- php/php-src/trunk/ext/pdo/pdo_dbh.c 2009-07-19 17:31:36 UTC (rev 284383)
+++ php/php-src/trunk/ext/pdo/pdo_dbh.c 2009-07-19 18:55:31 UTC (rev 284384)
@@ -775,8 +775,8 @@
}
if (Z_TYPE_P(value) != IS_ARRAY
|| zend_hash_index_find(Z_ARRVAL_P(value), 0,
(void**)&item) == FAILURE
- || Z_TYPE_PP(item) != IS_STRING
- || zend_lookup_class(Z_STRVAL_PP(item),
Z_STRLEN_PP(item), &pce TSRMLS_CC) == FAILURE
+ || !PDO_ZVAL_PP_IS_TEXT(item)
+ || zend_u_lookup_class(Z_TYPE_PP(item),
Z_UNIVAL_PP(item), Z_UNILEN_PP(item), &pce TSRMLS_CC) == FAILURE
) {
pdo_raise_impl_error(dbh, NULL, "HY000",
"PDO::ATTR_STATEMENT_CLASS requires
format array(classname, array(ctor_args)); "
Added: php/php-src/trunk/ext/pdo_sqlite/tests/bug48773.phpt
===
--- php/php-src/trunk/ext/pdo_sqlite/tests/bug48773.phpt
(rev 0)
+++ php/php-src/trunk/ext/pdo_sqlite/tests/bug48773.phpt2009-07-19
18:55:31 UTC (rev 284384)
@@ -0,0 +1,34 @@
+--TEST--
+Bug #48773 (Incorrect error when setting PDO::ATTR_STATEMENT_CLASS with
ctor_args)
+--SKIPIF--
+
+--FILE--
+setAttribute(PDO::ATTR_STATEMENT_CLASS,
array($this->statementClass, array($this)));
+ }
+}
+
+$db = new foo('sqlite::memory:', '', '');
+$stmt = $db->query('SELECT 1');
+var_dump($stmt);
+
+?>
+--EXPECTF--
+object(bar)#%d (1) {
+ [%u|b%"queryString"]=>
+ %unicode|string%(8) "SELECT 1"
+}
Property changes on: php/php-src/trunk/ext/pdo_sqlite/tests/bug48773.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
rasmus Sun, 19 Jul 2009 17:18:03 +
URL: http://svn.php.net/viewvc?view=revision&revision=284382
Changed paths:
U SVNROOT/commit-email.php
Log:
Let's try it without word-wrapping. Let people do their own formatting
in these messages instead.
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-19 17:13:35 UTC (rev 284381)
+++ SVNROOT/commit-email.php2009-07-19 17:18:03 UTC (rev 284382)
@@ -236,7 +236,7 @@
"\t" . implode("\r\n\t", $changed_paths) . "\r\n" .
"\r\n" .
"Log:\r\n" .
-wordwrap($commit_log, 72, "\r\n") . "\r\n" .
+$commit_log . "\r\n" .
"\r\n" .
$diffs_string;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
rasmus Sun, 19 Jul 2009 17:13:35 +
URL: http://svn.php.net/viewvc?view=revision&revision=284381
http://bugs.php.net/1234
http://bugs.php.net/1234
Changed paths:
U SVNROOT/commit-email.php
Log:
Support for "pecl bug 1234" and "pear bug 1234" which is only
really
needed if referencing a pecl/pear bug when committing
to php-src or
vice-versa. Otherwise it will pick up the bug
type from the commit
path.
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-19 17:02:03 UTC (rev 284380)
+++ SVNROOT/commit-email.php2009-07-19 17:13:35 UTC (rev 284381)
@@ -123,6 +123,7 @@
$commit_log = implode("\n", array_slice($commit_info, 3));
// Support bug#1234 bug url extraction
$bugs = preg_match_all("/(?:bug|#)[\\s#:]*([0-9]+)/i", $commit_log,
$bugs_array);
+$bugs = preg_match_all("/(?:pecl|pear|)\\s*(?:bug|#)[\\s#:]*([0-9]+)/i",
$commit_log, $bugs_array);
//
-
// Determine "from" address
@@ -189,6 +190,14 @@
case 'pecl': $bug_url = 'http://pecl.php.net/bugs'; break;
default: $bug_url = 'http://bugs.php.net'; break;
}
+
+foreach($bugs_array[0] as $k=>$bug_match) {
+ if(stristr($bug_match,'pecl')) $bug_urls[$k] = 'http://pecl.php.net/bugs';
+ else if(stristr($bug_match,'pear')) $bug_urls[$k] =
'http://pear.php.net/bugs';
+ else $bug_urls[$k] = $bug_url;
+
+}
+
foreach ($changed_paths as $changed_path) {
$changed_path = trim(strstr($changed_path, ' '));
if (substr($changed_path, -1) !== '/') {
@@ -209,8 +218,8 @@
$bugs_body = '';
if ($bugs) {
-foreach ($bugs_array[1] as $bug_id) {
-$bugs_body .= " $bug_url/$bug_id\r\n";
+foreach ($bugs_array[1] as $k=>$bug_id) {
+$bugs_body .= ' '.$bug_urls[$k]."/$bug_id\r\n";
}
}
--
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 3/NEWS
pajoye Sun, 19 Jul 2009 17:02:03 + URL: http://svn.php.net/viewvc?view=revision&revision=284380 http://bugs.php.net/49763 Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_3/NEWS Log: - #49763 entry (and test commit in multiple branches :) Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-07-19 16:31:43 UTC (rev 284379) +++ php/php-src/branches/PHP_5_2/NEWS 2009-07-19 17:02:03 UTC (rev 284380) @@ -8,6 +8,8 @@ (naf at altlinux dot ru, Felipe) - Fixed bug #48788 (RecursiveDirectoryIterator doesn't descend into symlinked directories). (Ilia) +- Fixed bug #48763 (ZipArchive produces corrupt archive). (dani dot church at + gmail dot com, Pierre) - Fixed bug #48762 (IPv6 address filter still rejects valid address). (Felipe) - Fixed bug #48733 (CURLOPT_WRITEHEADER|CURLOPT_FILE|CURLOPT_STDERR warns on files that have been opened with r+). (Ilia) Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-07-19 16:31:43 UTC (rev 284379) +++ php/php-src/branches/PHP_5_3/NEWS 2009-07-19 17:02:03 UTC (rev 284380) @@ -17,6 +17,8 @@ directories). (Ilia) - Fixed bug #48771 (rename() between volumes fails and reports no error on Windows). (Pierre) +- Fixed bug #48763 (ZipArchive produces corrupt archive). (dani dot church at + gmail dot com, Pierre) - Fixed bug #48757 (ReflectionFunction::invoke() parameter issues). (Kalle) - Fixed bug #48733 (CURLOPT_WRITEHEADER|CURLOPT_FILE|CURLOPT_STDERR warns on files that have been opened with r+). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/ branches/PHP_5_3/Zend/tests/call_user_func_001.phpt branches/PHP_5_3/Zend/tests/call_user_func_002.phpt branches/PHP_5_3/Zend/tests/call_user_func_003.phpt trunk/Zend/tests
felipe Sun, 19 Jul 2009 16:31:43 +
URL: http://svn.php.net/viewvc?view=revision&revision=284379
Changed paths:
A php/php-src/branches/PHP_5_3/Zend/tests/call_user_func_001.phpt
A php/php-src/branches/PHP_5_3/Zend/tests/call_user_func_002.phpt
A php/php-src/branches/PHP_5_3/Zend/tests/call_user_func_003.phpt
A php/php-src/trunk/Zend/tests/call_user_func_001.phpt
A php/php-src/trunk/Zend/tests/call_user_func_002.phpt
A php/php-src/trunk/Zend/tests/call_user_func_003.phpt
Log:
- New tests
Added: php/php-src/branches/PHP_5_3/Zend/tests/call_user_func_001.phpt
===
--- php/php-src/branches/PHP_5_3/Zend/tests/call_user_func_001.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/Zend/tests/call_user_func_001.phpt
2009-07-19 16:31:43 UTC (rev 284379)
@@ -0,0 +1,35 @@
+--TEST--
+Testing call_user_func inside namespace
+--FILE--
+
+--EXPECTF--
+%string|unicode%(6) "foobar"
+
+Warning: call_user_func() expects parameter 1 to be a valid callback, cannot
access private method testing\foo::priv() in %s on line %d
+
+Warning: call_user_func() expects parameter 1 to be a valid callback, cannot
access protected method testing\foo::prot() in %s on line %d
Property changes on:
php/php-src/branches/PHP_5_3/Zend/tests/call_user_func_001.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Added: php/php-src/branches/PHP_5_3/Zend/tests/call_user_func_002.phpt
===
--- php/php-src/branches/PHP_5_3/Zend/tests/call_user_func_002.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/Zend/tests/call_user_func_002.phpt
2009-07-19 16:31:43 UTC (rev 284379)
@@ -0,0 +1,29 @@
+--TEST--
+Testing call_user_func() with autoload and passing invalid params
+--FILE--
+
+--EXPECTF--
+%unicode|string%(3) "foo"
+
+Warning: call_user_func() expects parameter 1 to be a valid callback, class
'foo' not found in %s on line %d
+
+Warning: call_user_func() expects parameter 1 to be a valid callback, class ''
not found in %s on line %d
+
+Notice: Undefined variable: foo in %s on line %d
+
+Warning: call_user_func() expects parameter 1 to be a valid callback, first
array member is not a valid class name or object in %s on line %d
+
+Notice: Undefined variable: foo in %s on line %d
+
+Warning: call_user_func() expects parameter 1 to be a valid callback, first
array member is not a valid class name or object in %s on line %d
Property changes on:
php/php-src/branches/PHP_5_3/Zend/tests/call_user_func_002.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Added: php/php-src/branches/PHP_5_3/Zend/tests/call_user_func_003.phpt
===
--- php/php-src/branches/PHP_5_3/Zend/tests/call_user_func_003.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/Zend/tests/call_user_func_003.phpt
2009-07-19 16:31:43 UTC (rev 284379)
@@ -0,0 +1,31 @@
+--TEST--
+Testing call_user_func() with closures
+--FILE--
+__invoke());
+var_dump(call_user_func(function() use (&$foo) { return $foo; }, '__invoke'));
+
+?>
+--EXPECTF--
+%unicode|string%(3) "OK!"
+object(Closure)#%d (1) {
+ [%u|b%"static"]=>
+ array(1) {
+[%u|b%"instance"]=>
+object(Closure)#%d (0) {
+}
+ }
+}
Property changes on:
php/php-src/branches/PHP_5_3/Zend/tests/call_user_func_003.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Added: php/php-src/trunk/Zend/tests/call_user_func_001.phpt
===
--- php/php-src/trunk/Zend/tests/call_user_func_001.phpt
(rev 0)
+++ php/php-src/trunk/Zend/tests/call_user_func_001.phpt2009-07-19
16:31:43 UTC (rev 284379)
@@ -0,0 +1,35 @@
+--TEST--
+Testing call_user_func inside namespace
+--FILE--
+
+--EXPECTF--
+%string|unicode%(6) "foobar"
+
+Warning: call_user_func() expects parameter 1 to be a valid callback, cannot
access private method testing\foo::priv() in %s on line %d
+
+Warning: call_user_func() expects parameter 1 to be a valid callback, cannot
access protected method testing\foo::prot() in %s on line %d
Property changes on: php/php-src/trunk/Zend/tests/call_user_func_001.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Added: php/php-src/trunk/Zend/tests/call_user_func_002.phpt
===
--- php/php-src/trunk/Zend/tests/call_user_func_002.phpt
[PHP-CVS] svn: php/php-src/branches/PHP_5_2/ configure.in
sixdSun, 19 Jul 2009 16:28:15 + URL: http://svn.php.net/viewvc?view=revision&revision=284378 http://bugs.php.net/48722 Changed paths: U php/php-src/branches/PHP_5_2/configure.in Log: MFH: Bug #48722 (Update OCI8 --enable-sigchild warning) Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2009-07-19 16:27:59 UTC (rev 284377) +++ php/php-src/branches/PHP_5_2/configure.in 2009-07-19 16:28:15 UTC (rev 284378) @@ -1556,13 +1556,18 @@ fi if test "$PHP_SIGCHILD" != "yes"; then + if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then cat < processes when using a local Oracle-DB | -| please recompile PHP and specify --enable-sigchild when configuring| -| (This problem has been reported under Linux using Oracle >= 8.1.5) | +| If you encounter processes when using a local Oracle | +| database, set the value BEQUEATH_DETACH=YES in Oracle Net's| +| sqlnet.ora file on the PHP host, or set the environment variable | +| BEQUEATH_DETACH to YES before starting Apache. If the problem | +| still occurs, then recompile PHP and specify --enable-sigchild | +| when configuring. | X + fi fi fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/branches/PHP_5_3/ configure.in
sixdSun, 19 Jul 2009 16:27:59 + URL: http://svn.php.net/viewvc?view=revision&revision=284377 http://bugs.php.net/48722 Changed paths: U php/php-src/branches/PHP_5_3/configure.in Log: MFH: Bug #48722 (Update OCI8 --enable-sigchild warning) Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2009-07-19 16:27:35 UTC (rev 284376) +++ php/php-src/branches/PHP_5_3/configure.in 2009-07-19 16:27:59 UTC (rev 284377) @@ -1577,13 +1577,18 @@ fi if test "$PHP_SIGCHILD" != "yes"; then + if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then cat < processes when using a local Oracle-DB | -| please recompile PHP and specify --enable-sigchild when configuring| -| (This problem has been reported under Linux using Oracle >= 8.1.5) | +| If you encounter processes when using a local Oracle | +| database, set the value BEQUEATH_DETACH=YES in Oracle Net's| +| sqlnet.ora file on the PHP host, or set the environment variable | +| BEQUEATH_DETACH to YES before starting Apache. If the problem | +| still occurs, then recompile PHP and specify --enable-sigchild | +| when configuring. | X + fi fi fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/trunk/ configure.in
sixdSun, 19 Jul 2009 16:27:35 + URL: http://svn.php.net/viewvc?view=revision&revision=284376 http://bugs.php.net/48722 Changed paths: U php/php-src/trunk/configure.in Log: Bug #48722 (Update OCI8 --enable-sigchild warning) Modified: php/php-src/trunk/configure.in === --- php/php-src/trunk/configure.in 2009-07-19 16:26:16 UTC (rev 284375) +++ php/php-src/trunk/configure.in 2009-07-19 16:27:35 UTC (rev 284376) @@ -1514,13 +1514,18 @@ fi if test "$PHP_SIGCHILD" != "yes"; then + if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then cat < processes when using a local Oracle-DB | -| please recompile PHP and specify --enable-sigchild when configuring| -| (This problem has been reported under Linux using Oracle >= 8.1.5) | +| If you encounter processes when using a local Oracle | +| database, set the value BEQUEATH_DETACH=YES in Oracle Net's| +| sqlnet.ora file on the PHP host, or set the environment variable | +| BEQUEATH_DETACH to YES before starting Apache. If the problem | +| still occurs, then recompile PHP and specify --enable-sigchild | +| when configuring. | X + fi fi fi -- 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/oci8/tests/ connect.inc
sixdSun, 19 Jul 2009 16:21:35 + URL: http://svn.php.net/viewvc?view=revision&revision=284374 Changed paths: U php/php-src/branches/PHP_5_2/ext/oci8/tests/connect.inc Log: make it easier for maintainers to set un/pw in environments that don't pass shell variables Modified: php/php-src/branches/PHP_5_2/ext/oci8/tests/connect.inc === --- php/php-src/branches/PHP_5_2/ext/oci8/tests/connect.inc 2009-07-19 16:08:44 UTC (rev 284373) +++ php/php-src/branches/PHP_5_2/ext/oci8/tests/connect.inc 2009-07-19 16:21:35 UTC (rev 284374) @@ -1,6 +1,10 @@ -- 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/oci8/tests/ connect.inc
sixdSun, 19 Jul 2009 16:08:44 + URL: http://svn.php.net/viewvc?view=revision&revision=284373 Changed paths: U php/php-src/trunk/ext/oci8/tests/connect.inc Log: make it easier for maintainers to set un/pw in environments that don't pass shell variables Modified: php/php-src/trunk/ext/oci8/tests/connect.inc === --- php/php-src/trunk/ext/oci8/tests/connect.inc2009-07-19 16:08:24 UTC (rev 284372) +++ php/php-src/trunk/ext/oci8/tests/connect.inc2009-07-19 16:08:44 UTC (rev 284373) @@ -1,6 +1,10 @@ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/branches/PHP_5_3/ext/oci8/tests/ connect.inc
sixdSun, 19 Jul 2009 16:08:24 + URL: http://svn.php.net/viewvc?view=revision&revision=284372 Changed paths: U php/php-src/branches/PHP_5_3/ext/oci8/tests/connect.inc Log: make it easier for maintainers to set un/pw in environments that don't pass shell variables Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/connect.inc === --- php/php-src/branches/PHP_5_3/ext/oci8/tests/connect.inc 2009-07-19 16:06:19 UTC (rev 284371) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/connect.inc 2009-07-19 16:08:24 UTC (rev 284372) @@ -1,6 +1,10 @@ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/branches/PHP_5_3/ext/oci8/tests/ oci8safemode.phpt
sixdSun, 19 Jul 2009 16:06:19 + URL: http://svn.php.net/viewvc?view=revision&revision=284371 Changed paths: U php/php-src/branches/PHP_5_3/ext/oci8/tests/oci8safemode.phpt Log: Fix expected output to match final PHP 5.3 deprecated behavior Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/oci8safemode.phpt === --- php/php-src/branches/PHP_5_3/ext/oci8/tests/oci8safemode.phpt 2009-07-19 16:05:55 UTC (rev 284370) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/oci8safemode.phpt 2009-07-19 16:06:19 UTC (rev 284371) @@ -15,6 +15,8 @@ echo "Done\n"; ?> --EXPECTF-- +PHP Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0 + Warning: oci_connect(): Privileged connect is disabled in Safe Mode in %s on line %d Warning: oci_password_change(): is disabled in Safe Mode in %s on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
rasmus Sun, 19 Jul 2009 16:05:55 +
URL: http://svn.php.net/viewvc?view=revision&revision=284370
Changed paths:
U SVNROOT/commit-email.php
Log:
Support #12345 as well
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-19 16:05:08 UTC (rev 284369)
+++ SVNROOT/commit-email.php2009-07-19 16:05:55 UTC (rev 284370)
@@ -122,7 +122,7 @@
$commit_date = strtotime(substr($commit_info[1], 0, strlen("-00-00
00:00:00 +")));
$commit_log = implode("\n", array_slice($commit_info, 3));
// Support bug#1234 bug url extraction
-$bugs = preg_match_all("/bug[\\s#:]*([0-9]+)/i", $commit_log, $bugs_array);
+$bugs = preg_match_all("/(?:bug|#)[\\s#:]*([0-9]+)/i", $commit_log,
$bugs_array);
//
-
// Determine "from" address
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/branches/PHP_5_3/ext/oci8/tests/ extauth_01.phpt extauth_02.phpt extauth_03.phpt
sixdSun, 19 Jul 2009 16:05:08 +
URL: http://svn.php.net/viewvc?view=revision&revision=284369
Changed paths:
U php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_01.phpt
U php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_02.phpt
U php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_03.phpt
Log:
Reduce Oracle version-dependent diffs. Make PHP 5/6 compatible
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_01.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_01.phpt 2009-07-19
16:04:57 UTC (rev 284368)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_01.phpt 2009-07-19
16:05:08 UTC (rev 284369)
@@ -141,56 +141,56 @@
Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect
identifier specified in %s on line %d
array(4) {
- ["code"]=>
+ [%u|b%"code"]=>
int(12154)
- ["message"]=>
- string(65) "ORA-12154: %s"
- ["offset"]=>
+ [%u|b%"message"]=>
+ %unicode|string%(65) "ORA-12154: %s"
+ [%u|b%"offset"]=>
int(0)
- ["sqltext"]=>
- string(0) ""
+ [%u|b%"sqltext"]=>
+ %unicode|string%(0) ""
}
bool(false)
Test 8
Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect
identifier specified in %s on line %d
array(4) {
- ["code"]=>
+ [%u|b%"code"]=>
int(12154)
- ["message"]=>
- string(65) "ORA-12154: %s"
- ["offset"]=>
+ [%u|b%"message"]=>
+ %unicode|string%(65) "ORA-12154: %s"
+ [%u|b%"offset"]=>
int(0)
- ["sqltext"]=>
- string(0) ""
+ [%u|b%"sqltext"]=>
+ %unicode|string%(0) ""
}
bool(false)
Test 9
-Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect
identifier specified in %s on line %d
+Warning: oci_connect(): ORA-%d: TNS:%s in %s on line %d
array(4) {
- ["code"]=>
- int(12154)
- ["message"]=>
- string(65) "ORA-12154: %s"
- ["offset"]=>
+ [%u|b%"code"]=>
+ int(%d)
+ [%u|b%"message"]=>
+ %unicode|string%(%d) "ORA-%d: %s"
+ [%u|b%"offset"]=>
int(0)
- ["sqltext"]=>
- string(0) ""
+ [%u|b%"sqltext"]=>
+ %unicode|string%(0) ""
}
bool(false)
Test 10
-Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect
identifier specified in %s on line %d
+Warning: oci_connect(): ORA-%d: TNS:%s in %s on line %d
array(4) {
- ["code"]=>
- int(12154)
- ["message"]=>
- string(65) "ORA-12154: %s"
- ["offset"]=>
+ [%u|b%"code"]=>
+ int(%d)
+ [%u|b%"message"]=>
+ %unicode|string%(%d) "ORA-%d: %s"
+ [%u|b%"offset"]=>
int(0)
- ["sqltext"]=>
- string(0) ""
+ [%u|b%"sqltext"]=>
+ %unicode|string%(0) ""
}
bool(false)
===DONE===
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_02.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_02.phpt 2009-07-19
16:04:57 UTC (rev 284368)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_02.phpt 2009-07-19
16:05:08 UTC (rev 284369)
@@ -141,56 +141,56 @@
Warning: oci_new_connect(): ORA-12154: TNS:could not resolve the connect
identifier specified in %s on line %d
array(4) {
- ["code"]=>
+ [%u|b%"code"]=>
int(12154)
- ["message"]=>
- string(65) "ORA-12154: %s"
- ["offset"]=>
+ [%u|b%"message"]=>
+ %unicode|string%(65) "ORA-12154: %s"
+ [%u|b%"offset"]=>
int(0)
- ["sqltext"]=>
- string(0) ""
+ [%u|b%"sqltext"]=>
+ %unicode|string%(0) ""
}
bool(false)
Test 8
Warning: oci_new_connect(): ORA-12154: TNS:could not resolve the connect
identifier specified in %s on line %d
array(4) {
- ["code"]=>
+ [%u|b%"code"]=>
int(12154)
- ["message"]=>
- string(65) "ORA-12154: %s"
- ["offset"]=>
+ [%u|b%"message"]=>
+ %unicode|string%(65) "ORA-12154: %s"
+ [%u|b%"offset"]=>
int(0)
- ["sqltext"]=>
- string(0) ""
+ [%u|b%"sqltext"]=>
+ %unicode|string%(0) ""
}
bool(false)
Test 9
-Warning: oci_new_connect(): ORA-12154: TNS:could not resolve the connect
identifier specified in %s on line %d
+Warning: oci_new_connect(): ORA-%d: TNS:%s %s on line %d
array(4) {
- ["code"]=>
- int(12154)
- ["message"]=>
- string(65) "ORA-12154: %s"
- ["offset"]=>
+ [%u|b%"code"]=>
+ int(%d)
+ [%u|b%"message"]=>
+ %unicode|string%(%d) "ORA-%d: %s"
+ [%u|b%"offset"]=>
int(0)
- ["sqltext"]=>
- string(0) ""
+ [%u|b%"sqltext"]=>
+ %unicode|string%(0) ""
}
bool(false)
Test 10
-Warning: oci_new_connect(): ORA-12154: TNS:could not resolve the connect
identifier specified in %s on line %d
+Warning: oci_new_connect(): ORA-%d: TNS:%s %s on line %d
array(4) {
- ["code"]=>
- int(12154)
- ["message"]=>
- string(65) "ORA-12154: %s"
- ["offset"]=>
+ [%u|b%"code"]=>
+ int(%d)
+ [%u|b%"message"]=>
+ %unicode|string%(%d) "ORA-%d: %s"
+ [%u|b%"offset"]=>
int(0)
- ["sqltext"]=>
- string(0) ""
+ [%u|b%"sqltext"]=>
+ %unicode|string%(0) ""
}
bool(false)
===DONE===
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_03.phpt
===
[PHP-CVS] svn: php/php-src/trunk/ext/oci8/tests/ extauth_01.phpt extauth_02.phpt extauth_03.phpt
sixdSun, 19 Jul 2009 16:04:57 +
URL: http://svn.php.net/viewvc?view=revision&revision=284368
Changed paths:
U php/php-src/trunk/ext/oci8/tests/extauth_01.phpt
U php/php-src/trunk/ext/oci8/tests/extauth_02.phpt
U php/php-src/trunk/ext/oci8/tests/extauth_03.phpt
Log:
Reduce Oracle version-dependent diffs. Make PHP 5/6 compatible
Modified: php/php-src/trunk/ext/oci8/tests/extauth_01.phpt
===
--- php/php-src/trunk/ext/oci8/tests/extauth_01.phpt2009-07-19 15:57:06 UTC
(rev 284367)
+++ php/php-src/trunk/ext/oci8/tests/extauth_01.phpt2009-07-19 16:04:57 UTC
(rev 284368)
@@ -141,56 +141,56 @@
Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect
identifier specified in %s on line %d
array(4) {
- [u"code"]=>
+ [%u|b%"code"]=>
int(12154)
- [u"message"]=>
- unicode(65) "ORA-12154: %s"
- [u"offset"]=>
+ [%u|b%"message"]=>
+ %unicode|string%(65) "ORA-12154: %s"
+ [%u|b%"offset"]=>
int(0)
- [u"sqltext"]=>
- unicode(0) ""
+ [%u|b%"sqltext"]=>
+ %unicode|string%(0) ""
}
bool(false)
Test 8
Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect
identifier specified in %s on line %d
array(4) {
- [u"code"]=>
+ [%u|b%"code"]=>
int(12154)
- [u"message"]=>
- unicode(65) "ORA-12154: %s"
- [u"offset"]=>
+ [%u|b%"message"]=>
+ %unicode|string%(65) "ORA-12154: %s"
+ [%u|b%"offset"]=>
int(0)
- [u"sqltext"]=>
- unicode(0) ""
+ [%u|b%"sqltext"]=>
+ %unicode|string%(0) ""
}
bool(false)
Test 9
-Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect
identifier specified in %s on line %d
+Warning: oci_connect(): ORA-%d: TNS:%s in %s on line %d
array(4) {
- [u"code"]=>
- int(12154)
- [u"message"]=>
- unicode(65) "ORA-12154: %s"
- [u"offset"]=>
+ [%u|b%"code"]=>
+ int(%d)
+ [%u|b%"message"]=>
+ %unicode|string%(%d) "ORA-%d: %s"
+ [%u|b%"offset"]=>
int(0)
- [u"sqltext"]=>
- unicode(0) ""
+ [%u|b%"sqltext"]=>
+ %unicode|string%(0) ""
}
bool(false)
Test 10
-Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect
identifier specified in %s on line %d
+Warning: oci_connect(): ORA-%d: TNS:%s in %s on line %d
array(4) {
- [u"code"]=>
- int(12154)
- [u"message"]=>
- unicode(65) "ORA-12154: %s"
- [u"offset"]=>
+ [%u|b%"code"]=>
+ int(%d)
+ [%u|b%"message"]=>
+ %unicode|string%(%d) "ORA-%d: %s"
+ [%u|b%"offset"]=>
int(0)
- [u"sqltext"]=>
- unicode(0) ""
+ [%u|b%"sqltext"]=>
+ %unicode|string%(0) ""
}
bool(false)
===DONE===
Modified: php/php-src/trunk/ext/oci8/tests/extauth_02.phpt
===
--- php/php-src/trunk/ext/oci8/tests/extauth_02.phpt2009-07-19 15:57:06 UTC
(rev 284367)
+++ php/php-src/trunk/ext/oci8/tests/extauth_02.phpt2009-07-19 16:04:57 UTC
(rev 284368)
@@ -141,56 +141,56 @@
Warning: oci_new_connect(): ORA-12154: TNS:could not resolve the connect
identifier specified in %s on line %d
array(4) {
- [u"code"]=>
+ [%u|b%"code"]=>
int(12154)
- [u"message"]=>
- unicode(65) "ORA-12154: %s"
- [u"offset"]=>
+ [%u|b%"message"]=>
+ %unicode|string%(65) "ORA-12154: %s"
+ [%u|b%"offset"]=>
int(0)
- [u"sqltext"]=>
- unicode(0) ""
+ [%u|b%"sqltext"]=>
+ %unicode|string%(0) ""
}
bool(false)
Test 8
Warning: oci_new_connect(): ORA-12154: TNS:could not resolve the connect
identifier specified in %s on line %d
array(4) {
- [u"code"]=>
+ [%u|b%"code"]=>
int(12154)
- [u"message"]=>
- unicode(65) "ORA-12154: %s"
- [u"offset"]=>
+ [%u|b%"message"]=>
+ %unicode|string%(65) "ORA-12154: %s"
+ [%u|b%"offset"]=>
int(0)
- [u"sqltext"]=>
- unicode(0) ""
+ [%u|b%"sqltext"]=>
+ %unicode|string%(0) ""
}
bool(false)
Test 9
-Warning: oci_new_connect(): ORA-12154: TNS:could not resolve the connect
identifier specified in %s on line %d
+Warning: oci_new_connect(): ORA-%d: TNS:%s %s on line %d
array(4) {
- [u"code"]=>
- int(12154)
- [u"message"]=>
- unicode(65) "ORA-12154: %s"
- [u"offset"]=>
+ [%u|b%"code"]=>
+ int(%d)
+ [%u|b%"message"]=>
+ %unicode|string%(%d) "ORA-%d: %s"
+ [%u|b%"offset"]=>
int(0)
- [u"sqltext"]=>
- unicode(0) ""
+ [%u|b%"sqltext"]=>
+ %unicode|string%(0) ""
}
bool(false)
Test 10
-Warning: oci_new_connect(): ORA-12154: TNS:could not resolve the connect
identifier specified in %s on line %d
+Warning: oci_new_connect(): ORA-%d: TNS:%s %s on line %d
array(4) {
- [u"code"]=>
- int(12154)
- [u"message"]=>
- unicode(65) "ORA-12154: %s"
- [u"offset"]=>
+ [%u|b%"code"]=>
+ int(%d)
+ [%u|b%"message"]=>
+ %unicode|string%(%d) "ORA-%d: %s"
+ [%u|b%"offset"]=>
int(0)
- [u"sqltext"]=>
- unicode(0) ""
+ [%u|b%"sqltext"]=>
+ %unicode|string%(0) ""
}
bool(false)
===DONE===
Modified: php/php-src/trunk/ext/oci8/tests/extauth_03.phpt
===
--- php/php-src/trunk/ext/oci8/tests/exta
[PHP-CVS] svn: php/php-src/trunk/Zend/ zend_dtrace.d zend_dtrace.h
dsp Sun, 19 Jul 2009 15:57:06 +
URL: http://svn.php.net/viewvc?view=revision&revision=284367
Changed paths:
U php/php-src/trunk/Zend/zend_dtrace.d
U php/php-src/trunk/Zend/zend_dtrace.h
Log:
- Add license headers
Modified: php/php-src/trunk/Zend/zend_dtrace.d
===
--- php/php-src/trunk/Zend/zend_dtrace.d2009-07-19 15:34:27 UTC (rev
284366)
+++ php/php-src/trunk/Zend/zend_dtrace.d2009-07-19 15:57:06 UTC (rev
284367)
@@ -1,3 +1,20 @@
+/*
+ +--+
+ | Zend Engine |
+ +--+
+ | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
+ +--+
+ | This source file is subject to version 2.00 of the Zend license, |
+ | that is bundled with this package in the file LICENSE, and is|
+ | available through the world-wide-web at the following url: |
+ | http://www.zend.com/license/2_00.txt.|
+ | If you did not receive a copy of the Zend license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | lice...@zend.com so we can mail you a copy immediately. |
+ +--+
+ | Authors: David Soria Parra |
+ +--+
+*/
provider php {
probe exception__caught(char *classname);
probe exception__thrown(char* classname);
Modified: php/php-src/trunk/Zend/zend_dtrace.h
===
--- php/php-src/trunk/Zend/zend_dtrace.h2009-07-19 15:34:27 UTC (rev
284366)
+++ php/php-src/trunk/Zend/zend_dtrace.h2009-07-19 15:57:06 UTC (rev
284367)
@@ -1,7 +1,20 @@
/*
- * Generated by dtrace(1M).
- */
-
+ +--+
+ | Zend Engine |
+ +--+
+ | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
+ +--+
+ | This source file is subject to version 2.00 of the Zend license, |
+ | that is bundled with this package in the file LICENSE, and is|
+ | available through the world-wide-web at the following url: |
+ | http://www.zend.com/license/2_00.txt.|
+ | If you did not receive a copy of the Zend license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | lice...@zend.com so we can mail you a copy immediately. |
+ +--+
+ | Authors: David Soria Parra |
+ +--+
+*/
#ifndef_ZEND_DTRACE_H
#define_ZEND_DTRACE_H
--
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/lib/ zip_close.c
pajoye Sun, 19 Jul 2009 15:32:51 +
URL: http://svn.php.net/viewvc?view=revision&revision=284365
Changed paths:
U php/php-src/trunk/ext/zip/lib/zip_close.c
Log:
- MFB: Fix #48763, create corrupt archive
Modified: php/php-src/trunk/ext/zip/lib/zip_close.c
===
--- php/php-src/trunk/ext/zip/lib/zip_close.c 2009-07-19 15:32:09 UTC (rev
284364)
+++ php/php-src/trunk/ext/zip/lib/zip_close.c 2009-07-19 15:32:51 UTC (rev
284365)
@@ -175,6 +175,7 @@
de.filename = strdup("-");
de.filename_len = 1;
cd->entry[j].filename = "-";
+ cd->entry[j].filename_len = 1;
}
else {
de.filename = strdup(za->cdir->entry[i].filename);
@@ -195,13 +196,15 @@
error = 1;
break;
}
+ memcpy(cd->entry+j, za->cdir->entry+i, sizeof(cd->entry[j]));
+
if (de.bitflags & ZIP_GPBF_DATA_DESCRIPTOR) {
de.crc = za->cdir->entry[i].crc;
de.comp_size = za->cdir->entry[i].comp_size;
de.uncomp_size = za->cdir->entry[i].uncomp_size;
de.bitflags &= ~ZIP_GPBF_DATA_DESCRIPTOR;
- }
- memcpy(cd->entry+j, za->cdir->entry+i, sizeof(cd->entry[j]));
+ cd->entry[j].bitflags &= ~ZIP_GPBF_DATA_DESCRIPTOR;
+ }
}
if (za->entry[i].ch_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_3/ext/zip/lib/ zip_close.c
pajoye Sun, 19 Jul 2009 15:32:09 +
URL: http://svn.php.net/viewvc?view=revision&revision=284364
Changed paths:
U php/php-src/branches/PHP_5_3/ext/zip/lib/zip_close.c
Log:
- MFB: Fix #48763, create corrupt archive
Modified: php/php-src/branches/PHP_5_3/ext/zip/lib/zip_close.c
===
--- php/php-src/branches/PHP_5_3/ext/zip/lib/zip_close.c2009-07-19
15:31:05 UTC (rev 284363)
+++ php/php-src/branches/PHP_5_3/ext/zip/lib/zip_close.c2009-07-19
15:32:09 UTC (rev 284364)
@@ -175,6 +175,7 @@
de.filename = strdup("-");
de.filename_len = 1;
cd->entry[j].filename = "-";
+ cd->entry[j].filename_len = 1;
}
else {
de.filename = strdup(za->cdir->entry[i].filename);
@@ -195,13 +196,15 @@
error = 1;
break;
}
+ memcpy(cd->entry+j, za->cdir->entry+i, sizeof(cd->entry[j]));
+
if (de.bitflags & ZIP_GPBF_DATA_DESCRIPTOR) {
de.crc = za->cdir->entry[i].crc;
de.comp_size = za->cdir->entry[i].comp_size;
de.uncomp_size = za->cdir->entry[i].uncomp_size;
de.bitflags &= ~ZIP_GPBF_DATA_DESCRIPTOR;
+ cd->entry[j].bitflags &= ~ZIP_GPBF_DATA_DESCRIPTOR;
}
- memcpy(cd->entry+j, za->cdir->entry+i, sizeof(cd->entry[j]));
}
if (za->entry[i].ch_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/zip/lib/ zip_close.c
pajoye Sun, 19 Jul 2009 15:31:05 +
URL: http://svn.php.net/viewvc?view=revision&revision=284363
Changed paths:
U php/php-src/branches/PHP_5_2/ext/zip/lib/zip_close.c
Log:
- Fix #48763, create corrupt archive
Modified: php/php-src/branches/PHP_5_2/ext/zip/lib/zip_close.c
===
--- php/php-src/branches/PHP_5_2/ext/zip/lib/zip_close.c2009-07-19
15:21:13 UTC (rev 284362)
+++ php/php-src/branches/PHP_5_2/ext/zip/lib/zip_close.c2009-07-19
15:31:05 UTC (rev 284363)
@@ -175,6 +175,7 @@
de.filename = strdup("-");
de.filename_len = 1;
cd->entry[j].filename = "-";
+ cd->entry[j].filename_len = 1;
}
else {
de.filename = strdup(za->cdir->entry[i].filename);
@@ -195,13 +196,15 @@
error = 1;
break;
}
+ memcpy(cd->entry+j, za->cdir->entry+i, sizeof(cd->entry[j]));
+
if (de.bitflags & ZIP_GPBF_DATA_DESCRIPTOR) {
de.crc = za->cdir->entry[i].crc;
de.comp_size = za->cdir->entry[i].comp_size;
de.uncomp_size = za->cdir->entry[i].uncomp_size;
de.bitflags &= ~ZIP_GPBF_DATA_DESCRIPTOR;
+ cd->entry[j].bitflags &= ~ZIP_GPBF_DATA_DESCRIPTOR;
}
- memcpy(cd->entry+j, za->cdir->entry+i, sizeof(cd->entry[j]));
}
if (za->entry[i].ch_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/zip/lib/ zip.h zip_add.c zip_close.c zip_filerange_crc.c zip_get_archive_flag.c zip_open.c zip_set_archive_flag.c
pajoye Sun, 19 Jul 2009 15:21:13 +
URL: http://svn.php.net/viewvc?view=revision&revision=284362
Changed paths:
U php/php-src/branches/PHP_5_2/ext/zip/lib/zip.h
U php/php-src/branches/PHP_5_2/ext/zip/lib/zip_add.c
U php/php-src/branches/PHP_5_2/ext/zip/lib/zip_close.c
U php/php-src/branches/PHP_5_2/ext/zip/lib/zip_filerange_crc.c
U php/php-src/branches/PHP_5_2/ext/zip/lib/zip_get_archive_flag.c
U php/php-src/branches/PHP_5_2/ext/zip/lib/zip_open.c
U php/php-src/branches/PHP_5_2/ext/zip/lib/zip_set_archive_flag.c
Log:
- MF53
Modified: php/php-src/branches/PHP_5_2/ext/zip/lib/zip.h
===
--- php/php-src/branches/PHP_5_2/ext/zip/lib/zip.h 2009-07-19 15:20:48 UTC
(rev 284361)
+++ php/php-src/branches/PHP_5_2/ext/zip/lib/zip.h 2009-07-19 15:21:13 UTC
(rev 284362)
@@ -20,7 +20,7 @@
3. The names of the authors may not be used to endorse or promote
products derived from this software without specific prior
written permission.
-
+
THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -39,11 +39,11 @@
#ifdef PHP_WIN32
# include "zip_win32.h"
-# ifdef PHP_ZIP_EXPORTS
+# ifdef PHP_ZIP_EXPORTS
# define ZIP_EXTERN(rt) __declspec(dllexport)rt _stdcall
-# else
+# else
# define ZIP_EXTERN(rt) rt
-# endif
+# endif
#elif defined(__GNUC__) && __GNUC__ >= 4
# define ZIP_EXTERN(rt) __attribute__ ((visibility("default"))) rt
#else
@@ -217,7 +217,7 @@
off_t, off_t);
ZIP_EXTERN(void) zip_source_free(struct zip_source *);
ZIP_EXTERN(struct zip_source *)zip_source_function(struct zip *,
- zip_source_callback, void *);
+ zip_source_callback, void *);
ZIP_EXTERN(struct zip_source *)zip_source_zip(struct zip *, struct zip *,
int, int, off_t, off_t);
ZIP_EXTERN(int) zip_stat(struct zip *, const char *, int, struct zip_stat *);
Modified: php/php-src/branches/PHP_5_2/ext/zip/lib/zip_add.c
===
--- php/php-src/branches/PHP_5_2/ext/zip/lib/zip_add.c 2009-07-19 15:20:48 UTC
(rev 284361)
+++ php/php-src/branches/PHP_5_2/ext/zip/lib/zip_add.c 2009-07-19 15:21:13 UTC
(rev 284362)
@@ -17,7 +17,7 @@
3. The names of the authors may not be used to endorse or promote
products derived from this software without specific prior
written permission.
-
+
THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Modified: php/php-src/branches/PHP_5_2/ext/zip/lib/zip_close.c
===
--- php/php-src/branches/PHP_5_2/ext/zip/lib/zip_close.c2009-07-19
15:20:48 UTC (rev 284361)
+++ php/php-src/branches/PHP_5_2/ext/zip/lib/zip_close.c2009-07-19
15:21:13 UTC (rev 284362)
@@ -229,12 +229,11 @@
zs = NULL;
if (!ZIP_ENTRY_DATA_CHANGED(za->entry+i)) {
- if ((zs=zip_source_zip(za, za, i, ZIP_FL_RECOMPRESS, 0, -1))
- == NULL) {
- error = 1;
- break;
+ if ((zs=zip_source_zip(za, za, i, ZIP_FL_RECOMPRESS, 0,
-1)) == NULL) {
+ error = 1;
+ break;
+ }
}
- }
if (add_data(za, zs ? zs : za->entry[i].source, &de, out) < 0) {
error = 1;
@@ -286,19 +285,19 @@
return -1;
}
- if (za->zp) {
- fclose(za->zp);
- za->zp = NULL;
- reopen_on_error = 1;
+ if (za->zp) {
+ fclose(za->zp);
+ za->zp = NULL;
+ reopen_on_error = 1;
}
if (_zip_rename(temp, za->zn) != 0) {
_zip_error_set(&za->error, ZIP_ER_RENAME, errno);
remove(temp);
free(temp);
- if (reopen_on_error) {
- /* ignore errors, since we're already in an error case */
- za->zp = fopen(za->zn, "rb");
- }
+ if (reopen_on_error) {
+ /* ignore errors, since we're already in an error case */
+ za->zp = fopen(za->zn, "rb");
+ }
return -1;
}
mask = umask(0);
@@ -638,7 +637,7 @@
FILE *tfp;
int len = strlen(za->zn) + 8;
-if ((temp=(char *)malloc(strlen(za->zn)+8)) == NULL) {
+if ((temp=(char *)malloc(len)) == NULL) {
_zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
[PHP-CVS] svn: php/php-src/branches/PHP_5_3/ext/zip/lib/ zip_close.c zip_fclose.c zip_fread.c zip_get_archive_comment.c zip_open.c
pajoye Sun, 19 Jul 2009 15:20:48 +
URL: http://svn.php.net/viewvc?view=revision&revision=284361
Changed paths:
U php/php-src/branches/PHP_5_3/ext/zip/lib/zip_close.c
U php/php-src/branches/PHP_5_3/ext/zip/lib/zip_fclose.c
U php/php-src/branches/PHP_5_3/ext/zip/lib/zip_fread.c
U php/php-src/branches/PHP_5_3/ext/zip/lib/zip_get_archive_comment.c
U php/php-src/branches/PHP_5_3/ext/zip/lib/zip_open.c
Log:
- WS
Modified: php/php-src/branches/PHP_5_3/ext/zip/lib/zip_close.c
===
--- php/php-src/branches/PHP_5_3/ext/zip/lib/zip_close.c2009-07-19
15:08:58 UTC (rev 284360)
+++ php/php-src/branches/PHP_5_3/ext/zip/lib/zip_close.c2009-07-19
15:20:48 UTC (rev 284361)
@@ -200,7 +200,7 @@
de.comp_size = za->cdir->entry[i].comp_size;
de.uncomp_size = za->cdir->entry[i].uncomp_size;
de.bitflags &= ~ZIP_GPBF_DATA_DESCRIPTOR;
- }
+ }
memcpy(cd->entry+j, za->cdir->entry+i, sizeof(cd->entry[j]));
}
@@ -229,11 +229,10 @@
zs = NULL;
if (!ZIP_ENTRY_DATA_CHANGED(za->entry+i)) {
- if ((zs=zip_source_zip(za, za, i, ZIP_FL_RECOMPRESS, 0, -1))
- == NULL) {
- error = 1;
- break;
- }
+ if ((zs=zip_source_zip(za, za, i, ZIP_FL_RECOMPRESS, 0,
-1)) == NULL) {
+ error = 1;
+ break;
+ }
}
if (add_data(za, zs ? zs : za->entry[i].source, &de, out) < 0) {
@@ -286,27 +285,27 @@
return -1;
}
-if (za->zp) {
- fclose(za->zp);
- za->zp = NULL;
- reopen_on_error = 1;
+ if (za->zp) {
+ fclose(za->zp);
+ za->zp = NULL;
+ reopen_on_error = 1;
}
if (_zip_rename(temp, za->zn) != 0) {
- _zip_error_set(&za->error, ZIP_ER_RENAME, errno);
- remove(temp);
- free(temp);
- if (reopen_on_error) {
- /* ignore errors, since we're already in an error case */
- za->zp = fopen(za->zn, "rb");
+ _zip_error_set(&za->error, ZIP_ER_RENAME, errno);
+ remove(temp);
+ free(temp);
+ if (reopen_on_error) {
+ /* ignore errors, since we're already in an error case */
+ za->zp = fopen(za->zn, "rb");
+ }
+ return -1;
}
- return -1;
-}
mask = umask(0);
umask(mask);
chmod(za->zn, 0666&~mask);
_zip_free(za);
-free(temp);
+ free(temp);
return 0;
}
Modified: php/php-src/branches/PHP_5_3/ext/zip/lib/zip_fclose.c
===
--- php/php-src/branches/PHP_5_3/ext/zip/lib/zip_fclose.c 2009-07-19
15:08:58 UTC (rev 284360)
+++ php/php-src/branches/PHP_5_3/ext/zip/lib/zip_fclose.c 2009-07-19
15:20:48 UTC (rev 284361)
@@ -49,14 +49,14 @@
free(zf->buffer);
free(zf->zstr);
if (zf->za) {
-for (i=0; iza->nfile; i++) {
- if (zf->za->file[i] == zf) {
- zf->za->file[i] = zf->za->file[zf->za->nfile-1];
- zf->za->nfile--;
- break;
+ for (i=0; iza->nfile; i++) {
+ if (zf->za->file[i] == zf) {
+ zf->za->file[i] = zf->za->file[zf->za->nfile-1];
+ zf->za->nfile--;
+ break;
+ }
+ }
}
-}
- }
ret = 0;
if (zf->error.zip_err)
Modified: php/php-src/branches/PHP_5_3/ext/zip/lib/zip_fread.c
===
--- php/php-src/branches/PHP_5_3/ext/zip/lib/zip_fread.c2009-07-19
15:08:58 UTC (rev 284360)
+++ php/php-src/branches/PHP_5_3/ext/zip/lib/zip_fread.c2009-07-19
15:20:48 UTC (rev 284361)
@@ -41,7 +41,7 @@
zip_fread(struct zip_file *zf, void *outbuf, size_t toread)
{
int ret;
-size_t out_before, len;
+ size_t out_before, len;
int i;
if (!zf)
Modified: php/php-src/branches/PHP_5_3/ext/zip/lib/zip_get_archive_comment.c
===
--- php/php-src/branches/PHP_5_3/ext/zip/lib/zip_get_archive_comment.c
2009-07-19 15:08:58 UTC (rev 284360)
+++ php/php-src/branches/PHP_5_3/ext/zip/lib/zip_get_archive_comment.c
2009-07-19 15:20:48 UTC (rev 284361)
@@ -42,11 +42,11 @@
{
if ((flags & ZIP_FL_UNCHANGED)
|| (za->ch_comment_len == -1)) {
- if (za->cdir) {
- if (lenp != NULL)
- *lenp = za->cdir->comment_len;
- return za->cdir->comment;
- }
+ if (za->cdir) {
+ if (lenp != NULL)
+
[PHP-CVS] svn: php/phpruntests/trunk/QA/ QATESTS.tgz
zoe Sun, 19 Jul 2009 15:08:58 + URL: http://svn.php.net/viewvc?view=revision&revision=284360 Changed paths: U php/phpruntests/trunk/QA/QATESTS.tgz Log: updated tests slightly 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/trunk/ext/zip/lib/ zipint_alias.h
pajoye Sun, 19 Jul 2009 15:02:53 + URL: http://svn.php.net/viewvc?view=revision&revision=284359 Changed paths: D php/php-src/trunk/ext/zip/lib/zipint_alias.h Log: - not used anymore Deleted: php/php-src/trunk/ext/zip/lib/zipint_alias.h === --- php/php-src/trunk/ext/zip/lib/zipint_alias.h2009-07-19 15:02:26 UTC (rev 284358) +++ php/php-src/trunk/ext/zip/lib/zipint_alias.h2009-07-19 15:02:53 UTC (rev 284359) @@ -1,49 +0,0 @@ - -/* state of change of a file in zip archive */ -#define zip_state php_ziplib__zip_state -#define zip_error php_ziplib__zip_error -#define zip_dirent php_ziplib__zip_dirent -#define zip_cdir php_ziplib__zip_cdir -#define zip_source php_ziplib__zip_source -#define zip_entry php_ziplib__zip_entry - -#define _zip_err_str php_ziplib___zip_err_str -#define _zip_nerr_str php_ziplib___zip_nerr_str -#define _zip_err_type php_ziplib___zip_err_type - -#define _zip_cdir_free php_ziplib___zip_cdir_free -#define _zip_cdir_new php_ziplib___zip_cdir_new -#define _zip_cdir_write php_ziplib___zip_cdir_write - -#define _zip_dirent_finalize php_ziplib___zip_dirent_finalize -#define _zip_dirent_init php_ziplib___zip_dirent_init -#define _zip_dirent_read php_ziplib___zip_dirent_read -#define _zip_dirent_write php_ziplib___zip_dirent_write - -#define _zip_entry_free php_ziplib___zip_entry_free -#define _zip_entry_init php_ziplib___zip_entry_init -#define _zip_entry_new php_ziplib___zip_entry_new - -#define _zip_error_clear php_ziplib___zip_error_clear -#define _zip_error_copy php_ziplib___zip_error_copy -#define _zip_error_fini php_ziplib___zip_error_fini -#define _zip_error_get php_ziplib___zip_error_get -#define _zip_error_init php_ziplib___zip_error_init -#define _zip_error_set php_ziplib___zip_error_set -#define _zip_error_strerror php_ziplib___zip_error_strerror - -#define _zip_file_fillbuf php_ziplib___zip_file_fillbuf -#define _zip_file_get_offset php_ziplib___zip_file_get_offset - -#define _zip_free php_ziplib___zip_free -#define _zip_get_name php_ziplib___zip_get_name -#define _zip_local_header_read php_ziplib___zip_local_header_read -#define _zip_memdup php_ziplib___zip_memdup -#define _zip_name_locate php_ziplib___zip_name_locate -#define _zip_new php_ziplib___zip_new -#define _zip_read2 php_ziplib___zip_read2 -#define _zip_read4 php_ziplib___zip_read4 -#define _zip_replace php_ziplib___zip_replace -#define _zip_set_name php_ziplib___zip_set_name -#define _zip_unchange php_ziplib___zip_unchange -#define _zip_unchange_data php_ziplib___zip_unchange_data -- 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/lib/ zip_open.c
pajoye Sun, 19 Jul 2009 15:02:02 +
URL: http://svn.php.net/viewvc?view=revision&revision=284357
Changed paths:
U php/php-src/trunk/ext/zip/lib/zip_open.c
Log:
- WS
Modified: php/php-src/trunk/ext/zip/lib/zip_open.c
===
--- php/php-src/trunk/ext/zip/lib/zip_open.c2009-07-19 15:01:19 UTC (rev
284356)
+++ php/php-src/trunk/ext/zip/lib/zip_open.c2009-07-19 15:02:02 UTC (rev
284357)
@@ -69,11 +69,11 @@
if (flags & ZIP_OVERWRITE) {
return _zip_allocate_new(fn, zep);
}
-
+
switch (_zip_file_exists(fn, flags, zep)) {
case -1:
if (!(flags & ZIP_OVERWRITE)) {
- return NULL;
+ return NULL;
}
case 0:
--
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/lib/ zip_alias.h
pajoye Sun, 19 Jul 2009 15:01:19 + URL: http://svn.php.net/viewvc?view=revision&revision=284356 Changed paths: D php/php-src/trunk/ext/zip/lib/zip_alias.h Log: - not used anymore Deleted: php/php-src/trunk/ext/zip/lib/zip_alias.h === --- php/php-src/trunk/ext/zip/lib/zip_alias.h 2009-07-19 14:57:28 UTC (rev 284355) +++ php/php-src/trunk/ext/zip/lib/zip_alias.h 2009-07-19 15:01:19 UTC (rev 284356) @@ -1,45 +0,0 @@ - -#define zip_source_cmd php_ziplib__zip_source_cmd -#define zip_source_callback php_ziplib__zip_source_callback -#define zip_stat php_ziplib__zip_stat -#define zip php_ziplib__zip -#define zip_file php_ziplib__zip_file -#define zip_source php_ziplib__zip_source -#define zip_add php_ziplib__zip_add -#define zip_add_dir php_ziplib__zip_add_dir -#define zip_close php_ziplib__zip_close -#define zip_delete php_ziplib__zip_delete -#define zip_error_clear php_ziplib__zip_error_clear -#define zip_error_get php_ziplib__zip_error_get -#define zip_error_get_sys_type php_ziplib__zip_error_get_sys_type -#define zip_error_to_str php_ziplib__zip_error_to_str -#define zip_fclose php_ziplib__zip_fclose -#define zip_file_error_clear php_ziplib__zip_fille_error_clear -#define zip_file_error_get php_ziplib__zip_file_error_get -#define zip_file_strerror php_ziplib__zip_file_strerror -#define zip_fopen php_ziplib__zip_fopen -#define zip_fopen_index php_ziplib__zip_fopen_index -#define zip_fread php_ziplib__zip_fread -#define zip_get_archive_comment php_ziplib__zip_get_archive_comment -#define zip_get_file_comment php_ziplib__zip_get_file_comment -#define zip_get_name php_ziplib__zip_get_name -#define zip_get_num_files php_ziplib__zip_get_num_files -#define zip_name_locate php_ziplib__zip_name_locate -#define zip_open php_ziplib__zip_open -#define zip_rename php_ziplib__zip_rename -#define zip_replace php_ziplib__zip_replace -#define zip_set_archive_comment php_ziplib__zip_set_archive_comment -#define zip_set_file_comment php_ziplib__zip_set_file_comment -#define zip_source_buffer php_ziplib__zip_source_buffer -#define zip_source_file php_ziplib__zip_source_file -#define zip_source_filep php_ziplib__zip_source_filep -#define zip_source_free php_ziplib__zip_source_free -#define zip_source_function php_ziplib__zip_source_function -#define zip_source_zip php_ziplib__zip_source_zip -#define zip_stat php_ziplib__zip_stat -#define zip_stat_index php_ziplib__zip_stat_index -#define zip_stat_init php_ziplib__zip_stat_init -#define zip_strerror php_ziplib__zip_strerror -#define zip_unchange php_ziplib__zip_unchange -#define zip_unchange_all php_ziplib__zip_unchange_all -#define zip_unchange_archive php_ziplib__zip_unchange_archive -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/branches/PHP_5_3/
nlopess Sun, 19 Jul 2009 14:57:28 + URL: http://svn.php.net/viewvc?view=revision&revision=284355 Changed paths: _U php/php-src/branches/PHP_5_3/ _U php/php-src/branches/PHP_5_3/pear/ _U php/php-src/branches/PHP_5_3/sapi/cli/ _U php/php-src/branches/PHP_5_3/scripts/ _U php/php-src/branches/PHP_5_3/scripts/man1/ Log: ignore a few generated files Property changes on: php/php-src/branches/PHP_5_3 ___ Modified: svn:ignore - Makefile.objects Makefile.fragments Makefile acconfig.h aclocal.m4 autom4te.cache bsd_converted buildmk.stamp buildconf.stamp config.h.in config.cache config.log config.status config_vars.mk configuration-parser.c configuration-parser.h configuration-parser.output configuration-scanner.c configure configure.bat conftest conftest.c generated_lists meta_cc meta_ccld mkinstalldirs missing install-sh internal_functions.c libtool shlibtool php php5.spec stamp-h test.php3 *.lo *.la libs modules php-*.tar.gz want_dependencies deps config.nice php_version.h *.plg *.opt *.ncb Release Release_inline Debug Release_TS Release_TSDbg Release_TS_inline Debug_TS results.txt libs _libs include autom4te.cache FBCIndex FBCLockFolder debug.log confdefs.h configure.js config.nice.bat configure.bat ZendEngine1 php_test_results_*.txt *.gcda *.gcno lcov_data lcov_html php_lcov.info tmp-php.ini + Makefile.objects Makefile.fragments Makefile acconfig.h aclocal.m4 autom4te.cache bsd_converted buildmk.stamp buildconf.stamp config.h.in config.cache config.log config.status config_vars.mk configuration-parser.c configuration-parser.h configuration-parser.output configuration-scanner.c configure configure.bat conftest conftest.c generated_lists meta_cc meta_ccld mkinstalldirs missing install-sh internal_functions.c libtool shlibtool php php5.spec stamp-h test.php3 *.lo *.la libs modules php-*.tar.gz want_dependencies deps config.nice php_version.h *.plg *.opt *.ncb Release Release_inline Debug Release_TS Release_TSDbg Release_TS_inline Debug_TS results.txt libs _libs include autom4te.cache FBCIndex FBCLockFolder debug.log confdefs.h configure.js config.nice.bat configure.bat ZendEngine1 php_test_results_*.txt *.gcda *.gcno lcov_data lcov_html php_lcov.info tmp-php.ini diff Property changes on: php/php-src/branches/PHP_5_3/pear ___ Modified: svn:ignore - install-pear-nozlib.phar Makefile deps phpize run-tests php-config test.php *.gcda *.gcno + install-pear-nozlib.phar Makefile deps phpize run-tests php-config test.php *.gcda *.gcno scripts Property changes on: php/php-src/branches/PHP_5_3/sapi/cli ___ Added: svn:ignore + php php.1 Property changes on: php/php-src/branches/PHP_5_3/scripts ___ Added: svn:ignore + php-config phpize Property changes on: php/php-src/branches/PHP_5_3/scripts/man1 ___ Added: svn:ignore + *.1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/ branches/PHP_5_3/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_open03.
nlopess Sun, 19 Jul 2009 14:52:27 +
URL: http://svn.php.net/viewvc?view=revision&revision=284353
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/standard/proc_open.c
U php/php-src/branches/PHP_5_3/ext/standard/proc_open.h
A
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open03.phpt
A
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open04.phpt
A
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open05.phpt
A
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open06.phpt
A
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open07.phpt
A
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open08.phpt
U php/php-src/trunk/ext/standard/proc_open.c
U php/php-src/trunk/ext/standard/proc_open.h
A
php/php-src/trunk/ext/standard/tests/general_functions/proc_open03.phpt
A
php/php-src/trunk/ext/standard/tests/general_functions/proc_open04.phpt
A
php/php-src/trunk/ext/standard/tests/general_functions/proc_open05.phpt
A
php/php-src/trunk/ext/standard/tests/general_functions/proc_open06.phpt
A
php/php-src/trunk/ext/standard/tests/general_functions/proc_open07.phpt
A
php/php-src/trunk/ext/standard/tests/general_functions/proc_open08.phpt
Log:
Add support for proc_open()'s bypass_shell feature for Unix systems
(slightly modified patch from Gwynne)
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-07-19 14:36:16 UTC (rev 284352)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-07-19 14:52:27 UTC (rev 284353)
@@ -5,6 +5,8 @@
Functors. (Christian Seiler)
- Fixed open_basedir circumvention for mail.log. (Maksymilian Arciemowicz,
Stas)
+- Added support for proc_open()'s bypass_shell feature for Unix systems
+ (Gwynne, Nuno)
- Fixed bug #48899 (is_callable returns true even if method does not exist in
parent class). (Felipe)
Modified: php/php-src/branches/PHP_5_3/ext/standard/proc_open.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/proc_open.c 2009-07-19 14:36:16 UTC (rev 284352)
+++ php/php-src/branches/PHP_5_3/ext/standard/proc_open.c 2009-07-19 14:52:27 UTC (rev 284353)
@@ -71,6 +71,56 @@
static int le_proc_open;
+#if !defined(PHP_WIN32) && !defined(NETWARE)
+/* {{{ _php_array_to_argv */
+static char **_php_array_to_argv(zval *arg_array, int is_persistent)
+{
+ zval **element, temp;
+ char **c_argv, **ap;
+ HashTable *target_hash;
+ HashPosition pos;
+
+ target_hash = Z_ARRVAL_P(arg_array);
+ ap = c_argv = (char **)pecalloc(zend_hash_num_elements(target_hash) + 1, sizeof(char *), is_persistent);
+
+ /* skip first element */
+ zend_hash_internal_pointer_reset_ex(target_hash, &pos);
+ zend_hash_move_forward_ex(target_hash, &pos);
+ for ( ;
+ zend_hash_get_current_data_ex(target_hash, (void **) &element, &pos) == SUCCESS;
+ zend_hash_move_forward_ex(target_hash, &pos)) {
+
+ temp = **element;
+ if (Z_TYPE_PP(element) != IS_STRING) {
+ zval_copy_ctor(&temp);
+ convert_to_string(&temp);
+ }
+ *ap++ = pestrndup(Z_STRVAL(temp), Z_STRLEN(temp), is_persistent);
+ if (Z_TYPE_PP(element) != IS_STRING) {
+ zval_dtor(&temp);
+ }
+ }
+
+ return c_argv;
+}
+/* }}} */
+
+/* {{{ _php_free_argv */
+static void _php_free_argv(char **argv, int is_persistent)
+{
+ if (argv) {
+ char **ap = NULL;
+
+ for (ap = argv; *ap; ap++) {
+ pefree(*ap, is_persistent);
+ }
+ pefree(argv, is_persistent);
+ }
+}
+/* }}} */
+
+#endif
+
/* {{{ _php_array_to_envp */
static php_process_env_t _php_array_to_envp(zval *environment, int is_persistent TSRMLS_DC)
{
@@ -177,8 +227,6 @@
}
assert(p - env.envp <= sizeenv);
-
- zend_hash_internal_pointer_reset_ex(target_hash, &pos);
return env;
}
@@ -243,6 +291,7 @@
FG(pclose_ret) = -1;
#endif
_php_free_envp(proc->env, proc->is_persistent);
+ _php_free_argv(proc->argv, proc->is_persistent);
pefree(proc->command, proc->is_persistent);
pefree(proc, proc->is_persistent);
@@ -465,6 +514,7 @@
Run a process with more control over it's file descriptors */
PHP_FUNCTION(proc_open)
{
+ zval *command_with_args = NULL;
char *command, *cwd=NULL;
int command_len, cwd_len = 0;
zval *descriptorspec;
@@ -477,6 +527,7 @@
zval **descitem = NULL;
HashPosition pos;
struct php_proc_open_descriptor_item descriptors[PHP_PROC_OPEN_MAX_DESCRIPTORS];
+ char** child_argv = NULL;
#ifdef PHP_WIN32
PROCESS_INFORMATION pi;
HANDLE childHandle;
@@ -488,7 +539,6 @@
UINT old_error_mode;
#endif
#ifdef NETWARE
- char** child_argv = NULL;
char* command_dup = NULL;
char* orig_cwd = NULL;
int command_num_args = 0;
@@ -499,43 +549,85 @@
int is_persisten
[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 Sun, 19 Jul 2009 14:36:16 +
URL: http://svn.php.net/viewvc?view=revision&revision=284352
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
Log:
- Removed unnecessary strlen() call and if statement.
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-19 14:19:32 UTC
(rev 284351)
+++ php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-07-19 14:36:16 UTC
(rev 284352)
@@ -1576,14 +1576,11 @@
char *type;
++postval;
- if ((type =
php_memnstr(postval, ";type=", sizeof(";type=") - 1, postval +
strlen(postval {
+ if ((type =
php_memnstr(postval, ";type=", sizeof(";type=") - 1, postval +
Z_STRLEN_PP(current {
*type = '\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))) {
- if (type) {
- *type = ';';
- }
RETVAL_FALSE;
return 1;
}
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-19 14:19:32 UTC
(rev 284351)
+++ php/php-src/branches/PHP_5_3/ext/curl/interface.c 2009-07-19 14:36:16 UTC
(rev 284352)
@@ -1803,14 +1803,11 @@
char *type;
++postval;
- if ((type =
php_memnstr(postval, ";type=", sizeof(";type=") - 1, postval +
strlen(postval {
+ if ((type =
php_memnstr(postval, ";type=", sizeof(";type=") - 1, postval +
Z_STRLEN_PP(current {
*type = '\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))) {
- if (type) {
- *type = ';';
- }
RETVAL_FALSE;
return 1;
}
Modified: php/php-src/trunk/ext/curl/interface.c
===
--- php/php-src/trunk/ext/curl/interface.c 2009-07-19 14:19:32 UTC (rev
284351)
+++ php/php-src/trunk/ext/curl/interface.c 2009-07-19 14:36:16 UTC (rev
284352)
@@ -1866,14 +1866,11 @@
char *type;
++postval;
- if ((type =
php_memnstr(postval, ";type=", sizeof(";type=") - 1, postval +
strlen(postval {
+ if ((type =
php_memnstr(postval, ";type=", sizeof(";type=") - 1, postval +
Z_STRLEN_PP(current {
*type = '\0';
}
/* open_basedir check */
if
(php_check_open_basedir(postval TSRMLS_CC)) {
- if (type) {
- *type = ';';
- }
RETVAL_FALSE;
return 1;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/trunk/Zend/ zend_exceptions.c
felipe Sun, 19 Jul 2009 14:19:32 + URL: http://svn.php.net/viewvc?view=revision&revision=284351 Changed paths: U php/php-src/trunk/Zend/zend_exceptions.c Log: - Fixed ZTS build Modified: php/php-src/trunk/Zend/zend_exceptions.c === --- php/php-src/trunk/Zend/zend_exceptions.c2009-07-19 14:00:25 UTC (rev 284350) +++ php/php-src/trunk/Zend/zend_exceptions.c2009-07-19 14:19:32 UTC (rev 284351) @@ -89,7 +89,7 @@ int name_len, s_classname_len; classname = NULL_ZSTR; - zend_get_object_classname(exception, &classname, &name_len); + zend_get_object_classname(exception, &classname, &name_len TSRMLS_CC); zend_unicode_to_string(ZEND_U_CONVERTER(UG(utf8_conv)), &s_classname, &s_classname_len, classname.u, u_strlen(classname.u) TSRMLS_CC); DTRACE_EXCEPTION_THROWN(s_classname); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/trunk/ NEWS Zend/zend.c Zend/zend_dtrace.c Zend/zend_dtrace.d Zend/zend_dtrace.h Zend/zend_exceptions.c Zend/zend_execute.c Zend/zend_vm_def.h Zend/zend_vm_execute.h acinclu
dsp Sun, 19 Jul 2009 14:00:25 +
URL: http://svn.php.net/viewvc?view=revision&revision=284350
Changed paths:
U php/php-src/trunk/NEWS
U php/php-src/trunk/Zend/zend.c
A php/php-src/trunk/Zend/zend_dtrace.c
A php/php-src/trunk/Zend/zend_dtrace.d
A php/php-src/trunk/Zend/zend_dtrace.h
U php/php-src/trunk/Zend/zend_exceptions.c
U php/php-src/trunk/Zend/zend_execute.c
U php/php-src/trunk/Zend/zend_vm_def.h
U php/php-src/trunk/Zend/zend_vm_execute.h
U php/php-src/trunk/acinclude.m4
U php/php-src/trunk/configure.in
U php/php-src/trunk/main/main.c
Log:
- Add DTrace support.
Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS 2009-07-19 11:15:56 UTC (rev 284349)
+++ php/php-src/trunk/NEWS 2009-07-19 14:00:25 UTC (rev 284350)
@@ -38,6 +38,7 @@
- Improved ext/dba:
. Added support for Tokyo Cabinet. (Michael)
+- Added DTrace support. (David Soria Parra)
- Added runtime JIT auto-globals fetching and caching. (Dmitry, Sara)
- Added E_STRICT to E_ALL. (Dmitry)
- Added "context" and "binary_pipes" params in "other_options" for proc_open().
Modified: php/php-src/trunk/Zend/zend.c
===
--- php/php-src/trunk/Zend/zend.c 2009-07-19 11:15:56 UTC (rev 284349)
+++ php/php-src/trunk/Zend/zend.c 2009-07-19 14:00:25 UTC (rev 284350)
@@ -30,6 +30,7 @@
#include "zend_ini.h"
#include "zend_vm.h"
#include "zend_unicode.h"
+#include "zend_dtrace.h"
#ifdef ZTS
# define GLOBAL_FUNCTION_TABLE global_function_table
@@ -1133,10 +1134,18 @@
zend_getenv = utility_functions->getenv_function;
zend_resolve_path = utility_functions->resolve_path_function;
+#if HAVE_SYS_SDT_H
+/* build with dtrace support */
+ zend_compile_file = dtrace_compile_file;
+ zend_execute = dtrace_execute;
+ zend_execute_internal = dtrace_execute_internal;
+#else
zend_compile_file = compile_file;
- zend_compile_string = compile_string;
zend_execute = execute;
zend_execute_internal = NULL;
+#endif /* HAVE_SYS_SDT_H */
+
+ zend_compile_string = compile_string;
zend_throw_exception_hook = NULL;
zend_init_opcodes_handlers();
@@ -1537,6 +1546,7 @@
zval *orig_user_error_handler;
zend_bool in_compilation;
zend_class_entry *saved_class_entry;
+ char dtrace_error_buffer[1024];
TSRMLS_FETCH();
/* Obtain relevant filename and lineno */
@@ -1581,6 +1591,12 @@
va_start(args, format);
+ if(DTRACE_ERROR_ENABLED()) {
+ vsprintf(dtrace_error_buffer, format, args);
+ }
+ DTRACE_ERROR(dtrace_error_buffer, error_filename, error_lineno);
+
+
/* if we don't have a user defined error handler */
if (!EG(user_error_handler)
|| !(EG(user_error_handler_error_reporting) & type)
Added: php/php-src/trunk/Zend/zend_dtrace.c
===
--- php/php-src/trunk/Zend/zend_dtrace.c (rev 0)
+++ php/php-src/trunk/Zend/zend_dtrace.c 2009-07-19 14:00:25 UTC (rev 284350)
@@ -0,0 +1,122 @@
+/*
+ +--+
+ | Zend Engine |
+ +--+
+ | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
+ +--+
+ | This source file is subject to version 2.00 of the Zend license, |
+ | that is bundled with this package in the file LICENSE, and is|
+ | available through the world-wide-web at the following url: |
+ | http://www.zend.com/license/2_00.txt.|
+ | If you did not receive a copy of the Zend license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | lice...@zend.com so we can mail you a copy immediately. |
+ +--+
+ | Authors: David Soria Parra |
+ +--+
+*/
+
+/* $Id$ */
+
+#include "zend.h"
+#include "zend_API.h"
+#include "zend_dtrace.h"
+
+#ifdef HAVE_SYS_SDT_H
+/* PHP DTrace probes {{{ */
+static inline char *dtrace_get_executed_filename(TSRMLS_D)
+{
+ if (EG(current_execute_data) && EG(current_execute_data)->op_array) {
+ return EG(current_execute_data)->op_array->filename;
+ } else {
+ return zend_get_executed_filename(TSRMLS_C);
+ }
+}
+
+ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle *file_handle, int type TSRMLS_DC)
+{
+ zend_op_array *res;
+ DTRACE_COMPILE_FILE_ENTRY(file_handle->opened_path, file_handle->filename);
+ res = compile_file(file_handle, type TSRMLS_CC);
+ DTRACE_COMPILE_FILE_RETURN(file_handle->opened_path, file_handle->fil
