iliaa Wed Feb 27 00:32:40 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main/streams xp_socket.c
/php-src NEWS
Log:
MFB: Fixed bug #44233 (MSG_PEEK undefined under BeOS R5)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.33.2.2.2.7&r2=1.33.2.2.2.8&diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.33.2.2.2.7
php-src/main/streams/xp_socket.c:1.33.2.2.2.8
--- php-src/main/streams/xp_socket.c:1.33.2.2.2.7 Mon Dec 31 07:20:15 2007
+++ php-src/main/streams/xp_socket.c Wed Feb 27 00:32:39 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xp_socket.c,v 1.33.2.2.2.7 2007/12/31 07:20:15 sebastian Exp $ */
+/* $Id: xp_socket.c,v 1.33.2.2.2.8 2008/02/27 00:32:39 iliaa Exp $ */
#include "php.h"
#include "ext/standard/file.h"
@@ -35,6 +35,10 @@
# define MSG_DONTWAIT 0
#endif
+#ifndef MSG_PEEK
+# define MSG_PEEK 0
+#endif
+
php_stream_ops php_stream_generic_socket_ops;
PHPAPI php_stream_ops php_stream_socket_ops;
php_stream_ops php_stream_udp_socket_ops;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1098&r2=1.2027.2.547.2.1099&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1098 php-src/NEWS:1.2027.2.547.2.1099
--- php-src/NEWS:1.2027.2.547.2.1098 Tue Feb 26 00:04:18 2008
+++ php-src/NEWS Wed Feb 27 00:32:39 2008
@@ -14,6 +14,8 @@
- Fixed bug #44242 (metaphone('CMXFXM') crashes PHP). (Felipe)
+- Fixed bug #44233 (MSG_PEEK undefined under BeOS R5). (jonathonfreeman at
+ gmail dot com, Ilia)
- Fixed bug #44216 (strftime segfaults on large negative value). (Derick)
- Fixed bug #44200 (A crash in PDO when no bound targets exists and yet
bound parameters are present). (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
