Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS ext/zlib/tests/bug61139.phpt ext/zlib/zlib_fopen_wrapper.c

[Hannes Magnusson]

Why is this test creating the file in the root directory?
And should it be created at all since the function fails?

-Hannes

On Fri, Mar 2, 2012 at 15:16, Nikita Popov  wrote:
> nikic                                    Fri, 02 Mar 2012 14:16:47 +
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=323819
>
> Log:
> Merge: Fix bug #61139: gzopen leaks when specifying invalid mode
>
> Bug: https://bugs.php.net/61139 (Assigned) gzopen leaks when specifying 
> invalid mode
>
> Changed paths:
>    U   php/php-src/branches/PHP_5_4/NEWS
>    A   php/php-src/branches/PHP_5_4/ext/zlib/tests/bug61139.phpt
>    U   php/php-src/branches/PHP_5_4/ext/zlib/zlib_fopen_wrapper.c
>
> Modified: php/php-src/branches/PHP_5_4/NEWS
> ===
> --- php/php-src/branches/PHP_5_4/NEWS   2012-03-02 14:08:11 UTC (rev 323818)
> +++ php/php-src/branches/PHP_5_4/NEWS   2012-03-02 14:16:47 UTC (rev 323819)
> @@ -43,6 +43,9 @@
>  - XMLRPC:
>   . Fixed bug #61097 (Memory leak in xmlrpc functions copying zvals). (Nikita 
> Popov)
>
> +- Zlib:
> +  . Fixed bug #61139 (gzopen leaks when specifying invalid mode). (Nikita 
> Popov)
> +
>  01 Mar 2012, PHP 5.4.0
>
>  - Installation:
>
> Added: php/php-src/branches/PHP_5_4/ext/zlib/tests/bug61139.phpt
> ===
> --- php/php-src/branches/PHP_5_4/ext/zlib/tests/bug61139.phpt                 
>           (rev 0)
> +++ php/php-src/branches/PHP_5_4/ext/zlib/tests/bug61139.phpt   2012-03-02 
> 14:16:47 UTC (rev 323819)
> @@ -0,0 +1,14 @@
> +--TEST--
> +Bug #61139 (gzopen leaks when specifying invalid mode)
> +--SKIPIF--
> + +if (!extension_loaded('zlib')) {
> +       die('skip - zlib extension not loaded');
> +}
> +?>
> +--FILE--
> + +
> +gzopen('someFile', 'c');
> +--EXPECTF--
> +Warning: gzopen(): gzopen failed in %s on line %d
>
> Modified: php/php-src/branches/PHP_5_4/ext/zlib/zlib_fopen_wrapper.c
> ===
> --- php/php-src/branches/PHP_5_4/ext/zlib/zlib_fopen_wrapper.c  2012-03-02 
> 14:08:11 UTC (rev 323818)
> +++ php/php-src/branches/PHP_5_4/ext/zlib/zlib_fopen_wrapper.c  2012-03-02 
> 14:16:47 UTC (rev 323819)
> @@ -109,7 +109,7 @@
>  php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char 
> *mode, int options,
>                                                          char **opened_path, 
> php_stream_context *context STREAMS_DC TSRMLS_DC)
>  {
> -       struct php_gz_stream_data_t *self = {0};
> +       struct php_gz_stream_data_t *self;
>        php_stream *stream = NULL, *innerstream = NULL;
>
>        /* sanity check the stream: it can be either read-only or write-only */
> @@ -120,8 +120,6 @@
>                return NULL;
>        }
>
> -       self = emalloc(sizeof(*self));
> -
>        if (strncasecmp("compress.zlib://", path, 16) == 0) {
>                path += 16;
>        } else if (strncasecmp("zlib:", path, 5) == 0) {
> @@ -134,32 +132,29 @@
>                int fd;
>
>                if (SUCCESS == php_stream_cast(innerstream, PHP_STREAM_AS_FD, 
> (void **) &fd, REPORT_ERRORS)) {
> -                       self->gz_file = gzdopen(dup(fd), mode);
> +                       self = emalloc(sizeof(*self));
>                        self->stream = innerstream;
> -                       if (self->gz_file)      {
> +                       self->gz_file = gzdopen(dup(fd), mode);
> +
> +                       if (self->gz_file) {
>                                stream = 
> php_stream_alloc_rel(&php_stream_gzio_ops, self, 0, mode);
>                                if (stream) {
>                                        stream->flags |= 
> PHP_STREAM_FLAG_NO_BUFFER;
>                                        return stream;
>                                }
> +
>                                gzclose(self->gz_file);
>                        }
> +
> +                       efree(self);
>                        if (options & REPORT_ERRORS) {
>                                php_error_docref(NULL TSRMLS_CC, E_WARNING, 
> "gzopen failed");
>                        }
> -               } else if (innerstream) {
> -                       php_stream_close(innerstream);
>                }
> -       }
>
> -       if (stream) {
> -               php_stream_close(stream);
> +               php_stream_close(innerstream);
>        }
> -
> -       if (self) {
> -               efree(self);
> -       }
> -
> +
>        return NULL;
>  }
>
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php

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

[Michael Wallner]

On 19 March 2012 20:15, Christopher Jones  wrote:
>>> Hi Mike,
>>>
>>> Can you update (or get updated) http://qa.php.net/phpt_details.php
>>> with this feature?

Here we go:
https://github.com/php/web-qa/pull/3


>
> It's way too buried for my liking, but the path is:
>
> http://qa.php.net/
> http://qa.php.net/howtohelp.php
> http://qa.php.net/write-test.php
>
> Then down in the "PHPT structure details" section is a link title "here" to
> http://qa.php.net/phpt_details.php

Jeez!

-- 
Regards,
Mike

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

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

[Michael Wallner]

Hi Chris,

On 19 March 2012 17:30, Christopher Jones  wrote:
> Hi Mike,
>
> Can you update (or get updated) http://qa.php.net/phpt_details.php
> with this feature?

Thanks again for the heads up!  Could you please also reveal how to
get there from the homepage?
I'm just curious... ;)

-- 
Regards,
Mike

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

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

[Christopher Jones]

On 03/19/2012 12:08 PM, Michael Wallner wrote:

Hi Chris,

On 19 March 2012 17:30, Christopher Jones  wrote:

Hi Mike,

Can you update (or get updated) http://qa.php.net/phpt_details.php
with this feature?


Thanks again for the heads up!  Could you please also reveal how to
get there from the homepage?
I'm just curious... ;)



It's way too buried for my liking, but the path is:

http://qa.php.net/
http://qa.php.net/howtohelp.php
http://qa.php.net/write-test.php

Then down in the "PHPT structure details" section is a link title "here" to
http://qa.php.net/phpt_details.php

Chris

--
Email: christopher.jo...@oracle.com
Tel:  +1 650 506 8630
Blog:  http://blogs.oracle.com/opal/

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

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

[Christopher Jones]

On 03/17/2012 02:35 AM, Michael Wallner wrote:

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

Revision: http://svn.php.net/viewvc?view=revision&revision=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


Hi Mike,

Can you update (or get updated) http://qa.php.net/phpt_details.php
with this feature?

Thanks,

Chris



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\" 2>&1<  
\"$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'] .= ''."\n";
+   $JUNIT['result_xml'] .= ''."\n";
+   $JUNIT['result_xml'] .= ''."\n";
+   }
+   return 'BORKED';
+   }
+
+   save_text($tmp_post, $request);
+   $cmd = "$php $pass_options $ini_settings -f \"$test_file\" 2>&1<  
\"$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\" 2>&1<  
\"$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 =

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/reflection/php_reflection.c branches/PHP_5_3/ext/reflection/tests/bug61388.phpt branches/PHP_5_4/ext/reflection/php_reflection.c

[Gustavo André dos Santos Lopes]

cataphract   Sun, 18 Mar 2012 18:23:27 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324337

Log:
- Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads
  when get_properties returns a hash table with (inaccessible) dynamic
  numeric properties).

Bug: https://bugs.php.net/61388 (Assigned) ReflectionObject:getProperties 
called on ArrayObject throws Segmentation Fault
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
A   php/php-src/branches/PHP_5_3/ext/reflection/tests/bug61388.phpt
U   php/php-src/branches/PHP_5_4/ext/reflection/php_reflection.c
A   php/php-src/branches/PHP_5_4/ext/reflection/tests/bug61388.phpt
U   php/php-src/trunk/ext/reflection/php_reflection.c
A   php/php-src/trunk/ext/reflection/tests/bug61388.phpt

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-03-18 18:18:01 UTC (rev 324336)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-03-18 18:23:27 UTC (rev 324337)
@@ -72,6 +72,13 @@
   . Fixed bug #61088 (Memory leak in readline_callback_handler_install).
 (Nikic, Laruence)

+- Reflection:
+  . Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads
+when get_properties returns a hash table with (inaccessible) dynamic
+numeric properties). (Gustavo)
+  . Fixed bug #60968 (Late static binding doesn't work with
+ReflectionMethod::invokeArgs()). (Laruence)
+
 - SOAP
   . Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)
   . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
@@ -90,10 +97,6 @@
 - SQLite3 extension:
   . Add createCollation() method. (Brad Dewar)

-- Reflection:
-  . Fixed bug #60968 (Late static binding doesn't work with
-ReflectionMethod::invokeArgs()). (Laruence)
-
 - Session:
   . Fixed bug #60860 (session.save_handler=user without defined function core
 dumps). (Felipe)

Modified: php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
===
--- php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
2012-03-18 18:18:01 UTC (rev 324336)
+++ php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
2012-03-18 18:23:27 UTC (rev 324337)
@@ -3667,6 +3667,13 @@
zend_class_entry *ce = *va_arg(args, zend_class_entry**);
zval *retval = va_arg(args, zval*), member;

+   /* under some circumstances, the properties hash table may contain 
numeric
+* properties (e.g. when casting from array). This is a WONT FIX bug, at
+* least for the moment. Ignore these */
+   if (hash_key->nKeyLength == 0) {
+   return 0;
+   }
+
if (hash_key->arKey[0] == '\0') {
return 0; /* non public cannot be dynamic */
}

Added: php/php-src/branches/PHP_5_3/ext/reflection/tests/bug61388.phpt
===
--- php/php-src/branches/PHP_5_3/ext/reflection/tests/bug61388.phpt 
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/reflection/tests/bug61388.phpt 
2012-03-18 18:23:27 UTC (rev 324337)
@@ -0,0 +1,32 @@
+--TEST--
+ReflectionObject:getProperties() issues invalid reads when it get_properties 
returns a hash table with (inaccessible) dynamic numeric properties
+--FILE--
+getProperties(ReflectionProperty::IS_PUBLIC));
+
+$x = (object)array("a", "oo" => "b");
+$reflObj = new ReflectionObject($x);
+print_r($reflObj->getProperties(ReflectionProperty::IS_PUBLIC));
+--EXPECT--
+Array
+(
+[0] => ReflectionProperty Object
+(
+[name] => test
+[class] => ArrayObject
+)
+
+)
+Array
+(
+[0] => ReflectionProperty Object
+(
+[name] => oo
+[class] => stdClass
+)
+
+)


Property changes on: 
php/php-src/branches/PHP_5_3/ext/reflection/tests/bug61388.phpt
___
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Modified: php/php-src/branches/PHP_5_4/ext/reflection/php_reflection.c
===
--- php/php-src/branches/PHP_5_4/ext/reflection/php_reflection.c
2012-03-18 18:18:01 UTC (rev 324336)
+++ php/php-src/branches/PHP_5_4/ext/reflection/php_reflection.c
2012-03-18 18:23:27 UTC (rev 324337)
@@ -3832,6 +3832,13 @@
zend_class_entry *ce = *va_arg(args, zend_class_entry**);
zval *retval = va_arg(args, zval*), member;

+   /* under some circumstances, the properties hash table may contain 
numeric
+* properties (e.g. when casting from array). This is a WONT FIX bug, at
+* least for the moment. Ignore these */
+   if (hash_key->nKeyLength == 0) {
+ 

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/spl/spl_directory.c branches/PHP_5_3/ext/spl/tests/bug61418.phpt branches/PHP_5_4/ext/spl/spl_directory.c branches/PHP_5_4/ext/s

[Gustavo André dos Santos Lopes]

cataphract   Sun, 18 Mar 2012 15:07:20 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324327

Log:
- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
  FilesystemIterator's iterators are requested more than once without
  having had its dtor callback called in between).

Bug: https://bugs.php.net/61418 (Assigned) Segmentation foult using 
FiltesystemIterator & RegexIterator
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c
A   php/php-src/branches/PHP_5_3/ext/spl/tests/bug61418.phpt
U   php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c
A   php/php-src/branches/PHP_5_4/ext/spl/tests/bug61418.phpt
U   php/php-src/trunk/ext/spl/spl_directory.c
A   php/php-src/trunk/ext/spl/tests/bug61418.phpt

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS	2012-03-18 13:19:50 UTC (rev 324326)
+++ php/php-src/branches/PHP_5_3/NEWS	2012-03-18 15:07:20 UTC (rev 324327)
@@ -81,6 +81,9 @@

 - SPL
   . Fixed memory leak when calling SplFileInfo's constructor twice. (Felipe)
+  . Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
+FilesystemIterator's iterators are requested more than once without
+having had its dtor callback called in between). (Gustavo)
   . Fixed bug #61347 (inconsistent isset behavior of Arrayobject). (Laruence)
   . Fixed bug #61326 (ArrayObject comparison). (Gustavo)


Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c
===
--- php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c	2012-03-18 13:19:50 UTC (rev 324326)
+++ php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c	2012-03-18 15:07:20 UTC (rev 324327)
@@ -120,6 +120,16 @@
 		spl_filesystem_file_free_line(intern TSRMLS_CC);
 		break;
 	}
+
+	{
+		zend_object_iterator *iterator;
+		iterator = (zend_object_iterator*)
+spl_filesystem_object_to_iterator(intern);
+		if (iterator->data != NULL) {
+			iterator->data = NULL;
+			iterator->funcs->dtor(iterator TSRMLS_CC);
+		}
+	}
 	efree(object);
 } /* }}} */

@@ -1627,10 +1637,15 @@
 	dir_object = (spl_filesystem_object*)zend_object_store_get_object(object TSRMLS_CC);
 	iterator   = spl_filesystem_object_to_iterator(dir_object);

-	Z_SET_REFCOUNT_P(object, Z_REFCOUNT_P(object) + 2);
-	iterator->intern.data = (void*)object;
-	iterator->intern.funcs = &spl_filesystem_dir_it_funcs;
-	iterator->current = object;
+	/* initialize iterator if it wasn't gotten before */
+	if (iterator->intern.data == NULL) {
+		iterator->intern.data = object;
+		iterator->intern.funcs = &spl_filesystem_dir_it_funcs;
+		/* ->current must be initialized; rewind doesn't set it and valid
+		 * doesn't check whether it's set */
+		iterator->current = object;
+	}
+	zval_add_ref(&object);

 	return (zend_object_iterator*)iterator;
 }
@@ -1709,15 +1724,15 @@
 static void spl_filesystem_tree_it_dtor(zend_object_iterator *iter TSRMLS_DC)
 {
 	spl_filesystem_iterator *iterator = (spl_filesystem_iterator *)iter;
-	zval *zfree = (zval*)iterator->intern.data;

-	if (iterator->current) {
-		zval_ptr_dtor(&iterator->current);
+	if (iterator->intern.data) {
+		zval *object = 	iterator->intern.data;
+		zval_ptr_dtor(&object);
+	} else {
+		if (iterator->current) {
+			zval_ptr_dtor(&iterator->current);
+		}
 	}
-	iterator->intern.data = NULL; /* mark as unused */
-	/* free twice as we add ref twice */
-	zval_ptr_dtor(&zfree);
-	zval_ptr_dtor(&zfree);
 }
 /* }}} */

@@ -1828,10 +1843,12 @@
 	dir_object = (spl_filesystem_object*)zend_object_store_get_object(object TSRMLS_CC);
 	iterator   = spl_filesystem_object_to_iterator(dir_object);

-	Z_SET_REFCOUNT_P(object, Z_REFCOUNT_P(object) + 2);
-	iterator->intern.data = (void*)object;
-	iterator->intern.funcs = &spl_filesystem_tree_it_funcs;
-	iterator->current = NULL;
+	/* initialize iterator if wasn't gotten before */
+	if (iterator->intern.data == NULL) {
+		iterator->intern.data = object;
+		iterator->intern.funcs = &spl_filesystem_tree_it_funcs;
+	}
+	zval_add_ref(&object);

 	return (zend_object_iterator*)iterator;
 }

Added: php/php-src/branches/PHP_5_3/ext/spl/tests/bug61418.phpt
===
--- php/php-src/branches/PHP_5_3/ext/spl/tests/bug61418.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/bug61418.phpt	2012-03-18 15:07:20 UTC (rev 324327)
@@ -0,0 +1,23 @@
+--TEST--
+Bug #61418: Segmentation fault using FiltesystemIterator & RegexIterator
+--FILE--
+ $file)
+{
+}
+unset($regexpIterator);
+unset($fileIterator);
+
+$dirIterator = new DirectoryIterator(__DIR__);
+$regexpIterator2 = new RegexIterator($dirIterator, '#.*#');
+foreach ($dirIterator as $key => $file)
+{
+}
+unset($regexpIterator2);
+unset($dirIterator);
+?>
+==DONE==
+--EXPECT--
+==DONE==

[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

[Gustavo André dos Santos Lopes]

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

Revision: http://svn.php.net/viewvc?view=revision&revision=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--
+
+--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--
+
+==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 use streams_socket_create
+--FILE--
+
+--EXPECTF--
+memory: %dkb
+bool(true)
+memory: %dkb
+bool(true)
+memory: %dkb
+memory: %dkb
+bool(true)
+memory: %dkb
+bool(true)
+memory: %dkb


Property changes on: php/php-src/branches/P

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

[Ilia Alshanetsky]

iliaaSat, 17 Mar 2012 17:51:51 +

Revision: http://svn.php.net/viewvc?view=revision&revision=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*+). (Pierrick)
+  . Fixed bug #61225 (Incorrect lexing of 0b00*+). (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/run-tests.php branches/PHP_5_4/run-tests.php trunk/run-tests.php

[Michael Wallner]

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

Revision: http://svn.php.net/viewvc?view=revision&revision=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\" 2>&1 
< \"$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'] .= ''."\n";
+   $JUNIT['result_xml'] .= ''."\n";
+   $JUNIT['result_xml'] .= ''."\n";
+   }
+   return 'BORKED';
+   }
+
+   save_text($tmp_post, $request);
+   $cmd = "$php $pass_options $ini_settings -f \"$test_file\" 2>&1 
< \"$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\" 2>&1 
< \"$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)) 

[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

[Pierre Joye]

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

Revision: http://svn.php.net/viewvc?view=revision&revision=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_4/NEWS branches/PHP_5_4/ext/standard/info.c trunk/ext/standard/info.c

[Adam Harvey]

aharvey  Fri, 16 Mar 2012 02:07:46 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324289

Log:
Fix bug #61409 (Bad formatting on phpinfo()). Patch by Jakub Vrana.

Bug: https://bugs.php.net/61409 (Assigned) Bad formatting on php_info()
  
Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/ext/standard/info.c
U   php/php-src/trunk/ext/standard/info.c

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-15 23:17:06 UTC (rev 324288)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-16 02:07:46 UTC (rev 324289)
@@ -96,6 +96,7 @@
 - Standard:
   . Fixed memory leak in substr_replace. (Pierrick)
   . Make max_file_uploads ini directive settable outside of php.ini (Rasmus)
+  . Fixed bug #61409 (Bad formatting on phpinfo()). (Jakub Vrana)
   . Fixed bug #60222 (time_nanosleep() does validate input params). (Ilia)
   . Fixed bug #60106 (stream_socket_server silently truncates long unix socket
 paths). (Ilia)

Modified: php/php-src/branches/PHP_5_4/ext/standard/info.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/info.c2012-03-15 23:17:06 UTC 
(rev 324288)
+++ php/php-src/branches/PHP_5_4/ext/standard/info.c2012-03-16 02:07:46 UTC 
(rev 324289)
@@ -117,7 +117,7 @@
HashPosition pos;

if (!sapi_module.phpinfo_as_text) {
-   php_info_printf("Registered 
%s", name);
+   php_info_printf("Registered 
%s", name);
} else {
php_info_printf("\nRegistered %s => ", name);
}

Modified: php/php-src/trunk/ext/standard/info.c
===
--- php/php-src/trunk/ext/standard/info.c   2012-03-15 23:17:06 UTC (rev 
324288)
+++ php/php-src/trunk/ext/standard/info.c   2012-03-16 02:07:46 UTC (rev 
324289)
@@ -117,7 +117,7 @@
HashPosition pos;

if (!sapi_module.phpinfo_as_text) {
-   php_info_printf("Registered 
%s", name);
+   php_info_printf("Registered 
%s", name);
} else {
php_info_printf("\nRegistered %s => ", name);
}

-- 
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/interbase/ibase_service.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/interbase/ibase_service.c trunk/ext/interbase/ibase_service

[Ilia Alshanetsky]

iliaaThu, 15 Mar 2012 19:59:26 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324281

Log:
Fixed bug #60947 (Segmentation fault while executing ibase_db_info)

Bug: https://bugs.php.net/60947 (Assigned) Segmentation fault while executing 
ibase_db_info
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/interbase/ibase_service.c
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/ext/interbase/ibase_service.c
U   php/php-src/trunk/ext/interbase/ibase_service.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-03-15 16:04:07 UTC (rev 324280)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-03-15 19:59:26 UTC (rev 324281)
@@ -29,6 +29,10 @@
 function is by reference). (Nikita Popov)
   . Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry)

+- Ibase
+  . Fixed bug #60947 (Segmentation fault while executing ibase_db_info).
+(Ilia)
+
 - Installation
   . Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones)


Modified: php/php-src/branches/PHP_5_3/ext/interbase/ibase_service.c
===
--- php/php-src/branches/PHP_5_3/ext/interbase/ibase_service.c  2012-03-15 
16:04:07 UTC (rev 324280)
+++ php/php-src/branches/PHP_5_3/ext/interbase/ibase_service.c  2012-03-15 
19:59:26 UTC (rev 324281)
@@ -321,6 +321,7 @@
heap_p = heap_buf + res_size;
}
result += 2;
+   *(result+line_len) = 0;
snprintf(heap_p, heap_buf_size - (heap_buf - 
heap_p), "%s\n", result);
heap_p += line_len +2;
goto query_loop; /* repeat until result is 
exhausted */

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-15 16:04:07 UTC (rev 324280)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-15 19:59:26 UTC (rev 324281)
@@ -38,6 +38,10 @@
   . Fixed bug #52719 (array_walk_recursive crashes if third param of the
 function is by reference). (Nikita Popov)

+- Ibase
+  . Fixed bug #60947 (Segmentation fault while executing ibase_db_info).
+(Ilia)
+
 - Installation
   . Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones)


Modified: php/php-src/branches/PHP_5_4/ext/interbase/ibase_service.c
===
--- php/php-src/branches/PHP_5_4/ext/interbase/ibase_service.c  2012-03-15 
16:04:07 UTC (rev 324280)
+++ php/php-src/branches/PHP_5_4/ext/interbase/ibase_service.c  2012-03-15 
19:59:26 UTC (rev 324281)
@@ -321,6 +321,7 @@
heap_p = heap_buf + res_size;
}
result += 2;
+   *(result+line_len) = 0;
snprintf(heap_p, heap_buf_size - (heap_buf - 
heap_p), "%s\n", result);
heap_p += line_len +2;
goto query_loop; /* repeat until result is 
exhausted */

Modified: php/php-src/trunk/ext/interbase/ibase_service.c
===
--- php/php-src/trunk/ext/interbase/ibase_service.c 2012-03-15 16:04:07 UTC 
(rev 324280)
+++ php/php-src/trunk/ext/interbase/ibase_service.c 2012-03-15 19:59:26 UTC 
(rev 324281)
@@ -321,6 +321,7 @@
heap_p = heap_buf + res_size;
}
result += 2;
+   *(result+line_len) = 0;
snprintf(heap_p, heap_buf_size - (heap_buf - 
heap_p), "%s\n", result);
heap_p += line_len +2;
goto query_loop; /* repeat until result is 
exhausted */

-- 
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/pdo_odbc/odbc_stmt.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/pdo_odbc/odbc_stmt.c trunk/ext/pdo_odbc/odbc_stmt.c

[Ilia Alshanetsky]

iliaaWed, 14 Mar 2012 20:20:33 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324251

Log:
Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO).

Bug: https://bugs.php.net/61212 (Open) PDO ODBC Segfaults on 
SQL_SUCESS_WITH_INFO
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/pdo_odbc/odbc_stmt.c
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/ext/pdo_odbc/odbc_stmt.c
U   php/php-src/trunk/ext/pdo_odbc/odbc_stmt.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-03-14 20:08:14 UTC (rev 324250)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-03-14 20:20:33 UTC (rev 324251)
@@ -47,6 +47,9 @@
   . Fixed bug #61194 (PDO should export compression flag with myslqnd).
 (Johannes)

+- PDO_odbc
+  . Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO). (Ilia)
+
 - PDO_pgsql
   . Fixed bug #61267 (pdo_pgsql's PDO::exec() returns the number of SELECTed
 rows on postgresql >= 9). (ben dot pineau at gmail dot com)

Modified: php/php-src/branches/PHP_5_3/ext/pdo_odbc/odbc_stmt.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo_odbc/odbc_stmt.c   2012-03-14 
20:08:14 UTC (rev 324250)
+++ php/php-src/branches/PHP_5_3/ext/pdo_odbc/odbc_stmt.c   2012-03-14 
20:20:33 UTC (rev 324251)
@@ -637,12 +637,14 @@

if (C->fetched_len != SQL_NO_TOTAL) {
/* use size suggested by the driver, if it 
knows it */
-   alloced = C->fetched_len + 1;
+   buf = emalloc(C->fetched_len + 1);
+   memcpy(buf, C->data, C->fetched_len);
+   buf[C->fetched_len] = 0;
+   used = C->fetched_len;
+   } else {
+   buf = estrndup(C->data, 256);
+   used = 255; /* not 256; the driver NUL 
terminated the buffer */
}
-
-   buf = emalloc(alloced);
-   memcpy(buf, C->data, 256);
-   used = 255; /* not 256; the driver NUL terminated the 
buffer */

do {
C->fetched_len = 0;

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-14 20:08:14 UTC (rev 324250)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-14 20:20:33 UTC (rev 324251)
@@ -75,6 +75,9 @@
   . Fixed bug #61194 (PDO should export compression flag with myslqnd).
 (Johannes)

+- PDO_odbc
+  . Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO). (Ilia)
+
 - Phar
   . Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL
 bytes). (Nikita Popov)

Modified: php/php-src/branches/PHP_5_4/ext/pdo_odbc/odbc_stmt.c
===
--- php/php-src/branches/PHP_5_4/ext/pdo_odbc/odbc_stmt.c   2012-03-14 
20:08:14 UTC (rev 324250)
+++ php/php-src/branches/PHP_5_4/ext/pdo_odbc/odbc_stmt.c   2012-03-14 
20:20:33 UTC (rev 324251)
@@ -637,12 +637,14 @@

if (C->fetched_len != SQL_NO_TOTAL) {
/* use size suggested by the driver, if it 
knows it */
-   alloced = C->fetched_len + 1;
+   buf = emalloc(C->fetched_len + 1);
+   memcpy(buf, C->data, C->fetched_len);
+   buf[C->fetched_len] = 0;
+   used = C->fetched_len;
+   } else {
+   buf = estrndup(C->data, 256);
+   used = 255; /* not 256; the driver NUL 
terminated the buffer */
}
-
-   buf = emalloc(alloced);
-   memcpy(buf, C->data, 256);
-   used = 255; /* not 256; the driver NUL terminated the 
buffer */

