(php_socket_errno) win32 errno compatible macro.

(php_socket_strerror) win32 compatible strerror replacement.
Add an E_NOTICE when a socket write fails.

diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c
index df79f601ea7b45b0642f19c9375338fa717dfe75..629cb720a56f9b9b1a3952f83b84be099facb5c9 100644 (file)
--- a/ext/standard/fsock.c
+++ b/ext/standard/fsock.c
@@ -113,6 +113,7 @@ static int fsock_globals_id;
 
 /*
  * Converts a host name to an IP address.
+ * TODO: This looks like unused code suitable for nuking.
  */
 PHPAPI int php_lookup_hostname(const char *addr, struct in_addr *in)
 {
@@ -144,13 +145,11 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent)
        struct timeval tv;
        char *hashkey = NULL;
        php_stream *stream = NULL;
-#ifdef PHP_WIN32
        int err;
-#endif
 
        RETVAL_FALSE;
        
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lzzd", &host, &host_len, &port, &zerrno, &zerrstr, &timeout) == FAILURE)        {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lzzd", &host, &host_len, &port, &zerrno, &zerrstr, &timeout) == FAILURE) {
                RETURN_FALSE;
        }
 
@@ -204,8 +203,8 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent)
                int socktype = SOCK_STREAM;
                int i;
 
-               for (i = 0; sockmodes[i].proto != NULL; i++)    {
-                       if (strncmp(host, sockmodes[i].proto, sockmodes[i].protolen) == 0)      {
+               for (i = 0; sockmodes[i].proto != NULL; i++) {
+                       if (strncmp(host, sockmodes[i].proto, sockmodes[i].protolen) == 0) {
                                ssl_flags = sockmodes[i].ssl_flags;             
                                socktype = sockmodes[i].socktype;
                                host += sockmodes[i].protolen;
@@ -213,24 +212,22 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent)
                        }
                }
 #if !HAVE_OPENSSL_EXT
-               if (ssl_flags != php_ssl_none)  {
+               if (ssl_flags != php_ssl_none) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "no SSL support in this build");
                }
                else
 #endif
                stream = php_stream_sock_open_host(host, (unsigned short)port, socktype, &tv, hashkey);
 
-#ifdef PHP_WIN32
                /* Preserve error */
-               err = WSAGetLastError();
-#endif
+               err = php_socket_errno();
 
                if (stream == NULL) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to connect to %s:%d", host, port);
                }
                
 #if HAVE_OPENSSL_EXT
-               if (stream && ssl_flags != php_ssl_none)        {
+               if (stream && ssl_flags != php_ssl_none) {
                        int ssl_ret = FAILURE;
                        switch(ssl_flags)       {
                                case php_ssl_v23:
@@ -248,8 +245,11 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent)
                }
 #endif
                
-       } else  
+       } else {
+               /* FIXME: Win32 - this probably does not return sensible errno and errstr */
                stream = php_stream_sock_open_unix(host, host_len, hashkey, &tv);
+               err = php_socket_errno();
+       }
 
        if (hashkey)
                efree(hashkey);
@@ -257,30 +257,14 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent)
        if (stream == NULL)     {
                if (zerrno) {
                        zval_dtor(zerrno);
-#ifndef PHP_WIN32
-                       ZVAL_LONG(zerrno, errno);
-#else
                        ZVAL_LONG(zerrno, err);
-#endif
                }
-#ifndef PHP_WIN32
                if (zerrstr) {
-                       zval_dtor(zerrstr);
-                       ZVAL_STRING(zerrstr, strerror(errno), 1);
-               }
-#else
-               if (zerrstr) {
-                       char *buf;
+                       char *buf = php_socket_strerror(err, NULL, 0);
 
-                       if (! FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, 
-                                       Z_LVAL_P(zerrno), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&buf, 0, NULL)) {
-                               RETURN_FALSE;
-                       }
-
-                       ZVAL_STRING(zerrstr, buf, 1);
-                       LocalFree(buf);
+                       /* no need to dup; we would only need to efree buf anyway */
+                       ZVAL_STRING(zerrstr, buf, 0);
                }
