[PHP-DEV] CVS update: php3/functions From: zeev (php-dev <email protected>)
Date: 04/29/98

Date: Wednesday April 29, 1998 @ 22:36
Author: zeev

Update of /repository/php3/functions
In directory asf:/tmp/cvs-serv21400/functions

Modified Files:
        file.c fsock.c
Log Message:
diff says it all :(

Index: php3/functions/file.c
diff -c php3/functions/file.c:1.162 php3/functions/file.c:1.163
*** php3/functions/file.c:1.162 Wed Apr 29 22:02:49 1998
--- php3/functions/file.c Wed Apr 29 22:36:20 1998
***************
*** 26,32 ****
     | Authors: Rasmus Lerdorf <rasmus <email protected>> |
     +----------------------------------------------------------------------+
   */
! /* $Id: file.c,v 1.162 1998/04/30 02:02:49 zeev Exp $ */
  #ifdef THREAD_SAFE
  #include "tls.h"
  #endif
--- 26,32 ----
     | Authors: Rasmus Lerdorf <rasmus <email protected>> |
     +----------------------------------------------------------------------+
   */
! /* $Id: file.c,v 1.163 1998/04/30 02:36:20 zeev Exp $ */
  #ifdef THREAD_SAFE
  #include "tls.h"
  #endif
***************
*** 104,110 ****
          {"tempnam", php3_tempnam, NULL},
          {"file", php3_file, NULL},
          {"set_socket_blocking", php3_set_socket_blocking, NULL},
! #if (HAVE_SYS_TIME_H && HAVE_SETSOCKOPT && defined(SO_SNDTIMEO) && defined(SO_RCVTIMEO))
          {"set_socket_timeout", php3_set_socket_timeout, NULL},
  #endif
          {NULL, NULL, NULL}
--- 104,110 ----
          {"tempnam", php3_tempnam, NULL},
          {"file", php3_file, NULL},
          {"set_socket_blocking", php3_set_socket_blocking, NULL},
! #if (0 && HAVE_SYS_TIME_H && HAVE_SETSOCKOPT && defined(SO_SNDTIMEO) && defined(SO_RCVTIMEO))
          {"set_socket_timeout", php3_set_socket_timeout, NULL},
  #endif
          {NULL, NULL, NULL}
***************
*** 457,463 ****
  }
  
  
! #if (HAVE_SYS_TIME_H && HAVE_SETSOCKOPT && defined(SO_SNDTIMEO) && defined(SO_RCVTIMEO))
  void php3_set_socket_timeout(INTERNAL_FUNCTION_PARAMETERS)
  {
          YYSTYPE *socket,*timeout;
--- 457,464 ----
  }
  
  
! #if (0 && HAVE_SYS_TIME_H && HAVE_SETSOCKOPT && defined(SO_SNDTIMEO) && defined(SO_RCVTIMEO))
! /* this doesn't work, as it appears those properties are read-only :( */
  void php3_set_socket_timeout(INTERNAL_FUNCTION_PARAMETERS)
  {
          YYSTYPE *socket,*timeout;
Index: php3/functions/fsock.c
diff -c php3/functions/fsock.c:1.64 php3/functions/fsock.c:1.65
*** php3/functions/fsock.c:1.64 Wed Apr 29 09:24:12 1998
--- php3/functions/fsock.c Wed Apr 29 22:36:20 1998
***************
*** 27,33 ****
     | Jim Winstead (jimw <email protected>) |
     +----------------------------------------------------------------------+
  */
! /* $Id: fsock.c,v 1.64 1998/04/29 13:24:12 ssb Exp $ */
  #ifdef THREAD_SAFE
  #include "tls.h"
  #endif
--- 27,33 ----
     | Jim Winstead (jimw <email protected>) |
     +----------------------------------------------------------------------+
  */
! /* $Id: fsock.c,v 1.65 1998/04/30 02:36:20 zeev Exp $ */
  #ifdef THREAD_SAFE
  #include "tls.h"
  #endif
***************
*** 182,188 ****
          int retval;
          int count=0;
          
! while (count<maxlen && (retval=recv(socket,buf,1,0))!=SOCK_RECV_ERR && retval!=0) {
                  if (*buf=='\n') {
                          buf++;
                          count++;
--- 182,188 ----
          int retval;
          int count=0;
          
! while (count<maxlen && (retval=recv(socket,buf,1,0))!=SOCK_RECV_ERR && retval!=EWOULDBLOCK && retval!=0) {
                  if (*buf=='\n') {
                          buf++;
                          count++;