date:20120317

[PHP-CVS] [git] karma.git branch PHP_POST_RECEIVE updated. 7c4de5d

2012-03-17 Thread irker

The branch PHP_POST_RECEIVE on karma.git has been updated
   via  7c4de5d5a9e10eb0322d87e69f07e32ad843de60 (commit)
  from  34f6910a46bbdaf32871f9cb1cda1c41d26ca96f (commit)

http://git.php.net/?p=karma.git;a=log;h=7c4de5d5a9e10eb0322d87e69f07e32ad843de60;hp=34f6910a46bbdaf32871f9cb1cda1c41d26ca96f

Summary of changes:
 lib/Git/PostReceiveHook.php |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-- Log 
commit 7c4de5d5a9e10eb0322d87e69f07e32ad843de60
Author: Alexander Moskaliov ir...@php.net
Date:   Sat Mar 17 11:12:29 2012 +0400

fix link in created branch mail

diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index 44c2dba..5955bc2 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -169,7 +169,7 @@ class PostReceiveHook extends ReceiveHook
 
 if ($changeType != self::TYPE_DELETED) {
 $message .= \n;
-$message .= Link: http://git.php.net/?p=; . 
$this-getRepositoryName() . ;a=log;h= . $newrev . ;hp= . $oldrev . \n;
+$message .= Link: http://git.php.net/?p=; . 
$this-getRepositoryName() . ;a=log;h= . $newrev . ($changeType != 
self::TYPE_CREATED ? ;hp= . $oldrev : ) . \n;
 $message .= \n;
 }
 

Thank you for your contribution.

-- 
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_4/php.ini-development branches/PHP_5_4/php.ini-production trunk/php.ini-development trunk/php.ini-production

2012-03-17 Thread Pierre Joye

pajoye   Sat, 17 Mar 2012 08:52:27 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=324317

Log:
- Fix bug #61424, ext/sqlite is not bundled anymore, remove it from php.ini

Bug: https://bugs.php.net/61424 (Open) 8 dll error messages during start of win 
php
  
Changed paths:
U   php/php-src/branches/PHP_5_4/php.ini-development
U   php/php-src/branches/PHP_5_4/php.ini-production
U   php/php-src/trunk/php.ini-development
U   php/php-src/trunk/php.ini-production

Modified: php/php-src/branches/PHP_5_4/php.ini-development
===
--- php/php-src/branches/PHP_5_4/php.ini-development2012-03-17 01:37:12 UTC 
(rev 324316)
+++ php/php-src/branches/PHP_5_4/php.ini-development2012-03-17 08:52:27 UTC 
(rev 324317)
@@ -898,7 +898,6 @@

 ;extension=php_soap.dll
 ;extension=php_sockets.dll
-;extension=php_sqlite.dll
 ;extension=php_sqlite3.dll
 ;extension=php_sybase_ct.dll
 ;extension=php_tidy.dll

Modified: php/php-src/branches/PHP_5_4/php.ini-production
===
--- php/php-src/branches/PHP_5_4/php.ini-production 2012-03-17 01:37:12 UTC 
(rev 324316)
+++ php/php-src/branches/PHP_5_4/php.ini-production 2012-03-17 08:52:27 UTC 
(rev 324317)
@@ -898,7 +898,6 @@

 ;extension=php_soap.dll
 ;extension=php_sockets.dll
-;extension=php_sqlite.dll
 ;extension=php_sqlite3.dll
 ;extension=php_sybase_ct.dll
 ;extension=php_tidy.dll

Modified: php/php-src/trunk/php.ini-development
===
--- php/php-src/trunk/php.ini-development   2012-03-17 01:37:12 UTC (rev 
324316)
+++ php/php-src/trunk/php.ini-development   2012-03-17 08:52:27 UTC (rev 
324317)
@@ -898,7 +898,6 @@

 ;extension=php_soap.dll
 ;extension=php_sockets.dll