do {
C->fetched_len = 0;

Modified: php/php-src/trunk/ext/pdo_odbc/odbc_stmt.c
===
--- php/php-src/trunk/ext/pdo_odbc/odbc_stmt.c  2012-03-14 20:08:14 UTC (rev 
324250)
+++ php/php-src/trunk/ext/pdo_odbc/odbc_stmt.c  2012-03-14 20:20:33 UTC (rev 
324251)
@@ -637,12 +637,14 @@

if (C->fetched_len != SQL_NO_TOTAL) {
/* use size suggested by the driver, if it 
knows it */
-   alloced = C->fetched_len + 1;
+   buf = emalloc(C->fetched_len + 1);
+   

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/mysqli_report.phpt branches/PHP_5_4/ext/mysqli/tests/mysqli_report.phpt trunk/ext/mysqli/tests/mysqli_report.phpt

[Ulf Wendel]

uw   Wed, 14 Mar 2012 14:55:09 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324242

Log:
Test for MySQL version.Variable is deprecated in MySQL 5.6.

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_report.phpt
U   php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_report.phpt
U   php/php-src/trunk/ext/mysqli/tests/mysqli_report.phpt

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_report.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_report.phpt	2012-03-14 14:05:54 UTC (rev 324241)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_report.phpt	2012-03-14 14:55:09 UTC (rev 324242)
@@ -194,37 +194,39 @@
 	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
 		printf("[017] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());

-	// this might cause a warning - no index used
-	if (!$res = @mysqli_query($link, "SHOW VARIABLES LIKE 'log_slow_queries'"))
-		printf("[018] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+	if (mysqli_get_server_version($link) <= 50600) {
+		// this might cause a warning - no index used
+		if (!$res = @mysqli_query($link, "SHOW VARIABLES LIKE 'log_slow_queries'"))
+			printf("[018] [%d] %s\n", mysqli_errno($link), mysqli_error($link));

-	if (!$row = mysqli_fetch_assoc($res))
-		printf("[019] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+		if (!$row = mysqli_fetch_assoc($res))
+			printf("[019] [%d] %s\n", mysqli_errno($link), mysqli_error($link));

-	$log_slow_query = ('ON' == $row['Value']);
+		$log_slow_query = ('ON' == $row['Value']);

-	if (mysqli_get_server_version($link) >= 51011) {
-		// this might cause a warning - no index used
-		if (!$res = @mysqli_query($link, "SHOW VARIABLES LIKE 'log_queries_not_using_indexes'"))
-			printf("[020] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+		if (mysqli_get_server_version($link) >= 50111) {
+			// this might cause a warning - no index used
+			if (!$res = @mysqli_query($link, "SHOW VARIABLES LIKE 'log_queries_not_using_indexes'"))
+printf("[020] [%d] %s\n", mysqli_errno($link), mysqli_error($link));

-		if (!$row = mysqli_fetch_assoc($res))
-			printf("[021] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+			if (!$row = mysqli_fetch_assoc($res))
+printf("[021] [%d] %s\n", mysqli_errno($link), mysqli_error($link));

-		$log_queries_not_using_indexes = ('ON' == $row['Value']);
+			$log_queries_not_using_indexes = ('ON' == $row['Value']);

-		if ($log_slow_queries && $log_queries_not_using_indexes) {
+			if ($log_slow_queries && $log_queries_not_using_indexes) {

-			for ($i = 100; $i < 2; $i++) {
-if (!mysqli_query($link, "INSERT INTO test(id, label) VALUES ($i, 'z')"))
-	printf("[022 - %d] [%d] %s\n", $i - 99, mysqli_errno($link), mysqli_error($link));
-			}
+for ($i = 100; $i < 2; $i++) {
+	if (!mysqli_query($link, "INSERT INTO test(id, label) VALUES ($i, 'z')"))
+		printf("[022 - %d] [%d] %s\n", $i - 99, mysqli_errno($link), mysqli_error($link));
+}

-			// this might cause a warning - no index used
-			if (!$res = @mysqli_query($link, "SELECT id, label FROM test WHERE id = 1323"))
-printf("[023] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+// this might cause a warning - no index used
+if (!$res = @mysqli_query($link, "SELECT id, label FROM test WHERE id = 1323"))
+	printf("[023] [%d] %s\n", mysqli_errno($link), mysqli_error($link));

-			mysqli_free_result($res);
+mysqli_free_result($res);
+			}
 		}
 	}


Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_report.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_report.phpt	2012-03-14 14:05:54 UTC (rev 324241)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_report.phpt	2012-03-14 14:55:09 UTC (rev 324242)
@@ -194,37 +194,39 @@
 	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
 		printf("[017] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());

-	// this might cause a warning - no index used
-	if (!$res = @mysqli_query($link, "SHOW VARIABLES LIKE 'log_slow_queries'"))
-		printf("[018] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+	if (mysqli_get_server_version($link) <= 50600) {
+		// this might cause a warning - no index used
+		if (!$res = @mysqli_query($link, "SHOW VARIABLES LIKE 'log_slow_queries'"))
+			printf("[018] [%d] %s\n", mysqli_errno($link), mysqli_error($link));

-	if (!$row = mysqli_fetch_assoc($res))
-		printf("[019] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+		if (!$row = mysqli_fetch_assoc($res))
+			printf("[019] [%d] %s\n", mysqli_errno($link), mysqli_error($link));

-	$log_slow_query = ('ON' == $row['Value']);
+		$log_slow_query = ('ON' == $row['Value']);

-	if (mysqli_ge

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/ext/standard/html.c branches/PHP_5_4/ext/standard/tests/strings/bug61374.phpt trunk/ext/standard/html.c trunk/ext/standard/tests/str

[Gustavo André dos Santos Lopes]

cataphract   Tue, 13 Mar 2012 18:08:30 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324199

Log:
- Fixed bug #61374: html_entity_decode tries to decode code points that don't
  exist in ISO-8859-1.

Bug: https://bugs.php.net/61374 (Assigned) html_entity_decode tries to decode 
code points that don't exist in ISO-8859-1
  
Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/ext/standard/html.c
A   php/php-src/branches/PHP_5_4/ext/standard/tests/strings/bug61374.phpt
U   php/php-src/trunk/ext/standard/html.c
A   php/php-src/trunk/ext/standard/tests/strings/bug61374.phpt

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-13 16:09:42 UTC (rev 324198)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-13 18:08:30 UTC (rev 324199)
@@ -8,6 +8,8 @@
   . "Connection: close" instead of "Connection: closed" (Gustavo)

 - Core:
+  . Fixed bug #61374 (html_entity_decode tries to decode code points that don't
+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*+). (Pierrick)

Modified: php/php-src/branches/PHP_5_4/ext/standard/html.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/html.c2012-03-13 16:09:42 UTC 
(rev 324198)
+++ php/php-src/branches/PHP_5_4/ext/standard/html.c2012-03-13 18:08:30 UTC 
(rev 324199)
@@ -1004,8 +1004,9 @@
/* && code2 == '\0' always true for current 
maps */)
goto invalid_code;

-   /* deal with encodings other than utf-8/iso-8859-1 */
-   if (!CHARSET_UNICODE_COMPAT(charset)) {
+   /* UTF-8 doesn't need mapping (ISO-8859-1 doesn't either, but
+* the call is needed to ensure the codepoint <= U+00FF)  */
+   if (charset != cs_utf_8) {
/* replace unicode code point */
if (map_from_unicode(code, charset, &code) == FAILURE 
|| code2 != 0)
goto invalid_code; /* not representable in 
target charset */

Added: php/php-src/branches/PHP_5_4/ext/standard/tests/strings/bug61374.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/strings/bug61374.phpt   
(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/strings/bug61374.phpt   
2012-03-13 18:08:30 UTC (rev 324199)
@@ -0,0 +1,7 @@
+--TEST--
+Bug #61374: html_entity_decode tries to decode code points that don't exist in 
ISO-8859-1
+--FILE--
+-- 
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/ NEWS

[Pierre Joye]

pajoye   Tue, 13 Mar 2012 12:55:33 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324185

Log:
- add CVE

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-13 11:03:09 UTC (rev 324184)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-13 12:55:33 UTC (rev 324185)
@@ -317,9 +317,9 @@
 been added. (Scott)
   . Added http_response_code() function. FR #52555. (Paul Dragoonis, Kalle)
   . Fixed bug #55500 (Corrupted $_FILES indices lead to security concern).
-(Stas)
+(CVE-2012-1172). (Stas)
   . Fixed bug #54374 (Insufficient validating of upload name leading to
-corrupted $_FILES indices). (Stas, lekensteyn at gmail dot com)
+corrupted $_FILES indices). (CVE-2012-1172). (Stas, lekensteyn at gmail 
dot com)

 - Improved CLI SAPI:
   . Added built-in web server that is intended for testing purpose.

-- 
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/array_bind_bdouble.phpt branches/PHP_5_3/ext/oci8/tests/array_bind_bfloat.phpt branches/PHP_5_3/ext/oci8/tests/bind_raw_2.phpt branches/PHP

[Christopher Jones]

sixd Mon, 12 Mar 2012 18:08:34 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324165

Log:
Test portability and coverage changes

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bdouble.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bfloat.phpt
A   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_raw_2.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug43497_92.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/drcp_privileged.phpt
U   php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_bdouble.phpt
U   php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_bfloat.phpt
A   php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_raw_2.phpt
U   php/php-src/branches/PHP_5_4/ext/oci8/tests/bug43497_92.phpt
U   php/php-src/branches/PHP_5_4/ext/oci8/tests/drcp_privileged.phpt
U   php/php-src/trunk/ext/oci8/tests/array_bind_bdouble.phpt
U   php/php-src/trunk/ext/oci8/tests/array_bind_bfloat.phpt
A   php/php-src/trunk/ext/oci8/tests/bind_raw_2.phpt
U   php/php-src/trunk/ext/oci8/tests/bug43497_92.phpt
U   php/php-src/trunk/ext/oci8/tests/drcp_privileged.phpt

Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bdouble.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bdouble.phpt	2012-03-12 17:40:24 UTC (rev 324164)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bdouble.phpt	2012-03-12 18:08:34 UTC (rev 324165)
@@ -4,6 +4,7 @@
  true, 'timesten' => false);  // test runs on these DBs
 require(dirname(__FILE__).'/skipif.inc');
+if (!defined('SQLT_BDOUBLE')) die('skip SQLT_BDOUBLE type not available on older Oracle clients');
 ?>
 --FILE--
  true, 'timesten' => false);  // test runs on these DBs
 require(dirname(__FILE__).'/skipif.inc');
+if (!defined('SQLT_BFLOAT')) die('skip SQLT_BFLOAT type not available on older Oracle clients');
 ?>
 --FILE--
  true, 'timesten' => false);  // test runs on these DBs
+require(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+
+--EXPECT--
+string(32) "88b274d7a257ac6f70435b83abd4e26e"
+int(300)
+Done


Property changes on: php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_raw_2.phpt
___
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bug43497_92.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bug43497_92.phpt	2012-03-12 17:40:24 UTC (rev 324164)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bug43497_92.phpt	2012-03-12 18:08:34 UTC (rev 324165)
@@ -5,8 +5,12 @@
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
 require(dirname(__FILE__).'/skipif.inc');
 if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
-if (preg_match('/Unknown/', oci_client_version()) != 1) {
-die("skip expected output only valid with Oracle 9gR2 clients");
+ob_start();
+phpinfo(INFO_MODULES);
+$phpinfo = ob_get_clean();
+$iv = preg_match('/Oracle .*Version => (9\.2)/', $phpinfo);
+if ($iv != 1) {
+die ("skip tests a feature that works only with Oracle 9iR2 client");
 }
 ?>
 --FILE--

Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/drcp_privileged.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/drcp_privileged.phpt	2012-03-12 17:40:24 UTC (rev 324164)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/drcp_privileged.phpt	2012-03-12 18:08:34 UTC (rev 324165)
@@ -3,11 +3,14 @@
 --SKIPIF--
 
 --INI--

Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_bdouble.phpt
===
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_bdouble.phpt	2012-03-12 17:40:24 UTC (rev 324164)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_bdouble.phpt	2012-03-12 18:08:34 UTC (rev 324165)
@@ -4,6 +4,7 @@
  true, 'timesten' => false);  // test runs on these DBs
 require(dirname(__FILE__).'/skipif.inc');
+if (!defined('SQLT_BDOUBLE')) die('skip SQLT_BDOUBLE type not available on older Oracle clients');
 ?>
 --FILE--
  true, 'timesten' => false);  // test runs on these DBs
 require(dirname(__FILE__).'/skipif.inc');
+if (!defined('SQLT_BFLOAT')) die('skip SQLT_BFLOAT type not available on older Oracle clients');
 ?>
 --FILE--
  true, 'timesten' => false);  // test runs on these DBs
+require(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+
+--EXPECT--
+string(32) "88b274d7a257ac6f70435b83abd4e26e"
+int(300)
+Done


Property changes on: php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_raw_2.phpt
___
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + n

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/basic_functions.c branches/PHP_5_3/ext/standard/tests/time/bug60222.phpt branches/PHP_5_4/NEWS branches/PHP_5_4/ext/sta

[Ilia Alshanetsky]

iliaaMon, 12 Mar 2012 16:53:07 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324163

Log:
Fixed bug #60222 (time_nanosleep() does validate input params).

Bug: https://bugs.php.net/60222 (Open) time_nanosleep won't throw a warning for 
negative second
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
A   php/php-src/branches/PHP_5_3/ext/standard/tests/time/bug60222.phpt
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
A   php/php-src/branches/PHP_5_4/ext/standard/tests/time/bug60222.phpt
U   php/php-src/trunk/ext/standard/basic_functions.c
A   php/php-src/trunk/ext/standard/tests/time/bug60222.phpt

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-03-12 16:19:10 UTC (rev 324162)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-03-12 16:53:07 UTC (rev 324163)
@@ -24,6 +24,7 @@
   . Fixed bug #60569 (Nullbyte truncates Exception $message). (Ilia)
   . Fixed bug #60227 (header() cannot detect the multi-line header with CR).
 (rui, Gustavo)
+  . Fixed bug #60222 (time_nanosleep() does validate input params). (Ilia)
   . Fixed bug #52719 (array_walk_recursive crashes if third param of the
 function is by reference). (Nikita Popov)
   . Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry)

Modified: php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2012-03-12 
16:19:10 UTC (rev 324162)
+++ php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2012-03-12 
16:53:07 UTC (rev 324163)
@@ -4497,6 +4497,15 @@
return;
}

+   if (tv_sec < 0) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "The seconds value 
must be greater than 0");
+   RETURN_FALSE;
+   }
+   if (tv_nsec < 0) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "The nanoseconds 
value must be greater than 0");
+   RETURN_FALSE;
+   }
+
php_req.tv_sec = (time_t) tv_sec;
php_req.tv_nsec = tv_nsec;
if (!nanosleep(&php_req, &php_rem)) {

Added: php/php-src/branches/PHP_5_3/ext/standard/tests/time/bug60222.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/time/bug60222.phpt  
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/time/bug60222.phpt  
2012-03-12 16:53:07 UTC (rev 324163)
@@ -0,0 +1,15 @@
+--TEST--
+Bug #60222 (time_nanosleep() does validate input params)
+--FILE--
+
+===DONE===
+--EXPECTF--
+Warning: time_nanosleep(): The seconds value must be greater than 0 in %s on 
line %d
+bool(false)
+
+Warning: time_nanosleep(): The nanoseconds value must be greater than 0 in %s 
on line %d
+bool(false)
+===DONE===

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-12 16:19:10 UTC (rev 324162)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-12 16:53:07 UTC (rev 324163)
@@ -87,6 +87,7 @@
 - Standard:
   . Fixed memory leak in substr_replace. (Pierrick)
   . Make max_file_uploads ini directive settable outside of php.ini (Rasmus)
+  . Fixed bug #60222 (time_nanosleep() does validate input params). (Ilia)
   . Fixed bug #60106 (stream_socket_server silently truncates long unix socket
 paths). (Ilia)


Modified: php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2012-03-12 
16:19:10 UTC (rev 324162)
+++ php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2012-03-12 
16:53:07 UTC (rev 324163)
@@ -4432,6 +4432,15 @@
return;
}

+   if (tv_sec < 0) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "The seconds value 
must be greater than 0");
+   RETURN_FALSE;
+   }
+   if (tv_nsec < 0) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "The nanoseconds 
value must be greater than 0");
+   RETURN_FALSE;
+   }
+
php_req.tv_sec = (time_t) tv_sec;
php_req.tv_nsec = tv_nsec;
if (!nanosleep(&php_req, &php_rem)) {

Added: php/php-src/branches/PHP_5_4/ext/standard/tests/time/bug60222.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/time/bug60222.phpt  
(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/time/bug60222.phpt  
2012-03-12 16:53:07 UTC (rev 324163)
@@ -0,0 +1,15 @@
+--TEST--
+Bug #60222 (t

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

[Rasmus Lerdorf]

rasmus   Mon, 12 Mar 2012 15:21:15 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324160

Log:
Remove reference to "default_charset" here since the it isn't
really about the ini option at all. That only comes into play
when you force it by passing and empty encoding string to those
functions.

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-12 14:52:02 UTC (rev 324159)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-12 15:21:15 UTC (rev 324160)
@@ -168,8 +168,8 @@
   . Changed error handlers to only generate docref links when the docref_root
 php.ini setting is not empty. (Derick)
   . Changed silent conversion of array to string to produce a notice. (Patrick)
-  . Changed default value of "default_charset" php.ini option from ISO-8859-1 
to
-UTF-8. (Rasmus)
+  . Changed default encoding from ISO-8859-1 to UTF-8 when not specified in
+htmlspecialchars and htmlentities. (Rasmus)
   . Changed casting of null/''/false into an Object when adding a property
 from E_STRICT into a warning. (Scott)
   . Changed E_ALL to include E_STRICT. (Stas)

-- 
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/bug61273.phpt branches/PHP_5_4/Zend/tests/bug61273.phpt trunk/Zend/tests/bug61273.phpt

[Xinchen Hui]

laruence Mon, 12 Mar 2012 14:52:02 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324159

Log:
reduce memory usage

Changed paths:
U   php/php-src/branches/PHP_5_3/Zend/tests/bug61273.phpt
U   php/php-src/branches/PHP_5_4/Zend/tests/bug61273.phpt
U   php/php-src/trunk/Zend/tests/bug61273.phpt

Modified: php/php-src/branches/PHP_5_3/Zend/tests/bug61273.phpt
===
--- php/php-src/branches/PHP_5_3/Zend/tests/bug61273.phpt   2012-03-12 
14:22:08 UTC (rev 324158)
+++ php/php-src/branches/PHP_5_3/Zend/tests/bug61273.phpt   2012-03-12 
14:52:02 UTC (rev 324159)
@@ -7,7 +7,7 @@
  * for 5.4 #define ZEND_VM_STACK_PAGE_SIZE ((16 * 1024) - 16)
  * we should trick EG(argument_stack) into growing
  */
-$args = array_fill(0, 64 * 1024 - 64, "*");
+$args = array_fill(0, 64 * 1024 - 64, 0);
 call_user_func_array(function(&$a) {}, $args);
 echo strval("okey");
 --EXPECTF--

Modified: php/php-src/branches/PHP_5_4/Zend/tests/bug61273.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/bug61273.phpt   2012-03-12 
14:22:08 UTC (rev 324158)
+++ php/php-src/branches/PHP_5_4/Zend/tests/bug61273.phpt   2012-03-12 
14:52:02 UTC (rev 324159)
@@ -7,7 +7,7 @@
  * for 5.4 #define ZEND_VM_STACK_PAGE_SIZE ((16 * 1024) - 16)
  * we should trick EG(argument_stack) into growing
  */
-$args = array_fill(0, 64 * 1024 - 64, "*");
+$args = array_fill(0, 64 * 1024 - 64, 0);
 call_user_func_array(function(&$a) {}, $args);
 echo strval("okey");
 --EXPECTF--

Modified: php/php-src/trunk/Zend/tests/bug61273.phpt
===
--- php/php-src/trunk/Zend/tests/bug61273.phpt  2012-03-12 14:22:08 UTC (rev 
324158)
+++ php/php-src/trunk/Zend/tests/bug61273.phpt  2012-03-12 14:52:02 UTC (rev 
324159)
@@ -7,7 +7,7 @@
  * for 5.4 #define ZEND_VM_STACK_PAGE_SIZE ((16 * 1024) - 16)
  * we should trick EG(argument_stack) into growing
  */
-$args = array_fill(0, 64 * 1024 - 64, "*");
+$args = array_fill(0, 64 * 1024 - 64, 0);
 call_user_func_array(function(&$a) {}, $args);
 echo strval("okey");
 --EXPECTF--

-- 
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/ UPGRADING

[Rasmus Lerdorf]

rasmus   Mon, 12 Mar 2012 06:11:58 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324124

Log:
This change was badly worded and filed in the wrong section.
This isn't an ini change at all.

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

Modified: php/php-src/branches/PHP_5_4/UPGRADING
===
--- php/php-src/branches/PHP_5_4/UPGRADING  2012-03-12 05:58:15 UTC (rev 
324123)
+++ php/php-src/branches/PHP_5_4/UPGRADING  2012-03-12 06:11:58 UTC (rev 
324124)
@@ -36,15 +36,6 @@
 1. Changes to INI directives
 =

-- The default character set is now UTF-8 when the default_charset
-  php.ini directive is not explicitly set. This applies to functions
-  such as htmlentities() and htmlspecialchars(). If you were relying
-  on the previous default of ISO-8859-1 you will need to add:
-
-default_charset = iso-8859-1
-
-  to your php.ini to preserve pre-PHP 5.4 behavior.
-
 - PHP 5.4 now checks at compile time if /dev/urandom or /dev/arandom
   are present.  If either is available, session.entropy_file now
   defaults to that file and session.entropy_length defaults to 32.
@@ -200,6 +191,13 @@

 - call_user_func_array() no longer allows call-time pass by reference.

+- the default character set for htmlspecialchars() and htmlentities() is
+  now UTF-8. In previous versions it was ISO-8859-1. Note that changing
+  your output charset via the php.ini default_charset directive does not
+  affect htmlspecialchars/htmlentities unless you are passing "" (an
+  empty string) as the encoding parameter to your htmlspecialchars/htmlentities
+  calls.
+
 - htmlentities() and htmlspecialchars() are stricter in the code units they
   accept for the asian encodings. For Big5-HKSCS, the octets 0x80 and 0xFF are
   rejected.  For GB2312/EUC-CN, the octets 0x8E, 0x8F, 0xA0 and 0xFF are

-- 
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/Zend/tests/bug60569.phpt branches/PHP_5_3/Zend/zend_exceptions.c branches/PHP_5_4/NEWS branches/PHP_5_4/Zend/tests/bug60569.phpt bra

[Ilia Alshanetsky]

iliaaSun, 11 Mar 2012 18:15:13 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324112

Log:
Fixed bug #60569 (Nullbyte truncates Exception $message).

Bug: https://bugs.php.net/60569 (Open) Nullbyte truncates Exception $message.
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
A   php/php-src/branches/PHP_5_3/Zend/tests/bug60569.phpt
U   php/php-src/branches/PHP_5_3/Zend/zend_exceptions.c
U   php/php-src/branches/PHP_5_4/NEWS
A   php/php-src/branches/PHP_5_4/Zend/tests/bug60569.phpt
U   php/php-src/branches/PHP_5_4/Zend/zend_exceptions.c
A   php/php-src/trunk/Zend/tests/bug60569.phpt
U   php/php-src/trunk/Zend/zend_exceptions.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-03-11 15:56:56 UTC (rev 324111)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-03-11 18:15:13 UTC (rev 324112)
@@ -21,6 +21,7 @@
   . Fixed bug #60825 (Segfault when running symfony 2 tests).
 (Dmitry, Laruence)
   . Fixed bug #60801 (strpbrk() mishandles NUL byte). (Adam)
+  . Fixed bug #60569 (Nullbyte truncates Exception $message). (Ilia)
   . Fixed bug #60227 (header() cannot detect the multi-line header with CR).
 (rui, Gustavo)
   . Fixed bug #52719 (array_walk_recursive crashes if third param of the

Added: php/php-src/branches/PHP_5_3/Zend/tests/bug60569.phpt
===
(Binary files differ)


Property changes on: php/php-src/branches/PHP_5_3/Zend/tests/bug60569.phpt
___
Added: svn:mime-type
   + application/octet-stream

Modified: php/php-src/branches/PHP_5_3/Zend/zend_exceptions.c
===
--- php/php-src/branches/PHP_5_3/Zend/zend_exceptions.c 2012-03-11 15:56:56 UTC 
(rev 324111)
+++ php/php-src/branches/PHP_5_3/Zend/zend_exceptions.c 2012-03-11 18:15:13 UTC 
(rev 324112)
@@ -192,7 +192,7 @@
object = getThis();

if (message) {
-   zend_update_property_string(default_exception_ce, object, 
"message", sizeof("message")-1, message TSRMLS_CC);
+   zend_update_property_stringl(default_exception_ce, object, 
"message", sizeof("message")-1, message, message_len TSRMLS_CC);
}

if (code) {

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-11 15:56:56 UTC (rev 324111)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-11 18:15:13 UTC (rev 324112)
@@ -32,6 +32,7 @@
 error). (Stefan)
   . Fixed bug #60573 (type hinting with "self" keyword causes weird errors).
 (Laruence)
+  . Fixed bug #60569 (Nullbyte truncates Exception $message). (Ilia)
   . Fixed bug #52719 (array_walk_recursive crashes if third param of the
 function is by reference). (Nikita Popov)


Added: php/php-src/branches/PHP_5_4/Zend/tests/bug60569.phpt
===
(Binary files differ)


Property changes on: php/php-src/branches/PHP_5_4/Zend/tests/bug60569.phpt
___
Added: svn:mime-type
   + application/octet-stream

Modified: php/php-src/branches/PHP_5_4/Zend/zend_exceptions.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_exceptions.c 2012-03-11 15:56:56 UTC 
(rev 324111)
+++ php/php-src/branches/PHP_5_4/Zend/zend_exceptions.c 2012-03-11 18:15:13 UTC 
(rev 324112)
@@ -205,7 +205,7 @@
object = getThis();

if (message) {
-   zend_update_property_string(default_exception_ce, object, 
"message", sizeof("message")-1, message TSRMLS_CC);
+   zend_update_property_stringl(default_exception_ce, object, 
"message", sizeof("message")-1, message, message_len TSRMLS_CC);
}

if (code) {

Added: php/php-src/trunk/Zend/tests/bug60569.phpt
===
(Binary files differ)


Property changes on: php/php-src/trunk/Zend/tests/bug60569.phpt
___
Added: svn:mime-type
   + application/octet-stream

Modified: php/php-src/trunk/Zend/zend_exceptions.c
===
--- php/php-src/trunk/Zend/zend_exceptions.c2012-03-11 15:56:56 UTC (rev 
324111)
+++ php/php-src/trunk/Zend/zend_exceptions.c2012-03-11 18:15:13 UTC (rev 
324112)
@@ -205,7 +205,7 @@
object = getThis();

if (message) {
-   zend_update_property_string(default_exception_ce, object, 
"message", sizeof("message")-1, message TSRMLS_CC);
+   zend_update_property_stringl(default_exception_ce, object, 
"message", sizeof("message")

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/spl/spl_directory.c branches/PHP_5_3/ext/spl/tests/SplFileInfo_001.phpt branches/PHP_5_4/ext/spl/spl_directory.c branches/PHP_5_

[Felipe Pena]

felipe   Sun, 11 Mar 2012 15:42:57 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324110

Log:
- Fixed memory leak when calling SplFileInfo's constructor twice

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c
A   php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_001.phpt
U   php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c
A   php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_001.phpt
U   php/php-src/trunk/ext/spl/spl_directory.c
A   php/php-src/trunk/ext/spl/tests/SplFileInfo_001.phpt

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-03-11 15:31:19 UTC (rev 324109)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-03-11 15:42:57 UTC (rev 324110)
@@ -71,6 +71,7 @@
 chunksize length line is > 10 bytes). (Ilia)

 - SPL
+  . Fixed memory leak when calling SplFileInfo's constructor twice. (Felipe)
   . Fixed bug #61347 (inconsistent isset behavior of Arrayobject). (Laruence)
   . Fixed bug #61326 (ArrayObject comparison). (Gustavo)


Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c
===
--- php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c2012-03-11 
15:31:19 UTC (rev 324109)
+++ php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c2012-03-11 
15:42:57 UTC (rev 324110)
@@ -366,6 +366,10 @@
 void spl_filesystem_info_set_filename(spl_filesystem_object *intern, char 
*path, int len, int use_copy TSRMLS_DC) /* {{{ */
 {
char *p1, *p2;
+
+   if (intern->file_name) {
+   efree(intern->file_name);
+   }

intern->file_name = use_copy ? estrndup(path, len) : path;
intern->file_name_len = len;
@@ -386,7 +390,10 @@
} else {
intern->_path_len = 0;
}
-
+
+   if (intern->_path) {
+   efree(intern->_path);
+   }
intern->_path = estrndup(path, intern->_path_len);
 } /* }}} */


Added: php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_001.phpt
===
--- php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_001.phpt 
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_001.phpt 
2012-03-11 15:42:57 UTC (rev 324110)
@@ -0,0 +1,11 @@
+--TEST--
+Testing SplFileInfo calling the constructor twice
+--FILE--
+__construct(1);
+
+echo "done!\n";
+?>
+--EXPECT--
+done!

Modified: php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c
===
--- php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c2012-03-11 
15:31:19 UTC (rev 324109)
+++ php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c2012-03-11 
15:42:57 UTC (rev 324110)
@@ -376,6 +376,10 @@
 void spl_filesystem_info_set_filename(spl_filesystem_object *intern, char 
*path, int len, int use_copy TSRMLS_DC) /* {{{ */
 {
char *p1, *p2;
+
+   if (intern->file_name) {
+   efree(intern->file_name);
+   }

intern->file_name = use_copy ? estrndup(path, len) : path;
intern->file_name_len = len;
@@ -396,7 +400,10 @@
} else {
intern->_path_len = 0;
}
-
+
+   if (intern->_path) {
+   efree(intern->_path);
+   }
intern->_path = estrndup(path, intern->_path_len);
 } /* }}} */


Added: php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_001.phpt
===
--- php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_001.phpt 
(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_001.phpt 
2012-03-11 15:42:57 UTC (rev 324110)
@@ -0,0 +1,11 @@
+--TEST--
+Testing SplFileInfo calling the constructor twice
+--FILE--
+__construct(1);
+
+echo "done!\n";
+?>
+--EXPECT--
+done!

Modified: php/php-src/trunk/ext/spl/spl_directory.c
===
--- php/php-src/trunk/ext/spl/spl_directory.c   2012-03-11 15:31:19 UTC (rev 
324109)
+++ php/php-src/trunk/ext/spl/spl_directory.c   2012-03-11 15:42:57 UTC (rev 
324110)
@@ -376,6 +376,10 @@
 void spl_filesystem_info_set_filename(spl_filesystem_object *intern, char 
*path, int len, int use_copy TSRMLS_DC) /* {{{ */
 {
char *p1, *p2;
+
+   if (intern->file_name) {
+   efree(intern->file_name);
+   }

intern->file_name = use_copy ? estrndup(path, len) : path;
intern->file_name_len = len;
@@ -396,7 +400,10 @@
} else {
intern->_path_len = 0;
}
-
+
+   if (intern->_path) {
+   efree(intern->_path);
+   }
intern->_path = estrndup(path, intern->_path_len);
 } /* }}} */


Added:

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/Zend/ zend_execute_API.c

[Xinchen Hui]

laruence Sun, 11 Mar 2012 15:31:19 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324109

Log:
Typo when merging from trunk

Changed paths:
U   php/php-src/branches/PHP_5_3/Zend/zend_execute_API.c

Modified: php/php-src/branches/PHP_5_3/Zend/zend_execute_API.c
===
--- php/php-src/branches/PHP_5_3/Zend/zend_execute_API.c2012-03-11 
15:28:31 UTC (rev 324108)
+++ php/php-src/branches/PHP_5_3/Zend/zend_execute_API.c2012-03-11 
15:31:19 UTC (rev 324109)
@@ -877,7 +877,7 @@

if (fci->no_separation &&

!ARG_MAY_BE_SENT_BY_REF(EX(function_state).function, i + 1)) {
-   if (i || 
UNEXPECTED(UNEXPECTED(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) == 
EG(argument_stack)->top))) {
+   if (i || 
UNEXPECTED(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) == 
EG(argument_stack)->top)) {
/* hack to clean up the stack */

zend_vm_stack_push_nocheck((void *) (zend_uintptr_t)i TSRMLS_CC);

zend_vm_stack_clear_multiple(TSRMLS_C);

-- 
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/Zend/tests/bug61273.phpt branches/PHP_5_3/Zend/zend_execute_API.c branches/PHP_5_4/NEWS branches/PHP_5_4/Zend/tests/bug61273.phpt br

[Xinchen Hui]

laruence Sun, 11 Mar 2012 15:28:31 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324108

Log:
Fixed bug #61273 (call_user_func_array with more than 16333 arguments leaks / 
crashes)

Bug: https://bugs.php.net/61273 (Assigned) call_user_func_array with more than 
16333 arguments leaks / crashes
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
A   php/php-src/branches/PHP_5_3/Zend/tests/bug61273.phpt
U   php/php-src/branches/PHP_5_3/Zend/zend_execute_API.c
U   php/php-src/branches/PHP_5_4/NEWS
A   php/php-src/branches/PHP_5_4/Zend/tests/bug61273.phpt
U   php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
A   php/php-src/trunk/Zend/tests/bug61273.phpt
U   php/php-src/trunk/Zend/zend_execute_API.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-03-11 15:12:28 UTC (rev 324107)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-03-11 15:28:31 UTC (rev 324108)
@@ -3,6 +3,8 @@
 ?? ??? 2012, PHP 5.3.11

 - Core:
+  . Fixed bug #61273 (call_user_func_array with more than 16333 arguments
+leaks / crashes). (Laruence)
   . Fixed bug #61165 (Segfault - strip_tags()). (Laruence)
   . Improved max_input_vars directive to check nested variables (Dmitry).
   . Fixed bug #61095 (Incorect lexing of 0x00*+). (Etienne)

