moriyoshi Mon, 20 Jun 2011 20:30:36 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312345
Log:
- Forgot to commit these.
Changed paths:
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/main/network.c
U php/php-src/branches/PHP_5_4/main/php_main.h
U php/php-src/branches/PHP_5_4/main/php_network.h
U php/php-src/trunk/main/network.c
U php/php-src/trunk/main/php_main.h
U php/php-src/trunk/main/php_network.h
Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS 2011-06-20 20:27:39 UTC (rev 312344)
+++ php/php-src/branches/PHP_5_4/NEWS 2011-06-20 20:30:36 UTC (rev 312345)
@@ -112,15 +112,17 @@
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(),
Modified: php/php-src/branches/PHP_5_4/main/network.c
===================================================================
--- php/php-src/branches/PHP_5_4/main/network.c 2011-06-20 20:27:39 UTC (rev
312344)
+++ php/php-src/branches/PHP_5_4/main/network.c 2011-06-20 20:30:36 UTC (rev
312345)
@@ -148,7 +148,7 @@
/* {{{ 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 @@
/* {{{ 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;
Modified: php/php-src/branches/PHP_5_4/main/php_main.h
===================================================================
--- php/php-src/branches/PHP_5_4/main/php_main.h 2011-06-20 20:27:39 UTC
(rev 312344)
+++ php/php-src/branches/PHP_5_4/main/php_main.h 2011-06-20 20:30:36 UTC
(rev 312345)
@@ -35,6 +35,7 @@
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);
Modified: php/php-src/branches/PHP_5_4/main/php_network.h
===================================================================
--- php/php-src/branches/PHP_5_4/main/php_network.h 2011-06-20 20:27:39 UTC
(rev 312344)
+++ php/php-src/branches/PHP_5_4/main/php_network.h 2011-06-20 20:30:36 UTC
(rev 312345)
@@ -194,10 +194,12 @@
/* 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 @@
#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
Modified: php/php-src/trunk/main/network.c
===================================================================
--- php/php-src/trunk/main/network.c 2011-06-20 20:27:39 UTC (rev 312344)
+++ php/php-src/trunk/main/network.c 2011-06-20 20:30:36 UTC (rev 312345)
@@ -148,7 +148,7 @@
/* {{{ 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 @@
/* {{{ 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;
Modified: php/php-src/trunk/main/php_main.h
===================================================================
--- php/php-src/trunk/main/php_main.h 2011-06-20 20:27:39 UTC (rev 312344)
+++ php/php-src/trunk/main/php_main.h 2011-06-20 20:30:36 UTC (rev 312345)
@@ -35,6 +35,7 @@
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);
Modified: php/php-src/trunk/main/php_network.h
===================================================================
--- php/php-src/trunk/main/php_network.h 2011-06-20 20:27:39 UTC (rev
312344)
+++ php/php-src/trunk/main/php_network.h 2011-06-20 20:30:36 UTC (rev
312345)
@@ -194,10 +194,12 @@
/* 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 @@
#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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
