lbarnaud                Wed May 20 09:06:32 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/sockets        sockets.c 
    /php-src    NEWS 
  Log:
  MFH: Fixed bug #48326 (constant MSG_DONTWAIT not defined)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.24&r2=1.171.2.9.2.25&diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.24 
php-src/ext/sockets/sockets.c:1.171.2.9.2.25
--- php-src/ext/sockets/sockets.c:1.171.2.9.2.24        Sun May 10 01:07:01 2009
+++ php-src/ext/sockets/sockets.c       Wed May 20 09:06:31 2009
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sockets.c,v 1.171.2.9.2.24 2009/05/10 01:07:01 felipe Exp $ */
+/* $Id: sockets.c,v 1.171.2.9.2.25 2009/05/20 09:06:31 lbarnaud Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -484,6 +484,9 @@
        REGISTER_LONG_CONSTANT("SOCK_RDM",              SOCK_RDM,               
CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("MSG_OOB",               MSG_OOB,                
CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("MSG_WAITALL",   MSG_WAITALL,    CONST_CS | 
CONST_PERSISTENT);
+#ifdef MSG_DONTWAIT
+       REGISTER_LONG_CONSTANT("MSG_DONTWAIT",  MSG_DONTWAIT,   CONST_CS | 
CONST_PERSISTENT);
+#endif
        REGISTER_LONG_CONSTANT("MSG_PEEK",              MSG_PEEK,               
CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("MSG_DONTROUTE", MSG_DONTROUTE,  CONST_CS | 
CONST_PERSISTENT);
 #ifdef MSG_EOR
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1514&r2=1.2027.2.547.2.1515&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1514 php-src/NEWS:1.2027.2.547.2.1515
--- php-src/NEWS:1.2027.2.547.2.1514    Mon May 18 18:46:06 2009
+++ php-src/NEWS        Wed May 20 09:06:31 2009
@@ -16,6 +16,7 @@
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
+- Fixed bug #48326 (constant MSG_DONTWAIT not defined). (Arnaud)
 - Fixed bug #48313 (fgetcsv() does not return null for empty rows). (Ilia)
 - Fixed bug #48309 (stream_copy_to_stream() and fpasstru() do not update stream
   position of plain files). (Arnaud)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to