Added: php/php-src/branches/PHP_5_3/Zend/tests/bug61273.phpt
===
--- php/php-src/branches/PHP_5_3/Zend/tests/bug61273.phpt   
(rev 0)
+++ php/php-src/branches/PHP_5_3/Zend/tests/bug61273.phpt   2012-03-11 
15:28:31 UTC (rev 324108)
@@ -0,0 +1,15 @@
+--TEST--
+Bug #61273 (call_user_func_array with more than 16333 arguments leaks / 
crashes)
+--FILE--
+no_separation &&

!ARG_MAY_BE_SENT_BY_REF(EX(function_state).function, i + 1)) {
-   if(i) {
+   if (i || 
UNEXPECTED(UNEXPECTED(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) == 
EG(argument_stack)->top))) {
/* hack to clean up the stack */

zend_vm_stack_push_nocheck((void *) (zend_uintptr_t)i TSRMLS_CC);

zend_vm_stack_clear_multiple(TSRMLS_C);

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-11 15:12:28 UTC (rev 324107)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-11 15:28:31 UTC (rev 324108)
@@ -8,6 +8,8 @@
   . "Connection: close" instead of "Connection: closed" (Gustavo)

 - Core:
+  . Fixed bug #61273 (call_user_func_array with more than 16333 arguments
+leaks / crashes). (Laruence)
   . Fixed bug #61225 (Incorect lexing of 0b00*+). (Pierrick)
   . Fixed bug #61165 (Segfault - strip_tags()). (Laruence)
   . Fixed bug #61106 (Segfault when using header_register_callback). (Nikita

Added: php/php-src/branches/PHP_5_4/Zend/tests/bug61273.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/bug61273.phpt   
(rev 0)
+++ php/php-src/branches/PHP_5_4/Zend/tests/bug61273.phpt   2012-03-11 
15:28:31 UTC (rev 324108)
@@ -0,0 +1,15 @@
+--TEST--
+Bug #61273 (call_user_func_array with more than 16333 arguments leaks / 
crashes)
+--FILE--
+no_separation &&

!ARG_MAY_BE_SENT_BY_REF(EX(function_state).function, i + 1)) {
-   if(i) {
+   if (i || 
UNEXPECTED(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) == 
(EG(argument_stack)->top))) {
/* hack to clean up the stack */

zend_vm_stack_push_nocheck((void *) (zend_uintptr_t)i TSRMLS_CC);

zend_vm_stack_clear_multiple(TSRMLS_C);

Added: php/php-src/trunk/Zend/tests/bug61273.phpt
===
--- php/php-src/trunk/Zend/tests/bug61273.phpt  (rev 0)
+++ php/php-src/trunk/Zend/tests/bug61273.phpt  2012-03-11 15:28:31 UTC (rev 
324108)
@@ -0,0 +1,15 @@
+--TEST--
+Bug #61273 (call_user_func_array with more than 16333 arguments leaks / 
crashes)
+--FILE--
+no_separation &&

!ARG_MAY_BE_SENT_BY_REF(EX(function_state).function, i + 1)) {
-   if(i) {
+   if (i || 
UNEXPECTED(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) == 
(EG(argument_stack)->top))) {
/* hack to clean up the stack */
  

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

[Xinchen Hui]

laruence Sun, 11 Mar 2012 15:12:28 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324107

Log:
Fix wrong type in the marco of fetching thread globals

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

Modified: php/php-src/branches/PHP_5_3/.gdbinit
===
--- php/php-src/branches/PHP_5_3/.gdbinit   2012-03-11 14:44:07 UTC (rev 
324106)
+++ php/php-src/branches/PHP_5_3/.gdbinit   2012-03-11 15:12:28 UTC (rev 
324107)
@@ -1,8 +1,8 @@
 define executor_globals
if basic_functions_module.zts
set $tsrm_ls = ts_resource_ex(0, 0)
-   set $eg = ((zend_executor_globals) (*((void ***) 
$tsrm_ls))[executor_globals_id-1])
-   set $cg = ((zend_compiler_globals) (*((void ***) 
$tsrm_ls))[compiler_globals_id-1])
+   set $eg = ((zend_executor_globals*) (*((void ***) 
$tsrm_ls))[executor_globals_id-1])
+   set $cg = ((zend_compiler_globals*) (*((void ***) 
$tsrm_ls))[compiler_globals_id-1])
else
set $eg = executor_globals
set $cg = compiler_globals

Modified: php/php-src/branches/PHP_5_4/.gdbinit
===
--- php/php-src/branches/PHP_5_4/.gdbinit   2012-03-11 14:44:07 UTC (rev 
324106)
+++ php/php-src/branches/PHP_5_4/.gdbinit   2012-03-11 15:12:28 UTC (rev 
324107)
@@ -1,8 +1,8 @@
 define executor_globals
if basic_functions_module.zts
set $tsrm_ls = ts_resource_ex(0, 0)
-   set $eg = ((zend_executor_globals) (*((void ***) 
$tsrm_ls))[executor_globals_id-1])
-   set $cg = ((zend_compiler_globals) (*((void ***) 
$tsrm_ls))[compiler_globals_id-1])
+   set $eg = ((zend_executor_globals*) (*((void ***) 
$tsrm_ls))[executor_globals_id-1])
+   set $cg = ((zend_compiler_globals*) (*((void ***) 
$tsrm_ls))[compiler_globals_id-1])
else
set $eg = executor_globals
set $cg = compiler_globals

Modified: php/php-src/trunk/.gdbinit
===
--- php/php-src/trunk/.gdbinit  2012-03-11 14:44:07 UTC (rev 324106)
+++ php/php-src/trunk/.gdbinit  2012-03-11 15:12:28 UTC (rev 324107)
@@ -1,8 +1,8 @@
 define executor_globals
if basic_functions_module.zts
set $tsrm_ls = ts_resource_ex(0, 0)
-   set $eg = ((zend_executor_globals) (*((void ***) 
$tsrm_ls))[executor_globals_id-1])
-   set $cg = ((zend_compiler_globals) (*((void ***) 
$tsrm_ls))[compiler_globals_id-1])
+   set $eg = ((zend_executor_globals*) (*((void ***) 
$tsrm_ls))[executor_globals_id-1])
+   set $cg = ((zend_compiler_globals*) (*((void ***) 
$tsrm_ls))[compiler_globals_id-1])
else
set $eg = executor_globals
set $cg = compiler_globals

-- 
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/tests/ bug60978.phpt

[Xinchen Hui]

laruence Sun, 11 Mar 2012 14:44:07 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324106

Log:
fix test

Changed paths:
U   php/php-src/trunk/Zend/tests/bug60978.phpt

Modified: php/php-src/trunk/Zend/tests/bug60978.phpt
===
--- php/php-src/trunk/Zend/tests/bug60978.phpt  2012-03-11 13:45:23 UTC (rev 
324105)
+++ php/php-src/trunk/Zend/tests/bug60978.phpt  2012-03-11 14:44:07 UTC (rev 
324106)
@@ -3,7 +3,7 @@
 --FILE--
 
 --EXPECT--

-- 
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/readline/readline.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/readline/readline.c trunk/ext/readline/readline.c

[Xinchen Hui]

laruence Sun, 11 Mar 2012 09:19:38 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324104

Log:
Fixed bug #61088 (Memory leak in readline_callback_handler_install).

Bug: https://bugs.php.net/61088 (Assigned) Memory leak in 
readline_callback_handler_install
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/readline/readline.c
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/ext/readline/readline.c
U   php/php-src/trunk/ext/readline/readline.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-03-11 09:12:25 UTC (rev 324103)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-03-11 09:19:38 UTC (rev 324104)
@@ -57,6 +57,10 @@
 - PHP-FPM SAPI:
   . Fixed bug #60811 (php-fpm compilation problem). (rasmus)

+- Readline:
+  . Fixed bug #61088 (Memory leak in readline_callback_handler_install).
+(Nikic, Laruence)
+
 - SOAP
   . Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)
   . Fixed bug #60887 (SoapClient ignores user_agent option and sends no

Modified: php/php-src/branches/PHP_5_3/ext/readline/readline.c
===
--- php/php-src/branches/PHP_5_3/ext/readline/readline.c2012-03-11 
09:12:25 UTC (rev 324103)
+++ php/php-src/branches/PHP_5_3/ext/readline/readline.c2012-03-11 
09:19:38 UTC (rev 324104)
@@ -561,9 +561,8 @@
FREE_ZVAL(_prepped_callback);
}

-   MAKE_STD_ZVAL(_prepped_callback);
-   *_prepped_callback = *callback;
-   zval_copy_ctor(_prepped_callback);
+   ALLOC_ZVAL(_prepped_callback);
+   MAKE_COPY_ZVAL(&callback, _prepped_callback);

rl_callback_handler_install(prompt, php_rl_callback_handler);


Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-11 09:12:25 UTC (rev 324103)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-11 09:19:38 UTC (rev 324104)
@@ -46,6 +46,10 @@
   . Fixed bug #60948 (mysqlnd FTBFS when -Wformat-security is enabled).
 (Johannes)

+- Readline:
+  . Fixed bug #61088 (Memory leak in readline_callback_handler_install).
+(Nikic, Laruence)
+
 - Session
   . Fixed bug #60634 (Segmentation fault when trying to die() in
 SessionHandler::write()). (Ilia)

Modified: php/php-src/branches/PHP_5_4/ext/readline/readline.c
===
--- php/php-src/branches/PHP_5_4/ext/readline/readline.c2012-03-11 
09:12:25 UTC (rev 324103)
+++ php/php-src/branches/PHP_5_4/ext/readline/readline.c2012-03-11 
09:19:38 UTC (rev 324104)
@@ -576,9 +576,8 @@
FREE_ZVAL(_prepped_callback);
}

-   MAKE_STD_ZVAL(_prepped_callback);
-   *_prepped_callback = *callback;
-   zval_copy_ctor(_prepped_callback);
+   ALLOC_ZVAL(_prepped_callback);
+   MAKE_COPY_ZVAL(&callback, _prepped_callback);

rl_callback_handler_install(prompt, php_rl_callback_handler);


Modified: php/php-src/trunk/ext/readline/readline.c
===
--- php/php-src/trunk/ext/readline/readline.c   2012-03-11 09:12:25 UTC (rev 
324103)
+++ php/php-src/trunk/ext/readline/readline.c   2012-03-11 09:19:38 UTC (rev 
324104)
@@ -576,9 +576,8 @@
FREE_ZVAL(_prepped_callback);
}

-   MAKE_STD_ZVAL(_prepped_callback);
-   *_prepped_callback = *callback;
-   zval_copy_ctor(_prepped_callback);
+   ALLOC_ZVAL(_prepped_callback);
+   MAKE_COPY_ZVAL(&callback, _prepped_callback);

rl_callback_handler_install(prompt, php_rl_callback_handler);


-- 
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/ NEWS

[Xinchen Hui]

laruence Sun, 11 Mar 2012 09:07:02 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324101

Log:
Same wrong order here

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-11 09:06:12 UTC (rev 324100)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-11 09:07:02 UTC (rev 324101)
@@ -61,10 +61,10 @@
 object). (Laruence)

 - PDO_mysql
+  . Fixed bug #61207 (PDO::nextRowset() after a multi-statement query doesn't
+always work). (Johannes)
   . Fixed bug #61194 (PDO should export compression flag with myslqnd).
 (Johannes)
-  . Fixed bug #61207 (PDO::nextRowset() after a multi-statement query doesn't
-always work). (Johannes)

 - Phar
   . Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL

-- 
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

[Xinchen Hui]

laruence Sun, 11 Mar 2012 09:06:12 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324100

Log:
Sorry for wrong order again.

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-03-11 09:02:00 UTC (rev 324099)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-03-11 09:06:12 UTC (rev 324100)
@@ -38,10 +38,10 @@
   . Fixed bug #61003 (mysql_stat() require a valid connection). (Johannes).

 - PDO_mysql
+  . Fixed bug #61207 (PDO::nextRowset() after a multi-statement query doesn't
+always work). (Johannes)
   . Fixed bug #61194 (PDO should export compression flag with myslqnd).
 (Johannes)
-  . Fixed bug #61207 (PDO::nextRowset() after a multi-statement query doesn't
-always work). (Johannes)

 - PDO_pgsql
   . Fixed bug #61267 (pdo_pgsql's PDO::exec() returns the number of SELECTed

-- 
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 PHP_5_4/NEWS

[Xinchen Hui]

laruence Sun, 11 Mar 2012 09:02:00 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324099

Log:
Re-order them according to README.SVN-RULES

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-03-11 08:56:14 UTC (rev 324098)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-03-11 09:02:00 UTC (rev 324099)
@@ -38,10 +38,10 @@
   . Fixed bug #61003 (mysql_stat() require a valid connection). (Johannes).

 - PDO_mysql
+  . Fixed bug #61194 (PDO should export compression flag with myslqnd).
+(Johannes)
   . Fixed bug #61207 (PDO::nextRowset() after a multi-statement query doesn't
 always work). (Johannes)
-  . Fixed bug #61194 (PDO should export compression flag with myslqnd).
-(Johannes)

 - PDO_pgsql
   . Fixed bug #61267 (pdo_pgsql's PDO::exec() returns the number of SELECTed
@@ -59,14 +59,14 @@

 - SOAP
   . Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)
+  . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
+User-Agent header). (carloschilazo at gmail dot com)
   . Fixed bug #60842, #51775 (Chunked response parsing error when
 chunksize length line is > 10 bytes). (Ilia)
-  . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
-User-Agent header). (carloschilazo at gmail dot com)

 - SPL
+  . Fixed bug #61347 (inconsistent isset behavior of Arrayobject). (Laruence)
   . Fixed bug #61326 (ArrayObject comparison). (Gustavo)
-  . Fixed bug #61347 (inconsistent isset behavior of Arrayobject). (Laruence)

 - SQLite3 extension:
   . Add createCollation() method. (Brad Dewar)
@@ -86,20 +86,20 @@
 (Gustavo)
   . Fixed bug #61115 (stream related segfault on fatal error in
 php_stream_context_link). (Gustavo)
-  . Fixed bug #60106 (stream_socket_server silently truncates long unix
-socket paths). (Ilia)
-  . Further fix for bug #60455 (stream_get_line misbehaves if EOF is not
-detected together with the last read). (Gustavo)
   . Fixed bug #60817 (stream_get_line() reads from stream even when there is
 already sufficient data buffered). stream_get_line() now behaves more like
 fgets(), as is documented. (Gustavo)
+  . Further fix for bug #60455 (stream_get_line misbehaves if EOF is not
+detected together with the last read). (Gustavo)
+  . Fixed bug #60106 (stream_socket_server silently truncates long unix
+socket paths). (Ilia)

 - Tidy:
   . Fixed bug #54682 (tidy null pointer dereference). (Tony, David Soria Parra)

 - XMLRPC:
+  . Fixed bug #61264 (xmlrpc_parse_method_descriptions leaks temporary 
variable). (Nikita Popov)
   . Fixed bug #61097 (Memory leak in xmlrpc functions copying zvals). (Nikic)
-  . Fixed bug #61264 (xmlrpc_parse_method_descriptions leaks temporary 
variable). (Nikita Popov)

 - Zlib:
   . Fixed bug #61139 (gzopen leaks when specifying invalid mode). (Nikic)

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-11 08:56:14 UTC (rev 324098)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-11 09:02:00 UTC (rev 324099)
@@ -3,9 +3,9 @@
 ?? ??? 2012, PHP 5.4.1 RC1

 - CLI Server:
-  . "Connection: close" instead of "Connection: closed" (Gustavo)
   . Implemented FR #60850 (Built in web server does not set
 $_SERVER['SCRIPT_FILENAME'] when using router). (Laruence)
+  . "Connection: close" instead of "Connection: closed" (Gustavo)

 - Core:
   . Fixed bug #61225 (Incorect lexing of 0b00*+). (Pierrick)
@@ -51,20 +51,20 @@
 SessionHandler::write()). (Ilia)

 - SOAP
+  . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
+User-Agent header). (carloschilazo at gmail dot com)
   . Fixed bug #60842, #51775 (Chunked response parsing error when
 chunksize length line is > 10 bytes). (Ilia)
-  . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
-User-Agent header). (carloschilazo at gmail dot com)

 - PDO
   . Fixed bug #61292 (Segfault while calling a method on an overloaded PDO
 object). (Laruence)

 - PDO_mysql
+  . Fixed bug #61194 (PDO should export compression flag with myslqnd).
+(Johannes)
   . Fixed bug #61207 (PDO::nextRowset() after a multi-statement query doesn't
 always work). (Johannes)
-  . Fixed bug #61194 (PDO should export compression flag with myslqnd).
-(Johannes)

 - Phar
   . Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL

-- 
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/NEWS branches/PHP_5_4/sapi/cli/php_cli_server.c branches/PHP_5_4/sapi/cli/tests/php_cli_server_017.phpt trunk/sapi/cli/php_cli_server.c trunk/sapi/cli/tes

[Xinchen Hui]

laruence Sun, 11 Mar 2012 08:56:14 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324098

Log:
Implemented FR #60850 (Built in web server does not set 
$_SERVER['SCRIPT_FILENAME'] when using router)

Bug: https://bugs.php.net/60850 (Open) Built in web server does not set 
$_SERVER['SCRIPT_FILENAME'] when using router
  
Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
A   php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_017.phpt
U   php/php-src/trunk/sapi/cli/php_cli_server.c
A   php/php-src/trunk/sapi/cli/tests/php_cli_server_017.phpt

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-11 08:41:40 UTC (rev 324097)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-11 08:56:14 UTC (rev 324098)
@@ -4,6 +4,8 @@

 - CLI Server:
   . "Connection: close" instead of "Connection: closed" (Gustavo)
+  . Implemented FR #60850 (Built in web server does not set
+$_SERVER['SCRIPT_FILENAME'] when using router). (Laruence)

 - Core:
   . Fixed bug #61225 (Incorect lexing of 0b00*+). (Pierrick)

Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
===
--- php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c  2012-03-11 
08:41:40 UTC (rev 324097)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c  2012-03-11 
08:56:14 UTC (rev 324098)
@@ -599,6 +599,11 @@
sapi_cli_server_register_variable(track_vars_array, "SCRIPT_NAME", 
client->request.vpath TSRMLS_CC);
if (SG(request_info).path_translated) {
sapi_cli_server_register_variable(track_vars_array, 
"SCRIPT_FILENAME", SG(request_info).path_translated TSRMLS_CC);
+   } else if (client->server->router) {
+   char *temp;
+   spprintf(&temp, 0, "%s/%s", client->server->document_root, 
client->server->router);
+   sapi_cli_server_register_variable(track_vars_array, 
"SCRIPT_FILENAME", temp TSRMLS_CC);
+   efree(temp);
}
if (client->request.path_info) {
sapi_cli_server_register_variable(track_vars_array, 
"PATH_INFO", client->request.path_info TSRMLS_CC);

Added: php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_017.phpt
===
--- php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_017.phpt 
(rev 0)
+++ php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_017.phpt 
2012-03-11 08:56:14 UTC (rev 324098)
@@ -0,0 +1,44 @@
+--TEST--
+Implement Req #60850 (Built in web server does not set 
$_SERVER['SCRIPT_FILENAME'] when using router)
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+HTTP/1.1 200 OK
+Host: %s
+Connection: close
+X-Powered-By: %s
+Content-type: text/html
+
+string(%d) "%s/tests/index.php"

Modified: php/php-src/trunk/sapi/cli/php_cli_server.c
===
--- php/php-src/trunk/sapi/cli/php_cli_server.c 2012-03-11 08:41:40 UTC (rev 
324097)
+++ php/php-src/trunk/sapi/cli/php_cli_server.c 2012-03-11 08:56:14 UTC (rev 
324098)
@@ -599,6 +599,11 @@
sapi_cli_server_register_variable(track_vars_array, "SCRIPT_NAME", 
client->request.vpath TSRMLS_CC);
if (SG(request_info).path_translated) {
sapi_cli_server_register_variable(track_vars_array, 
"SCRIPT_FILENAME", SG(request_info).path_translated TSRMLS_CC);
+   } else if (client->server->router) {
+   char *temp;
+   spprintf(&temp, 0, "%s/%s", client->server->document_root, 
client->server->router);
+   sapi_cli_server_register_variable(track_vars_array, 
"SCRIPT_FILENAME", temp TSRMLS_CC);
+   efree(temp);
}
if (client->request.path_info) {
sapi_cli_server_register_variable(track_vars_array, 
"PATH_INFO", client->request.path_info TSRMLS_CC);

Added: php/php-src/trunk/sapi/cli/tests/php_cli_server_017.phpt
===
--- php/php-src/trunk/sapi/cli/tests/php_cli_server_017.phpt
(rev 0)
+++ php/php-src/trunk/sapi/cli/tests/php_cli_server_017.phpt2012-03-11 
08:56:14 UTC (rev 324098)
@@ -0,0 +1,44 @@
+--TEST--
+Implement Req #60850 (Built in web server does not set 
$_SERVER['SCRIPT_FILENAME'] when using router)
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+HTTP/1.1 200 OK
+Host: %s
+Connection: close
+X-Powered-By: %s
+Content-type: text/html
+
+string(%d) "%s/tests/index.php"

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/sapi/cli/CREDITS branches/PHP_5_4/sapi/cli/php_cli_server.c trunk/sapi/cli/CREDITS trunk/sapi/cli/php_cli_server.c

[Xinchen Hui]

laruence Sun, 11 Mar 2012 08:41:40 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324097

Log:
Add Moriyoshi Koizumi and I to the cli SAPI credits

Changed paths:
U   php/php-src/branches/PHP_5_4/sapi/cli/CREDITS
U   php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
U   php/php-src/trunk/sapi/cli/CREDITS
U   php/php-src/trunk/sapi/cli/php_cli_server.c

Modified: php/php-src/branches/PHP_5_4/sapi/cli/CREDITS
===
--- php/php-src/branches/PHP_5_4/sapi/cli/CREDITS   2012-03-11 08:40:25 UTC 
(rev 324096)
+++ php/php-src/branches/PHP_5_4/sapi/cli/CREDITS   2012-03-11 08:41:40 UTC 
(rev 324097)
@@ -1,2 +1,2 @@
 CLI
-Edin Kadribasic, Marcus Boerger, Johannes Schlueter
+Edin Kadribasic, Marcus Boerger, Johannes Schlueter, Moriyoshi Koizumi, 
Xinchen Hui

Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
===
--- php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c  2012-03-11 
08:40:25 UTC (rev 324096)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c  2012-03-11 
08:41:40 UTC (rev 324097)
@@ -13,6 +13,7 @@
| lice...@php.net so we can mail you a copy immediately.   |
+--+
| Author: Moriyoshi Koizumi |
+   | Xinchen Hui|
+--+
 */


Modified: php/php-src/trunk/sapi/cli/CREDITS
===
--- php/php-src/trunk/sapi/cli/CREDITS  2012-03-11 08:40:25 UTC (rev 324096)
+++ php/php-src/trunk/sapi/cli/CREDITS  2012-03-11 08:41:40 UTC (rev 324097)
@@ -1,2 +1,2 @@
 CLI
-Edin Kadribasic, Marcus Boerger, Johannes Schlueter
+Edin Kadribasic, Marcus Boerger, Johannes Schlueter, Moriyoshi Koizumi, 
Xinchen Hui

Modified: php/php-src/trunk/sapi/cli/php_cli_server.c
===
--- php/php-src/trunk/sapi/cli/php_cli_server.c 2012-03-11 08:40:25 UTC (rev 
324096)
+++ php/php-src/trunk/sapi/cli/php_cli_server.c 2012-03-11 08:41:40 UTC (rev 
324097)
@@ -13,6 +13,7 @@
| lice...@php.net so we can mail you a copy immediately.   |
+--+
| Author: Moriyoshi Koizumi |
+   | Xinchen Hui|
+--+
 */


-- 
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 PHP_5_4/NEWS

[Xinchen Hui]

laruence Sun, 11 Mar 2012 08:34:06 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324095

Log:
Oops, sorry for my poor english

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

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-03-11 08:30:30 UTC (rev 324094)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-03-11 08:34:06 UTC (rev 324095)
@@ -66,7 +66,7 @@

 - SPL
   . Fixed bug #61326 (ArrayObject comparison). (Gustavo)
-  . Fixed bug #61347 (inconsist isset behavior of Arrayobject). (Laruence)
+  . Fixed bug #61347 (inconsistent isset behavior of Arrayobject). (Laruence)

 - SQLite3 extension:
   . Add createCollation() method. (Brad Dewar)

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-11 08:30:30 UTC (rev 324094)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-11 08:34:06 UTC (rev 324095)
@@ -73,7 +73,7 @@
 ReflectionMethod::invokeArgs()). (Laruence)

 - SPL:
-  . Fixed bug #61347 (inconsist isset behavior of Arrayobject). (Laruence)
+  . Fixed bug #61347 (inconsistent isset behavior of Arrayobject). (Laruence)

 - Standard:
   . Fixed memory leak in substr_replace. (Pierrick)

-- 
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/spl/tests/ bug60082.phpt

[Xinchen Hui]

laruence Sun, 11 Mar 2012 08:30:30 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324094

Log:
Fix test

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/spl/tests/bug60082.phpt

Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/bug60082.phpt
===
--- php/php-src/branches/PHP_5_3/ext/spl/tests/bug60082.phpt2012-03-11 
08:27:55 UTC (rev 324093)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/bug60082.phpt2012-03-11 
08:30:30 UTC (rev 324094)
@@ -16,4 +16,6 @@
 ===DONE===
 
 --EXPECTF--
+Deprecated: Call-time pass-by-reference has been deprecated in %sbug60082.php 
on line %d
+
 Fatal error: main(): Nesting level too deep - recursive dependency? in 
%sbug60082.php on line %d

-- 
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/spl/spl_array.c branches/PHP_5_3/ext/spl/tests/bug61347.phpt branches/PHP_5_4/NEWS branches/PHP_5_4/ext/spl/spl_array.c branches

[Xinchen Hui]

laruence Sun, 11 Mar 2012 08:27:55 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324093

Log:
Fixed bug #61347 (inconsist isset behavior of Arrayobject)

Bug: https://bugs.php.net/61347 (Open) inconsist isset behavior of Arrayobject
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/spl/spl_array.c
A   php/php-src/branches/PHP_5_3/ext/spl/tests/bug61347.phpt
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/ext/spl/spl_array.c
A   php/php-src/branches/PHP_5_4/ext/spl/tests/bug61347.phpt
U   php/php-src/trunk/ext/spl/spl_array.c
A   php/php-src/trunk/ext/spl/tests/bug61347.phpt

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS	2012-03-11 04:20:25 UTC (rev 324092)
+++ php/php-src/branches/PHP_5_3/NEWS	2012-03-11 08:27:55 UTC (rev 324093)
@@ -66,6 +66,7 @@

 - SPL
   . Fixed bug #61326 (ArrayObject comparison). (Gustavo)
+  . Fixed bug #61347 (inconsist isset behavior of Arrayobject). (Laruence)

 - SQLite3 extension:
   . Add createCollation() method. (Brad Dewar)

Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_array.c
===
--- php/php-src/branches/PHP_5_3/ext/spl/spl_array.c	2012-03-11 04:20:25 UTC (rev 324092)
+++ php/php-src/branches/PHP_5_3/ext/spl/spl_array.c	2012-03-11 08:27:55 UTC (rev 324093)
@@ -578,49 +578,46 @@
 	}

 	switch(Z_TYPE_P(offset)) {
-	case IS_STRING:
-		if (check_empty) {
-			if (zend_symtable_find(spl_array_get_hash_table(intern, 0 TSRMLS_CC), Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void **) &tmp) != FAILURE) {
-switch (check_empty) {
-	case 0:
-		return Z_TYPE_PP(tmp) != IS_NULL;
-	case 2:
-		return 1;
-	default:
-		return zend_is_true(*tmp);
+		case IS_STRING:
+			{
+HashTable *ht = spl_array_get_hash_table(intern, 0 TSRMLS_CC);
+if (zend_symtable_find(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void **) &tmp) != FAILURE) {
+	switch (check_empty) {
+		case 0:
+			return Z_TYPE_PP(tmp) != IS_NULL;
+		case 2:
+			return 1;
+		default:
+			return zend_is_true(*tmp);
+	}
 }
+return 0;
 			}
-			return 0;
-		} else {
-			return zend_symtable_exists(spl_array_get_hash_table(intern, 0 TSRMLS_CC), Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1);
-		}
-	case IS_DOUBLE:
-	case IS_RESOURCE:
-	case IS_BOOL:
-	case IS_LONG:
-		if (offset->type == IS_DOUBLE) {
-			index = (long)Z_DVAL_P(offset);
-		} else {
-			index = Z_LVAL_P(offset);
-		}
-		if (check_empty) {
-			HashTable *ht = spl_array_get_hash_table(intern, 0 TSRMLS_CC);
-			if (zend_hash_index_find(ht, index, (void **)&tmp) != FAILURE) {
-switch (check_empty) {
-	case 0:
-		return Z_TYPE_PP(tmp) != IS_NULL;
-	case 2:
-		return 1;
-	default:
-		return zend_is_true(*tmp);
+		case IS_DOUBLE:
+		case IS_RESOURCE:
+		case IS_BOOL:
+		case IS_LONG:
+			{
+HashTable *ht = spl_array_get_hash_table(intern, 0 TSRMLS_CC);
+if (offset->type == IS_DOUBLE) {
+	index = (long)Z_DVAL_P(offset);
+} else {
+	index = Z_LVAL_P(offset);
 }
+if (zend_hash_index_find(ht, index, (void **)&tmp) != FAILURE) {
+	switch (check_empty) {
+		case 0:
+			return Z_TYPE_PP(tmp) != IS_NULL;
+		case 2:
+			return 1;
+		default:
+			return zend_is_true(*tmp);
+	}
+}
+return 0;
 			}
-			return 0;
-		} else {
-			return zend_hash_index_exists(spl_array_get_hash_table(intern, 0 TSRMLS_CC), index);
-		}
-	default:
-		zend_error(E_WARNING, "Illegal offset type");
+		default:
+			zend_error(E_WARNING, "Illegal offset type");
 	}
 	return 0;
 } /* }}} */

Added: php/php-src/branches/PHP_5_3/ext/spl/tests/bug61347.phpt
===
--- php/php-src/branches/PHP_5_3/ext/spl/tests/bug61347.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/bug61347.phpt	2012-03-11 08:27:55 UTC (rev 324093)
@@ -0,0 +1,40 @@
+--TEST--
+Bug #61347 (inconsist isset behavior of Arrayobject)
+--FILE--
+ NULL, 37 => NULL);
+var_dump(isset($a['b'])); //false
+
+$b = new ArrayObject($a);
+var_dump(isset($b['b'])); //false
+var_dump(isset($b[37])); //false
+var_dump(isset($b['no_exists'])); //false
+var_dump(empty($b['b'])); //true
+var_dump(empty($b[37])); //true
+
+var_dump(array_key_exists('b', $b)); //true
+var_dump($b['b']);
+
+$a = array('b' => '', 37 => false);
+$b = new ArrayObject($a);
+var_dump(isset($b['b'])); //true
+var_dump(isset($b[37])); //true
+var_dump(isset($b['no_exists'])); //false
+var_dump(empty($b['b'])); //true
+var_dump(empty($b[37])); //true
+
+
+--EXPECT--
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+bool(true)
+NULL
+bool(true)
+bool(true)
+bool(false)
+bool(true)
+bool(true)

