svn: /php/php-src/branches/PHP_5_3_2/ main/streams/xp_socket.c tests/security/open_basedir_parse_ini_file.phpt
| From: | Pierre Joye | Date: | Wed, 03 Feb 2010 20:21:40 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_3_2/ main/streams/xp_socket.c tests/security/open_basedir_parse_ini_file.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-61747@lists.php.net to get a copy of this message | ||
pajoye Wed, 03 Feb 2010 20:21:40 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=294453
Log:
- Fixed bug #50787 (stream_set_write_buffer() has no effect on socket streams).
Bug: http://bugs.php.net/50787 (Closed)
stream_set_write_buffer() has no effect on socket streams
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
U php/php-src/branches/PHP_5_3_2/main/streams/xp_socket.c
_U php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_2
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293974
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293974
/php/php-src/trunk:284726
Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Modified: php/php-src/branches/PHP_5_3_2/main/streams/xp_socket.c
===================================================================
--- php/php-src/branches/PHP_5_3_2/main/streams/xp_socket.c 2010-02-03 20:19:05 UTC (rev 294452)
+++ php/php-src/branches/PHP_5_3_2/main/streams/xp_socket.c 2010-02-03 20:21:40 UTC (rev 294453)
@@ -400,6 +400,10 @@
}
#endif
+ case PHP_STREAM_OPTION_WRITE_BUFFER:
+ php_stream_set_chunk_size(stream, (ptrparam ? *(size_t *)ptrparam : PHP_SOCK_CHUNK_SIZE));
+ return PHP_STREAM_OPTION_RETURN_OK;
+
default:
return PHP_STREAM_OPTION_RETURN_NOTIMPL;
}
Property changes on: php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951