--- embedaddon/php/ext/sockets/php_sockets.h	2012/02/21 23:48:01	1.1
+++ embedaddon/php/ext/sockets/php_sockets.h	2014/06/15 20:03:55	1.1.1.4
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2012 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -22,7 +22,7 @@
 #ifndef PHP_SOCKETS_H
 #define PHP_SOCKETS_H
 
-/* $Id: php_sockets.h,v 1.1 2012/02/21 23:48:01 misho Exp $ */
+/* $Id: php_sockets.h,v 1.1.1.4 2014/06/15 20:03:55 misho Exp $ */
 
 #if HAVE_SOCKETS
 
@@ -37,40 +37,6 @@ extern zend_module_entry sockets_module_entry;
 #endif
 #endif
 
-PHP_MINIT_FUNCTION(sockets);
-PHP_MINFO_FUNCTION(sockets);
-PHP_RSHUTDOWN_FUNCTION(sockets);
-
-PHP_FUNCTION(socket_select);
-PHP_FUNCTION(socket_create_listen);
-#ifdef HAVE_SOCKETPAIR
-PHP_FUNCTION(socket_create_pair);
-#endif
-PHP_FUNCTION(socket_accept);
-PHP_FUNCTION(socket_set_nonblock);
-PHP_FUNCTION(socket_set_block);
-PHP_FUNCTION(socket_listen);
-PHP_FUNCTION(socket_close);
-PHP_FUNCTION(socket_write);
-PHP_FUNCTION(socket_read);
-PHP_FUNCTION(socket_getsockname);
-PHP_FUNCTION(socket_getpeername);
-PHP_FUNCTION(socket_create);
-PHP_FUNCTION(socket_connect);
-PHP_FUNCTION(socket_strerror);
-PHP_FUNCTION(socket_bind);
-PHP_FUNCTION(socket_recv);
-PHP_FUNCTION(socket_send);
-PHP_FUNCTION(socket_recvfrom);
-PHP_FUNCTION(socket_sendto);
-PHP_FUNCTION(socket_get_option);
-PHP_FUNCTION(socket_set_option);
-#ifdef HAVE_SHUTDOWN
-PHP_FUNCTION(socket_shutdown);
-#endif
-PHP_FUNCTION(socket_last_error);
-PHP_FUNCTION(socket_clear_error);
-
 #ifndef PHP_WIN32
 typedef int PHP_SOCKET;
 # define PHP_SOCKETS_API PHPAPI
@@ -80,10 +46,11 @@ typedef SOCKET PHP_SOCKET;
 #endif
 
 typedef struct {
-	PHP_SOCKET bsd_socket;
-	int		type;
-	int		error;
-	int		blocking;
+	PHP_SOCKET	bsd_socket;
+	int			type;
+	int			error;
+	int			blocking;
+	zval		*zstream;
 } php_socket;
 
 #ifdef PHP_WIN32
@@ -96,14 +63,6 @@ struct	sockaddr_un {
 PHP_SOCKETS_API int php_sockets_le_socket(void);
 
 #define php_sockets_le_socket_name "Socket"
-
-/* Prototypes */
-#ifdef ilia_0 /* not needed, only causes a compiler warning */
-static int php_open_listen_sock(php_socket **php_sock, int port, int backlog TSRMLS_DC);
-static int php_accept_connect(php_socket *in_sock, php_socket **new_sock, struct sockaddr *la TSRMLS_DC);
-static int php_read(php_socket *sock, void *buf, size_t maxlen, int flags);
-static char *php_strerror(int error TSRMLS_DC);
-#endif
 
 ZEND_BEGIN_MODULE_GLOBALS(sockets)
 	int last_error;