laruence Tue, 20 Sep 2011 05:07:15 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=317037
Log:
Fix folder
Changed paths:
U php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
U php/php-src/trunk/sapi/cli/php_cli_server.c
Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-09-20
03:02:49 UTC (rev 317036)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-09-20
05:07:15 UTC (rev 317037)
@@ -1537,7 +1537,7 @@
}
/* }}} */
-static size_t php_cli_server_client_send_through(php_cli_server_client
*client, const char *str, size_t str_len) /* }}} */
+static size_t php_cli_server_client_send_through(php_cli_server_client
*client, const char *str, size_t str_len) /* {{{ */
{
struct timeval tv = { 10, 0 };
ssize_t nbytes_left = str_len;
@@ -1935,6 +1935,7 @@
php_cli_server_close_connection(server, client TSRMLS_CC);
return SUCCESS;
}
+/* }}} */
static void php_cli_server_dtor(php_cli_server *server TSRMLS_DC) /* {{{ */
{
@@ -2133,7 +2134,7 @@
int(*whandler)(php_cli_server*, php_cli_server_client* TSRMLS_DC);
} php_cli_server_do_event_for_each_fd_callback_params;
-static int php_cli_server_do_event_for_each_fd_callback(void *_params, int fd,
int event)
+static int php_cli_server_do_event_for_each_fd_callback(void *_params, int fd,
int event) /* {{{ */
{
php_cli_server_do_event_for_each_fd_callback_params *params = _params;
#ifdef ZTS
@@ -2185,7 +2186,7 @@
}
}
return SUCCESS;
-}
+} /* }}} */
static void php_cli_server_do_event_for_each_fd(php_cli_server *server,
int(*rhandler)(php_cli_server*, php_cli_server_client* TSRMLS_DC),
int(*whandler)(php_cli_server*, php_cli_server_client* TSRMLS_DC) TSRMLS_DC) /*
{{{ */
{
@@ -2228,13 +2229,13 @@
return retval;
} /* }}} */
-
static php_cli_server server;
-static void php_cli_server_sigint_handler(int sig)
+static void php_cli_server_sigint_handler(int sig) /* {{{ */
{
server.is_running = 0;
-};
+}
+/* }}} */
int do_cli_server(int argc, char **argv TSRMLS_DC) /* {{{ */
{
Modified: php/php-src/trunk/sapi/cli/php_cli_server.c
===================================================================
--- php/php-src/trunk/sapi/cli/php_cli_server.c 2011-09-20 03:02:49 UTC (rev
317036)
+++ php/php-src/trunk/sapi/cli/php_cli_server.c 2011-09-20 05:07:15 UTC (rev
317037)
@@ -1537,7 +1537,7 @@
}
/* }}} */
-static size_t php_cli_server_client_send_through(php_cli_server_client
*client, const char *str, size_t str_len) /* }}} */
+static size_t php_cli_server_client_send_through(php_cli_server_client
*client, const char *str, size_t str_len) /* {{{ */
{
struct timeval tv = { 10, 0 };
ssize_t nbytes_left = str_len;
@@ -1935,6 +1935,7 @@
php_cli_server_close_connection(server, client TSRMLS_CC);
return SUCCESS;
}
+/* }}} */
static void php_cli_server_dtor(php_cli_server *server TSRMLS_DC) /* {{{ */
{
@@ -2133,7 +2134,7 @@
int(*whandler)(php_cli_server*, php_cli_server_client* TSRMLS_DC);
} php_cli_server_do_event_for_each_fd_callback_params;
-static int php_cli_server_do_event_for_each_fd_callback(void *_params, int fd,
int event)
+static int php_cli_server_do_event_for_each_fd_callback(void *_params, int fd,
int event) /* {{{ */
{
php_cli_server_do_event_for_each_fd_callback_params *params = _params;
#ifdef ZTS
@@ -2185,7 +2186,7 @@
}
}
return SUCCESS;
-}
+} /* }}} */
static void php_cli_server_do_event_for_each_fd(php_cli_server *server,
int(*rhandler)(php_cli_server*, php_cli_server_client* TSRMLS_DC),
int(*whandler)(php_cli_server*, php_cli_server_client* TSRMLS_DC) TSRMLS_DC) /*
{{{ */
{
@@ -2228,13 +2229,13 @@
return retval;
} /* }}} */
-
static php_cli_server server;
-static void php_cli_server_sigint_handler(int sig)
+static void php_cli_server_sigint_handler(int sig) /* {{{ */
{
server.is_running = 0;
-};
+}
+/* }}} */
int do_cli_server(int argc, char **argv TSRMLS_DC) /* {{{ */
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
