- Merge: Fixed bug #49447 php engine need to correctly check for socket API

diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index 193a9ba8bf0407e3e70ca516e6daad6135fae1cb..f984837914a43edd16f9063b3452985deee01e10 100644 (file)
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -147,7 +147,7 @@ ftp_open(const char *host, short port, long timeout_sec TSRMLS_DC)
 
        size = sizeof(ftp->localaddr);
        memset(&ftp->localaddr, 0, size);
-       if (getsockname(ftp->fd, (struct sockaddr*) &ftp->localaddr, &size) == -1) {
+       if (getsockname(ftp->fd, (struct sockaddr*) &ftp->localaddr, &size) != 0) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "getsockname failed: %s (%d)", strerror(errno), errno);
                goto bail;
        }

diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index fda2d3796fbedba8710a6237ac15eaa61dc31406..2590461c8c3107b4cda59bd1635aa86a118e2bc3 100644 (file)
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -259,6 +259,10 @@ static int php_openssl_sockop_close(php_stream *stream, int close_handle TSRMLS_
                        SSL_CTX_free(sslsock->ctx);
                        sslsock->ctx = NULL;
                }
+#ifdef PHP_WIN32
+               if (sslsock->s.socket == -1)
+                       sslsock->s.socket = SOCK_ERR;
+#endif
                if (sslsock->s.socket != SOCK_ERR) {
 #ifdef PHP_WIN32
                        /* prevent more data from coming in */

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 26da425b1ded981c177800b68fd2040e2a0b7c46..3d32b712ccf9459905eb97c269a8e5b4ef0cdce9 100644 (file)
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -370,14 +370,14 @@ static int php_open_listen_sock(php_socket **php_sock, int port, int backlog TSR
 
        sock->type = PF_INET;
 
-       if (bind(sock->bsd_socket, (struct sockaddr *)&la, sizeof(la)) < 0) {
+       if (bind(sock->bsd_socket, (struct sockaddr *)&la, sizeof(la)) != 0) {
                PHP_SOCKET_ERROR(sock, "unable to bind to given address", errno);
                close(sock->bsd_socket);
                efree(sock);
                return 0;
        }
 
-       if (listen(sock->bsd_socket, backlog) < 0) {
+       if (listen(sock->bsd_socket, backlog) != 0) {
                PHP_SOCKET_ERROR(sock, "unable to listen on socket", errno);
                close(sock->bsd_socket);
                efree(sock);

diff --git a/main/network.c b/main/network.c
index 5fb1f9e0ee56b732c5418b83c84314ad0ff1dae8..9f8c729e807e80fab012ea2a902ea45ae83f0458 100644 (file)
--- a/main/network.c
+++ b/main/network.c
@@ -314,7 +314,7 @@ PHPAPI int php_network_connect_socket(php_socket_t sockfd,
 
        SET_SOCKET_BLOCKING_MODE(sockfd, orig_flags);
        
-       if ((n = connect(sockfd, addr, addrlen)) < 0) {
+       if ((n = connect(sockfd, addr, addrlen)) != 0) {
                error = php_socket_errno();
 
                if (error_code) {
@@ -348,7 +348,7 @@ PHPAPI int php_network_connect_socket(php_socket_t sockfd,
                   BSD-derived systems set errno correctly
                   Solaris returns -1 from getsockopt in case of error
                   */
-               if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (char*)&error, &len) < 0) {
+               if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (char*)&error, &len) != 0) {
                        ret = -1;
                }
        } else {
@@ -375,7 +375,7 @@ ok:
        if (asynchronous) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Asynchronous connect() not supported on this platform");
        }
-       return connect(sockfd, addr, addrlen);
+       return (connect(sockfd, addr, addrlen) == 0) ? 0 : -1;
 #endif
 }
 /* }}} */
@@ -715,7 +715,7 @@ PHPAPI php_socket_t php_network_accept_incoming(php_socket_t srvsock,
 
                clisock = accept(srvsock, (struct sockaddr*)&sa, &sl);
 
-               if (clisock >= 0) {
+               if (clisock != SOCK_ERR) {
                        php_network_populate_name_from_sockaddr((struct sockaddr*)&sa, sl,
                                        textaddr, textaddrlen,
                                        addr, addrlen
@@ -867,7 +867,7 @@ skip_bind:
                                        timeout ? &working_timeout : NULL,
                                        error_string, error_code);
 
-                       if (n != SOCK_CONN_ERR) {
+                       if (n != -1) {
                                goto connected;
                        }
 

diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
index 295eb2a11f3e941275f8021ad13cd316e3086c5b..1526422dbc4fa44ff6c6db3ee70298f3e91bf7af 100644 (file)
--- a/main/streams/xp_socket.c
+++ b/main/streams/xp_socket.c
@@ -181,6 +181,10 @@ static int php_sockop_close(php_stream *stream, int close_handle TSRMLS_DC)
 
        if (close_handle) {
 
+#ifdef PHP_WIN32
+               if (sock->socket == -1)
+                       sock->socket = SOCK_ERR;
+#endif
                if (sock->socket != SOCK_ERR) {
 #ifdef PHP_WIN32
                        /* prevent more data from coming in */
@@ -226,10 +230,12 @@ static inline int sock_sendto(php_netstream_data_t *sock, char *buf, size_t bufl
                struct sockaddr *addr, socklen_t addrlen
                TSRMLS_DC)
 {
+       int ret;
        if (addr) {
-               return sendto(sock->socket, buf, buflen, flags, addr, addrlen);
+               ret = sendto(sock->socket, buf, buflen, flags, addr, addrlen);
+               return (ret == SOCK_CONN_ERR) ? -1 : ret;
        }
-       return send(sock->socket, buf, buflen, flags);
+       return ((ret = send(sock->socket, buf, buflen, flags)) == SOCK_CONN_ERR) ? -1 : ret;
 }
 
 static inline int sock_recvfrom(php_netstream_data_t *sock, char *buf, size_t buflen, int flags,
@@ -244,10 +250,12 @@ static inline int sock_recvfrom(php_netstream_data_t *sock, char *buf, size_t bu
 
        if (want_addr) {
                ret = recvfrom(sock->socket, buf, buflen, flags, (struct sockaddr*)&sa, &sl);
+               ret = (ret == SOCK_CONN_ERR) ? -1 : ret;
                php_network_populate_name_from_sockaddr((struct sockaddr*)&sa, sl,
                        textaddr, textaddrlen, addr, addrlen TSRMLS_CC);
        } else {
                ret = recv(sock->socket, buf, buflen, flags);
+               ret = (ret == SOCK_CONN_ERR) ? -1 : ret;
        }
 
        return ret;
@@ -312,7 +320,7 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void
 
                        switch (xparam->op) {
                                case STREAM_XPORT_OP_LISTEN:
-                                       xparam->outputs.returncode = listen(sock->socket, 5);
+                                       xparam->outputs.returncode = (listen(sock->socket, 5) == 0) ?  0: -1;
                                        return PHP_STREAM_OPTION_RETURN_OK;
 
                                case STREAM_XPORT_OP_GET_NAME: