cvs: php4 /ext/ftp/ ftp.c
| From: | Andrew Skalski | Date: | Tue, 23 May 2000 13:56:04 +0000 |
| Subject: | cvs: php4 /ext/ftp/ ftp.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-15550@lists.php.net to get a copy of this message | ||
askalski Tue May 23 15:56:04 2000 EDT
Modified files:
/php4/ext/ftp ftp.c
Log:
Changed the #ifdefs around "errno = ETIMEDOUT;" to include the rest
of the statement ["if (n == 0)"]
Index: php4/ext/ftp/ftp.c
diff -u php4/ext/ftp/ftp.c:1.21 php4/ext/ftp/ftp.c:1.22
--- php4/ext/ftp/ftp.c:1.21 Tue May 23 15:49:55 2000
+++ php4/ext/ftp/ftp.c Tue May 23 15:56:04 2000
@@ -28,7 +28,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ftp.c,v 1.21 2000/05/23 13:49:55 andi Exp $ */
+/* $Id: ftp.c,v 1.22 2000/05/23 13:56:04 askalski Exp $ */
#include "php.h"
@@ -842,8 +842,8 @@
FD_SET(s, &write_set);
n = select(s + 1, NULL, &write_set, NULL, &tv);
if (n < 1) {
- if (n == 0)
#ifndef PHP_WIN32
+ if (n == 0)
errno = ETIMEDOUT;
#endif
return -1;
@@ -875,8 +875,8 @@
FD_SET(s, &read_set);
n = select(s + 1, &read_set, NULL, NULL, &tv);
if (n < 1) {
- if (n == 0)
#ifndef PHP_WIN32
+ if (n == 0)
errno = ETIMEDOUT;
#endif
return -1;
@@ -952,8 +952,8 @@
n = select(s + 1, &accept_set, NULL, NULL, &tv);
if (n < 1) {
- if (n == 0)
#ifndef PHP_WIN32
+ if (n == 0)
errno = ETIMEDOUT;
#endif
return -1;