Modifi

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/spl/spl_array.c branches/PHP_5_3/ext/spl/tests/bug61326.phpt branches/PHP_5_4/ext/spl/spl_array.c branches/PHP_5_4/ext/spl/tests

[Gustavo André dos Santos Lopes]

cataphract   Sat, 10 Mar 2012 17:19:39 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324082

Log:
- Fixed bug #61326 (ArrayObject comparison).

Bug: https://bugs.php.net/61326 (Assigned) ArrayObject comparison
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/spl/spl_array.c
A   php/php-src/branches/PHP_5_3/ext/spl/tests/bug61326.phpt
U   php/php-src/branches/PHP_5_4/ext/spl/spl_array.c
A   php/php-src/branches/PHP_5_4/ext/spl/tests/bug61326.phpt
U   php/php-src/trunk/ext/spl/spl_array.c
A   php/php-src/trunk/ext/spl/tests/bug61326.phpt

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS	2012-03-10 16:24:37 UTC (rev 324081)
+++ php/php-src/branches/PHP_5_3/NEWS	2012-03-10 17:19:39 UTC (rev 324082)
@@ -47,6 +47,9 @@
   . Fixed bug #61267 (pdo_pgsql's PDO::exec() returns the number of SELECTed
 rows on postgresql >= 9). (ben dot pineau at gmail dot com)

+- PDO_Sqlite extension:
+  . Add createCollation support. (Damien)
+
 - Phar:
   . Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL
 bytes). (Nikic)
@@ -60,13 +63,13 @@
 chunksize length line is > 10 bytes). (Ilia)
   . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
 User-Agent header). (carloschilazo at gmail dot com)
-
+
+- SPL
+  . Fixed bug #61326 (ArrayObject comparison). (Gustavo)
+
 - SQLite3 extension:
   . Add createCollation() method. (Brad Dewar)

-- PDO_Sqlite extension:
-  . Add createCollation support. (Damien)
-
 - Reflection:
   . Fixed bug #60968 (Late static binding doesn't work with
 ReflectionMethod::invokeArgs()). (Laruence)

Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_array.c
===
--- php/php-src/branches/PHP_5_3/ext/spl/spl_array.c	2012-03-10 16:24:37 UTC (rev 324081)
+++ php/php-src/branches/PHP_5_3/ext/spl/spl_array.c	2012-03-10 17:19:39 UTC (rev 324082)
@@ -836,6 +836,30 @@
 	std_object_handlers.unset_property(object, member TSRMLS_CC);
 } /* }}} */

+static int spl_array_compare_objects(zval *o1, zval *o2 TSRMLS_DC) /* {{{ */
+{
+	HashTable			*ht1,
+		*ht2;
+	spl_array_object	*intern1,
+		*intern2;
+	int	result	= 0;
+	zvaltemp_zv;
+
+	intern1	= (spl_array_object*)zend_object_store_get_object(o1 TSRMLS_CC);
+	intern2	= (spl_array_object*)zend_object_store_get_object(o2 TSRMLS_CC);
+	ht1		= spl_array_get_hash_table(intern1, 0 TSRMLS_CC);
+	ht2		= spl_array_get_hash_table(intern2, 0 TSRMLS_CC);
+
+	zend_compare_symbol_tables(&temp_zv, ht1, ht2 TSRMLS_CC);
+	result = (int)Z_LVAL(temp_zv);
+	/* if we just compared std.properties, don't do it again */
+	if (result == 0 &&
+			!(ht1 == intern1->std.properties && ht2 == intern2->std.properties)) {
+		result = std_object_handlers.compare_objects(o1, o2 TSRMLS_CC);
+	}
+	return result;
+} /* }}} */
+
 static int spl_array_skip_protected(spl_array_object *intern, HashTable *aht TSRMLS_DC) /* {{{ */
 {
 	char *string_key;
@@ -2003,6 +2027,8 @@
 	spl_handler_ArrayObject.has_property = spl_array_has_property;
 	spl_handler_ArrayObject.unset_property = spl_array_unset_property;

+	spl_handler_ArrayObject.compare_objects = spl_array_compare_objects;
+
 	REGISTER_SPL_STD_CLASS_EX(ArrayIterator, spl_array_object_new, spl_funcs_ArrayIterator);
 	REGISTER_SPL_IMPLEMENTS(ArrayIterator, Iterator);
 	REGISTER_SPL_IMPLEMENTS(ArrayIterator, ArrayAccess);

Added: php/php-src/branches/PHP_5_3/ext/spl/tests/bug61326.phpt
===
--- php/php-src/branches/PHP_5_3/ext/spl/tests/bug61326.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/bug61326.phpt	2012-03-10 17:19:39 UTC (rev 324082)
@@ -0,0 +1,17 @@
+--TEST--
+Bug #61326: ArrayObject comparison
+--FILE--
+foo = 'bar';
+var_dump($aobj1 == $aobj3);
+--EXPECT--
+bool(false)
+bool(true)
+bool(false)


Property changes on: php/php-src/branches/PHP_5_3/ext/spl/tests/bug61326.phpt
___
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Modified: php/php-src/branches/PHP_5_4/ext/spl/spl_array.c
===
--- php/php-src/branches/PHP_5_4/ext/spl/spl_array.c	2012-03-10 16:24:37 UTC (rev 324081)
+++ php/php-src/branches/PHP_5_4/ext/spl/spl_array.c	2012-03-10 17:19:39 UTC (rev 324082)
@@ -862,6 +862,30 @@
 	std_object_handlers.unset_property(object, member, key TSRMLS_CC);
 } /* }}} */

+static int spl_array_compare_objects(zval *o1, zval *o2 TSRMLS_DC) /* {{{ */
+{
+	HashTable			*ht1,
+		*ht2;
+	spl_array_object	*intern1,
+		*intern2;
+	int	result	= 0;
+	zvaltemp_zv;
+
+	intern1	= (spl_array_object*)zend_object_store_get_object(o1 TSRMLS_CC);
+	intern2	= (

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

[Michael Wallner]

mike Fri, 09 Mar 2012 19:51:09 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324068

Log:
merge 322758 (detect a php-cgi which is a sibling of php cli)

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


Property changes on: php/php-src/branches/PHP_5_3
___
Modified: svn:mergeinfo
   - /php/php-src/trunk:284726,305015,305018-305019
   + /php/php-src/trunk:284726,305015,305018-305019,322758

Modified: php/php-src/branches/PHP_5_3/run-tests.php
===
--- php/php-src/branches/PHP_5_3/run-tests.php  2012-03-09 18:38:18 UTC (rev 
324067)
+++ php/php-src/branches/PHP_5_3/run-tests.php  2012-03-09 19:51:09 UTC (rev 
324068)
@@ -1357,6 +1357,9 @@
} else if (file_exists("./sapi/cgi/php-cgi")) {
$old_php = $php;
$php = realpath("./sapi/cgi/php-cgi") . ' -C ';
+   } else if (file_exists(dirname($php) . "/php-cgi")) {
+   $old_php = $php;
+   $php = realpath(dirname($php) . "/php-cgi") . ' 
-C ';
} else {
show_result('SKIP', $tested, $tested_file, 
"reason: CGI not available");
if ($JUNIT) {


Property changes on: php/php-src/branches/PHP_5_4
___
Modified: svn:mergeinfo
   - /php/php-src/trunk:284726,322419,322421,322423,322963
   + /php/php-src/trunk:284726,322419,322421,322423,322758,322963

Modified: php/php-src/branches/PHP_5_4/run-tests.php
===
--- php/php-src/branches/PHP_5_4/run-tests.php  2012-03-09 18:38:18 UTC (rev 
324067)
+++ php/php-src/branches/PHP_5_4/run-tests.php  2012-03-09 19:51:09 UTC (rev 
324068)
@@ -1357,6 +1357,9 @@
} else if (file_exists("./sapi/cgi/php-cgi")) {
$old_php = $php;
$php = realpath("./sapi/cgi/php-cgi") . ' -C ';
+   } else if (file_exists(dirname($php) . "/php-cgi")) {
+   $old_php = $php;
+   $php = realpath(dirname($php) . "/php-cgi") . ' 
-C ';
} else {
show_result('SKIP', $tested, $tested_file, 
"reason: CGI not available");
if ($JUNIT) {

-- 
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/soap/php_http.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/soap/php_http.c trunk/ext/soap/php_http.c

[Ilia Alshanetsky]

iliaaThu, 08 Mar 2012 20:14:26 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324027

Log:
Fixed bug #60842, #51775 (Chunked response parsing error when chunksize length 
line is > 10 bytes).

Bugs: https://bugs.php.net/60842 (Open) CR+LF bug on chunk_size
  https://bugs.php.net/51775 (Feedback) Chunked response parsing error
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/soap/php_http.c
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/ext/soap/php_http.c
U   php/php-src/trunk/ext/soap/php_http.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-03-08 19:31:57 UTC (rev 324026)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-03-08 20:14:26 UTC (rev 324027)
@@ -56,6 +56,8 @@

 - SOAP
   . Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)
+  . Fixed bug #60842, #51775 (Chunked response parsing error when
+chunksize length line is > 10 bytes). (Ilia)
   . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
 User-Agent header). (carloschilazo at gmail dot com)


Modified: php/php-src/branches/PHP_5_3/ext/soap/php_http.c
===
--- php/php-src/branches/PHP_5_3/ext/soap/php_http.c2012-03-08 19:31:57 UTC 
(rev 324026)
+++ php/php-src/branches/PHP_5_3/ext/soap/php_http.c2012-03-08 20:14:26 UTC 
(rev 324027)
@@ -1311,15 +1311,15 @@
}

if (header_chunked) {
-   char ch, done, chunk_size[10], headerbuf[8192];
+   char ch, done, headerbuf[8192];

done = FALSE;

while (!done) {
int buf_size = 0;

-   php_stream_gets(stream, chunk_size, sizeof(chunk_size));
-   if (sscanf(chunk_size, "%x", &buf_size) > 0 ) {
+   php_stream_gets(stream, headerbuf, sizeof(headerbuf));
+   if (sscanf(headerbuf, "%x", &buf_size) > 0 ) {
if (buf_size > 0) {
int len_size = 0;


Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-08 19:31:57 UTC (rev 324026)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-08 20:14:26 UTC (rev 324027)
@@ -49,6 +49,8 @@
 SessionHandler::write()). (Ilia)

 - SOAP
+  . Fixed bug #60842, #51775 (Chunked response parsing error when
+chunksize length line is > 10 bytes). (Ilia)
   . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
 User-Agent header). (carloschilazo at gmail dot com)


Modified: php/php-src/branches/PHP_5_4/ext/soap/php_http.c
===
--- php/php-src/branches/PHP_5_4/ext/soap/php_http.c2012-03-08 19:31:57 UTC 
(rev 324026)
+++ php/php-src/branches/PHP_5_4/ext/soap/php_http.c2012-03-08 20:14:26 UTC 
(rev 324027)
@@ -1313,15 +1313,15 @@
}

if (header_chunked) {
-   char ch, done, chunk_size[10], headerbuf[8192];
+   char ch, done, headerbuf[8192];

done = FALSE;

while (!done) {
int buf_size = 0;

-   php_stream_gets(stream, chunk_size, sizeof(chunk_size));
-   if (sscanf(chunk_size, "%x", &buf_size) > 0 ) {
+   php_stream_gets(stream, headerbuf, sizeof(headerbuf));
+   if (sscanf(headerbuf, "%x", &buf_size) > 0 ) {
if (buf_size > 0) {
int len_size = 0;


Modified: php/php-src/trunk/ext/soap/php_http.c
===
--- php/php-src/trunk/ext/soap/php_http.c   2012-03-08 19:31:57 UTC (rev 
324026)
+++ php/php-src/trunk/ext/soap/php_http.c   2012-03-08 20:14:26 UTC (rev 
324027)
@@ -1313,15 +1313,15 @@
}

if (header_chunked) {
-   char ch, done, chunk_size[10], headerbuf[8192];
+   char ch, done, headerbuf[8192];

done = FALSE;

while (!done) {
int buf_size = 0;

-   php_stream_gets(stream, chunk_size, sizeof(chunk_size));
-   if (sscanf(chunk_size, "%x", &buf_size) > 0 ) {
+   php_stream_gets(stream, headerbuf, sizeof(headerbuf));
+   if (sscanf(headerbuf, "%x", &buf_size) > 0 ) {
if (buf_size > 0) {
int len_size = 0;


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mysqli/ mysqli.c

[Johannes Schlüter]

johannes Thu, 08 Mar 2012 12:52:12 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324022

Log:
Use correct property ctor, should fix threading issue in bug #55334
# The code was refactored in 5_4/trunk, no need to merge

Bug: https://bugs.php.net/55334 (Open) MySQLi make mod_php crash on stress test 
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c2012-03-08 12:39:48 UTC 
(rev 324021)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c2012-03-08 12:52:12 UTC 
(rev 324022)
@@ -502,7 +502,7 @@
(void **) &intern->prop_handler);

zend_object_std_init(&intern->zo, class_type TSRMLS_CC);
-   zend_hash_copy(intern->zo.properties, &class_type->default_properties, 
(copy_ctor_func_t) zval_add_ref,
+   zend_hash_copy(intern->zo.properties, &class_type->default_properties, 
(copy_ctor_func_t)  zval_property_ctor,
(void *) &tmp, sizeof(zval *));

/* link object */

-- 
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/main/streams/streams.c branches/PHP_5_4/main/streams/streams.c trunk/main/streams/streams.c

[Gustavo André dos Santos Lopes]

cataphract   Thu, 08 Mar 2012 12:39:48 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324021

Log:
- Oops committed old version of the patch in r324020. Fixed. See bug #61253.

Bug: https://bugs.php.net/61253 (Assigned) Wrappers opened with errors 
concurrency problem
  
Changed paths:
U   php/php-src/branches/PHP_5_3/main/streams/streams.c
U   php/php-src/branches/PHP_5_4/main/streams/streams.c
U   php/php-src/trunk/main/streams/streams.c

Modified: php/php-src/branches/PHP_5_3/main/streams/streams.c
===
--- php/php-src/branches/PHP_5_3/main/streams/streams.c 2012-03-08 12:30:59 UTC 
(rev 324020)
+++ php/php-src/branches/PHP_5_3/main/streams/streams.c 2012-03-08 12:39:48 UTC 
(rev 324021)
@@ -201,7 +201,7 @@
err_buf_p = 
zend_llist_get_next_ex(err_list, &pos), i++) {
strcat(msg, *err_buf_p);
if (i < count - 1) {
-   l += brlen;
+   strcat(msg, br);
}
}


Modified: php/php-src/branches/PHP_5_4/main/streams/streams.c
===
--- php/php-src/branches/PHP_5_4/main/streams/streams.c 2012-03-08 12:30:59 UTC 
(rev 324020)
+++ php/php-src/branches/PHP_5_4/main/streams/streams.c 2012-03-08 12:39:48 UTC 
(rev 324021)
@@ -210,7 +210,7 @@
err_buf_p = 
zend_llist_get_next_ex(err_list, &pos), i++) {
strcat(msg, *err_buf_p);
if (i < count - 1) {
-   l += brlen;
+   strcat(msg, br);
}
}


Modified: php/php-src/trunk/main/streams/streams.c
===
--- php/php-src/trunk/main/streams/streams.c2012-03-08 12:30:59 UTC (rev 
324020)
+++ php/php-src/trunk/main/streams/streams.c2012-03-08 12:39:48 UTC (rev 
324021)
@@ -210,7 +210,7 @@
err_buf_p = 
zend_llist_get_next_ex(err_list, &pos), i++) {
strcat(msg, *err_buf_p);
if (i < count - 1) {
-   l += brlen;
+   strcat(msg, br);
}
}


-- 
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/basic_functions.c branches/PHP_5_3/ext/standard/file.h branches/PHP_5_3/main/php_streams.h branches/PHP_5_3/main/stream

[Gustavo André dos Santos Lopes]

cataphract   Thu, 08 Mar 2012 12:30:59 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324020

Log:
- Fixed bug #61253: Wrappers opened with errors concurrency problem
#NOTE: There is a very small possibility that this will further break
#extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the
#only one and it may leak memory after this. I say "further break" because
#extensions that do that are already broken (will segfault) under ZTS, which is
#why this patch is necessary.
#There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.

Bug: https://bugs.php.net/61253 (Assigned) Wrappers opened with errors 
concurrency problem
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
U   php/php-src/branches/PHP_5_3/ext/standard/file.h
U   php/php-src/branches/PHP_5_3/main/php_streams.h
U   php/php-src/branches/PHP_5_3/main/streams/streams.c
U   php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
U   php/php-src/branches/PHP_5_4/ext/standard/file.h
U   php/php-src/branches/PHP_5_4/main/php_streams.h
U   php/php-src/branches/PHP_5_4/main/streams/streams.c
U   php/php-src/trunk/ext/standard/basic_functions.c
U   php/php-src/trunk/ext/standard/file.h
U   php/php-src/trunk/main/php_streams.h
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-08 12:23:22 UTC (rev 324019)
+++ php/php-src/branches/PHP_5_3/NEWS	2012-03-08 12:30:59 UTC (rev 324020)
@@ -76,6 +76,8 @@
 SessionHandler::write()). (Ilia)

 - Streams:
+  . Fixed bug #61253 (Wrappers opened with errors concurrency problem on ZTS).
+(Gustavo)
   . Fixed bug #61115 (stream related segfault on fatal error in
 php_stream_context_link). (Gustavo)
   . Fixed bug #60106 (stream_socket_server silently truncates long unix

Modified: php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c	2012-03-08 12:23:22 UTC (rev 324019)
+++ php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c	2012-03-08 12:30:59 UTC (rev 324020)
@@ -3751,6 +3751,8 @@
 	/* Default to global filters only */
 	FG(stream_filters) = NULL;

+	FG(wrapper_errors) = NULL;
+
 	return SUCCESS;
 }
 /* }}} */

Modified: php/php-src/branches/PHP_5_3/ext/standard/file.h
===
--- php/php-src/branches/PHP_5_3/ext/standard/file.h	2012-03-08 12:23:22 UTC (rev 324019)
+++ php/php-src/branches/PHP_5_3/ext/standard/file.h	2012-03-08 12:30:59 UTC (rev 324020)
@@ -123,6 +123,7 @@
 	php_stream_context *default_context;
 	HashTable *stream_wrappers;			/* per-request copy of url_stream_wrappers_hash */
 	HashTable *stream_filters;			/* per-request copy of stream_filters_hash */
+	HashTable *wrapper_errors;			/* key: wrapper address; value: linked list of char* */
 } php_file_globals;

 #ifdef ZTS

Modified: php/php-src/branches/PHP_5_3/main/php_streams.h
===
--- php/php-src/branches/PHP_5_3/main/php_streams.h	2012-03-08 12:23:22 UTC (rev 324019)
+++ php/php-src/branches/PHP_5_3/main/php_streams.h	2012-03-08 12:30:59 UTC (rev 324020)
@@ -162,8 +162,8 @@
 	int is_url;		/* so that PG(allow_url_fopen) can be respected */

 	/* support for wrappers to return (multiple) error messages to the stream opener */
-	int err_count;
-	char **err_stack;
+	int err_count;	/* unused */
+	char **err_stack;/* unusued */
 };

 #define PHP_STREAM_FLAG_NO_SEEK		1

Modified: php/php-src/branches/PHP_5_3/main/streams/streams.c
===
--- php/php-src/branches/PHP_5_3/main/streams/streams.c	2012-03-08 12:23:22 UTC (rev 324019)
+++ php/php-src/branches/PHP_5_3/main/streams/streams.c	2012-03-08 12:30:59 UTC (rev 324020)
@@ -148,20 +148,35 @@

 /* }}} */

+static zend_llist *php_get_wrapper_errors_list(php_stream_wrapper *wrapper TSRMLS_DC)
+{
+zend_llist *list = NULL;
+if (!FG(wrapper_errors)) {
+return NULL;
+} else {
+zend_hash_find(FG(wrapper_errors), (const char*)&wrapper,
+sizeof wrapper, (void**)&list);
+return list;
+}
+}
+
 /* {{{ wrapper error reporting */
 void php_stream_display_wrapper_errors(php_stream_wrapper *wrapper, const char *path, const char *caption TSRMLS_DC)
 {
 	char *tmp = estrdup(path);
 	char *msg;
 	int free_msg = 0;
-	php_stream_wrapper orig_wrapper;

 	if (wrapper) {
-		if (wrapper->err_count > 0) {
+		zend_llist *err_list = php_get_wrapper_errors_list(wrapper TSRMLS_CC);
+		if (err_list) {
+			size_t l = 0;
+			int brlen;
 			int i;
-			size_t l;
-			int brlen;
-			

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo_pgsql/pgsql_driver.c branches/PHP_5_3/ext/pdo_pgsql/tests/bug61267.phpt branches/PHP_5_4/ext/pdo_pgsql/pgsql_driver.c branch

[Gustavo André dos Santos Lopes]

cataphract   Thu, 08 Mar 2012 08:52:28 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324014

Log:
- Fixed bug #61267: pdo_pgsql's PDO::exec() returns the number of SELECTed
  rows on postgresql >= 9

Bug: https://bugs.php.net/61267 (Open) pdo_pgsql's PDO::exec() returns the 
number of SELECTed rows on postgresql >= 9.
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/pdo_pgsql/pgsql_driver.c
A   php/php-src/branches/PHP_5_3/ext/pdo_pgsql/tests/bug61267.phpt
U   php/php-src/branches/PHP_5_4/ext/pdo_pgsql/pgsql_driver.c
A   php/php-src/branches/PHP_5_4/ext/pdo_pgsql/tests/bug61267.phpt
U   php/php-src/trunk/ext/pdo_pgsql/pgsql_driver.c
A   php/php-src/trunk/ext/pdo_pgsql/tests/bug61267.phpt

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-03-08 08:45:31 UTC (rev 324013)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-03-08 08:52:28 UTC (rev 324014)
@@ -2,10 +2,6 @@
 |||
 ?? ??? 2012, PHP 5.3.11

-- Array:
-  . Fixed bug #52719 (array_walk_recursive crashes if third param of the
-function is by reference). (Nikita Popov)
-
 - Core:
   . Fixed bug #61165 (Segfault - strip_tags()). (Laruence)
   . Improved max_input_vars directive to check nested variables (Dmitry).
@@ -25,6 +21,8 @@
   . Fixed bug #60801 (strpbrk() mishandles NUL byte). (Adam)
   . Fixed bug #60227 (header() cannot detect the multi-line header with CR).
 (rui, Gustavo)
+  . Fixed bug #52719 (array_walk_recursive crashes if third param of the
+function is by reference). (Nikita Popov)
   . Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry)

 - Installation
@@ -45,8 +43,13 @@
   . Fixed bug #61194 (PDO should export compression flag with myslqnd).
 (Johannes)

+- PDO_pgsql
+  . Fixed bug #61267 (pdo_pgsql's PDO::exec() returns the number of SELECTed
+rows on postgresql >= 9). (ben dot pineau at gmail dot com)
+
 - Phar:
-  . Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL 
bytes). (Nikic)
+  . Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL
+bytes). (Nikic)

 - PHP-FPM SAPI:
   . Fixed bug #60811 (php-fpm compilation problem). (rasmus)

Modified: php/php-src/branches/PHP_5_3/ext/pdo_pgsql/pgsql_driver.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo_pgsql/pgsql_driver.c   2012-03-08 
08:45:31 UTC (rev 324013)
+++ php/php-src/branches/PHP_5_3/ext/pdo_pgsql/pgsql_driver.c   2012-03-08 
08:52:28 UTC (rev 324014)
@@ -299,7 +299,7 @@
return -1;
}
H->pgoid = PQoidValue(res);
-   ret = atol(PQcmdTuples(res));
+   ret = (qs == PGRES_COMMAND_OK) ? atol(PQcmdTuples(res)) : 0L;
PQclear(res);

return ret;

Added: php/php-src/branches/PHP_5_3/ext/pdo_pgsql/tests/bug61267.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pdo_pgsql/tests/bug61267.phpt  
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/pdo_pgsql/tests/bug61267.phpt  
2012-03-08 08:52:28 UTC (rev 324014)
@@ -0,0 +1,22 @@
+--TEST--
+PDO::exec() returns 0 when the statement is a SELECT.
+--SKIPIF--
+
+--FILE--
+exec('SELECT * from generate_series(1, 42);');
+var_dump($res);
+echo "Done\n";
+?>
+--EXPECTF--
+int(0)
+Done


Property changes on: 
php/php-src/branches/PHP_5_3/ext/pdo_pgsql/tests/bug61267.phpt
___
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Modified: php/php-src/branches/PHP_5_4/ext/pdo_pgsql/pgsql_driver.c
===
--- php/php-src/branches/PHP_5_4/ext/pdo_pgsql/pgsql_driver.c   2012-03-08 
08:45:31 UTC (rev 324013)
+++ php/php-src/branches/PHP_5_4/ext/pdo_pgsql/pgsql_driver.c   2012-03-08 
08:52:28 UTC (rev 324014)
@@ -299,7 +299,7 @@
return -1;
}
H->pgoid = PQoidValue(res);
-   ret = atol(PQcmdTuples(res));
+   ret = (qs == PGRES_COMMAND_OK) ? atol(PQcmdTuples(res)) : 0L;
PQclear(res);

return ret;

Added: php/php-src/branches/PHP_5_4/ext/pdo_pgsql/tests/bug61267.phpt
===
--- php/php-src/branches/PHP_5_4/ext/pdo_pgsql/tests/bug61267.phpt  
(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/pdo_pgsql/tests/bug61267.phpt  
2012-03-08 08:52:28 UTC (rev 324014)
@@ -0,0 +1,22 @@
+--TEST--
+PDO::exec() returns 0 when the statement is a SELECT.
+--SKIPIF--
+
+--FILE--
+exec('SELECT * from generate_series(1, 42);');
+var_dump($res);
+echo "Done\n";
+?>
+--EXPECTF--
+int(0)
+Done


Property changes on: 
php/php-

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/session/session.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/session/session.c trunk/ext/session/session.c

[Ilia Alshanetsky]

iliaaThu, 08 Mar 2012 03:31:46 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324009

Log:
Fixed bug #60634 (Segmentation fault when trying to die() in 
SessionHandler::write())

Bug: https://bugs.php.net/60634 (Assigned) Segmentation fault when trying to 
die() in SessionHandler::write()
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/session/session.c
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/ext/session/session.c
U   php/php-src/trunk/ext/session/session.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-03-07 19:47:18 UTC (rev 324008)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-03-08 03:31:46 UTC (rev 324009)
@@ -52,6 +52,7 @@
   . Fixed bug #60811 (php-fpm compilation problem). (rasmus)

 - SOAP
+  . Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)
   . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
 User-Agent header). (carloschilazo at gmail dot com)

@@ -61,9 +62,6 @@
 - PDO_Sqlite extension:
   . Add createCollation support. (Damien)

-- SOAP:
-  . Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)
-
 - Reflection:
   . Fixed bug #60968 (Late static binding doesn't work with
 ReflectionMethod::invokeArgs()). (Laruence)
@@ -71,6 +69,8 @@
 - Session:
   . Fixed bug #60860 (session.save_handler=user without defined function core
 dumps). (Felipe)
+  . Fixed bug #60634 (Segmentation fault when trying to die() in
+SessionHandler::write()). (Ilia)

 - Streams:
   . Fixed bug #61115 (stream related segfault on fatal error in

Modified: php/php-src/branches/PHP_5_3/ext/session/session.c
===
--- php/php-src/branches/PHP_5_3/ext/session/session.c  2012-03-07 19:47:18 UTC 
(rev 324008)
+++ php/php-src/branches/PHP_5_3/ext/session/session.c  2012-03-08 03:31:46 UTC 
(rev 324009)
@@ -1512,9 +1512,7 @@
 {
if (PS(session_status) == php_session_active) {
PS(session_status) = php_session_none;
-   zend_try {
-   php_session_save_current_state(TSRMLS_C);
-   } zend_end_try();
+   php_session_save_current_state(TSRMLS_C);
}
 }
 /* }}} */
@@ -2167,7 +2165,9 @@
 {
int i;

-   php_session_flush(TSRMLS_C);
+   zend_try {
+   php_session_flush(TSRMLS_C);
+   } zend_end_try();
php_rshutdown_session_globals(TSRMLS_C);

/* this should NOT be done in php_rshutdown_session_globals() */

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-07 19:47:18 UTC (rev 324008)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-08 03:31:46 UTC (rev 324009)
@@ -44,6 +44,10 @@
   . Fixed bug #60948 (mysqlnd FTBFS when -Wformat-security is enabled).
 (Johannes)

+- Session
+  . Fixed bug #60634 (Segmentation fault when trying to die() in
+SessionHandler::write()). (Ilia)
+
 - SOAP
   . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
 User-Agent header). (carloschilazo at gmail dot com)

Modified: php/php-src/branches/PHP_5_4/ext/session/session.c
===
--- php/php-src/branches/PHP_5_4/ext/session/session.c  2012-03-07 19:47:18 UTC 
(rev 324008)
+++ php/php-src/branches/PHP_5_4/ext/session/session.c  2012-03-08 03:31:46 UTC 
(rev 324009)
@@ -1450,9 +1450,7 @@
 {
if (PS(session_status) == php_session_active) {
PS(session_status) = php_session_none;
-   zend_try {
-   php_session_save_current_state(TSRMLS_C);
-   } zend_end_try();
+   php_session_save_current_state(TSRMLS_C);
}
 }
 /* }}} */
@@ -2142,7 +2140,9 @@
 {
int i;

-   php_session_flush(TSRMLS_C);
+   zend_try {
+   php_session_flush(TSRMLS_C);
+   } zend_end_try();
php_rshutdown_session_globals(TSRMLS_C);

/* this should NOT be done in php_rshutdown_session_globals() */

Modified: php/php-src/trunk/ext/session/session.c
===
--- php/php-src/trunk/ext/session/session.c 2012-03-07 19:47:18 UTC (rev 
324008)
+++ php/php-src/trunk/ext/session/session.c 2012-03-08 03:31:46 UTC (rev 
324009)
@@ -1450,9 +1450,7 @@
 {
if (PS(session_status) == php_session_active) {
PS(session_status) = php_session_none;
-   zend_try {
-   php_session_save_current_state(TSRMLS_C);
-   } zend_end_try();
+   php_session_save_current_state(TSRMLS_C);
}
 }
 /* }}} */
@@ -2142,7 +2140,9 @@
 {
int i;

-  

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

[Gustavo André dos Santos Lopes]

cataphract   Wed, 07 Mar 2012 19:47:18 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324008

Log:
- Updated NEWS with news of bug #61306 having been resolved (see r323988).
- Tidied up NEWS

Bug: https://bugs.php.net/61306 (Assigned) Segfault at end of request
  
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-07 17:34:24 UTC (rev 324007)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-07 19:47:18 UTC (rev 324008)
@@ -2,35 +2,34 @@
 |||
 ?? ??? 2012, PHP 5.4.1 RC1

-- Array:
-  . Fixed bug #52719 (array_walk_recursive crashes if third param of the
-function is by reference). (Nikita Popov)
-  . Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX).
-(Laruence)
-
 - CLI Server:
   . "Connection: close" instead of "Connection: closed" (Gustavo)

 - Core:
-  . Fixed bug #60573 (type hinting with "self" keyword causes weird errors).
+  . Fixed bug #61225 (Incorect lexing of 0b00*+). (Pierrick)
+  . Fixed bug #61165 (Segfault - strip_tags()). (Laruence)
+  . Fixed bug #61106 (Segfault when using header_register_callback). (Nikita
+Popov)
+  . Fixed bug #61087 (Memory leak in parse_ini_file when specifying
+invalid scanner mode). (Nikic, Laruence)
+  . Fixed bug #61072 (Memory leak when restoring an exception handler).
+(Nikic, Laruence)
+  . Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX).
 (Laruence)
+  . Fixed bug #61052 (Missing error check in trait 'insteadof' clause). 
(Stefan)
+  . Fixed bug #61011 (Crash when an exception is thrown by __autoload
+accessing a static property). (Laruence)
+  . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical
+vars). (Laruence)
+  . Fixed bug #60978 (exit code incorrect). (Laruence)
+  . Fixed bug #60911 (Confusing error message when extending traits). (Stefan)
+  . Fixed bug #60801 (strpbrk() mishandles NUL byte). (Adam)
   . Fixed bug #60717 (Order of traits in use statement can cause a fatal
 error). (Stefan)
-  . Fixed bug #60801 (strpbrk() mishandles NUL byte). (Adam)
-  . Fixed bug #60911 (Confusing error message when extending traits). (Stefan)
-  . Fixed bug #60978 (exit code incorrect). (Laruence)
-  . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical
-vars). (Laruence)
-  . Fixed bug #61011 (Crash when an exception is thrown by __autoload
-accessing a static property). (Laruence)
-  . Fixed bug #61052 (Missing error check in trait 'insteadof' clause). 
(Stefan)
-  . Fixed bug #61072 (Memory leak when restoring an exception handler).
-(Nikic, Laruence)
-  . Fixed bug #61087 (Memory leak in parse_ini_file when specifying
-invalid scanner mode). (Nikic, Laruence)
-  . Fixed bug #61106 (Segfault when using header_register_callback). (Nikita 
Popov)
-  . Fixed bug #61165 (Segfault - strip_tags()). (Laruence)
-  . Fixed bug #61225 (Incorect lexing of 0b00*+). (Pierrick)
+  . Fixed bug #60573 (type hinting with "self" keyword causes weird errors).
+(Laruence)
+  . Fixed bug #52719 (array_walk_recursive crashes if third param of the
+function is by reference). (Nikita Popov)

 - Installation
   . Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones)
@@ -70,15 +69,19 @@
 - Standard:
   . Fixed memory leak in substr_replace. (Pierrick)
   . Make max_file_uploads ini directive settable outside of php.ini (Rasmus)
-  . Fixed bug #60106 (stream_socket_server silently truncates long unix socket 
paths). (Ilia)
+  . Fixed bug #60106 (stream_socket_server silently truncates long unix socket
+paths). (Ilia)

 - XMLRPC:
-  . Fixed bug #61097 (Memory leak in xmlrpc functions copying zvals). (Nikita 
Popov)
-  . Fixed bug #61264 (xmlrpc_parse_method_descriptions leaks temporary 
variable). (Nikita Popov)
+  . Fixed bug #61264 (xmlrpc_parse_method_descriptions leaks temporary
+variable). (Nikita Popov)
+  . Fixed bug #61097 (Memory leak in xmlrpc functions copying zvals). (Nikita
+Popov)

 - Zlib:
+  . Fixed bug #61306 (initialization of global inappropriate for ZTS). 
(Gustavo)
+  . Fixed bug #61287 (A particular string fails to decompress). (Mike)
   . Fixed bug #61139 (gzopen leaks when specifying invalid mode). (Nikita 
Popov)
-  . Fixed bug #61287 (A particular string fails to decompress). (Mike)

 01 Mar 2012, PHP 5.4.0


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt

[Christopher Jones]

On 03/07/2012 10:15 AM, Stas Malyshev wrote:

Hi!


Users should be able to see the fixes in 5.4 by reading only 5.4 NEWS.


That's why we merge 5.3 news before the release.


See my other email.  This is error prone since bugs may not be
relevant, and release cycles may not coincide.  I'd like it to be made
redundant.




I think the 5.3& 5.4 branches have to be considered distinct from now
on.



What's different now?


Users may never touch a 5.3 bundle.  If they install 5.4.0 and then
upgrade to 5.4.1, they need to know what has changed in between.

Chris

--
Email: christopher.jo...@oracle.com
Tel:  +1 650 506 8630
Blog:  http://blogs.oracle.com/opal/

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt

[Christopher Jones]

On 03/07/2012 10:22 AM, Stas Malyshev wrote:

Hi!


I think what Chris is asking is to have NEWS entries in the branch
where a commit is done, no mater if the fix was already reported in a
previous branch NEWS file.


It'd mean instead of easy merge on release we'd have to have hard and 
time-consuming cleanup of old NEWS - I'd have to go through NEWS and for each 
entry go to 5.3 NEWS and check if it's there too and if it's there remove it. 
Or we'd just have it twice in
both 5.3 and 5.4 sections?


Ideally from the users/readers point of view, each branch that has a
fix would have a related NEWS entry.

With git this discussion might be moot so we might want to drop this
thread.  However my general standpoint is:
1. we should commit a comment to each branch's NEWS file when code is
committed to that branch.
2. the previous branch's NEWS files would not be merged into the N+1
branch at N+1 release.
3. the RC release fixes would stay under their RC section headers.

This would mean trivially more developer effort at commit time but
would:
1. show more accurately what is fixed in any code bundle.
2. require almost no manual cleanup at release time (except for grammar etc).


We need to figure it out btw as if we carry NEWS with patches in git that would 
mean patches will never cleanly apply between branches (as NEWS files are 
always different). We need to have a better mechanism for this.



If NEWS was automatically generated at push time or prior to release,
then discussion is moot.  Yes, some one-off manual tidy up might be
needed at release time.


BTW, why we don't put the same in the trunk NEWS then?


Because of the current manual merge of the previous branch's NEWS at
the time a new branch is released.  E.g. 5.4.0 NEWS included the
5.3.10 NEWS.

Chris

--
Email: christopher.jo...@oracle.com
Tel:  +1 650 506 8630
Blog:  http://blogs.oracle.com/opal/

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt

[Pierre Joye]

On Wed, Mar 7, 2012 at 7:22 PM, Stas Malyshev  wrote:

>  Or we'd just have it twice in both 5.3 and 5.4 sections?

Yes

> BTW, why we don't put the same in the trunk NEWS then?

I would say we could consider to add NEWS entry after a 1st release
for a given branch?

Cheers,
-- 
Pierre

@pierrejoye | http://blog.thepimp.net | http://www.libgd.org

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt

[Stas Malyshev]

Hi!


I think what Chris is asking is to have NEWS entries in the branch
where a commit is done, no mater if the fix was already reported in a
previous branch NEWS file.


It'd mean instead of easy merge on release we'd have to have hard and 
time-consuming cleanup of old NEWS - I'd have to go through NEWS and for 
each entry go to 5.3 NEWS and check if it's there too and if it's there 
remove it. Or we'd just have it twice in both 5.3 and 5.4 sections?
We need to figure it out btw as if we carry NEWS with patches in git 
that would mean patches will never cleanly apply between branches (as 
NEWS files are always different). We need to have a better mechanism for 
this.


BTW, why we don't put the same in the trunk NEWS then?
--
Stanislav Malyshev, Software Architect
SugarCRM: http://www.sugarcrm.com/
(408)454-6900 ext. 227

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt

[Pierre Joye]

I think what Chris is asking is to have NEWS entries in the branch
where a commit is done, no mater if the fix was already reported in a
previous branch NEWS file.

On Wed, Mar 7, 2012 at 7:15 PM, Stas Malyshev  wrote:
> Hi!
>
>
>> Users should be able to see the fixes in 5.4 by reading only 5.4 NEWS.
>
>
> That's why we merge 5.3 news before the release.
>
>> I think the 5.3&  5.4 branches have to be considered distinct from now
>> on.
>
>
>
> What's different now?
>
> --
> Stanislav Malyshev, Software Architect
> SugarCRM: http://www.sugarcrm.com/
> (408)454-6900 ext. 227
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>



-- 
Pierre

@pierrejoye | http://blog.thepimp.net | http://www.libgd.org

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt

[Stas Malyshev]

Hi!


Users should be able to see the fixes in 5.4 by reading only 5.4 NEWS.


That's why we merge 5.3 news before the release.


I think the 5.3&  5.4 branches have to be considered distinct from now
on.



What's different now?
--
Stanislav Malyshev, Software Architect
SugarCRM: http://www.sugarcrm.com/
(408)454-6900 ext. 227

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt

[Christopher Jones]

On 03/07/2012 10:00 AM, Stas Malyshev wrote:

Hi!


This one (#61173) isn't in 5.4 NEWS, since it was only fixed in 5.3.11.


Do we now duplicate 5.3 and 5.4 NEWS?


Users should be able to see the fixes in 5.4 by reading only 5.4 NEWS.
I think the 5.3 & 5.4 branches have to be considered distinct from now
on.

Chris

--
Email: christopher.jo...@oracle.com
Tel:  +1 650 506 8630
Blog:  http://blogs.oracle.com/opal/

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ ext/standard/tests/general_functions/bug60227.phpt ext/standard/tests/general_functions/bug60227_1.phpt ext/standard/tests/general_functions/bug60227_

[Pierre Joye]

hi Chris,

Agreed.

I would also like to have entries for what get fixed since the last
release of the same branch. It is even more important with the totally
asynchronous (and somehow slow) 5.3 releases.

On Wed, Mar 7, 2012 at 6:57 PM, Christopher Jones
 wrote:
>
>
> On 03/07/2012 09:51 AM, Stas Malyshev wrote:
>>
>> Hi!
>>
>>> What about NEWS?
>>
>>
>> It's already fixed in 5.3...
>
>
> Urrgh, so it (#60227) is.  We need a better branching mechanism so
> users can tell what is fixed and what isn't in any particular release.
>
> --
> Email: christopher.jo...@oracle.com
> Tel:  +1 650 506 8630
> Blog:  http://blogs.oracle.com/opal/
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>



-- 
Pierre

@pierrejoye | http://blog.thepimp.net | http://www.libgd.org

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt

[Stas Malyshev]

Hi!


This one (#61173) isn't in 5.4 NEWS, since it was only fixed in 5.3.11.


Do we now duplicate 5.3 and 5.4 NEWS?
--
Stanislav Malyshev, Software Architect
SugarCRM: http://www.sugarcrm.com/
(408)454-6900 ext. 227

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt

[Christopher Jones]

On 03/07/2012 08:06 AM, Christopher Jones wrote:



On 3/6/12 11:38 PM, Stanislav Malyshev wrote:

stas Wed, 07 Mar 2012 07:38:57 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323985

Log:
MFH: Fixed bug #61173 (Unable to detect error from finfo constructor).

Bug: https://bugs.php.net/61173 (Assigned) Unable to detect error from finfo 
constructor

Changed paths:
U php/php-src/branches/PHP_5_4/ext/fileinfo/fileinfo.c
A php/php-src/branches/PHP_5_4/ext/fileinfo/tests/bug61173.phpt


What about NEWS?

Chris



This one (#61173) isn't in 5.4 NEWS, since it was only fixed in 5.3.11.

Chris

--
Email: christopher.jo...@oracle.com
Tel:  +1 650 506 8630
Blog:  http://blogs.oracle.com/opal/

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ ext/standard/tests/general_functions/bug60227.phpt ext/standard/tests/general_functions/bug60227_1.phpt ext/standard/tests/general_functions/bug60227_

[Christopher Jones]

On 03/07/2012 09:51 AM, Stas Malyshev wrote:

Hi!


What about NEWS?


It's already fixed in 5.3...


Urrgh, so it (#60227) is.  We need a better branching mechanism so
users can tell what is fixed and what isn't in any particular release.

--
Email: christopher.jo...@oracle.com
Tel:  +1 650 506 8630
Blog:  http://blogs.oracle.com/opal/

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ ext/standard/tests/general_functions/bug60227.phpt ext/standard/tests/general_functions/bug60227_1.phpt ext/standard/tests/general_functions/bug60227_

[Stas Malyshev]

Hi!


What about NEWS?


It's already fixed in 5.3...
--
Stanislav Malyshev, Software Architect
SugarCRM: http://www.sugarcrm.com/
(408)454-6900 ext. 227

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/zlib/zlib.c trunk/ext/zlib/zlib.c

[Philip Olson]

On Mar 7, 2012, at 8:15 AM, Christopher Jones wrote:

> 
> 
> On 3/7/12 12:51 AM, Gustavo André dos Santos Lopes wrote:
>> cataphract   Wed, 07 Mar 2012 08:51:30 +
>> 
>> Revision: http://svn.php.net/viewvc?view=revision&revision=323988
>> 
>> Log:
>> - Tentative fix for bug #61306.
>> #cjones: Will update NEWS when confirmed it fixes the problem.
>> 
>> Bug: https://bugs.php.net/61306 (Assigned) Segfault at end of request
>> 
>> Changed paths:
>> U   php/php-src/branches/PHP_5_4/ext/zlib/zlib.c
>> U   php/php-src/trunk/ext/zlib/zlib.c
>> 
> 
> LOL!  My gut feel says that NEWS should be kept in sync whenever code
> changes.  It doesn't seem technically difficult.  Keeping NEWS up to
> date avoids any bus-factor or memory-loss situations.  If a bug fix is
> reverted, it's trivial to update NEWS again.  NEWS comments can say
> "attempt to fix" or "unfinished" if there is some temporary
> uncertainty about a fix.

They don't call him Christopher NEWS Jones for nothin'. :)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/zlib/zlib.c trunk/ext/zlib/zlib.c

[Christopher Jones]

On 3/7/12 12:51 AM, Gustavo André dos Santos Lopes wrote:

cataphract   Wed, 07 Mar 2012 08:51:30 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323988

Log:
- Tentative fix for bug #61306.
#cjones: Will update NEWS when confirmed it fixes the problem.

Bug: https://bugs.php.net/61306 (Assigned) Segfault at end of request

Changed paths:
 U   php/php-src/branches/PHP_5_4/ext/zlib/zlib.c
 U   php/php-src/trunk/ext/zlib/zlib.c



LOL!  My gut feel says that NEWS should be kept in sync whenever code
changes.  It doesn't seem technically difficult.  Keeping NEWS up to
date avoids any bus-factor or memory-loss situations.  If a bug fix is
reverted, it's trivial to update NEWS again.  NEWS comments can say
"attempt to fix" or "unfinished" if there is some temporary
uncertainty about a fix.

--
Email: christopher.jo...@oracle.com
Tel:  +1 650 506 8630
Blog:  http://blogs.oracle.com/opal/

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt

[Christopher Jones]

On 3/6/12 11:38 PM, Stanislav Malyshev wrote:

stas Wed, 07 Mar 2012 07:38:57 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323985

Log:
MFH: Fixed bug #61173 (Unable to detect error from finfo constructor).

Bug: https://bugs.php.net/61173 (Assigned) Unable to detect error from finfo 
constructor

Changed paths:
 U   php/php-src/branches/PHP_5_4/ext/fileinfo/fileinfo.c
 A   php/php-src/branches/PHP_5_4/ext/fileinfo/tests/bug61173.phpt


What about NEWS?

Chris

--
Email: christopher.jo...@oracle.com
Tel:  +1 650 506 8630
Blog:  http://blogs.oracle.com/opal/

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ ext/standard/tests/general_functions/bug60227.phpt ext/standard/tests/general_functions/bug60227_1.phpt ext/standard/tests/general_functions/bug60227_

[Christopher Jones]

On 3/6/12 11:49 PM, Stanislav Malyshev wrote:

stas Wed, 07 Mar 2012 07:49:56 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323986

Log:
MFH: Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP 
and forbid \0. See bug #60227.

Bug: https://bugs.php.net/60227 (Closed) header() cannot detect the multi-line 
header with CR(0x0D).

Changed paths:
 D   
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227.phpt
 A   
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_1.phpt
 A   
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_2.phpt
 A   
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_3.phpt
 A   
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_4.phpt
 U   php/php-src/branches/PHP_5_4/main/SAPI.c



What about NEWS?

--
Email: christopher.jo...@oracle.com
Tel:  +1 650 506 8630
Blog:  http://blogs.oracle.com/opal/

--
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/ext/zlib/zlib.c trunk/ext/zlib/zlib.c

[Gustavo André dos Santos Lopes]

cataphract   Wed, 07 Mar 2012 08:51:30 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323988

Log:
- Tentative fix for bug #61306.
#cjones: Will update NEWS when confirmed it fixes the problem.

Bug: https://bugs.php.net/61306 (Assigned) Segfault at end of request
  
Changed paths:
U   php/php-src/branches/PHP_5_4/ext/zlib/zlib.c
U   php/php-src/trunk/ext/zlib/zlib.c

Modified: php/php-src/branches/PHP_5_4/ext/zlib/zlib.c
===
--- php/php-src/branches/PHP_5_4/ext/zlib/zlib.c2012-03-07 07:55:26 UTC 
(rev 323987)
+++ php/php-src/branches/PHP_5_4/ext/zlib/zlib.c2012-03-07 08:51:30 UTC 
(rev 323988)
@@ -938,7 +938,6 @@
REGISTER_LONG_CONSTANT("ZLIB_ENCODING_GZIP", PHP_ZLIB_ENCODING_GZIP, 
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("ZLIB_ENCODING_DEFLATE", 
PHP_ZLIB_ENCODING_DEFLATE, CONST_CS|CONST_PERSISTENT);
REGISTER_INI_ENTRIES();
-   ZLIBG(ob_gzhandler) = NULL;
return SUCCESS;
 }
 /* }}} */
@@ -989,6 +988,13 @@
 }
 /* }}} */

+/* {{{ ZEND_MODULE_GLOBALS_CTOR */
+static ZEND_MODULE_GLOBALS_CTOR_D(zlib)
+{
+   zlib_globals->ob_gzhandler = NULL;
+}
+/* }}} */
+
 /* {{{ php_zlib_module_entry */
 zend_module_entry php_zlib_module_entry = {
STANDARD_MODULE_HEADER,
@@ -1001,9 +1007,9 @@
PHP_MINFO(zlib),
"2.0",
PHP_MODULE_GLOBALS(zlib),
+   ZEND_MODULE_GLOBALS_CTOR_N(zlib),
NULL,
NULL,
-   NULL,
STANDARD_MODULE_PROPERTIES_EX
 };
 /* }}} */

Modified: php/php-src/trunk/ext/zlib/zlib.c
===
--- php/php-src/trunk/ext/zlib/zlib.c   2012-03-07 07:55:26 UTC (rev 323987)
+++ php/php-src/trunk/ext/zlib/zlib.c   2012-03-07 08:51:30 UTC (rev 323988)
@@ -938,7 +938,6 @@
REGISTER_LONG_CONSTANT("ZLIB_ENCODING_GZIP", PHP_ZLIB_ENCODING_GZIP, 
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("ZLIB_ENCODING_DEFLATE", 
PHP_ZLIB_ENCODING_DEFLATE, CONST_CS|CONST_PERSISTENT);
REGISTER_INI_ENTRIES();
-   ZLIBG(ob_gzhandler) = NULL;
return SUCCESS;
 }
 /* }}} */
@@ -990,6 +989,13 @@
 }
 /* }}} */

+/* {{{ ZEND_MODULE_GLOBALS_CTOR */
+static ZEND_MODULE_GLOBALS_CTOR_D(zlib)
+{
+   zlib_globals->ob_gzhandler = NULL;
+}
+/* }}} */
+
 /* {{{ php_zlib_module_entry */
 zend_module_entry php_zlib_module_entry = {
STANDARD_MODULE_HEADER,
@@ -1002,9 +1008,9 @@
PHP_MINFO(zlib),
"2.0",
PHP_MODULE_GLOBALS(zlib),
+   ZEND_MODULE_GLOBALS_CTOR_N(zlib),
NULL,
NULL,
-   NULL,
STANDARD_MODULE_PROPERTIES_EX
 };
 /* }}} */

-- 
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/ ext/standard/tests/general_functions/bug60227.phpt ext/standard/tests/general_functions/bug60227_1.phpt ext/standard/tests/general_functions/bug60227_2.ph

[Stanislav Malyshev]

stas Wed, 07 Mar 2012 07:49:56 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323986

Log:
MFH: Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP 
and forbid \0. See bug #60227.

Bug: https://bugs.php.net/60227 (Closed) header() cannot detect the multi-line 
header with CR(0x0D).
  
Changed paths:
D   
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227.phpt
A   
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_1.phpt
A   
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_2.phpt
A   
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_3.phpt
A   
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_4.phpt
U   php/php-src/branches/PHP_5_4/main/SAPI.c

Deleted: 
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227.phpt 
2012-03-07 07:38:57 UTC (rev 323985)
+++ 
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227.phpt 
2012-03-07 07:49:56 UTC (rev 323986)
@@ -1,20 +0,0 @@
---TEST--
-Bug #60227 (header() cannot detect the multi-line header with CR)
---FILE--
-
---EXPECTF--
-Warning: Header may not contain more than a single header, new line detected. 
in %s on line %d
-foo
---EXPECTHEADERS--
-X-Foo1: a
-X-Foo2: b
-X-Foo3: c
-X-Foo4: d
-

Added: 
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_1.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_1.phpt
   (rev 0)
+++ 
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_1.phpt
   2012-03-07 07:49:56 UTC (rev 323986)
@@ -0,0 +1,20 @@
+--TEST--
+Bug #60227 (header() cannot detect the multi-line header with CR)
+--FILE--
+
+--EXPECTF--
+Warning: Header may not contain more than a single header, new line detected 
in %s on line %d
+foo
+--EXPECTHEADERS--
+X-Foo1: a
+X-Foo2: b
+X-Foo3: c
+X-Foo4: d
+

Added: 
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_2.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_2.phpt
   (rev 0)
+++ 
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_2.phpt
   2012-03-07 07:49:56 UTC (rev 323986)
@@ -0,0 +1,14 @@
+--TEST--
+Bug #60227 (header() cannot detect the multi-line header with CR), \r before \n
+--FILE--
+
+--EXPECTF--
+Warning: Header may not contain more than a single header, new line detected 
in %s on line %d
+foo
+--EXPECTHEADERS--
+X-foo: e
+foo

Added: 
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_3.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_3.phpt
   (rev 0)
+++ 
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_3.phpt
   2012-03-07 07:49:56 UTC (rev 323986)
@@ -0,0 +1,14 @@
+--TEST--
+Bug #60227 (header() cannot detect the multi-line header with CR), \0 before \n
+--FILE--
+
+--EXPECTF--
+Warning: Header may not contain NUL bytes in %s on line %d
+foo
+--EXPECTHEADERS--
+X-foo: e
+foo

Added: 
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_4.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_4.phpt
   (rev 0)
+++ 
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_4.phpt
   2012-03-07 07:49:56 UTC (rev 323986)
@@ -0,0 +1,14 @@
+--TEST--
+Bug #60227 (header() cannot detect the multi-line header with CR), CRLF
+--FILE--
+
+--EXPECTF--
+Warning: Header may not contain more than a single header, new line detected 
in %s on line %d
+foo
+--EXPECTHEADERS--
+X-foo: e
+ foo

Modified: php/php-src/branches/PHP_5_4/main/SAPI.c
===
--- php/php-src/branches/PHP_5_4/main/SAPI.c2012-03-07 07:38:57 UTC (rev 
323985)
+++ php/php-src/branches/PHP_5_4/main/SAPI.c2012-03-07 07:49:56 UTC (rev 
323986)
@@ -707,16 +707,26 @@
efree(header_line);
return SUCCESS;
} else {
-   /* new line safety check */
-   char *s = header_line, *e = header_line + header_line_len, *p;
-   while (s < e && ((p = memchr(s, '\n', (e - s))) || (p = 
memchr(s, '\r', (e - s) {
-   if (*(p + 1) == ' ' || *(p + 1) == '\t') {
-   s = p + 1;
-   

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt

[Stanislav Malyshev]

stas Wed, 07 Mar 2012 07:38:57 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323985

Log:
MFH: Fixed bug #61173 (Unable to detect error from finfo constructor).

Bug: https://bugs.php.net/61173 (Assigned) Unable to detect error from finfo 
constructor
  
Changed paths:
U   php/php-src/branches/PHP_5_4/ext/fileinfo/fileinfo.c
A   php/php-src/branches/PHP_5_4/ext/fileinfo/tests/bug61173.phpt

Modified: php/php-src/branches/PHP_5_4/ext/fileinfo/fileinfo.c
===
--- php/php-src/branches/PHP_5_4/ext/fileinfo/fileinfo.c2012-03-07 
06:36:46 UTC (rev 323984)
+++ php/php-src/branches/PHP_5_4/ext/fileinfo/fileinfo.c2012-03-07 
07:38:57 UTC (rev 323985)
@@ -76,9 +76,9 @@
} \
 }

-/* {{{ finfo_objects_dtor
+/* {{{ finfo_objects_free
  */
-static void finfo_objects_dtor(void *object, zend_object_handle handle 
TSRMLS_DC)
+static void finfo_objects_free(void *object TSRMLS_DC)
 {
struct finfo_object *intern = (struct finfo_object *) object;

@@ -107,7 +107,8 @@

intern->ptr = NULL;

-   retval.handle = zend_objects_store_put(intern, finfo_objects_dtor, 
NULL, NULL TSRMLS_CC);
+   retval.handle = zend_objects_store_put(intern, NULL,
+   finfo_objects_free, NULL TSRMLS_CC);
retval.handlers = (zend_object_handlers *) &finfo_object_handlers;

return retval;
@@ -275,6 +276,15 @@
 }
 /* }}} */

+#define FILEINFO_DESTROY_OBJECT(object)
\
+   do {
\
+   if (object) {   
\
+   zend_object_store_ctor_failed(object TSRMLS_CC);
\
+   zval_dtor(object);  
\
+   ZVAL_NULL(object);  
\
+   }   
\
+   } while (0)
+
 /* {{{ proto resource finfo_open([int options [, string arg]])
Create a new fileinfo resource. */
 PHP_FUNCTION(finfo_open)
@@ -287,12 +297,13 @@
char resolved_path[MAXPATHLEN];

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|lp", &options, 
&file, &file_len) == FAILURE) {
+   FILEINFO_DESTROY_OBJECT(object);
RETURN_FALSE;
}
-
+
if (object) {
struct finfo_object *finfo_obj = (struct 
finfo_object*)zend_object_store_get_object(object TSRMLS_CC);
-
+
if (finfo_obj->ptr) {
magic_close(finfo_obj->ptr->magic);
efree(finfo_obj->ptr);
@@ -309,9 +320,11 @@
 #else
if (php_check_open_basedir(file TSRMLS_CC)) {
 #endif
+   FILEINFO_DESTROY_OBJECT(object);
RETURN_FALSE;
}
if (!expand_filepath_with_mode(file, resolved_path, NULL, 0, 
CWD_EXPAND TSRMLS_CC)) {
+   FILEINFO_DESTROY_OBJECT(object);
RETURN_FALSE;
}
file = resolved_path;
@@ -325,21 +338,23 @@
if (finfo->magic == NULL) {
efree(finfo);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid mode 
'%ld'.", options);
-   RETURN_FALSE;
+   FILEINFO_DESTROY_OBJECT(object);
+   RETURN_FALSE;
}

if (magic_load(finfo->magic, file) == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to load 
magic database at '%s'.", file);
magic_close(finfo->magic);
efree(finfo);
+   FILEINFO_DESTROY_OBJECT(object);
RETURN_FALSE;
-   }
+   }

if (object) {
FILEINFO_REGISTER_OBJECT(object, finfo);
} else {
ZEND_REGISTER_RESOURCE(return_value, finfo, le_fileinfo);
-   }
+   }
 }
 /* }}} */


Added: php/php-src/branches/PHP_5_4/ext/fileinfo/tests/bug61173.phpt
===
--- php/php-src/branches/PHP_5_4/ext/fileinfo/tests/bug61173.phpt   
(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/fileinfo/tests/bug61173.phpt   
2012-03-07 07:38:57 UTC (rev 323985)
@@ -0,0 +1,14 @@
+--TEST--
+Bug #61173: Unable to detect error from finfo constructor
+--SKIPIF--
+-- 
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/ UPGRADING

[Christopher Jones]

sixd Tue, 06 Mar 2012 23:34:57 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323975

Log:
Sync char set wording with migration doc

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

Modified: php/php-src/branches/PHP_5_4/UPGRADING
===
--- php/php-src/branches/PHP_5_4/UPGRADING  2012-03-06 23:08:16 UTC (rev 
323974)
+++ php/php-src/branches/PHP_5_4/UPGRADING  2012-03-06 23:34:57 UTC (rev 
323975)
@@ -36,9 +36,10 @@
 1. Changes to INI directives
 =

-- The php.ini default_charset directive now defaults to UTF-8.  If you
-  were relying on the previous default of ISO-88590-1, you will need
-  to add:
+- The default character set is now UTF-8 when the default_charset
+  php.ini directive is not explicitly set. This applies to functions
+  such as htmlentities() and htmlspecialchars(). If you were relying
+  on the previous default of ISO-8859-1 you will need to add:

 default_charset = iso-8859-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_4/buildconf trunk/buildconf

[Christopher Jones]

sixd Tue, 06 Mar 2012 21:30:59 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323973

Log:
Make "buildconf --force" more robust, per IRC chat.  Not backported to 5.3 to 
avoid destabilization.

Changed paths:
U   php/php-src/branches/PHP_5_4/buildconf
U   php/php-src/trunk/buildconf

Modified: php/php-src/branches/PHP_5_4/buildconf
===
--- php/php-src/branches/PHP_5_4/buildconf  2012-03-06 20:57:56 UTC (rev 
323972)
+++ php/php-src/branches/PHP_5_4/buildconf  2012-03-06 21:30:59 UTC (rev 
323973)
@@ -32,7 +32,12 @@
   echo "use buildconf --force to override this check."
   exit 1
 fi
-
+
+if test "$devok" = "1"; then
+  echo "Removing configure caches"
+  rm -rf autom4te.cache config.cache
+fi
+
 rm -f generated_lists

 if test "$debug" = "yes"; then

Modified: php/php-src/trunk/buildconf
===
--- php/php-src/trunk/buildconf 2012-03-06 20:57:56 UTC (rev 323972)
+++ php/php-src/trunk/buildconf 2012-03-06 21:30:59 UTC (rev 323973)
@@ -32,7 +32,12 @@
   echo "use buildconf --force to override this check."
   exit 1
 fi
-
+
+if test "$devok" = "1"; then
+  echo "Removing configure caches"
+  rm -rf autom4te.cache config.cache
+fi
+
 rm -f generated_lists

 if test "$debug" = "yes"; then

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

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

[Christopher Jones]

sixd Tue, 06 Mar 2012 20:20:50 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323968

Log:
Typo and missing zend ini param

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

Modified: php/php-src/branches/PHP_5_4/UPGRADING
===
--- php/php-src/branches/PHP_5_4/UPGRADING  2012-03-06 19:12:39 UTC (rev 
323967)
+++ php/php-src/branches/PHP_5_4/UPGRADING  2012-03-06 20:20:50 UTC (rev 
323968)
@@ -74,7 +74,7 @@
   - safe_mode_exec_dir
   - safe_mode_allowed_env_vars
   - safe_mode_protected_env_vars
-  - session.bug_compat42
+  - session.bug_compat_42
   - session.bug_compat_warn
   - y2k_compliance
   - zend.ze1_compatibility_mode
@@ -106,6 +106,8 @@
 - Added zend.script_encoding. This value will be used unless a
   "declare(encoding=...)" directive appears at the top of the script.

+- Added zend.signal_check to check for replaced signal handlers on shutdown
+
 - Added enable_post_data_reading, which is enabled by default. When it's
   disabled, the POST data is not read (or processed); the behavior is similar
   to that of other request methods with body, like PUT. This allows reading

-- 
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/ UPGRADING

[Christopher Jones]

sixd Tue, 06 Mar 2012 19:12:39 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323967

Log:
Typo: "outout"

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

Modified: php/php-src/branches/PHP_5_4/UPGRADING
===
--- php/php-src/branches/PHP_5_4/UPGRADING  2012-03-06 19:05:24 UTC (rev 
323966)
+++ php/php-src/branches/PHP_5_4/UPGRADING  2012-03-06 19:12:39 UTC (rev 
323967)
@@ -122,7 +122,7 @@
 - Added cli.prompt to configure the CLI interactive shell prompt.

 - Added cli_server.color to enable the CLI web server to use ANSI color coding
-  in terminal outout.
+  in terminal output.

 
 2. Changes to reserved words and classes

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/Zend/ README.ZEND_MM zend_API.c

[Derick Rethans]

On Tue, 6 Mar 2012, Stas Malyshev wrote:

> > +Since PHP 5.4 it is possible to prevent shared extensions from  unloading 
> > so
> 
> Since 5.4 doesn't look right in 5.3 upgrading :) ITYM since 5.3.11?

Fixed, thanks :-)

Derick

-- 
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/README.ZEND_MM branches/PHP_5_4/Zend/README.ZEND_MM trunk/Zend/README.ZEND_MM

[Derick Rethans]

derick   Tue, 06 Mar 2012 18:34:10 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323962

Log:
Fixed version numbers.

Changed paths:
U   php/php-src/branches/PHP_5_3/Zend/README.ZEND_MM
U   php/php-src/branches/PHP_5_4/Zend/README.ZEND_MM
U   php/php-src/trunk/Zend/README.ZEND_MM

Modified: php/php-src/branches/PHP_5_3/Zend/README.ZEND_MM
===
--- php/php-src/branches/PHP_5_3/Zend/README.ZEND_MM2012-03-06 18:25:55 UTC 
(rev 323961)
+++ php/php-src/branches/PHP_5_3/Zend/README.ZEND_MM2012-03-06 18:34:10 UTC 
(rev 323962)
@@ -27,7 +27,7 @@
 Shared extensions:
 --

-Since PHP 5.4 it is possible to prevent shared extensions from unloading so
+Since PHP 5.3.11 it is possible to prevent shared extensions from unloading so
 that valgrind can correctly track the memory leaks in shared extensions. For
 this there is the ZEND_DONT_UNLOAD_MODULES environment variable. If set, then
 DL_UNLOAD() is skipped during the shutdown of shared extensions.

Modified: php/php-src/branches/PHP_5_4/Zend/README.ZEND_MM
===
--- php/php-src/branches/PHP_5_4/Zend/README.ZEND_MM2012-03-06 18:25:55 UTC 
(rev 323961)
+++ php/php-src/branches/PHP_5_4/Zend/README.ZEND_MM2012-03-06 18:34:10 UTC 
(rev 323962)
@@ -27,7 +27,7 @@
 Shared extensions:
 --

-Since PHP 5.4 it is possible to prevent shared extensions from unloading so
+Since PHP 5.3.11 it is possible to prevent shared extensions from unloading so
 that valgrind can correctly track the memory leaks in shared extensions. For
 this there is the ZEND_DONT_UNLOAD_MODULES environment variable. If set, then
 DL_UNLOAD() is skipped during the shutdown of shared extensions.

Modified: php/php-src/trunk/Zend/README.ZEND_MM
===
--- php/php-src/trunk/Zend/README.ZEND_MM   2012-03-06 18:25:55 UTC (rev 
323961)
+++ php/php-src/trunk/Zend/README.ZEND_MM   2012-03-06 18:34:10 UTC (rev 
323962)
@@ -27,7 +27,7 @@
 Shared extensions:
 --

-Since PHP 5.4 it is possible to prevent shared extensions from unloading so
+Since PHP 5.3.11 it is possible to prevent shared extensions from unloading so
 that valgrind can correctly track the memory leaks in shared extensions. For
 this there is the ZEND_DONT_UNLOAD_MODULES environment variable. If set, then
 DL_UNLOAD() is skipped during the shutdown of shared extensions.

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/Zend/ README.ZEND_MM zend_API.c

[Stas Malyshev]

Hi!


+Since PHP 5.4 it is possible to prevent shared extensions from unloading so


Since 5.4 doesn't look right in 5.3 upgrading :) ITYM since 5.3.11?

--
Stanislav Malyshev, Software Architect
SugarCRM: http://www.sugarcrm.com/
(408)454-6900 ext. 227

--
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/ README.ZEND_MM zend_API.c

[Derick Rethans]

derick   Tue, 06 Mar 2012 18:25:55 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323961

Log:
Add the ZEND_DONT_UNLOAD_MODULES environment variable for debugging to 5.3 as
well.

Changed paths:
U   php/php-src/branches/PHP_5_3/Zend/README.ZEND_MM
U   php/php-src/branches/PHP_5_3/Zend/zend_API.c

Modified: php/php-src/branches/PHP_5_3/Zend/README.ZEND_MM
===
--- php/php-src/branches/PHP_5_3/Zend/README.ZEND_MM2012-03-06 17:42:59 UTC 
(rev 323960)
+++ php/php-src/branches/PHP_5_3/Zend/README.ZEND_MM2012-03-06 18:25:55 UTC 
(rev 323961)
@@ -24,6 +24,14 @@

 $ USE_ZEND_ALLOC=0 valgrind --leak-check=full sapi/cli/php -r 'leak();'

+Shared extensions:
+--
+
+Since PHP 5.4 it is possible to prevent shared extensions from unloading so
+that valgrind can correctly track the memory leaks in shared extensions. For
+this there is the ZEND_DONT_UNLOAD_MODULES environment variable. If set, then
+DL_UNLOAD() is skipped during the shutdown of shared extensions.
+
 Tweaking:
 -


Modified: php/php-src/branches/PHP_5_3/Zend/zend_API.c
===
--- php/php-src/branches/PHP_5_3/Zend/zend_API.c2012-03-06 17:42:59 UTC 
(rev 323960)
+++ php/php-src/branches/PHP_5_3/Zend/zend_API.c2012-03-06 18:25:55 UTC 
(rev 323961)
@@ -2137,7 +2137,7 @@

 #if HAVE_LIBDL
 #if !(defined(NETWARE) && defined(APACHE_1_BUILD))
-   if (module->handle) {
+   if (module->handle && !getenv("ZEND_DONT_UNLOAD_MODULES")) {
DL_UNLOAD(module->handle);
}
 #endif

-- 
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/ext/pdo/tests/bug61292.phpt trunk/ext/pdo/tests/bug61292.phpt

[Xinchen Hui]

laruence Tue, 06 Mar 2012 06:24:50 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323936

Log:
Add test for bug #61292, bug was fixed in -r323935

Bug: https://bugs.php.net/61292 (Closed) Segfault while calling a method on an 
overloaded PDO object.
  
Changed paths:
A   php/php-src/branches/PHP_5_4/ext/pdo/tests/bug61292.phpt
A   php/php-src/trunk/ext/pdo/tests/bug61292.phpt

Added: php/php-src/branches/PHP_5_4/ext/pdo/tests/bug61292.phpt
===
--- php/php-src/branches/PHP_5_4/ext/pdo/tests/bug61292.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/pdo/tests/bug61292.phpt2012-03-06 
06:24:50 UTC (rev 323936)
@@ -0,0 +1,36 @@
+--TEST--
+Bug #61292 (Segfault while calling a method on an overloaded PDO object)
+--SKIPIF--
+
+--FILE--
+ TRUE);
+   parent::__construct(getenv("PDOTEST_DSN"), 
getenv("PDOTEST_USER"), getenv("PDOTEST_PASS"), $options);
+   }
+
+   var $bar = array();
+
+   public function foo()
+   {
+   var_dump($this->bar);
+   }
+}
+
+(new Database_SQL)->foo();
+?>
+--EXPECTF--
+array(0) {
+}

Added: php/php-src/trunk/ext/pdo/tests/bug61292.phpt
===
--- php/php-src/trunk/ext/pdo/tests/bug61292.phpt   
(rev 0)
+++ php/php-src/trunk/ext/pdo/tests/bug61292.phpt   2012-03-06 06:24:50 UTC 
(rev 323936)
@@ -0,0 +1,36 @@
+--TEST--
+Bug #61292 (Segfault while calling a method on an overloaded PDO object)
+--SKIPIF--
+
+--FILE--
+ TRUE);
+   parent::__construct(getenv("PDOTEST_DSN"), 
getenv("PDOTEST_USER"), getenv("PDOTEST_PASS"), $options);
+   }
+
+   var $bar = array();
+
+   public function foo()
+   {
+   var_dump($this->bar);
+   }
+}
+
+(new Database_SQL)->foo();
+?>
+--EXPECTF--
+array(0) {
+}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/ext/pdo/pdo_dbh.c trunk/ext/pdo/pdo_dbh.c

[Xinchen Hui]

laruence Tue, 06 Mar 2012 03:45:27 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323935

Log:
Fixed bug #61292 (Segfault while calling a method on an overloaded PDO object)

Bug: https://bugs.php.net/61292 (Verified) Segfault while calling a method on 
an overloaded PDO object.
  
Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/ext/pdo/pdo_dbh.c
U   php/php-src/trunk/ext/pdo/pdo_dbh.c

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-06 02:21:04 UTC (rev 323934)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-06 03:45:27 UTC (rev 323935)
@@ -49,6 +49,10 @@
   . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
 User-Agent header). (carloschilazo at gmail dot com)

+- PDO
+  . Fixed bug #61292 (Segfault while calling a method on an overloaded PDO
+object). (Laruence)
+
 - PDO_mysql
   . Fixed bug #61207 (PDO::nextRowset() after a multi-statement query doesn't
 always work). (Johannes)

Modified: php/php-src/branches/PHP_5_4/ext/pdo/pdo_dbh.c
===
--- php/php-src/branches/PHP_5_4/ext/pdo/pdo_dbh.c  2012-03-06 02:21:04 UTC 
(rev 323934)
+++ php/php-src/branches/PHP_5_4/ext/pdo/pdo_dbh.c  2012-03-06 03:45:27 UTC 
(rev 323935)
@@ -343,6 +343,7 @@
pdbh->def_stmt_ce = dbh->def_stmt_ce;
pdbh->def_stmt_ctor_args = 
dbh->def_stmt_ctor_args;
pdbh->std.properties = dbh->std.properties;
+   pdbh->std.properties_table = 
dbh->std.properties_table;
}
/* kill the non-persistent thingamy */
efree(dbh);

Modified: php/php-src/trunk/ext/pdo/pdo_dbh.c
===
--- php/php-src/trunk/ext/pdo/pdo_dbh.c 2012-03-06 02:21:04 UTC (rev 323934)
+++ php/php-src/trunk/ext/pdo/pdo_dbh.c 2012-03-06 03:45:27 UTC (rev 323935)
@@ -343,6 +343,7 @@
pdbh->def_stmt_ce = dbh->def_stmt_ce;
pdbh->def_stmt_ctor_args = 
dbh->def_stmt_ctor_args;
pdbh->std.properties = dbh->std.properties;
+   pdbh->std.properties_table = 
dbh->std.properties_table;
}
/* kill the non-persistent thingamy */
efree(dbh);

-- 
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/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt trunk/ext

[Johannes Schlüter]

johannes Tue, 06 Mar 2012 01:43:49 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323932

Log:
Apply test fix for bug #61288 pdo_mysql___construct_options_libmysql.phpt test 
fails

Bug: https://bugs.php.net/61288 (Open) 
pdo_mysql___construct_options_libmysql.phpt test fails
  
Changed paths:
U   
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
U   
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
U   
php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
2012-03-06 00:15:40 UTC (rev 323931)
+++ 
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
2012-03-06 01:43:49 UTC (rev 323932)
@@ -4,6 +4,7 @@
 

Modified: 
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
2012-03-06 00:15:40 UTC (rev 323931)
+++ 
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
2012-03-06 01:43:49 UTC (rev 323932)
@@ -4,6 +4,7 @@
 

Modified: 
php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
===
--- 
php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
   2012-03-06 00:15:40 UTC (rev 323931)
+++ 
php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
   2012-03-06 01:43:49 UTC (rev 323932)
@@ -4,6 +4,7 @@
 

-- 
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/mysqli/mysqli_prop.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/mysqli/mysqli_prop.c trunk/ext/mysqli/mysqli_prop.c

[Johannes Schlüter]

johannes Tue, 06 Mar 2012 00:15:40 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323931

Log:
Fix bug #61003 mysql_stat() require a valid connection

Bug: https://bugs.php.net/61003 (Assigned) mysql_stat() require a valid 
connection
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_prop.c
U   php/php-src/trunk/ext/mysqli/mysqli_prop.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-03-05 23:57:24 UTC (rev 323930)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-03-06 00:15:40 UTC (rev 323931)
@@ -36,6 +36,9 @@
 - Firebird Database extension (ibase):
   . Fixed bug #60802 (ibase_trans() gives segfault when passing params).

+- mysqli
+  . Fixed bug #61003 (mysql_stat() require a valid connection). (Johannes).
+
 - PDO_mysql
   . Fixed bug #61207 (PDO::nextRowset() after a multi-statement query doesn't
 always work). (Johannes)

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c   2012-03-05 
23:57:24 UTC (rev 323930)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c   2012-03-06 
00:15:40 UTC (rev 323931)
@@ -211,7 +211,11 @@
MAKE_STD_ZVAL(*retval);
ZVAL_NULL(*retval);

+#if defined(MYSQLI_USE_MYSQLND)
CHECK_STATUS(MYSQLI_STATUS_INITIALIZED);
+#else
+   CHECK_STATUS(MYSQLI_STATUS_VALID);
+#endif

mysql = (MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;


Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-05 23:57:24 UTC (rev 323930)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-06 00:15:40 UTC (rev 323931)
@@ -38,6 +38,9 @@
 - mbstring:
   . MFH mb_ereg_replace_callback() for security enhancements. (Rui)

+- mysqli
+  . Fixed bug #61003 (mysql_stat() require a valid connection). (Johannes).
+
 - mysqlnd
   . Fixed bug #60948 (mysqlnd FTBFS when -Wformat-security is enabled).
 (Johannes)

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_prop.c
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_prop.c   2012-03-05 
23:57:24 UTC (rev 323930)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_prop.c   2012-03-06 
00:15:40 UTC (rev 323931)
@@ -260,7 +260,11 @@
MAKE_STD_ZVAL(*retval);
ZVAL_NULL(*retval);

+#if defined(MYSQLI_USE_MYSQLND)
CHECK_STATUS(MYSQLI_STATUS_INITIALIZED);
+#else
+   CHECK_STATUS(MYSQLI_STATUS_VALID);
+#endif

mysql = (MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;


Modified: php/php-src/trunk/ext/mysqli/mysqli_prop.c
===
--- php/php-src/trunk/ext/mysqli/mysqli_prop.c  2012-03-05 23:57:24 UTC (rev 
323930)
+++ php/php-src/trunk/ext/mysqli/mysqli_prop.c  2012-03-06 00:15:40 UTC (rev 
323931)
@@ -260,7 +260,11 @@
MAKE_STD_ZVAL(*retval);
ZVAL_NULL(*retval);

+#if defined(MYSQLI_USE_MYSQLND)
CHECK_STATUS(MYSQLI_STATUS_INITIALIZED);
+#else
+   CHECK_STATUS(MYSQLI_STATUS_VALID);
+#endif

mysql = (MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;


-- 
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/pdo_mysql/mysql_driver.c branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h branches/

[Johannes Schlüter]

johannes Mon, 05 Mar 2012 23:57:24 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323930

Log:
Fix bug #61194 PDO should export compression flag with myslqnd

Bug: https://bugs.php.net/61194 (Closed) PDO should export compression flag 
with myslqnd
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c
U   php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c
U   php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h
U   
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/ext/pdo_mysql/mysql_driver.c
U   php/php-src/branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c
U   php/php-src/branches/PHP_5_4/ext/pdo_mysql/php_pdo_mysql_int.h
U   
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
U   php/php-src/trunk/ext/pdo_mysql/mysql_driver.c
U   php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c
U   php/php-src/trunk/ext/pdo_mysql/php_pdo_mysql_int.h
U   php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS	2012-03-05 23:55:12 UTC (rev 323929)
+++ php/php-src/branches/PHP_5_3/NEWS	2012-03-05 23:57:24 UTC (rev 323930)
@@ -36,6 +36,12 @@
 - Firebird Database extension (ibase):
   . Fixed bug #60802 (ibase_trans() gives segfault when passing params).

+- PDO_mysql
+  . Fixed bug #61207 (PDO::nextRowset() after a multi-statement query doesn't
+always work). (Johannes)
+  . Fixed bug #61194 (PDO should export compression flag with myslqnd).
+(Johannes)
+
 - Phar:
   . Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL bytes). (Nikic)


Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c	2012-03-05 23:55:12 UTC (rev 323929)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c	2012-03-05 23:57:24 UTC (rev 323930)
@@ -624,8 +624,8 @@
 		char *init_cmd = NULL;
 #ifndef PDO_USE_MYSQLND
 		char *default_file = NULL, *default_group = NULL;
-		long compress = 0;
 #endif
+		long compress = 0;
 #if defined(HAVE_MYSQL_STMT_PREPARE) || defined(PDO_USE_MYSQLND)
 		char *ssl_key = NULL, *ssl_cert = NULL, *ssl_ca = NULL, *ssl_capath = NULL, *ssl_cipher = NULL;
 #endif
@@ -706,7 +706,7 @@
 			}
 			efree(default_group);
 		}
-
+#endif
 		compress = pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_COMPRESS, 0 TSRMLS_CC);
 		if (compress) {
 			if (mysql_options(H->server, MYSQL_OPT_COMPRESS, 0)) {
@@ -714,7 +714,6 @@
 goto cleanup;
 			}
 		}
-#endif
 #if defined(HAVE_MYSQL_STMT_PREPARE) || defined(PDO_USE_MYSQLND)
 		ssl_key = pdo_attr_strval(driver_options, PDO_MYSQL_ATTR_SSL_KEY, NULL TSRMLS_CC);
 		ssl_cert = pdo_attr_strval(driver_options, PDO_MYSQL_ATTR_SSL_CERT, NULL TSRMLS_CC);

Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c	2012-03-05 23:55:12 UTC (rev 323929)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c	2012-03-05 23:57:24 UTC (rev 323930)
@@ -84,8 +84,8 @@
 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_MAX_BUFFER_SIZE", (long)PDO_MYSQL_ATTR_MAX_BUFFER_SIZE);
 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_READ_DEFAULT_FILE", (long)PDO_MYSQL_ATTR_READ_DEFAULT_FILE);
 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_READ_DEFAULT_GROUP", (long)PDO_MYSQL_ATTR_READ_DEFAULT_GROUP);
+#endif
 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_COMPRESS", (long)PDO_MYSQL_ATTR_COMPRESS);
-#endif
 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_DIRECT_QUERY", (long)PDO_MYSQL_ATTR_DIRECT_QUERY);
 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_FOUND_ROWS", (long)PDO_MYSQL_ATTR_FOUND_ROWS);
 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_IGNORE_SPACE", (long)PDO_MYSQL_ATTR_IGNORE_SPACE);

Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h
===
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h	2012-03-05 23:55:12 UTC (rev 323929)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h	2012-03-05 23:57:24 UTC (rev 323930)
@@ -163,8 +163,8 @@
 	PDO_MYSQL_ATTR_READ_DEFAULT_FILE,
 	PDO_MYSQL_ATTR_READ_DEFAULT_GROUP,
 	PDO_MYSQL_ATTR_MAX_BUFFER_SIZE,
+#endif
 	PDO_MYSQL_ATTR_COMPRESS,
-#endif
 	PDO_MYSQL_ATTR_DIRECT_QUERY,
 	PDO_MYSQL_ATTR_FOUND_ROWS,
 	PDO_MYSQL_ATTR_IGNORE_SPACE,

Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pd

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysqlnd/mysqlnd_wireprotocol.c trunk/ext/mysqlnd/mysqlnd_wireprotocol.c

[Johannes Schlüter]

johannes Mon, 05 Mar 2012 23:55:12 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323929

Log:
Fix bug #60948 mysqlnd FTBFS when -Wformat-security is enabled

# 5.3 not affected

Bugs: https://bugs.php.net/60948 (Assigned) mysqlnd FTBFS when 
-Wformat-security is enabled
  https://bugs.php.net/5 (Closed) fclose in php3_minit_file undeclared
  
Changed paths:
U   php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_wireprotocol.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c

Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_wireprotocol.c
===
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_wireprotocol.c 
2012-03-05 23:38:15 UTC (rev 323928)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_wireprotocol.c 
2012-03-05 23:55:12 UTC (rev 323929)
@@ -500,7 +500,7 @@
const char * const msg = "Authentication data too long. 
"
"Won't fit into the buffer and will be 
truncated. Authentication will thus fail";
SET_CLIENT_ERROR(*conn->error_info, CR_UNKNOWN_ERROR, 
UNKNOWN_SQLSTATE, msg);
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, msg);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", msg);
DBG_RETURN(0);
}


Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c2012-03-05 
23:38:15 UTC (rev 323928)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c2012-03-05 
23:55:12 UTC (rev 323929)
@@ -500,7 +500,7 @@
const char * const msg = "Authentication data too long. 
"
"Won't fit into the buffer and will be 
truncated. Authentication will thus fail";
SET_CLIENT_ERROR(*conn->error_info, CR_UNKNOWN_ERROR, 
UNKNOWN_SQLSTATE, msg);
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, msg);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", msg);
DBG_RETURN(0);
}


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c branches/PHP_5_3/ext/pdo_mysql/tests/bug_61207.phpt branches/PHP_5_4/ext/pdo_mysql/mysql_statement.c branches/PHP_5_4/ext/

[Johannes Schlüter]

johannes Mon, 05 Mar 2012 23:38:15 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323928

Log:
Fix Bug #61207 PDO::nextRowset() after a multi-statement query doesn't always 
work

Bug: https://bugs.php.net/61207 (Assigned) PDO::nextRowset() after a 
multi-statement query doesn't always work
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c
A   php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/bug_61207.phpt
U   php/php-src/branches/PHP_5_4/ext/pdo_mysql/mysql_statement.c
A   php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/bug_61207.phpt
U   php/php-src/trunk/ext/pdo_mysql/mysql_statement.c
A   php/php-src/trunk/ext/pdo_mysql/tests/bug_61207.phpt

Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c	2012-03-05 21:22:15 UTC (rev 323927)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c	2012-03-05 23:38:15 UTC (rev 323928)
@@ -131,6 +131,39 @@
 }
 /* }}} */

+static int pdo_mysql_fill_stmt_from_result(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
+{
+	pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data;
+	pdo_mysql_db_handle *H = S->H;
+	my_ulonglong row_count;
+	PDO_DBG_ENTER("pdo_mysql_fill_stmt_from_result");
+
+	row_count = mysql_affected_rows(H->server);
+	if (row_count == (my_ulonglong)-1) {
+		/* we either have a query that returned a result set or an error occured
+		   lets see if we have access to a result set */
+		if (!H->buffered) {
+			S->result = mysql_use_result(H->server);
+		} else {
+			S->result = mysql_store_result(H->server);
+		}
+		if (NULL == S->result) {
+			pdo_mysql_error_stmt(stmt);
+			PDO_DBG_RETURN(0);
+		}
+
+		stmt->row_count = (long) mysql_num_rows(S->result);
+		stmt->column_count = (int) mysql_num_fields(S->result);
+		S->fields = mysql_fetch_fields(S->result);
+	} else {
+		/* this was a DML or DDL query (INSERT, UPDATE, DELETE, ... */
+		stmt->row_count = (long) row_count;
+	}
+
+	PDO_DBG_RETURN(1);
+}
+/* }}} */
+
 #ifdef HAVE_MYSQL_STMT_PREPARE
 static int pdo_mysql_stmt_execute_prepared_libmysql(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
 {
@@ -310,30 +343,7 @@
 		PDO_DBG_RETURN(0);
 	}

-	row_count = mysql_affected_rows(H->server);
-	if (row_count == (my_ulonglong)-1) {
-		/* we either have a query that returned a result set or an error occured
-		   lets see if we have access to a result set */
-		if (!H->buffered) {
-			S->result = mysql_use_result(H->server);
-		} else {
-			S->result = mysql_store_result(H->server);
-		}
-		if (NULL == S->result) {
-			pdo_mysql_error_stmt(stmt);
-			PDO_DBG_RETURN(0);
-		}
-
-		stmt->row_count = (long) mysql_num_rows(S->result);
-		stmt->column_count = (int) mysql_num_fields(S->result);
-		S->fields = mysql_fetch_fields(S->result);
-
-	} else {
-		/* this was a DML or DDL query (INSERT, UPDATE, DELETE, ... */
-		stmt->row_count = (long) row_count;
-	}
-
-	PDO_DBG_RETURN(1);
+	PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt TSRMLS_CC));
 }
 /* }}} */

@@ -421,25 +431,7 @@
 		/* No more results */
 		PDO_DBG_RETURN(0);
 	} else {
-		if (!H->buffered) {
-			S->result = mysql_use_result(H->server);
-			row_count = 0;
-		} else {
-			S->result = mysql_store_result(H->server);
-			if ((long)-1 == (row_count = (long) mysql_affected_rows(H->server))) {
-pdo_mysql_error_stmt(stmt);
-PDO_DBG_RETURN(0);
-			}
-		}
-
-		if (NULL == S->result) {
-			PDO_DBG_RETURN(0);
-		}
-
-		stmt->row_count = row_count;
-		stmt->column_count = (int) mysql_num_fields(S->result);
-		S->fields = mysql_fetch_fields(S->result);
-		PDO_DBG_RETURN(1);
+		PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt TSRMLS_CC));
 	}
 #else
 	strcpy(stmt->error_code, "HYC00");

