- Forgot to commit these.

diff --git a/NEWS b/NEWS
index 9de5c97c0e1d5460332de2348ebafd0154afb2b1..c18d1508aca07717ac2ef537870151b44cf3308a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -112,15 +112,17 @@ PHP                                                                        NEWS
     instruction without previous ZEND_FETCH_CLASS.
   . zend_stack and zend_ptr_stack allocation is delayed until actual usage.
 
-- Improved CLI SAPI: (Johannes)
+- Improved CLI SAPI: (Johannes, Moriyoshi)
   . Added command line option --rz <name> which shows information of the
-    named Zend extension.
-  . Interactive readline shell improvements:
+    named Zend extension. (Johannes)
+  . Interactive readline shell improvements: (Johannes)
     . Added "cli.pager" php.ini setting to set a pager for output.
     . Added "cli.prompt" php.ini setting to configure the shell prompt.
     . Added shortcut #inisetting=value to change ini settings at run-time.
     . Changed shell not to terminate on fatal errors.
     . Interactive shell works with shared readline extension. FR #53878.
+  . Added built-in web server that is intended for testing purpose.
+    (Moriyoshi)
 
 - Improved FastCGI SAPI: (Dmitry)
   . Added apache compatible functions: apache_child_terminate(),

diff --git a/main/network.c b/main/network.c
index 0d7a30ca8b7123bb829549a5c018f7d14ec56e41..1e2f81aa12ae2e93143c21633e5302c39714bf39 100644 (file)
--- a/main/network.c
+++ b/main/network.c
@@ -148,7 +148,7 @@ static const char *php_gai_strerror(int code)
 
 /* {{{ php_network_freeaddresses
  */
-static void php_network_freeaddresses(struct sockaddr **sal)
+PHPAPI void php_network_freeaddresses(struct sockaddr **sal)
 {
        struct sockaddr **sap;
 
@@ -163,7 +163,7 @@ static void php_network_freeaddresses(struct sockaddr **sal)
 /* {{{ php_network_getaddresses
  * Returns number of addresses, 0 for none/error
  */
-static int php_network_getaddresses(const char *host, int socktype, struct sockaddr ***sal, char **error_string TSRMLS_DC)
+PHPAPI int php_network_getaddresses(const char *host, int socktype, struct sockaddr ***sal, char **error_string TSRMLS_DC)
 {
        struct sockaddr **sap;
        int n;

diff --git a/main/php_main.h b/main/php_main.h
index 203963a5d1670d23b4d17929238da21cf4c17905..da1aabc8f58545b677bdf693ea3156f8698ab5a4 100644 (file)
--- a/main/php_main.h
+++ b/main/php_main.h
@@ -35,6 +35,7 @@ PHPAPI void php_module_shutdown(TSRMLS_D);
 PHPAPI void php_module_shutdown_for_exec(void);
 PHPAPI int php_module_shutdown_wrapper(sapi_module_struct *sapi_globals);
 PHPAPI int php_request_startup_for_hook(TSRMLS_D);
+PHPAPI void php_request_shutdown_for_hook(void *dummy);
 
 PHPAPI int php_register_extensions(zend_module_entry **ptr, int count TSRMLS_DC);
 

diff --git a/main/php_network.h b/main/php_network.h
index ba501cb96f5e158e4ca6d048434136d3ff10fb37..a2dddbac0c9d95ff688d111df5275e8ebfdff230 100644 (file)
--- a/main/php_network.h
+++ b/main/php_network.h
@@ -194,10 +194,12 @@ PHPAPI void _php_emit_fd_setsize_warning(int max_fd);
 /* it is safe to FD_SET too many fd's under win32; the macro will simply ignore
  * descriptors that go beyond the default FD_SETSIZE */
 # define PHP_SAFE_FD_SET(fd, set)      FD_SET(fd, set)
+# define PHP_SAFE_FD_CLR(fd, set)      FD_CLR(fd, set)
 # define PHP_SAFE_FD_ISSET(fd, set)    FD_ISSET(fd, set)
 # define PHP_SAFE_MAX_FD(m, n)         do { if (n + 1 >= FD_SETSIZE) { _php_emit_fd_setsize_warning(n); }} while(0)
 #else
 # define PHP_SAFE_FD_SET(fd, set)      do { if (fd < FD_SETSIZE) FD_SET(fd, set); } while(0)
+# define PHP_SAFE_FD_CLR(fd, set)      do { if (fd < FD_SETSIZE) FD_CLR(fd, set); } while(0)
 # define PHP_SAFE_FD_ISSET(fd, set)    ((fd < FD_SETSIZE) && FD_ISSET(fd, set))
 # define PHP_SAFE_MAX_FD(m, n)         do { if (m >= FD_SETSIZE) { _php_emit_fd_setsize_warning(m); m = FD_SETSIZE - 1; }} while(0)
 #endif
@@ -220,6 +222,9 @@ typedef struct {
 #endif
 
 BEGIN_EXTERN_C()
+PHPAPI int php_network_getaddresses(const char *host, int socktype, struct sockaddr ***sal, char **error_string TSRMLS_DC);
+PHPAPI void php_network_freeaddresses(struct sockaddr **sal);
+
 PHPAPI php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short port,
                int socktype, int asynchronous, struct timeval *timeout, char **error_string,
                int *error_code, char *bindto, unsigned short bindport