Nuke buffering from php_streams, move connect_nonb() from fsock.c to network.c

and rename to php_connect_nonb().
Use php_connect_nonb() instead of connect() in php_hostconnect() -> timeouts
should now work in php_hostconnect().
sock streams abstraction now uses php_sockbuf as the "abstract" pointer.

1 files changed, 12 insertions, 1 deletions

diff --git a/ext/standard/fsock.h b/ext/standard/fsock.h
index f285306836..6d35af9674 100644
--- a/ext/standard/fsock.h
+++ b/ext/standard/fsock.h
@@ -14,6 +14,7 @@
    +----------------------------------------------------------------------+
    | Authors: Paul Panotzki - Bunyip Information Systems                  |
    |          Jim Winstead (jimw@php.net)                                 |
+   |          Wez Furlong                                                 |
    +----------------------------------------------------------------------+
 */
 
@@ -53,6 +54,7 @@
 extern php_stream_ops php_stream_socket_ops;
 #endif
 
+/* stream->abstract points to an instance of this */
 struct php_sockbuf {
 	int socket;
 	unsigned char *readbuf;
@@ -67,6 +69,9 @@ struct php_sockbuf {
 	size_t chunk_size;
 	struct timeval timeout;
 	char timeout_event;
+#if HAVE_PHP_STREAM
+	php_stream * stream;
+#endif
 };
 
 typedef struct php_sockbuf php_sockbuf;
@@ -88,9 +93,15 @@ PHPAPI size_t php_sock_set_def_chunk_size(size_t size);
 PHPAPI void php_msock_destroy(int *data);
 PHPAPI void php_cleanup_sockbuf(int persistent FLS_DC);
 
-PHPAPI int connect_nonb(int sockfd, struct sockaddr *addr, socklen_t addrlen, struct timeval *timeout);
 PHPAPI struct php_sockbuf *php_get_socket(int socket);
 
 PHP_RSHUTDOWN_FUNCTION(fsock);
 
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim: sw=4 ts=4 tw=78
+ */
 #endif /* FSOCK_H */