-;extension=php_sqlite.dll
 ;extension=php_sqlite3.dll
 ;extension=php_sybase_ct.dll
 ;extension=php_tidy.dll

Modified: php/php-src/trunk/php.ini-production
===
--- php/php-src/trunk/php.ini-production2012-03-17 01:37:12 UTC (rev 
324316)
+++ php/php-src/trunk/php.ini-production2012-03-17 08:52:27 UTC (rev 
324317)
@@ -898,7 +898,6 @@

 ;extension=php_soap.dll
 ;extension=php_sockets.dll
-;extension=php_sqlite.dll
 ;extension=php_sqlite3.dll
 ;extension=php_sybase_ct.dll
 ;extension=php_tidy.dll

-- 
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/run-tests.php branches/PHP_5_4/run-tests.php trunk/run-tests.php

2012-03-17 Thread Michael Wallner

mike Sat, 17 Mar 2012 09:35:25 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=324319

Log:
add --PUT-- section support based on POST_RAW

Changed paths:
U   php/php-src/branches/PHP_5_3/run-tests.php
U   php/php-src/branches/PHP_5_4/run-tests.php
U   php/php-src/trunk/run-tests.php

Modified: php/php-src/branches/PHP_5_3/run-tests.php
===
--- php/php-src/branches/PHP_5_3/run-tests.php  2012-03-17 09:19:10 UTC (rev 
324318)
+++ php/php-src/branches/PHP_5_3/run-tests.php  2012-03-17 09:35:25 UTC (rev 
324319)
@@ -1342,8 +1342,8 @@

$tested = trim($section_text['TEST']);

-   /* For GET/POST tests, check if cgi sapi is available and if it is, use 
it. */
-   if (!empty($section_text['GET']) || !empty($section_text['POST']) || 
!empty($section_text['POST_RAW']) || !empty($section_text['COOKIE']) || 
!empty($section_text['EXPECTHEADERS'])) {
+   /* For GET/POST/PUT tests, check if cgi sapi is available and if it is, 
use it. */
+   if (!empty($section_text['GET']) || !empty($section_text['POST']) || 
!empty($section_text['POST_RAW']) || !empty($section_text['PUT']) || 
!empty($section_text['COOKIE']) || !empty($section_text['EXPECTHEADERS'])) {
if (isset($php_cgi)) {
$old_php = $php;
$php = $php_cgi . ' -C ';
@@ -1718,6 +1718,46 @@
save_text($tmp_post, $request);
$cmd = $php $pass_options $ini_settings -f \$test_file\ 21 
 \$tmp_post\;

+   } elseif (array_key_exists('PUT', $section_text)  
!empty($section_text['PUT'])) {
+
+   $post = trim($section_text['PUT']);
+   $raw_lines = explode(\n, $post);
+
+   $request = '';
+   $started = false;
+
+   foreach ($raw_lines as $line) {
+
+   if (empty($env['CONTENT_TYPE'])  
preg_match('/^Content-Type:(.*)/i', $line, $res)) {
+   $env['CONTENT_TYPE'] = trim(str_replace(\r, 
'', $res[1]));
+   continue;
+   }
+
+   if ($started) {
+   $request .= \n;
+   }
+
+   $started = true;
+   $request .= $line;
+   }
+
+   $env['CONTENT_LENGTH'] = strlen($request);
+   $env['REQUEST_METHOD'] = 'PUT';
+
+   if (empty($request)) {
+   if ($JUNIT) {
+   $JUNIT['test_total']++;
+   $JUNIT['test_error']++;
+   $JUNIT['result_xml'] .= 'testcase 
classname='.$shortname.' name='.htmlspecialchars($tested, ENT_QUOTES).' 
time='.$test_execution_time.''.\n;
+   $JUNIT['result_xml'] .= 'error type=BORKED 
message=empty $request /'.\n;
+   $JUNIT['result_xml'] .= '/testcase'.\n;
+   }
+   return 'BORKED';
+   }
+
+   save_text($tmp_post, $request);
+   $cmd = $php $pass_options $ini_settings -f \$test_file\ 21 
 \$tmp_post\;
+
} else if (array_key_exists('POST', $section_text)  
!empty($section_text['POST'])) {

$post = trim($section_text['POST']);

Modified: php/php-src/branches/PHP_5_4/run-tests.php
===
--- php/php-src/branches/PHP_5_4/run-tests.php  2012-03-17 09:19:10 UTC (rev 
324318)
+++ php/php-src/branches/PHP_5_4/run-tests.php  2012-03-17 09:35:25 UTC (rev 
324319)
@@ -1342,8 +1342,8 @@

$tested = trim($section_text['TEST']);

-   /* For GET/POST tests, check if cgi sapi is available and if it is, use 
it. */
-   if (!empty($section_text['GET']) || !empty($section_text['POST']) || 
!empty($section_text['POST_RAW']) || !empty($section_text['COOKIE']) || 
!empty($section_text['EXPECTHEADERS'])) {
+   /* For GET/POST/PUT tests, check if cgi sapi is available and if it is, 
use it. */
+   if (!empty($section_text['GET']) || !empty($section_text['POST']) || 
!empty($section_text['POST_RAW']) || !empty($section_text['PUT']) || 
!empty($section_text['COOKIE']) || !empty($section_text['EXPECTHEADERS'])) {
if (isset($php_cgi)) {
$old_php = $php;
$php = $php_cgi . ' -C ';
@@ -1718,6 +1718,46 @@
save_text($tmp_post, $request);
$cmd = $php $pass_options $ini_settings -f \$test_file\ 21 
 \$tmp_post\;

+   } elseif (array_key_exists('PUT', $section_text)  
!empty($section_text['PUT'])) {
+
+   $post = trim($section_text['PUT']);
+   $raw_lines = explode(\n, $post);
+
+   $request = '';
+   $started = false;
+
+   foreach ($raw_lines as $line)

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS

2012-03-17 Thread Ilia Alshanetsky

iliaaSat, 17 Mar 2012 17:51:51 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=324323

Log:
Fixed typo

Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-17 10:37:21 UTC (rev 324322)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-17 17:51:51 UTC (rev 324323)
@@ -12,7 +12,7 @@
 exist in ISO-8859-1). (Gustavo)
   . Fixed bug #61273 (call_user_func_array with more than 16333 arguments
 leaks / crashes). (Laruence)
-  . Fixed bug #61225 (Incorect lexing of 0b00*+NUM). (Pierrick)
+  . Fixed bug #61225 (Incorrect lexing of 0b00*+NUM). (Pierrick)
   . Fixed bug #61165 (Segfault - strip_tags()). (Laruence)
   . Fixed bug #61106 (Segfault when using header_register_callback). (Nikita
 Popov)

-- 
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/tests/streams/bug61115-1.phpt branches/PHP_5_3/ext/standard/tests/streams/bug61115-2.phpt branches/PHP_5_3/ext/standard

2012-03-17 Thread Gustavo André dos Santos Lopes

cataphract   Sat, 17 Mar 2012 19:37:30 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=324324

Log:
- Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak
  already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
  fixing bug #61115. This better fix for #61115 fixes the leak (the inhibition
  for deleting the context was too broad) and so prevents segfaults in new
  circumstances (where the inhibition was not broad enough).

Bugs: https://bugs.php.net/61371 (Verified) stream_context_create() causes 
memory leaks on use streams_socket_create
  https://bugs.php.net/61115 (Assigned) Stream related segfault on fatal 
error in php_stream_context_del_link
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
A + php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug61115-1.phpt
(from 
php/php-src/trunk/ext/standard/tests/streams/bug61115.phpt:r324314)
A + php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug61115-2.phpt
(from 
php/php-src/trunk/ext/standard/tests/streams/bug61115.phpt:r324314)
A   php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug61371.phpt
U   php/php-src/branches/PHP_5_3/main/streams/streams.c
U   php/php-src/branches/PHP_5_4/ext/standard/streamsfuncs.c
A + php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug61115-1.phpt
(from 
php/php-src/trunk/ext/standard/tests/streams/bug61115.phpt:r324314)
A + php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug61115-2.phpt
(from 
php/php-src/trunk/ext/standard/tests/streams/bug61115.phpt:r324314)
A + php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug61115.phpt
(from 
php/php-src/trunk/ext/standard/tests/streams/bug61115.phpt:r324314)
A   php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug61371.phpt
U   php/php-src/branches/PHP_5_4/main/streams/streams.c
A + php/php-src/trunk/ext/standard/tests/streams/bug61115-1.phpt
(from 
php/php-src/trunk/ext/standard/tests/streams/bug61115.phpt:r324314)
A + php/php-src/trunk/ext/standard/tests/streams/bug61115-2.phpt
(from 
php/php-src/trunk/ext/standard/tests/streams/bug61115.phpt:r324314)
A   php/php-src/trunk/ext/standard/tests/streams/bug61371.phpt
U   php/php-src/trunk/main/streams/streams.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS	2012-03-17 17:51:51 UTC (rev 324323)
+++ php/php-src/branches/PHP_5_3/NEWS	2012-03-17 19:37:30 UTC (rev 324324)
@@ -98,6 +98,8 @@
 SessionHandler::write()). (Ilia)

 - Streams:
+  . Fixed bug #61371 (stream_context_create() causes memory leaks on use
+streams_socket_create). (Gustavo)
   . Fixed bug #61253 (Wrappers opened with errors concurrency problem on ZTS).
 (Gustavo)
   . Fixed bug #61115 (stream related segfault on fatal error in

Copied: php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug61115-1.phpt (from rev 324314, php/php-src/trunk/ext/standard/tests/streams/bug61115.phpt)
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug61115-1.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug61115-1.phpt	2012-03-17 19:37:30 UTC (rev 324324)
@@ -0,0 +1,11 @@
+--TEST--
+Bug #61115: Stream related segfault on fatal error in php_stream_context_del_link - variation 1
+--FILE--
+?php
+
+$fileResourceTemp = fopen('php://temp', 'wr');
+stream_context_get_options($fileResourceTemp);
+ftruncate($fileResourceTemp, PHP_INT_MAX);
+?
+--EXPECTF--
+Fatal error: Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes) in %s on line %d

Copied: php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug61115-2.phpt (from rev 324314, php/php-src/trunk/ext/standard/tests/streams/bug61115.phpt)
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug61115-2.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug61115-2.phpt	2012-03-17 19:37:30 UTC (rev 324324)
@@ -0,0 +1,10 @@
+--TEST--
+Bug #61115: Stream related segfault on fatal error in php_stream_context_del_link - variation 2
+--FILE--
+?php
+stream_socket_client('abc', $var, $var, 0, STREAM_CLIENT_PERSISTENT);
+
+?
+==DONE==
+--EXPECT--
+==DONE==

Added: php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug61371.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug61371.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug61371.phpt	2012-03-17 19:37:30 UTC (rev 324324)
@@ -0,0 +1,40 @@
+--TEST--
+Bug #61371: stream_context_create() causes memory leaks on

[PHP-CVS] [git] karma.git branch PHP_POST_RECEIVE updated. 7c4de5d

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/php.ini-development branches/PHP_5_4/php.ini-production trunk/php.ini-development trunk/php.ini-production

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/run-tests.php branches/PHP_5_4/run-tests.php trunk/run-tests.php

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/tests/streams/bug61115-1.phpt branches/PHP_5_3/ext/standard/tests/streams/bug61115-2.phpt branches/PHP_5_3/ext/standard

5 matches

Site Navigation

Mail list logo

Footer information