Added: php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/bug_61207.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/bug_61207.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/bug_61207.phpt	2012-03-05 23:38:15 UTC (rev 323928)
@@ -0,0 +1,103 @@
+--TEST--
+PDO MySQL Bug #61207 (PDO::nextRowset() after a multi-statement query doesn't always work)
+--SKIPIF--
+
+--FILE--
+query('create table `bug61207`( `id` int )');
+
+$handle1 = $link->prepare('insert into bug61207(id) values(1);
+  select * from bug61207 where id = ?;
+  update bug61207 set id = 2 where id = ?;');
+
+$handle1->bindValue('1', '1');
+$handle1->bindValue('2', '1');
+
+$handle1->execute();
+$i = 1;
+print("Handle 1:\n");
+do {
+	print('Rowset ' . $i++ . "\n");
+	if ($handle1->columnCount() > 0)
+		print("Results detected\n");
+} while($handle1->nextRowset());
+
+$handle2 = $link->prepare('select * from bug61207 where id = ?;
+   update bug61207 set id = 1 where id = ?;');
+
+$h

[PHP-CVS] svn: /php/php-src/branches/ PHP_5_3/win32/inet.h PHP_5_4/win32/inet.h

[Pierre Joye]

pajoye   Mon, 05 Mar 2012 20:53:40 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323926

Log:
- fix bug #61290, fix build

Bug: https://bugs.php.net/61290 (Open) php_sockets build failure - unresolved 
external symbol _inet_aton
  
Changed paths:
U   php/php-src/branches/PHP_5_3/win32/inet.h
U   php/php-src/branches/PHP_5_4/win32/inet.h

Modified: php/php-src/branches/PHP_5_3/win32/inet.h
===
--- php/php-src/branches/PHP_5_3/win32/inet.h   2012-03-05 20:14:55 UTC (rev 
323925)
+++ php/php-src/branches/PHP_5_3/win32/inet.h   2012-03-05 20:53:40 UTC (rev 
323926)
@@ -3,7 +3,7 @@
 #endif
 #include 

-#if (_WIN32_WINNT <= 0x500)
+#if (_WIN32_WINNT < 0x0600)
 PHPAPI int inet_pton(int af, const char* src, void* dst);
 PHPAPI const char* inet_ntop(int af, const void* src, char* dst, size_t size);
 PHPAPI int inet_aton(const char *cp, struct in_addr *inp);

Modified: php/php-src/branches/PHP_5_4/win32/inet.h
===
--- php/php-src/branches/PHP_5_4/win32/inet.h   2012-03-05 20:14:55 UTC (rev 
323925)
+++ php/php-src/branches/PHP_5_4/win32/inet.h   2012-03-05 20:53:40 UTC (rev 
323926)
@@ -3,7 +3,7 @@
 #endif
 #include 

-#if (_WIN32_WINNT <= 0x502)
+#if (_WIN32_WINNT < 0x0600)
 PHPAPI int inet_pton(int af, const char* src, void* dst);
 PHPAPI const char* inet_ntop(int af, const void* src, char* dst, size_t size);
 PHPAPI int inet_aton(const char *cp, struct in_addr *inp);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/ UPGRADING

[Christopher Jones]

sixd Mon, 05 Mar 2012 20:14:04 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323924

Log:
Align section headings with the latest (5.4) migration on-line doc.
This will aid future reuse of UPGRADING text.

Changed paths:
U   php/php-src/trunk/UPGRADING

Modified: php/php-src/trunk/UPGRADING
===
--- php/php-src/trunk/UPGRADING 2012-03-05 20:08:30 UTC (rev 323923)
+++ php/php-src/trunk/UPGRADING 2012-03-05 20:14:04 UTC (rev 323924)
@@ -1,192 +1,82 @@
 $Id$

-UPGRADE NOTES - PHP X.Y
+PHP X.Y UPGRADE NOTES

-1. Changes made to default configuration
-2. Reserved words and classes
-3. Changes made to engine behaviour
-4. Changes made to existing functions
-5. Changes made to existing methods
-6. Changes made to existing classes
-7. Deprecated
-8. Removed
-9. Extensions:
- a. moved out to PECL and actively maintained there
- b. no longer maintained
- c. with changed behaviour
- d. no longer possible to disable
-10. Changes in SAPI support
-11. Changes in INI directives
-12. Syntax additions
-13. Windows support
-14. New in PHP X.Y:
- a. New libraries
- b. New extensions
- c. New stream wrappers
- d. New stream filters
- e. New functions
- f. New global constants
- g. New classes
- h. New methods
- i. New class constants
- j. New hash algorithms
- k. New Syntax
+1. Backward Incompatible Changes
+2. New Features
+2. Changes in SAPI modules
+3. Deprecated Functionality
+4. Changed Functions
+5. New Functions
+6. New Classes and Interfaces
+7. Removed Extensions
+8. Other Changes to Extensions
+9. New Global Constants
+10. Changes to INI File Handling
+11. Other Changes

+
 
-1. Changes made to default configuration
+1. Backward Incompatible Changes
 

--
-
-=
-2. Reserved words and classes
-=
-
--
-
-=
-3. Changes made to engine behaviour
-=
-
--
-
-=
-4. Changes made to existing functions
-=
-
--
-
-===
-5. Changes made to existing methods
-===
-
--
-
-===
-6. Changes made to existing classes
-===
-
--
-
-=
-7. Deprecated
-=
-
-- The preg_replace /e modifier is now deprecated.
-  You should use preg_replace_callback instead.
-
-==
-8. Removed
-==
-
-a. removed features
-
-   -
-
-b. removed ini directives
-
-   -
-
-c. removed functions
-
-  -
-
-d. removed syntax
-
-   -
-
-=
-9. Extensions
-=
-
- a. moved out to PECL and actively maintained there
-
--
-
- b. no longer maintained
-
--
-
- c. with changed behaviour
-
--
-
- d. no longer possible to disable
-
--
-
-==
-10. Changes in SAPI support
-==
-
--
-
-=
-11. Changes in INI directives
-=
-
--
-
-
-12. Syntax additions
-
-
--
-
-===
-13. Windows support
-===
-
 - Drop Windows XP and 2003 support. (Pierre)

-===
-14. New in PHP X.Y:
-===
+
+2. New Features
+

- a. New libraries

-   -
+
+2. Changes in SAPI modules
+

- b. New extensions

-   -
+
+3. Deprecated Functionality
+

- c. New stream wrappers
+- The preg_replace /e modifier is now deprecated.  Use
+  preg_replace_callback instead.
+  (https://wiki.php.net/rfc/remove_preg_replace_eval_modifier)

-   -
+
+4. Changed Functions
+

- d. New stream filters

-   -
+
+5. New Functions
+

- e. New functions

-   - Extension:
- - function()
+
+6. New Classes and Interfaces
+

- f. New global constants
+- SPL:
+  - SplFixedArray::__wakeup()

-   -
+
+7. Removed Extensions
+

- g. New classes

-   - Extension:
- - ClassName
-
- h. New methods
+
+8. Other Changes to Extensions
+

-- Spl:
-

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS ext/zlib/php_zlib.h ext/zlib/tests/bug61287.phpt ext/zlib/zlib.c

[Michael Wallner]

mike Mon, 05 Mar 2012 15:38:24 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323917

Log:
MFH: Fixed bug #61287 (A particular string fails to decompress)

Bug: https://bugs.php.net/61287 (Assigned) A particular string fails to 
decompress
  
Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/ext/zlib/php_zlib.h
A + php/php-src/branches/PHP_5_4/ext/zlib/tests/bug61287.phpt
(from php/php-src/trunk/ext/zlib/tests/bug61287.phpt:r323916)
U   php/php-src/branches/PHP_5_4/ext/zlib/zlib.c

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-05 15:35:22 UTC (rev 323916)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-05 15:38:24 UTC (rev 323917)
@@ -61,6 +61,7 @@

 - Zlib:
   . Fixed bug #61139 (gzopen leaks when specifying invalid mode). (Nikita 
Popov)
+  . Fixed bug #61287 (A particular string fails to decompress). (Mike)

 01 Mar 2012, PHP 5.4.0


Modified: php/php-src/branches/PHP_5_4/ext/zlib/php_zlib.h
===
--- php/php-src/branches/PHP_5_4/ext/zlib/php_zlib.h2012-03-05 15:35:22 UTC 
(rev 323916)
+++ php/php-src/branches/PHP_5_4/ext/zlib/php_zlib.h2012-03-05 15:38:24 UTC 
(rev 323917)
@@ -65,6 +65,7 @@
 #define phpext_zlib_ptr zlib_module_ptr

 #ifdef ZTS
+# include "TSRM.h"
 # define ZLIBG(v) TSRMG(zlib_globals_id, zend_zlib_globals *, v)
 #else
 # define ZLIBG(v) (zlib_globals.v)

Copied: php/php-src/branches/PHP_5_4/ext/zlib/tests/bug61287.phpt (from rev 
323916, php/php-src/trunk/ext/zlib/tests/bug61287.phpt)
===
--- php/php-src/branches/PHP_5_4/ext/zlib/tests/bug61287.phpt   
(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/zlib/tests/bug61287.phpt   2012-03-05 
15:38:24 UTC (rev 323917)
@@ -0,0 +1,24 @@
+--TEST--
+bug #61287 - inflate needs the terminating null byte
+--SKIPIF--
+ 1,
+'discipline' => 23,
+'degrees' => array(),
+'country_id' => 27
+);
+
+$serialized = serialize($array);
+
+$deflated = gzdeflate($serialized, 9);
+$inflated = gzinflate($deflated);
+
+echo strlen($inflated),"\n";
+?>
+Done
+--EXPECT--
+92
+Done

Modified: php/php-src/branches/PHP_5_4/ext/zlib/zlib.c
===
--- php/php-src/branches/PHP_5_4/ext/zlib/zlib.c2012-03-05 15:35:22 UTC 
(rev 323916)
+++ php/php-src/branches/PHP_5_4/ext/zlib/zlib.c2012-03-05 15:38:24 UTC 
(rev 323917)
@@ -400,7 +400,7 @@
status = inflateInit2(&Z, encoding);
if (Z_OK == status) {
Z.next_in = (Bytef *) in_buf;
-   Z.avail_in = in_len;
+   Z.avail_in = in_len + 1; /* NOTE: data must be zero 
terminated */

switch (status = php_zlib_inflate_rounds(&Z, max_len, 
out_buf, out_len)) {
case Z_STREAM_END:

-- 
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/zlib/ php_zlib.h tests/bug61287.phpt zlib.c

[Michael Wallner]

mike Mon, 05 Mar 2012 15:35:22 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323916

Log:
fix bug #61287 (A particular string fails to decompress)

Bug: https://bugs.php.net/61287 (Assigned) A particular string fails to 
decompress
  
Changed paths:
U   php/php-src/trunk/ext/zlib/php_zlib.h
A   php/php-src/trunk/ext/zlib/tests/bug61287.phpt
U   php/php-src/trunk/ext/zlib/zlib.c

Modified: php/php-src/trunk/ext/zlib/php_zlib.h
===
--- php/php-src/trunk/ext/zlib/php_zlib.h   2012-03-05 15:33:38 UTC (rev 
323915)
+++ php/php-src/trunk/ext/zlib/php_zlib.h   2012-03-05 15:35:22 UTC (rev 
323916)
@@ -65,6 +65,7 @@
 #define phpext_zlib_ptr zlib_module_ptr

 #ifdef ZTS
+# include "TSRM.h"
 # define ZLIBG(v) TSRMG(zlib_globals_id, zend_zlib_globals *, v)
 #else
 # define ZLIBG(v) (zlib_globals.v)

Added: php/php-src/trunk/ext/zlib/tests/bug61287.phpt
===
--- php/php-src/trunk/ext/zlib/tests/bug61287.phpt  
(rev 0)
+++ php/php-src/trunk/ext/zlib/tests/bug61287.phpt  2012-03-05 15:35:22 UTC 
(rev 323916)
@@ -0,0 +1,24 @@
+--TEST--
+bug #61287 - inflate needs the terminating null byte
+--SKIPIF--
+ 1,
+'discipline' => 23,
+'degrees' => array(),
+'country_id' => 27
+);
+
+$serialized = serialize($array);
+
+$deflated = gzdeflate($serialized, 9);
+$inflated = gzinflate($deflated);
+
+echo strlen($inflated),"\n";
+?>
+Done
+--EXPECT--
+92
+Done

Modified: php/php-src/trunk/ext/zlib/zlib.c
===
--- php/php-src/trunk/ext/zlib/zlib.c   2012-03-05 15:33:38 UTC (rev 323915)
+++ php/php-src/trunk/ext/zlib/zlib.c   2012-03-05 15:35:22 UTC (rev 323916)
@@ -400,7 +400,7 @@
status = inflateInit2(&Z, encoding);
if (Z_OK == status) {
Z.next_in = (Bytef *) in_buf;
-   Z.avail_in = in_len;
+   Z.avail_in = in_len + 1; /* NOTE: data must be zero 
terminated */

switch (status = php_zlib_inflate_rounds(&Z, max_len, 
out_buf, out_len)) {
case Z_STREAM_END:

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/soap/php_sdl.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/soap/php_sdl.c trunk/ext/soap/php_sdl.c

[Hannes Magnusson]

On Mon, Mar 5, 2012 at 13:59, Dmitry Stogov  wrote:
> dmitry                                   Mon, 05 Mar 2012 12:59:01 +
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=323909
>
> Log:
> Fixed bug #60887 (SoapClient ignores user_agent option and sends no 
> User-Agent header)
>
> Bug: https://bugs.php.net/60887 (Assigned) SoapClient ignores user_agent 
> option and sends no User-Agent header
>
> Changed paths:
>    U   php/php-src/branches/PHP_5_3/NEWS
>    U   php/php-src/branches/PHP_5_3/ext/soap/php_sdl.c
>    U   php/php-src/branches/PHP_5_4/NEWS
>    U   php/php-src/branches/PHP_5_4/ext/soap/php_sdl.c
>    U   php/php-src/trunk/ext/soap/php_sdl.c
>
> Modified: php/php-src/branches/PHP_5_3/NEWS
> ===
> --- php/php-src/branches/PHP_5_3/NEWS   2012-03-05 12:47:25 UTC (rev 323908)
> +++ php/php-src/branches/PHP_5_3/NEWS   2012-03-05 12:59:01 UTC (rev 323909)
> @@ -41,7 +41,11 @@
>
>  - PHP-FPM SAPI:
>   . Fixed bug #60811 (php-fpm compilation problem). (rasmus)
> -
> +
> +- SOAP
> +  . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
> +    User-Agent header). (carloschilazo at gmail dot com)
> +
>  - SQLite3 extension:
>   . Add createCollation() method. (Brad Dewar)
>
>
> Modified: php/php-src/branches/PHP_5_3/ext/soap/php_sdl.c
> ===
> --- php/php-src/branches/PHP_5_3/ext/soap/php_sdl.c     2012-03-05 12:47:25 
> UTC (rev 323908)
> +++ php/php-src/branches/PHP_5_3/ext/soap/php_sdl.c     2012-03-05 12:59:01 
> UTC (rev 323909)
> @@ -3259,6 +3259,13 @@
>                context = php_stream_context_alloc();
>        }
>
> +       if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_user_agent", 
> sizeof("_user_agent"), (void **) &tmp) == SUCCESS &&
> +           Z_TYPE_PP(tmp) == IS_STRING && Z_STRLEN_PP(tmp) > 0) {
> +               smart_str_appends(&headers, "User-Agent: ");
> +               smart_str_appends(&headers, Z_STRVAL_PP(tmp));
> +               smart_str_appends(&headers, "\r\n");
> +       }

Shouldn't it fallback on the ini option?

-Hannes

--
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/soap/php_sdl.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/soap/php_sdl.c trunk/ext/soap/php_sdl.c

[Dmitry Stogov]

dmitry   Mon, 05 Mar 2012 12:59:01 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323909

Log:
Fixed bug #60887 (SoapClient ignores user_agent option and sends no User-Agent 
header)

Bug: https://bugs.php.net/60887 (Assigned) SoapClient ignores user_agent option 
and sends no User-Agent header
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/soap/php_sdl.c
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/ext/soap/php_sdl.c
U   php/php-src/trunk/ext/soap/php_sdl.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-03-05 12:47:25 UTC (rev 323908)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-03-05 12:59:01 UTC (rev 323909)
@@ -41,7 +41,11 @@

 - PHP-FPM SAPI:
   . Fixed bug #60811 (php-fpm compilation problem). (rasmus)
-
+
+- SOAP
+  . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
+User-Agent header). (carloschilazo at gmail dot com)
+
 - SQLite3 extension:
   . Add createCollation() method. (Brad Dewar)


Modified: php/php-src/branches/PHP_5_3/ext/soap/php_sdl.c
===
--- php/php-src/branches/PHP_5_3/ext/soap/php_sdl.c 2012-03-05 12:47:25 UTC 
(rev 323908)
+++ php/php-src/branches/PHP_5_3/ext/soap/php_sdl.c 2012-03-05 12:59:01 UTC 
(rev 323909)
@@ -3259,6 +3259,13 @@
context = php_stream_context_alloc();
}

+   if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_user_agent", 
sizeof("_user_agent"), (void **) &tmp) == SUCCESS &&
+   Z_TYPE_PP(tmp) == IS_STRING && Z_STRLEN_PP(tmp) > 0) {
+   smart_str_appends(&headers, "User-Agent: ");
+   smart_str_appends(&headers, Z_STRVAL_PP(tmp));
+   smart_str_appends(&headers, "\r\n");
+   }
+
if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_proxy_host", 
sizeof("_proxy_host"), (void **) &proxy_host) == SUCCESS &&
Z_TYPE_PP(proxy_host) == IS_STRING &&
zend_hash_find(Z_OBJPROP_P(this_ptr), "_proxy_port", 
sizeof("_proxy_port"), (void **) &proxy_port) == SUCCESS &&

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-05 12:47:25 UTC (rev 323908)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-05 12:59:01 UTC (rev 323909)
@@ -38,6 +38,10 @@
 - mbstring:
   . MFH mb_ereg_replace_callback() for security enhancements. (Rui)

+- SOAP
+  . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
+User-Agent header). (carloschilazo at gmail dot com)
+
 - Phar
   . Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL
 bytes). (Nikita Popov)

Modified: php/php-src/branches/PHP_5_4/ext/soap/php_sdl.c
===
--- php/php-src/branches/PHP_5_4/ext/soap/php_sdl.c 2012-03-05 12:47:25 UTC 
(rev 323908)
+++ php/php-src/branches/PHP_5_4/ext/soap/php_sdl.c 2012-03-05 12:59:01 UTC 
(rev 323909)
@@ -3259,6 +3259,13 @@
context = php_stream_context_alloc(TSRMLS_C);
}

+   if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_user_agent", 
sizeof("_user_agent"), (void **) &tmp) == SUCCESS &&
+   Z_TYPE_PP(tmp) == IS_STRING && Z_STRLEN_PP(tmp) > 0) {
+   smart_str_appends(&headers, "User-Agent: ");
+   smart_str_appends(&headers, Z_STRVAL_PP(tmp));
+   smart_str_appends(&headers, "\r\n");
+   }
+
if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_proxy_host", 
sizeof("_proxy_host"), (void **) &proxy_host) == SUCCESS &&
Z_TYPE_PP(proxy_host) == IS_STRING &&
zend_hash_find(Z_OBJPROP_P(this_ptr), "_proxy_port", 
sizeof("_proxy_port"), (void **) &proxy_port) == SUCCESS &&

Modified: php/php-src/trunk/ext/soap/php_sdl.c
===
--- php/php-src/trunk/ext/soap/php_sdl.c2012-03-05 12:47:25 UTC (rev 
323908)
+++ php/php-src/trunk/ext/soap/php_sdl.c2012-03-05 12:59:01 UTC (rev 
323909)
@@ -3259,6 +3259,13 @@
context = php_stream_context_alloc(TSRMLS_C);
}

+   if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_user_agent", 
sizeof("_user_agent"), (void **) &tmp) == SUCCESS &&
+   Z_TYPE_PP(tmp) == IS_STRING && Z_STRLEN_PP(tmp) > 0) {
+   smart_str_appends(&headers, "User-Agent: ");
+   smart_str_appends(&headers, Z_STRVAL_PP(tmp));
+   smart_str_appends(&headers, "\r\n");
+   }
+
if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_proxy_host", 
sizeof("_proxy_host"), (void **) &proxy_host) == SUCCESS &&
Z_TYPE_PP(proxy_host) == IS_STRING &&
zend_hash_find(Z_OBJPROP_P(this_ptr), "_proxy_port", 
sizeof("_proxy_po

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/zend_API.c branches/PHP_5_4/Zend/zend_API.c trunk/Zend/zend_API.c

[Dmitry Stogov]

dmitry   Mon, 05 Mar 2012 12:47:25 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323908

Log:
Fixed module numbering

Changed paths:
U   php/php-src/branches/PHP_5_3/Zend/zend_API.c
U   php/php-src/branches/PHP_5_4/Zend/zend_API.c
U   php/php-src/trunk/Zend/zend_API.c

Modified: php/php-src/branches/PHP_5_3/Zend/zend_API.c
===
--- php/php-src/branches/PHP_5_3/Zend/zend_API.c2012-03-05 12:21:39 UTC 
(rev 323907)
+++ php/php-src/branches/PHP_5_3/Zend/zend_API.c2012-03-05 12:47:25 UTC 
(rev 323908)
@@ -33,7 +33,6 @@
 #endif

 /* these variables are true statics/globals, and have to be mutex'ed on every 
access */
-static int module_count=0;
 ZEND_API HashTable module_registry;

 /* this function doesn't check for too many parameters */
@@ -2184,7 +2183,7 @@
 /* return the next free module number */
 int zend_next_free_module(void) /* {{{ */
 {
-   return ++module_count;
+   return zend_hash_num_elements(&module_registry) + 1;
 }
 /* }}} */


Modified: php/php-src/branches/PHP_5_4/Zend/zend_API.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_API.c2012-03-05 12:21:39 UTC 
(rev 323907)
+++ php/php-src/branches/PHP_5_4/Zend/zend_API.c2012-03-05 12:47:25 UTC 
(rev 323908)
@@ -33,7 +33,6 @@
 #endif

 /* these variables are true statics/globals, and have to be mutex'ed on every 
access */
-static int module_count=0;
 ZEND_API HashTable module_registry;

 static zend_module_entry **module_request_startup_handlers;
@@ -2381,7 +2380,7 @@
 /* return the next free module number */
 int zend_next_free_module(void) /* {{{ */
 {
-   return ++module_count;
+   return zend_hash_num_elements(&module_registry) + 1;
 }
 /* }}} */


Modified: php/php-src/trunk/Zend/zend_API.c
===
--- php/php-src/trunk/Zend/zend_API.c   2012-03-05 12:21:39 UTC (rev 323907)
+++ php/php-src/trunk/Zend/zend_API.c   2012-03-05 12:47:25 UTC (rev 323908)
@@ -33,7 +33,6 @@
 #endif

 /* these variables are true statics/globals, and have to be mutex'ed on every 
access */
-static int module_count=0;
 ZEND_API HashTable module_registry;

 static zend_module_entry **module_request_startup_handlers;
@@ -2381,7 +2380,7 @@
 /* return the next free module number */
 int zend_next_free_module(void) /* {{{ */
 {
-   return ++module_count;
+   return zend_hash_num_elements(&module_registry) + 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/win32/build/config.w32.h.in PHP_5_4/win32/build/config.w32.h.in

[Pierre Joye]

pajoye   Sun, 04 Mar 2012 22:15:12 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323903

Log:
- fix bug #54407, Incorrectly defined NTDDI_VERSION macro

Bug: https://bugs.php.net/54407 (Closed) Incorrectly defined NTDDI_VERSION 
macro 
  
Changed paths:
U   php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in
U   php/php-src/branches/PHP_5_4/win32/build/config.w32.h.in

Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in2012-03-04 
20:37:28 UTC (rev 323902)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in2012-03-04 
22:15:12 UTC (rev 323903)
@@ -6,7 +6,7 @@
 /* Define the minimum supported version */
 #undef _WIN32_WINNT
 #undef NTDDI_VERSION
-#define _WIN32_WINNT 0x502
+#define _WIN32_WINNT 0x0501
 #define NTDDI_VERSION  0x05010200

 /* Default PHP / PEAR directories */

Modified: php/php-src/branches/PHP_5_4/win32/build/config.w32.h.in
===
--- php/php-src/branches/PHP_5_4/win32/build/config.w32.h.in2012-03-04 
20:37:28 UTC (rev 323902)
+++ php/php-src/branches/PHP_5_4/win32/build/config.w32.h.in2012-03-04 
22:15:12 UTC (rev 323903)
@@ -6,7 +6,7 @@
 /* Define the minimum supported version */
 #undef _WIN32_WINNT
 #undef NTDDI_VERSION
-#define _WIN32_WINNT 0x502
+#define _WIN32_WINNT 0x0501
 #define NTDDI_VERSION  0x05010200

 /* Default PHP / PEAR directories */

-- 
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/NEWS branches/PHP_5_4/Zend/tests/traits/bug61052.phpt branches/PHP_5_4/Zend/zend_compile.c trunk/Zend/tests/traits/bug61052.phpt trunk/Zend/zend_compile.c

[Stefan Marr]

gron Sun, 04 Mar 2012 19:34:19 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323898

Log:
Fixed Bug #61052 (Missing error check in trait 'insteadof' clause)

Bug: https://bugs.php.net/61052 (Assigned) missing error check in trait 
'insteadof' clause
  
Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS
A   php/php-src/branches/PHP_5_4/Zend/tests/traits/bug61052.phpt
U   php/php-src/branches/PHP_5_4/Zend/zend_compile.c
A   php/php-src/trunk/Zend/tests/traits/bug61052.phpt
U   php/php-src/trunk/Zend/zend_compile.c

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-04 19:30:01 UTC (rev 323897)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-04 19:34:19 UTC (rev 323898)
@@ -23,6 +23,7 @@
 vars). (Laruence)
   . Fixed bug #61011 (Crash when an exception is thrown by __autoload
 accessing a static property). (Laruence)
+  . Fixed bug #61052 (Missing error check in trait 'insteadof' clause). 
(Stefan)
   . Fixed bug #61072 (Memory leak when restoring an exception handler).
 (Nikic, Laruence)
   . Fixed bug #61087 (Memory leak in parse_ini_file when specifying

Added: php/php-src/branches/PHP_5_4/Zend/tests/traits/bug61052.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/traits/bug61052.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_4/Zend/tests/traits/bug61052.phpt
2012-03-04 19:34:19 UTC (rev 323898)
@@ -0,0 +1,18 @@
+--TEST--
+Bug #61052 (missing error check in trait 'insteadof' clause)
+--FILE--
+exclude_from_classes[j]) 
{
char* class_name = 
(char*)cur_precedence->exclude_from_classes[j];
zend_uint name_length = 
strlen(class_name);

cur_precedence->exclude_from_classes[j] 
= zend_fetch_class(class_name, name_length, ZEND_FETCH_CLASS_TRAIT TSRMLS_CC);
+
+   /* make sure that the trait method is 
not from a class mentioned in
+exclude_from_classes, for consistency 
*/
+   if (cur_precedence->trait_method->ce == 
cur_precedence->exclude_from_classes[i]) {
+   zend_error(E_COMPILE_ERROR,
+  
"Inconsistent insteadof definition. "
+  "The method 
%s is to be used from %s, but %s is also on the exclude list",
+  
cur_method_ref->method_name,
+  
cur_precedence->trait_method->ce->name,
+  
cur_precedence->trait_method->ce->name);
+   }
+
efree(class_name);
j++;
}

Added: php/php-src/trunk/Zend/tests/traits/bug61052.phpt
===
--- php/php-src/trunk/Zend/tests/traits/bug61052.phpt   
(rev 0)
+++ php/php-src/trunk/Zend/tests/traits/bug61052.phpt   2012-03-04 19:34:19 UTC 
(rev 323898)
@@ -0,0 +1,18 @@
+--TEST--
+Bug #61052 (missing error check in trait 'insteadof' clause)
+--FILE--
+exclude_from_classes[j]) 
{
char* class_name = 
(char*)cur_precedence->exclude_from_classes[j];
zend_uint name_length = 
strlen(class_name);

cur_precedence->exclude_from_classes[j] 
= zend_fetch_class(class_name, name_length, ZEND_FETCH_CLASS_TRAIT TSRMLS_CC);
+
+   /* make sure that the trait method is 
not from a class mentioned in
+exclude_from_classes, for consistency 
*/
+   if (cur_precedence->trait_method->ce == 
cur_precedence->exclude_from_classes[i]) {
+   zend_error(E_COMPILE_ERROR,
+  
"Inconsistent insteadof definition. "
+  "The method 
%s is to be used from %s, but %s is also on the exclude list",
+  
cur_method_ref->method_name,
+  
cur_precedence->trait_method->ce->name,
+  
cur_precedence->trait_method->ce->name);
+

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/tests/streams/bug60106.phpt branches/PHP_5_3/main/streams/xp_socket.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/st

[Ilia Alshanetsky]

The operation can continue on-successfully so E_NOTICE seemed
appropriate, I don't see a problem with escalating this to E_WARNING.

On Sat, Mar 3, 2012 at 9:34 PM, Laruence  wrote:
> Hi:
>   is a WARNING better?  :)
>
> thanks
>
> On Sun, Mar 4, 2012 at 4:36 AM, Ilia Alshanetsky  wrote:
>> iliaa                                    Sat, 03 Mar 2012 20:36:14 +
>>
>> Revision: http://svn.php.net/viewvc?view=revision&revision=323852
>>
>> Log:
>> Fixed bug #60106 (stream_socket_server silently truncates long unix socket 
>> paths)
>>
>> Bug: https://bugs.php.net/60106 (Open) stream_socket_server + long unix 
>> socket path = 'Unknown error'
>>
>> Changed paths:
>>    U   php/php-src/branches/PHP_5_3/NEWS
>>    A   php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug60106.phpt
>>    U   php/php-src/branches/PHP_5_3/main/streams/xp_socket.c
>>    U   php/php-src/branches/PHP_5_4/NEWS
>>    A   php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug60106.phpt
>>    U   php/php-src/branches/PHP_5_4/main/streams/xp_socket.c
>>    A   php/php-src/trunk/ext/standard/tests/streams/bug60106.phpt
>>    U   php/php-src/trunk/main/streams/xp_socket.c
>>
>>
>> --
>> PHP CVS Mailing List (http://www.php.net/)
>> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
>
> --
> Laruence  Xinchen Hui
> http://www.laruence.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_3/main/streams/xp_socket.c branches/PHP_5_4/main/streams/xp_socket.c trunk/main/streams/xp_socket.c

[Gustavo André dos Santos Lopes]

cataphract   Sun, 04 Mar 2012 19:30:01 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323897

Log:
- size_t may be shorter than long and definitely is not signed. Note that the
  z modifier was only added in C99, so we can't use it.

Changed paths:
U   php/php-src/branches/PHP_5_3/main/streams/xp_socket.c
U   php/php-src/branches/PHP_5_4/main/streams/xp_socket.c
U   php/php-src/trunk/main/streams/xp_socket.c

Modified: php/php-src/branches/PHP_5_3/main/streams/xp_socket.c
===
--- php/php-src/branches/PHP_5_3/main/streams/xp_socket.c   2012-03-04 
19:17:49 UTC (rev 323896)
+++ php/php-src/branches/PHP_5_3/main/streams/xp_socket.c   2012-03-04 
19:30:01 UTC (rev 323897)
@@ -514,7 +514,9 @@
 * BUT, to get into this branch of code, the name is too long,
 * so we don't care. */
xparam->inputs.namelen = sizeof(unix_addr->sun_path) - 1;
-   php_error_docref(NULL TSRMLS_CC, E_NOTICE, "socket path 
exceeded the maximum allowed length of %ld bytes and was truncated", 
sizeof(unix_addr->sun_path));
+   php_error_docref(NULL TSRMLS_CC, E_NOTICE,
+   "socket path exceeded the maximum allowed length of %lu 
bytes "
+   "and was truncated", (unsigned 
long)sizeof(unix_addr->sun_path));
}

memcpy(unix_addr->sun_path, xparam->inputs.name, 
xparam->inputs.namelen);

Modified: php/php-src/branches/PHP_5_4/main/streams/xp_socket.c
===
--- php/php-src/branches/PHP_5_4/main/streams/xp_socket.c   2012-03-04 
19:17:49 UTC (rev 323896)
+++ php/php-src/branches/PHP_5_4/main/streams/xp_socket.c   2012-03-04 
19:30:01 UTC (rev 323897)
@@ -510,7 +510,9 @@
 * BUT, to get into this branch of code, the name is too long,
 * so we don't care. */
xparam->inputs.namelen = sizeof(unix_addr->sun_path) - 1;
-   php_error_docref(NULL TSRMLS_CC, E_NOTICE, "socket path 
exceeded the maximum allowed length of %ld bytes and was truncated", 
sizeof(unix_addr->sun_path));
+   php_error_docref(NULL TSRMLS_CC, E_NOTICE,
+   "socket path exceeded the maximum allowed length of %lu 
bytes "
+   "and was truncated", (unsigned 
long)sizeof(unix_addr->sun_path));
}

memcpy(unix_addr->sun_path, xparam->inputs.name, 
xparam->inputs.namelen);

Modified: php/php-src/trunk/main/streams/xp_socket.c
===
--- php/php-src/trunk/main/streams/xp_socket.c  2012-03-04 19:17:49 UTC (rev 
323896)
+++ php/php-src/trunk/main/streams/xp_socket.c  2012-03-04 19:30:01 UTC (rev 
323897)
@@ -510,7 +510,9 @@
 * BUT, to get into this branch of code, the name is too long,
 * so we don't care. */
xparam->inputs.namelen = sizeof(unix_addr->sun_path) - 1;
-   php_error_docref(NULL TSRMLS_CC, E_NOTICE, "socket path 
exceeded the maximum allowed length of %ld bytes and was truncated", 
sizeof(unix_addr->sun_path));
+   php_error_docref(NULL TSRMLS_CC, E_NOTICE,
+   "socket path exceeded the maximum allowed length of %lu 
bytes "
+   "and was truncated", (unsigned 
long)sizeof(unix_addr->sun_path));
}

memcpy(unix_addr->sun_path, xparam->inputs.name, 
xparam->inputs.namelen);

-- 
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/sockets/ multicast.h

[Gustavo André dos Santos Lopes]

cataphract   Sun, 04 Mar 2012 19:17:49 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323896

Log:
- Allow Windows builds targeting Vista and above have access to the RFC 3678
  API for multicasting.

Changed paths:
U   php/php-src/trunk/ext/sockets/multicast.h

Modified: php/php-src/trunk/ext/sockets/multicast.h
===
--- php/php-src/trunk/ext/sockets/multicast.h   2012-03-04 19:08:18 UTC (rev 
323895)
+++ php/php-src/trunk/ext/sockets/multicast.h   2012-03-04 19:17:49 UTC (rev 
323896)
@@ -18,8 +18,7 @@

 /* $Id$ */

-#if defined(MCAST_JOIN_GROUP) && \
-   (!defined(PHP_WIN32) || (_WIN32_WINNT >= 0x600 && 
SOCKETS_ENABLE_VISTA_API))
+#if defined(MCAST_JOIN_GROUP)
 #define RFC3678_API 1
 /* has block/unblock and source membership, in this case for both IPv4 and 
IPv6 */
 #define HAS_MCAST_EXT 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_4/NEWS branches/PHP_5_4/Zend/tests/traits/bug55524.phpt branches/PHP_5_4/Zend/zend_compile.c trunk/Zend/tests/traits/bug55524.phpt trunk/Zend/zend_compile.c

[Stefan Marr]

gron Sun, 04 Mar 2012 18:33:33 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323892

Log:
Fixed Bug #60911 (Confusing error message when extending traits)

Bug: https://bugs.php.net/60911 (Assigned) Confusing error message when 
extending traits
  
Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS
U   php/php-src/branches/PHP_5_4/Zend/tests/traits/bug55524.phpt
U   php/php-src/branches/PHP_5_4/Zend/zend_compile.c
U   php/php-src/trunk/Zend/tests/traits/bug55524.phpt
U   php/php-src/trunk/Zend/zend_compile.c

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2012-03-04 18:26:11 UTC (rev 323891)
+++ php/php-src/branches/PHP_5_4/NEWS   2012-03-04 18:33:33 UTC (rev 323892)
@@ -17,6 +17,7 @@
   . Fixed bug #60717 (Order of traits in use statement can cause a fatal
 error). (Stefan)
   . Fixed bug #60801 (strpbrk() mishandles NUL byte). (Adam)
+  . Fixed bug #60911 (Confusing error message when extending traits). (Stefan)
   . Fixed bug #60978 (exit code incorrect). (Laruence)
   . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical
 vars). (Laruence)

Modified: php/php-src/branches/PHP_5_4/Zend/tests/traits/bug55524.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/traits/bug55524.phpt
2012-03-04 18:26:11 UTC (rev 323891)
+++ php/php-src/branches/PHP_5_4/Zend/tests/traits/bug55524.phpt
2012-03-04 18:33:33 UTC (rev 323892)
@@ -12,4 +12,4 @@
 echo 'DONE';
 ?>
 --EXPECTF--
-Fatal error: A trait (Foo) cannot extend a class in %s on line %d
+Fatal error: A trait (Foo) cannot extend a class. Traits can only be composed 
from other traits with the 'use' keyword. Error in %s on line %d

Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.c2012-03-04 18:26:11 UTC 
(rev 323891)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c2012-03-04 18:33:33 UTC 
(rev 323892)
@@ -4995,7 +4995,7 @@
if (doing_inheritance) {
/* Make sure a trait does not try to extend a class */
if ((new_class_entry->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) {
-   zend_error(E_COMPILE_ERROR, "A trait (%s) cannot extend a class", 
new_class_entry->name);
+   zend_error(E_COMPILE_ERROR, "A trait (%s) cannot extend a class. 
Traits can only be composed from other traits with the 'use' keyword. Error", 
new_class_entry->name);
}

opline->extended_value = parent_class_name->u.op.var;

Modified: php/php-src/trunk/Zend/tests/traits/bug55524.phpt
===
--- php/php-src/trunk/Zend/tests/traits/bug55524.phpt   2012-03-04 18:26:11 UTC 
(rev 323891)
+++ php/php-src/trunk/Zend/tests/traits/bug55524.phpt   2012-03-04 18:33:33 UTC 
(rev 323892)
@@ -12,4 +12,4 @@
 echo 'DONE';
 ?>
 --EXPECTF--
-Fatal error: A trait (Foo) cannot extend a class in %s on line %d
+Fatal error: A trait (Foo) cannot extend a class. Traits can only be composed 
from other traits with the 'use' keyword. Error in %s on line %d

Modified: php/php-src/trunk/Zend/zend_compile.c
===
--- php/php-src/trunk/Zend/zend_compile.c   2012-03-04 18:26:11 UTC (rev 
323891)
+++ php/php-src/trunk/Zend/zend_compile.c   2012-03-04 18:33:33 UTC (rev 
323892)
@@ -4995,7 +4995,7 @@
if (doing_inheritance) {
/* Make sure a trait does not try to extend a class */
if ((new_class_entry->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) {
-   zend_error(E_COMPILE_ERROR, "A trait (%s) cannot extend a class", 
new_class_entry->name);
+   zend_error(E_COMPILE_ERROR, "A trait (%s) cannot extend a class. 
Traits can only be composed from other traits with the 'use' keyword. Error", 
new_class_entry->name);
}

opline->extended_value = parent_class_name->u.op.var;

-- 
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/NEWS branches/PHP_5_4/Zend/tests/traits/bug60717.phpt branches/PHP_5_4/Zend/tests/traits/bugs/abstract-methods06.phpt branches/PHP_5_4/Zend/zend_compile.c

[Stefan Marr]

gron Sun, 04 Mar 2012 18:26:11 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323891

Log:
Fixed Bug #60717 (Order of traits in use statement can cause a fatal error)
# Compatibility is now correctly checked in both directions.
# Introduced helper method for the test.

Bug: https://bugs.php.net/60717 (Assigned) Order of traits in use statement can 
cause a fatal error
  
Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS
A   php/php-src/branches/PHP_5_4/Zend/tests/traits/bug60717.phpt
U   
php/php-src/branches/PHP_5_4/Zend/tests/traits/bugs/abstract-methods06.phpt
U   php/php-src/branches/PHP_5_4/Zend/zend_compile.c
A   php/php-src/trunk/Zend/tests/traits/bug60717.phpt
U   php/php-src/trunk/Zend/tests/traits/bugs/abstract-methods06.phpt
U   php/php-src/trunk/Zend/zend_compile.c

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS	2012-03-04 17:21:16 UTC (rev 323890)
+++ php/php-src/branches/PHP_5_4/NEWS	2012-03-04 18:26:11 UTC (rev 323891)
@@ -14,6 +14,8 @@
 - Core:
   . Fixed bug #60573 (type hinting with "self" keyword causes weird errors).
 (Laruence)
+  . Fixed bug #60717 (Order of traits in use statement can cause a fatal
+error). (Stefan)
   . Fixed bug #60801 (strpbrk() mishandles NUL byte). (Adam)
   . Fixed bug #60978 (exit code incorrect). (Laruence)
   . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical

Added: php/php-src/branches/PHP_5_4/Zend/tests/traits/bug60717.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/traits/bug60717.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_4/Zend/tests/traits/bug60717.phpt	2012-03-04 18:26:11 UTC (rev 323891)
@@ -0,0 +1,73 @@
+--TEST--
+Bug #60717 (Order of traits in use statement can cause unexpected unresolved abstract method)
+--FILE--
+
 --EXPECTF--
-Fatal error: Declaration of THelloB::hello() must be compatible with THelloA::hello($a) in %s on line %d
\ No newline at end of file
+Fatal error: Declaration of THelloA::hello($a) must be compatible with THelloB::hello() in %s on line %d
\ No newline at end of file

Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.c	2012-03-04 17:21:16 UTC (rev 323890)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c	2012-03-04 18:26:11 UTC (rev 323891)
@@ -3623,6 +3623,18 @@
 }
 /* }}} */

+static zend_bool zend_traits_method_compatibility_check(zend_function *fn, zend_function *other_fn TSRMLS_DC) /* {{{ */
+{
+	zend_uintfn_flags = fn->common.scope->ce_flags;
+	zend_uint other_flags = other_fn->common.scope->ce_flags;
+
+	return zend_do_perform_implementation_check(fn, other_fn TSRMLS_CC)
+		&& zend_do_perform_implementation_check(other_fn, fn TSRMLS_CC)
+		&& ((fn_flags & ZEND_ACC_FINAL) == (other_flags & ZEND_ACC_FINAL))   /* equal final qualifier */
+		&& ((fn_flags & ZEND_ACC_STATIC)== (other_flags & ZEND_ACC_STATIC)); /* equal static qualifier */
+}
+/* }}} */
+
 static int zend_traits_merge_functions(zend_function *fn TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */
 {
 	size_t current;
@@ -3645,22 +3657,16 @@
 		if (i == current) {
 			continue; /* just skip this, cause its the table this function is applied on */
 		}
-
+
 		if (zend_hash_quick_find(function_tables[i], hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void **)&other_trait_fn) == SUCCESS) {
 			/* if it is an abstract method, there is no collision */
 			if (other_trait_fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
 /* Make sure they are compatible */
-if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
-	/* In case both are abstract, just check prototype, but need to do that in both directions */
-	if (   !zend_do_perform_implementation_check(fn, other_trait_fn TSRMLS_CC)
-		|| !zend_do_perform_implementation_check(other_trait_fn, fn TSRMLS_CC)) {
-		zend_error(E_COMPILE_ERROR, "Declaration of %s must be compatible with %s", //ZEND_FN_SCOPE_NAME(fn), fn->common.function_name, //::%s()
-	zend_get_function_declaration(fn TSRMLS_CC),
-	zend_get_function_declaration(other_trait_fn TSRMLS_CC));
-	}
-} else {
-	/* otherwise, do the full check */
-	do_inheritance_check_on_method(fn, other_trait_fn TSRMLS_CC);
+/* In case both are abstract, just check prototype, but need to do that in both directions */
+if (!zend_traits_method_compatibility_check(fn, other_trait_fn TSRMLS_CC)) {
+	zend_error(E_COMPILE_ERROR, "Declaration of %s must be compatible with %s",
+zend_get_function_declaration(fn TSRMLS_CC),
+zend_get_function_declaration(other_trait_fn TSRMLS_CC));
 }

 /* we can savely free and remove 

[PHP-CVS] svn: /php/php-src/trunk/ NEWS UPGRADING

[Pierre Joye]

pajoye   Sun, 04 Mar 2012 17:02:55 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323886

Log:
- notes about xp&2003 drop

Changed paths:
U   php/php-src/trunk/NEWS
U   php/php-src/trunk/UPGRADING

Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS  2012-03-04 17:00:40 UTC (rev 323885)
+++ php/php-src/trunk/NEWS  2012-03-04 17:02:55 UTC (rev 323886)
@@ -3,6 +3,7 @@
 ?? ??? 201?, PHP 5.5.0

 - General improvements:
+  . Drop Windows XP and 2003 support. (Pierre)
   . World domination

 - cURL:

Modified: php/php-src/trunk/UPGRADING
===
--- php/php-src/trunk/UPGRADING 2012-03-04 17:00:40 UTC (rev 323885)
+++ php/php-src/trunk/UPGRADING 2012-03-04 17:02:55 UTC (rev 323886)
@@ -137,7 +137,7 @@
 13. Windows support
 ===

--
+- Drop Windows XP and 2003 support. (Pierre)

 ===
 14. New in PHP X.Y:

-- 
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 UPGRADING

[Nikita Popov]

nikicSun, 04 Mar 2012 16:32:01 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323881

Log:
NEWS and UPGRADING for r323862

Changed paths:
U   php/php-src/trunk/NEWS
U   php/php-src/trunk/UPGRADING

Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS  2012-03-04 16:20:55 UTC (rev 323880)
+++ php/php-src/trunk/NEWS  2012-03-04 16:32:01 UTC (rev 323881)
@@ -28,6 +28,10 @@
still exists for backward compatibility but is doing nothing). 
(Pierrick)
   . Fixed bug #54995 (Missing CURLINFO_RESPONSE_CODE support). (Pierrick)

+- PCRE:
+  . Deprecated the /e modifier
+(https://wiki.php.net/rfc/remove_preg_replace_eval_modifier). (Nikita 
Popov)
+
 - pgsql
   . Added pg_escape_literal() and pg_escape_identifier() (Yasuo)


Modified: php/php-src/trunk/UPGRADING
===
--- php/php-src/trunk/UPGRADING 2012-03-04 16:20:55 UTC (rev 323880)
+++ php/php-src/trunk/UPGRADING 2012-03-04 16:32:01 UTC (rev 323881)
@@ -72,7 +72,8 @@
 7. Deprecated
 =

--
+- The preg_replace /e modifier is now deprecated.
+  You should use preg_replace_callback instead.

 ==
 8. Removed

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/trunk/ main/network.c win32/build/config.w32.h.in win32/inet.c win32/inet.h win32/sendmail.c

[Christopher Jones]

On Mar 4, 2012, at 7:08 AM, Pierre Joye  wrote:

> pajoye   Sun, 04 Mar 2012 15:08:12 +
> 
> Revision: http://svn.php.net/viewvc?view=revision&revision=323865
> 
> Log:
> - bump minimum version, no more XP/2003

Can you add this to UPGRADING and NEWS?

Chris 

> 
> Changed paths:
>U   php/php-src/trunk/main/network.c
>U   php/php-src/trunk/win32/build/config.w32.h.in
>U   php/php-src/trunk/win32/inet.c
>U   php/php-src/trunk/win32/inet.h
>U   php/php-src/trunk/win32/sendmail.c
> 
> Modified: php/php-src/trunk/main/network.c
> ===
> --- php/php-src/trunk/main/network.c2012-03-04 14:57:07 UTC (rev 323864)
> +++ php/php-src/trunk/main/network.c2012-03-04 15:08:12 UTC (rev 323865)
> @@ -25,7 +25,10 @@
> 
> #include 
> 
> +
> +
> #ifdef PHP_WIN32
> +# include 
> # include "win32/inet.h"
> # define O_RDONLY _O_RDONLY
> # include "win32/param.h"
> 
> Modified: php/php-src/trunk/win32/build/config.w32.h.in
> ===
> --- php/php-src/trunk/win32/build/config.w32.h.in2012-03-04 14:57:07 UTC 
> (rev 323864)
> +++ php/php-src/trunk/win32/build/config.w32.h.in2012-03-04 15:08:12 UTC 
> (rev 323865)
> @@ -6,8 +6,8 @@
> /* Define the minimum supported version */
> #undef _WIN32_WINNT
> #undef NTDDI_VERSION
> -#define _WIN32_WINNT 0x502
> -#define NTDDI_VERSION  _WIN32_WIN2K
> +#define _WIN32_WINNT 0x0600
> +#define NTDDI_VERSION  0x06000100
> 
> /* Default PHP / PEAR directories */
> #define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):""
> 
> Modified: php/php-src/trunk/win32/inet.c
> ===
> --- php/php-src/trunk/win32/inet.c2012-03-04 14:57:07 UTC (rev 323864)
> +++ php/php-src/trunk/win32/inet.c2012-03-04 15:08:12 UTC (rev 323865)
> @@ -1,12 +1,13 @@
> #include "config.w32.h"
> -#if (_WIN32_WINNT < 0x0600) /* Vista/2k8 have these functions */
> #include "php.h"
> #include 
> #include 
> #include 
> 
> #include "inet.h"
> +#if (_WIN32_WINNT < 0x0600) /* Vista/2k8 have these functions */
> 
> +
> PHPAPI int inet_pton(int af, const char* src, void* dst)
> {
>int address_length;
> @@ -76,6 +77,8 @@
>return NULL;
> }
> 
> +#endif
> +
> int inet_aton(const char *cp, struct in_addr *inp) {
>   inp->s_addr = inet_addr(cp);
> 
> @@ -85,4 +88,3 @@
> 
>   return 1;
> }
> -#endif
> 
> Modified: php/php-src/trunk/win32/inet.h
> ===
> --- php/php-src/trunk/win32/inet.h2012-03-04 14:57:07 UTC (rev 323864)
> +++ php/php-src/trunk/win32/inet.h2012-03-04 15:08:12 UTC (rev 323865)
> @@ -6,5 +6,6 @@
> #if (_WIN32_WINNT <= 0x502)
> PHPAPI int inet_pton(int af, const char* src, void* dst);
> PHPAPI const char* inet_ntop(int af, const void* src, char* dst, size_t size);
> +#endif
> +
> PHPAPI int inet_aton(const char *cp, struct in_addr *inp);
> -#endif
> 
> Modified: php/php-src/trunk/win32/sendmail.c
> ===
> --- php/php-src/trunk/win32/sendmail.c2012-03-04 14:57:07 UTC (rev 323864)
> +++ php/php-src/trunk/win32/sendmail.c2012-03-04 15:08:12 UTC (rev 323865)
> @@ -25,6 +25,7 @@
> #ifndef NETWARE
> #include 
> #include "time.h"
> +# include 
> #else/* NETWARE */
> #include 
> #endif/* NETWARE */
> 
> -- 
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/trunk/ ext/pcre/php_pcre.c ext/pcre/tests/002.phpt ext/pcre/tests/004.phpt tests/lang/bug24403.phpt

[Christopher Jones]

On Mar 4, 2012, at 5:39 AM, Nikita Popov  wrote:

> nikicSun, 04 Mar 2012 13:39:12 +
> 
> Revision: http://svn.php.net/viewvc?view=revision&revision=323862
> 
> Log:
> Deprecate /e modifier
> 

This needs to be in UPGRADING and NEWS.

Chris


> See https://wiki.php.net/rfc/remove_preg_replace_eval_modifier.
> 
> Changed paths:
>U   php/php-src/trunk/ext/pcre/php_pcre.c
>U   php/php-src/trunk/ext/pcre/tests/002.phpt
>U   php/php-src/trunk/ext/pcre/tests/004.phpt
>U   php/php-src/trunk/tests/lang/bug24403.phpt
> 
> Modified: php/php-src/trunk/ext/pcre/php_pcre.c
> ===
> --- php/php-src/trunk/ext/pcre/php_pcre.c2012-03-04 13:31:04 UTC (rev 
> 323861)
> +++ php/php-src/trunk/ext/pcre/php_pcre.c2012-03-04 13:39:12 UTC (rev 
> 323862)
> @@ -1019,6 +1019,10 @@
>replace_end = replace + replace_len;
>}
> 
> +if (eval) {
> +php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "The /e modifier is 
> deprecated, use preg_replace_callback instead");
> +}
> +
>/* Calculate the size of the offsets array, and allocate memory for it. */
>rc = pcre_fullinfo(pce->re, extra, PCRE_INFO_CAPTURECOUNT, &num_subpats);
>if (rc < 0) {
> 
> Modified: php/php-src/trunk/ext/pcre/tests/002.phpt
> ===
> --- php/php-src/trunk/ext/pcre/tests/002.phpt2012-03-04 13:31:04 UTC (rev 
> 323861)
> +++ php/php-src/trunk/ext/pcre/tests/002.phpt2012-03-04 13:39:12 UTC (rev 
> 323862)
> @@ -34,6 +34,8 @@
> Warning: preg_replace(): Compilation failed: missing terminating ] for 
> character class at offset 8 in %s002.php on line 11
> NULL
> 
> +Deprecated: preg_replace(): The /e modifier is deprecated, use 
> preg_replace_callback instead in %s on line 12
> +
> Parse error: %s in %s002.php(12) : regexp code on line 1
> 
> Fatal error: preg_replace(): Failed evaluating code:
> 
> Modified: php/php-src/trunk/ext/pcre/tests/004.phpt
> ===
> --- php/php-src/trunk/ext/pcre/tests/004.phpt2012-03-04 13:31:04 UTC (rev 
> 323861)
> +++ php/php-src/trunk/ext/pcre/tests/004.phpt2012-03-04 13:39:12 UTC (rev 
> 323862)
> @@ -16,7 +16,7 @@
> 
> var_dump(preg_split('/PHP_(?:NAMED_)?(?:FUNCTION|METHOD)\s*\((\w+(?:,\s*\w+)?)\)/S',
>  "PHP_FUNCTION(s, preg_match)\n{\nlalala", -1, PREG_SPLIT_DELIM_CAPTURE | 
> PREG_SPLIT_OFFSET_CAPTURE));
> ?>
> ---EXPECT--
> +--EXPECTF--
> int(2)
> array(2) {
>   [0]=>
> @@ -117,6 +117,8 @@
> }
>   }
> }
> +
> +Deprecated: preg_replace(): The /e modifier is deprecated, use 
> preg_replace_callback instead in %s on line %d
> string(9) "hello
> 
> 
> 
> Modified: php/php-src/trunk/tests/lang/bug24403.phpt
> ===
> --- php/php-src/trunk/tests/lang/bug24403.phpt2012-03-04 13:31:04 UTC 
> (rev 323861)
> +++ php/php-src/trunk/tests/lang/bug24403.phpt2012-03-04 13:39:12 UTC 
> (rev 323862)
> @@ -17,4 +17,5 @@
> }
> new a();
> ?>
> ---EXPECT--
> +--EXPECTF--
> +Deprecated: preg_replace(): The /e modifier is deprecated, use 
> preg_replace_callback instead in %s on line %d
> 
> -- 
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/branches/ PHP_5_3/win32/build/config.w32.h.in PHP_5_4/win32/build/config.w32.h.in

[Pierre Joye]

pajoye   Sun, 04 Mar 2012 15:23:24 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323866

Log:
- fix bug #54407, Incorrectly defined NTDDI_VERSION macro

Bug: https://bugs.php.net/54407 (Assigned) Incorrectly defined NTDDI_VERSION 
macro 
  
Changed paths:
U   php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in
U   php/php-src/branches/PHP_5_4/win32/build/config.w32.h.in

Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in2012-03-04 
15:08:12 UTC (rev 323865)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in2012-03-04 
15:23:24 UTC (rev 323866)
@@ -6,8 +6,8 @@
 /* Define the minimum supported version */
 #undef _WIN32_WINNT
 #undef NTDDI_VERSION
-#define _WIN32_WINNT 0x500
-#define NTDDI_VERSION  _WIN32_WIN2K
+#define _WIN32_WINNT 0x502
+#define NTDDI_VERSION  0x05010200

 /* Default PHP / PEAR directories */
 #define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):""

Modified: php/php-src/branches/PHP_5_4/win32/build/config.w32.h.in
===
--- php/php-src/branches/PHP_5_4/win32/build/config.w32.h.in2012-03-04 
15:08:12 UTC (rev 323865)
+++ php/php-src/branches/PHP_5_4/win32/build/config.w32.h.in2012-03-04 
15:23:24 UTC (rev 323866)
@@ -7,7 +7,7 @@
 #undef _WIN32_WINNT
 #undef NTDDI_VERSION
 #define _WIN32_WINNT 0x502
-#define NTDDI_VERSION  _WIN32_WIN2K
+#define NTDDI_VERSION  0x05010200

 /* Default PHP / PEAR directories */
 #define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):""

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/ main/network.c win32/build/config.w32.h.in win32/inet.c win32/inet.h win32/sendmail.c

[Pierre Joye]

pajoye   Sun, 04 Mar 2012 15:08:12 +

Revision: http://svn.php.net/viewvc?view=revision&revision=323865

Log:
- bump minimum version, no more XP/2003

Changed paths:
U   php/php-src/trunk/main/network.c
U   php/php-src/trunk/win32/build/config.w32.h.in
U   php/php-src/trunk/win32/inet.c
U   php/php-src/trunk/win32/inet.h
U   php/php-src/trunk/win32/sendmail.c

Modified: php/php-src/trunk/main/network.c
===
--- php/php-src/trunk/main/network.c2012-03-04 14:57:07 UTC (rev 323864)
+++ php/php-src/trunk/main/network.c2012-03-04 15:08:12 UTC (rev 323865)
@@ -25,7 +25,10 @@

 #include 

+
+
 #ifdef PHP_WIN32
+# include 
 # include "win32/inet.h"
 # define O_RDONLY _O_RDONLY
 # include "win32/param.h"

Modified: php/php-src/trunk/win32/build/config.w32.h.in
===
--- php/php-src/trunk/win32/build/config.w32.h.in   2012-03-04 14:57:07 UTC 
(rev 323864)
+++ php/php-src/trunk/win32/build/config.w32.h.in   2012-03-04 15:08:12 UTC 
(rev 323865)
@@ -6,8 +6,8 @@
 /* Define the minimum supported version */
 #undef _WIN32_WINNT
 #undef NTDDI_VERSION
-#define _WIN32_WINNT 0x502
-#define NTDDI_VERSION  _WIN32_WIN2K
+#define _WIN32_WINNT 0x0600
+#define NTDDI_VERSION  0x06000100

 /* Default PHP / PEAR directories */
 #define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):""

Modified: php/php-src/trunk/win32/inet.c
===
--- php/php-src/trunk/win32/inet.c  2012-03-04 14:57:07 UTC (rev 323864)
+++ php/php-src/trunk/win32/inet.c  2012-03-04 15:08:12 UTC (rev 323865)
@@ -1,12 +1,13 @@
 #include "config.w32.h"
-#if (_WIN32_WINNT < 0x0600) /* Vista/2k8 have these functions */
 #include "php.h"
 #include 
 #include 
 #include 

 #include "inet.h"
+#if (_WIN32_WINNT < 0x0600) /* Vista/2k8 have these functions */

+
 PHPAPI int inet_pton(int af, const char* src, void* dst)
 {
int address_length;
@@ -76,6 +77,8 @@
return NULL;
 }

+#endif
+
 int inet_aton(const char *cp, struct in_addr *inp) {
   inp->s_addr = inet_addr(cp);

@@ -85,4 +88,3 @@

   return 1;
 }
-#endif

Modified: php/php-src/trunk/win32/inet.h
===
--- php/php-src/trunk/win32/inet.h  2012-03-04 14:57:07 UTC (rev 323864)
+++ php/php-src/trunk/win32/inet.h  2012-03-04 15:08:12 UTC (rev 323865)
@@ -6,5 +6,6 @@
 #if (_WIN32_WINNT <= 0x502)
 PHPAPI int inet_pton(int af, const char* src, void* dst);
 PHPAPI const char* inet_ntop(int af, const void* src, char* dst, size_t size);
+#endif
+
 PHPAPI int inet_aton(const char *cp, struct in_addr *inp);
-#endif

Modified: php/php-src/trunk/win32/sendmail.c
===
--- php/php-src/trunk/win32/sendmail.c  2012-03-04 14:57:07 UTC (rev 323864)
+++ php/php-src/trunk/win32/sendmail.c  2012-03-04 15:08:12 UTC (rev 323865)
@@ -25,6 +25,7 @@
 #ifndef NETWARE
 #include 
 #include "time.h"
+# include 
 #else  /* NETWARE */
 #include 
 #endif /* NETWARE */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php