lbarnaud Wed Oct 22 18:59:34 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src NEWS
/php-src/ext/sockets sockets.c
Log:
MFH: Fixed bug #46360 (TCP_NODELAY constant for socket_{get,set}_option)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.349&r2=1.2027.2.547.2.965.2.350&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.349
php-src/NEWS:1.2027.2.547.2.965.2.350
--- php-src/NEWS:1.2027.2.547.2.965.2.349 Tue Oct 21 23:22:00 2008
+++ php-src/NEWS Wed Oct 22 18:59:33 2008
@@ -18,6 +18,8 @@
- Fixed bug causing the algorithm parameter of mhash() to be modified. (Scott)
+- Fixed bug #46360 (TCP_NODELAY constant for socket_{get,set}_option).
+ (bugs at trick dot vanstaveren dot us)
- Fixed bug #46238 (Segmentation fault on static call with empty string
method).
(Felipe)
- Fixed bug #46205 (Closure - Memory leaks when ReflectionException is thrown).
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.14.2.7&r2=1.171.2.9.2.14.2.8&diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.7
php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.8
--- php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.7 Tue Oct 21 23:39:15 2008
+++ php-src/ext/sockets/sockets.c Wed Oct 22 18:59:33 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sockets.c,v 1.171.2.9.2.14.2.7 2008/10/21 23:39:15 lbarnaud Exp $ */
+/* $Id: sockets.c,v 1.171.2.9.2.14.2.8 2008/10/22 18:59:33 lbarnaud Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -661,6 +661,9 @@
REGISTER_LONG_CONSTANT("SO_ERROR", SO_ERROR,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("SOL_SOCKET", SOL_SOCKET,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("SOMAXCONN", SOMAXCONN,
CONST_CS | CONST_PERSISTENT);
+#ifdef TCP_NODELAY
+ REGISTER_LONG_CONSTANT("TCP_NODELAY", TCP_NODELAY, CONST_CS |
CONST_PERSISTENT);
+#endif
REGISTER_LONG_CONSTANT("PHP_NORMAL_READ", PHP_NORMAL_READ, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PHP_BINARY_READ", PHP_BINARY_READ, CONST_CS |
CONST_PERSISTENT);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
