summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2008-02-27 00:32:39 +0000
committerIlia Alshanetsky <iliaa@php.net>2008-02-27 00:32:39 +0000
commit45c443576e0257caa0995b862bd0a1e52b55f99d (patch)
tree8188e1dcef1e069baa4c7ade2a8c33d08bd4fe26
parent7c28ec2e54bad684b6cecf1bb3ff230256d36651 (diff)
downloadphp-git-45c443576e0257caa0995b862bd0a1e52b55f99d.tar.gz
MFB: Fixed bug #44233 (MSG_PEEK undefined under BeOS R5)
-rw-r--r--NEWS2
-rw-r--r--main/streams/xp_socket.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 908b4b63bd..4968482b7b 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@ PHP NEWS
- 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)
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
index 2ad13052eb..d40cfefe61 100644
--- a/main/streams/xp_socket.c
+++ b/main/streams/xp_socket.c
@@ -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;