-#endif
                RETURN_FALSE;
        }
                

diff --git a/main/network.c b/main/network.c
index 64ee9864a3d6e5b03963d9577dbafbd826cd17bf..16f4d80e1544e215375404ccd98a4ec0cd8b7791 100644 (file)
--- a/main/network.c
+++ b/main/network.c
@@ -529,6 +529,50 @@ int php_sockaddr_size(php_sockaddr_storage *addr)
 }
 /* }}} */
 
+PHPAPI char *php_socket_strerror(long err, char *buf, size_t bufsize)
+{
+#ifndef PHP_WIN32
+       char *errstr;
+
+       errstr = strerror(err);
+       if (buf == NULL) {
+               buf = estrdup(errstr);
+       } else {
+               strncpy(buf, errstr, bufsize);
+       }
+       return buf;
+#else
+       char *sysbuf;
+       int free_it = 1;
+
+       if (!FormatMessage(
+                               FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+                               FORMAT_MESSAGE_FROM_SYSTEM |
+                               FORMAT_MESSAGE_IGNORE_INSERTS,
+                               NULL,
+                               err,
+                               MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                               (LPTSTR)&sysbuf,
+                               0,
+                               NULL)) {
+               free_it = 0;
+               sysbuf = "Unknown Error";
+       }
+
+       if (buf == NULL) {
+               buf = estrdup(sysbuf);
+       } else {
+               strncpy(buf, sysbuf, bufsize);
+       }
+
+       if (free_it) {
+               LocalFree(sysbuf);
+       }
+
+       return buf;
+#endif
+}
+
 PHPAPI php_stream *_php_stream_sock_open_from_socket(int socket, const char *persistent_id STREAMS_DC TSRMLS_DC)
 {
        php_stream *stream;
@@ -708,11 +752,21 @@ static size_t php_sockop_write(php_stream *stream, const char *buf, size_t count
        size_t didwrite;
        
 #if HAVE_OPENSSL_EXT
-       if (sock->ssl_active)
+       if (sock->ssl_active) {
                didwrite = SSL_write(sock->ssl_handle, buf, count);
-       else
+       } else
 #endif
-       didwrite = send(sock->socket, buf, count, 0);
+       {
+               didwrite = send(sock->socket, buf, count, 0);
+       
+               if (didwrite <= 0) {
+                       char *estr = php_socket_strerror(php_socket_errno(), NULL, 0);
+                       
+                       php_error_docref(NULL TSRMLS_CC, E_NOTICE, "send of %d bytes failed with errno=%d %s",
+                                       count, php_socket_errno(), estr);
+                       efree(estr);
+               }
+       }
        
        php_stream_notify_progress_increment(stream->context, didwrite, 0);
 
@@ -784,7 +838,7 @@ static size_t php_sockop_read(php_stream *stream, char *buf, size_t count TSRMLS
 
        php_stream_notify_progress_increment(stream->context, nr_bytes, 0);
 
-       if(nr_bytes == 0 || (nr_bytes < 0 && streams_socket_errno != EWOULDBLOCK)) {
+       if(nr_bytes == 0 || (nr_bytes < 0 && php_socket_errno() != EWOULDBLOCK)) {
                stream->eof = 1;
        }
 

diff --git a/main/php_network.h b/main/php_network.h
index 59c6bdf069482c5f2f7fff9462f79f8a41e015b0..4e6ae61ad84d598408e5e8f0b5a8fed51387012e 100644 (file)
--- a/main/php_network.h
+++ b/main/php_network.h
@@ -44,11 +44,16 @@
 #endif /* defined(PHP_WIN32) */
 
 #ifdef PHP_WIN32
-#define streams_socket_errno WSAGetLastError()
+#define php_socket_errno() WSAGetLastError()
 #else
-#define streams_socket_errno errno
+#define php_socket_errno() errno
 #endif
 
+/* like strerror, but caller must efree the returned string,
+ * unless buf is not NULL.
+ * Also works sensibly for win32 */
+PHPAPI char *php_socket_strerror(long err, char *buf, size_t bufsize);
+
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif