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
| From: | Gustavo André dos Santos Lopes | Date: | Thu, 08 Mar 2012 12:39:48 +0000 |
| Subject: | 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 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-67883@lists.php.net to get a copy of this message | ||
cataphract Thu, 08 Mar 2012 12:39:48 +0000
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.c 2012-03-08 12:30:59 UTC (rev 324020)
+++ php/php-src/trunk/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);
}
}