[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main/streams xp_socket.c

2008-02-26 Thread Ilia Alshanetsky 
iliaa   Wed Feb 27 00:32:40 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main/streams   xp_socket.c 
/php-srcNEWS 
  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.cWed 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.1098Tue Feb 26 00:04:18 2008
+++ php-src/NEWSWed 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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main/streams xp_socket.c

2007-07-24 Thread Dmitry Stogov 
dmitry  Tue Jul 24 14:24:44 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/main/streams   xp_socket.c 
  Log:
  Fixed bug #41984 (Hangs on large SoapClient requests)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.852&r2=1.2027.2.547.2.853&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.852 php-src/NEWS:1.2027.2.547.2.853
--- php-src/NEWS:1.2027.2.547.2.852 Tue Jul 24 14:21:36 2007
+++ php-src/NEWSTue Jul 24 14:24:44 2007
@@ -72,6 +72,7 @@
 - Fixed bug #42015 (ldap_rename(): server error "DSA is unwilling to perform").
   (bob at mroczka dot com, Jani)
 - Fixed bug #41989 (move_uploaded_file() & relative path in ZTS mode). (Tony)
+- Fixed bug #41984 (Hangs on large SoapClient requests). (Dmitry)
 - Fixed bug #41983 (Error Fetching http headers terminated by '\n'). (Dmitry)
 - Fixed bug #41964 (strtotime returns a timestamp for non-time string of
   pattern '(A|a) .+'). (Derick)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.33.2.2.2.5&r2=1.33.2.2.2.6&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.5 
php-src/main/streams/xp_socket.c:1.33.2.2.2.6
--- php-src/main/streams/xp_socket.c:1.33.2.2.2.5   Tue Jul 17 13:28:44 2007
+++ php-src/main/streams/xp_socket.cTue Jul 24 14:24:44 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: xp_socket.c,v 1.33.2.2.2.5 2007/07/17 13:28:44 jani Exp $ */
+/* $Id: xp_socket.c,v 1.33.2.2.2.6 2007/07/24 14:24:44 dmitry Exp $ */
 
 #include "php.h"
 #include "ext/standard/file.h"
@@ -31,6 +31,10 @@
 #include 
 #endif
 
+#ifndef MSG_DONTWAIT
+# define MSG_DONTWAIT 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;
@@ -59,7 +63,7 @@
ptimeout = &sock->timeout;
 
 retry:
-   didwrite = send(sock->socket, buf, count, 0);
+   didwrite = send(sock->socket, buf, count, (sock->is_blocked && 
ptimeout) ? MSG_DONTWAIT : 0);
 
if (didwrite <= 0) {
long err = php_socket_errno();
@@ -148,7 +152,7 @@
return 0;
}
 
-   nr_bytes = recv(sock->socket, buf, count, 0);
+   nr_bytes = recv(sock->socket, buf, count, (sock->is_blocked && 
sock->timeout.tv_sec != -1) ? MSG_DONTWAIT : 0);
 
stream->eof = (nr_bytes == 0 || (nr_bytes == -1 && php_socket_errno() 
!= EWOULDBLOCK));
 

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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main/streams xp_socket.c

2007-07-17 Thread Jani Taskinen 
janiTue Jul 17 13:28:44 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/main/streams   xp_socket.c 
  Log:
  MFH:- Fixed bugs #36796, #36918, #41371 (stream_set_blocking() does not work)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.837&r2=1.2027.2.547.2.838&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.837 php-src/NEWS:1.2027.2.547.2.838
--- php-src/NEWS:1.2027.2.547.2.837 Tue Jul 17 12:12:26 2007
+++ php-src/NEWSTue Jul 17 13:28:43 2007
@@ -154,6 +154,8 @@
   apache child die). (isk at ecommerce dot com, Gopal, Tony)
 - Fixed bug #39291 (ldap_sasl_bind() misses the sasl_authc_id parameter).
   (diafour at gmail dot com, Jani)
+- Fixed bugs #36796, #36918, #41371 (stream_set_blocking() does not work).
+  (Jani)
 - Fixed bug #35981 (pdo-pgsql should not use pkg-config when not present).
   (Jani)
 
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.33.2.2.2.4&r2=1.33.2.2.2.5&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.4 
php-src/main/streams/xp_socket.c:1.33.2.2.2.5
--- php-src/main/streams/xp_socket.c:1.33.2.2.2.4   Mon Jan  1 09:36:12 2007
+++ php-src/main/streams/xp_socket.cTue Jul 17 13:28:44 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: xp_socket.c,v 1.33.2.2.2.4 2007/01/01 09:36:12 sebastian Exp $ */
+/* $Id: xp_socket.c,v 1.33.2.2.2.5 2007/07/17 13:28:44 jani Exp $ */
 
 #include "php.h"
 #include "ext/standard/file.h"
@@ -281,18 +281,11 @@
}

case PHP_STREAM_OPTION_BLOCKING:
-   
oldmode = sock->is_blocked;
-   
-   /* no need to change anything */
-   if (value == oldmode)
-   return oldmode;
-   
if (SUCCESS == php_set_sock_blocking(sock->socket, 
value TSRMLS_CC)) {
sock->is_blocked = value;
return oldmode;
}
-
return PHP_STREAM_OPTION_RETURN_ERR;
 
case PHP_STREAM_OPTION_READ_TIMEOUT:
@@ -751,11 +744,8 @@
/* fall through */
;
}
-   
-   /* fall through */
-   default:
-   return php_sockop_set_option(stream, option, value, 
ptrparam TSRMLS_CC);
}
+   return php_sockop_set_option(stream, option, value, ptrparam TSRMLS_CC);
 }
 
 

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