Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_api.c branches/PHP_5_4/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c
Am 17.09.2011 05:12, schrieb Xinchen Hui: laruence Sat, 17 Sep 2011 03:12:23 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316895 Log: Fix Bug #55703(PHP crash when calling mysqli_fetch_fields) Since the catalog values always is def now, see http://dev.mysql.com/doc/refman/5.0/en/c-api-data-structures.html Bug: https://bugs.php.net/55703 (Duplicate) PHP crash when calling mysqli_fetch_fields Ideally, you would wait for a libmysql fix, after the fix add a version change and revert. What if libmysql decides to set a value in the future? What about people who still use MySQL 4.1.0 ? Ulf -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_api.c branches/PHP_5_4/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c
Hi: hmm, maybe we can revert this change after a libmysql fixed version? thanks 2011/9/19 Ulf Wendel ulf.wen...@oracle.com: Am 17.09.2011 05:12, schrieb Xinchen Hui: laruence Sat, 17 Sep 2011 03:12:23 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316895 Log: Fix Bug #55703(PHP crash when calling mysqli_fetch_fields) Since the catalog values always is def now, see http://dev.mysql.com/doc/refman/5.0/en/c-api-data-structures.html Bug: https://bugs.php.net/55703 (Duplicate) PHP crash when calling mysqli_fetch_fields Ideally, you would wait for a libmysql fix, after the fix add a version change and revert. What if libmysql decides to set a value in the future? What about people who still use MySQL 4.1.0 ? Ulf -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Laruence Xinchen Hui http://www.laruence.com/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_api.c branches/PHP_5_4/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c
On Mon, Sep 19, 2011 at 10:19 AM, Ulf Wendel ulf.wen...@oracle.com wrote: Am 17.09.2011 05:12, schrieb Xinchen Hui: laruence Sat, 17 Sep 2011 03:12:23 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316895 Log: Fix Bug #55703(PHP crash when calling mysqli_fetch_fields) Since the catalog values always is def now, see http://dev.mysql.com/doc/refman/5.0/en/c-api-data-structures.html Bug: https://bugs.php.net/55703 (Duplicate) PHP crash when calling mysqli_fetch_fields Ideally, you would wait for a libmysql fix, after the fix add a version change and revert. What if libmysql decides to set a value in the future? What about people who still use MySQL 4.1.0 ? uhm, 4.1 is EOLed for some time by now, why should we care about such an old version? http://www.mysql.com/support/eol-notice.html -- Ferenc Kovács @Tyr43l - http://tyrael.hu -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_api.c branches/PHP_5_4/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c
Am 19.09.2011 11:57, schrieb Ferenc Kovacs:
On Mon, Sep 19, 2011 at 10:19 AM, Ulf Wendelulf.wen...@oracle.com wrote:
Am 17.09.2011 05:12, schrieb Xinchen Hui:
laruence Sat, 17 Sep 2011 03:12:23 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316895
Log:
Fix Bug #55703(PHP crash when calling mysqli_fetch_fields)
Since the catalog values always is def now, see
http://dev.mysql.com/doc/refman/5.0/en/c-api-data-structures.html
Bug: https://bugs.php.net/55703 (Duplicate) PHP crash when calling
mysqli_fetch_fields
Ideally, you would wait for a libmysql fix, after the fix add a version
change and revert. What if libmysql decides to set a value in the future?
What about people who still use MySQL 4.1.0 ?
uhm, 4.1 is EOLed for some time by now, why should we care about such
an old version?
http://www.mysql.com/support/eol-notice.html
Good point, are you proposing to change code and make libmysql 5.0+ a
requirement? If so, several changes should be made to ext/mysql,
ext/mysqli and PDO_MySQL.
Ulf
nixnutz@linux-fuxh:~/php/php-src/branches/PHP_5_4 grep -H -n -R
MYSQL_VERSION_ID ext/mysqli/*.c
[snip]
ext/mysqli/mysqli.c:611:#if MYSQL_VERSION_ID = 4
[snip]
ext/mysqli/mysqli.c:854:#if MYSQL_VERSION_ID = 4
ext/mysqli/mysqli.c:886:#if !defined(MYSQLI_USE_MYSQLND) defined(ZTS)
MYSQL_VERSION_ID = 4
ext/mysqli/mysqli.c:924:#if !defined(MYSQLI_USE_MYSQLND) defined(ZTS)
MYSQL_VERSION_ID = 4
nixnutz@linux-fuxh:~/php/php-src/branches/PHP_5_4 grep -H -n -R
MYSQL_VERSION_ID ext/mysql/*.c
ext/mysql/php_mysql.c:82:#if MYSQL_VERSION_ID 32199 ||
defined(MYSQL_USE_MYSQLND)
ext/mysql/php_mysql.c:92:#if MYSQL_VERSION_ID = 32032 ||
defined(MYSQL_USE_MYSQLND)
ext/mysql/php_mysql.c:96:#if MYSQL_VERSION_ID 32133 ||
defined(FIELD_TYPE_TINY)
ext/mysql/php_mysql.c:100:#if MYSQL_VERSION_ID = 32200
ext/mysql/php_mysql.c:111:#if MYSQL_VERSION_ID 32224
ext/mysql/php_mysql.c:129:#if MYSQL_VERSION_ID = 40101
ext/mysql/php_mysql.c:247:#if MYSQL_VERSION_ID 4
ext/mysql/php_mysql.c:308:#if MYSQL_VERSION_ID 4
ext/mysql/php_mysql.c:571:#if MYSQL_VERSION_ID = 4
ext/mysql/php_mysql.c:578:#if MYSQL_VERSION_ID = 4
ext/mysql/php_mysql.c:598:#if MYSQL_VERSION_ID = 4
ext/mysql/php_mysql.c:623:#if !defined(MYSQL_USE_MYSQLND)
defined(ZTS) MYSQL_VERSION_ID = 4
ext/mysql/php_mysql.c:655:#if !defined(MYSQL_USE_MYSQLND)
defined(ZTS) MYSQL_VERSION_ID = 4
ext/mysql/php_mysql.c:727:#if MYSQL_VERSION_ID = 32230
ext/mysql/php_mysql.c:734: if ((MYSQL_VERSION_ID / 100) !=
(mysql_get_client_version() / 100)) {
ext/mysql/php_mysql.c:737:
MYSQL_VERSION_ID, mysql_get_client_version());
ext/mysql/php_mysql.c:836:#if MYSQL_VERSION_ID 32200
ext/mysql/php_mysql.c:1375:#if MYSQL_VERSION_ID 4
ext/mysql/php_mysql.c:1487:#if MYSQL_VERSION_ID 32199
nixnutz@linux-fuxh:~/php/php-src/branches/PHP_5_4 grep -H -n -R
MYSQL_VERSION_ID ext/pdo_mysql/*.c
ext/pdo_mysql/mysql_driver.c:330:#if MYSQL_VERSION_ID = 40100 ||
defined(PDO_USE_MYSQLND)
ext/pdo_mysql/mysql_driver.c:342:#if MYSQL_VERSION_ID = 40100 ||
defined(PDO_USE_MYSQLND)
ext/pdo_mysql/mysql_driver.c:356:#if MYSQL_VERSION_ID = 40100 ||
defined(PDO_USE_MYSQLND)
ext/pdo_mysql/mysql_driver.c:481:#if MYSQL_VERSION_ID = 32230
ext/pdo_mysql/mysql_driver.c:489:#if MYSQL_VERSION_ID 32230
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_api.c branches/PHP_5_4/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c
Good point, are you proposing to change code and make libmysql 5.0+ a requirement? If so, several changes should be made to ext/mysql, ext/mysqli and PDO_MySQL. I think that it is your call, but yes, I think it would reasonable, and it would make our/your work much easier if we would have to support fewer major versions. -- Ferenc Kovács @Tyr43l - http://tyrael.hu -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c branches/PHP_5_4/ext/pdo_mysql/mysql_driver.c branches/PHP_5_4/ext/pdo_mysql
johannes Mon, 19 Sep 2011 12:31:06 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316982
Log:
- Fix folding
Changed paths:
U php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c
U php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c
U php/php-src/branches/PHP_5_4/ext/pdo_mysql/mysql_driver.c
U php/php-src/branches/PHP_5_4/ext/pdo_mysql/mysql_statement.c
U php/php-src/trunk/ext/pdo_mysql/mysql_driver.c
U php/php-src/trunk/ext/pdo_mysql/mysql_statement.c
Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c 2011-09-19 12:06:54 UTC (rev 316981)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c 2011-09-19 12:31:06 UTC (rev 316982)
@@ -54,7 +54,7 @@
#endif
/* {{{ _pdo_mysql_error */
-int _pdo_mysql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int line TSRMLS_DC) /* {{{ */
+int _pdo_mysql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int line TSRMLS_DC)
{
pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh-driver_data;
pdo_error_type *pdo_err;
@@ -160,7 +160,7 @@
/* }}} */
/* {{{ mysql_handle_closer */
-static int mysql_handle_closer(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */
+static int mysql_handle_closer(pdo_dbh_t *dbh TSRMLS_DC)
{
pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh-driver_data;
@@ -324,6 +324,7 @@
*len = strlen(id);
PDO_DBG_RETURN(id);
}
+/* }}} */
/* {{{ mysql_handle_quoter */
static int mysql_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, int unquotedlen, char **quoted, int *quotedlen, enum pdo_param_type paramtype TSRMLS_DC)
@@ -361,6 +362,7 @@
PDO_DBG_RETURN(0 = mysql_handle_doer(dbh, ZEND_STRL(COMMIT) TSRMLS_CC));
#endif
}
+/* }}} */
/* {{{ mysql_handle_rollback */
static int mysql_handle_rollback(pdo_dbh_t *dbh TSRMLS_DC)
@@ -503,7 +505,7 @@
/* }}} */
/* {{{ pdo_mysql_check_liveness */
-static int pdo_mysql_check_liveness(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */
+static int pdo_mysql_check_liveness(pdo_dbh_t *dbh TSRMLS_DC)
{
pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh-driver_data;
#if MYSQL_VERSION_ID = 32230
@@ -560,7 +562,7 @@
#endif
/* {{{ pdo_mysql_handle_factory */
-static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_DC) /* {{{ */
+static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_DC)
{
pdo_mysql_db_handle *H;
int i, ret = 0;
Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c 2011-09-19 12:06:54 UTC (rev 316981)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c 2011-09-19 12:31:06 UTC (rev 316982)
@@ -335,7 +335,7 @@
PDO_DBG_RETURN(1);
}
-/* {{{ */
+/* }}} */
static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
{
@@ -461,8 +461,7 @@
};
-static int pdo_mysql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *param,
- enum pdo_param_event event_type TSRMLS_DC) /* {{{ */
+static int pdo_mysql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *param, enum pdo_param_event event_type TSRMLS_DC) /* {{{ */
{
#ifndef PDO_USE_MYSQLND
PDO_MYSQL_PARAM_BIND *b;
@@ -604,8 +603,7 @@
}
/* }}} */
-static int pdo_mysql_stmt_fetch(pdo_stmt_t *stmt,
- enum pdo_fetch_orientation ori, long offset TSRMLS_DC) /* {{{ */
+static int pdo_mysql_stmt_fetch(pdo_stmt_t *stmt, enum pdo_fetch_orientation ori, long offset TSRMLS_DC) /* {{{ */
{
pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt-driver_data;
#if PDO_USE_MYSQLND
@@ -777,7 +775,7 @@
PDO_DBG_RETURN(1);
} /* }}} */
-static char *type_to_name_native(int type) /* }}} */
+static char *type_to_name_native(int type) /* {{{ */
{
#define PDO_MYSQL_NATIVE_TYPE_NAME(x) case FIELD_TYPE_##x: return #x;
Modified: php/php-src/branches/PHP_5_4/ext/pdo_mysql/mysql_driver.c
===
--- php/php-src/branches/PHP_5_4/ext/pdo_mysql/mysql_driver.c 2011-09-19 12:06:54 UTC (rev 316981)
+++ php/php-src/branches/PHP_5_4/ext/pdo_mysql/mysql_driver.c 2011-09-19 12:31:06 UTC (rev 316982)
@@ -43,7 +43,7 @@
#endif
/* {{{ _pdo_mysql_error */
-int _pdo_mysql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int line TSRMLS_DC) /* {{{ */
+int _pdo_mysql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int line TSRMLS_DC)
{
pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh-driver_data;
pdo_error_type *pdo_err;
@@ -138,7 +138,7 @@
/* }}} */
/* {{{ mysql_handle_closer */
-static int mysql_handle_closer(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */
+static int mysql_handle_closer(pdo_dbh_t *dbh TSRMLS_DC)
{
pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh-driver_data;
@@ -296,6 +296,7 @@
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_api.c branches/PHP_5_4/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c
On Mon, 2011-09-19 at 12:25 +0200, Ferenc Kovacs wrote: Good point, are you proposing to change code and make libmysql 5.0+ a requirement? If so, several changes should be made to ext/mysql, ext/mysqli and PDO_MySQL. I think that it is your call, but yes, I think it would reasonable, and it would make our/your work much easier if we would have to support fewer major versions. While we can't change requirements in bug fix versions (5.3.x) and not sure this is a good thing to do during beta (5.4) johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/ext/zlib/zlib.c trunk/ext/zlib/zlib.c
mike Mon, 19 Sep 2011 14:37:00 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316992
Log:
Fixed bug #55544 ob_gzhandler always conflicts with zlib.output_compression
Bug: https://bugs.php.net/55544 (Assigned) ob_gzhandler always conflicts with
zlib.output_compression
Changed paths:
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/ext/zlib/zlib.c
U php/php-src/trunk/ext/zlib/zlib.c
Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS 2011-09-19 14:12:51 UTC (rev 316991)
+++ php/php-src/branches/PHP_5_4/NEWS 2011-09-19 14:37:00 UTC (rev 316992)
@@ -7,6 +7,10 @@
. Fixed bug #55705 (Omitting a callable typehinted argument causes a
segfault).
(Felipe, Laruence)
+- Zlib:
+ . Fixed bug #55544 (ob_gzhandler always conflicts with
+zlib.output_compression). (Mike)
+
15 Sep 2011, PHP 5.4.0 Beta
- General improvements:
. Added callable typehint. (Hannes)
Modified: php/php-src/branches/PHP_5_4/ext/zlib/zlib.c
===
--- php/php-src/branches/PHP_5_4/ext/zlib/zlib.c2011-09-19 14:12:51 UTC
(rev 316991)
+++ php/php-src/branches/PHP_5_4/ext/zlib/zlib.c2011-09-19 14:37:00 UTC
(rev 316992)
@@ -847,6 +847,7 @@
/* {{{ PHP_RINIT_FUNCTION */
static PHP_RINIT_FUNCTION(zlib)
{
+ ZLIBG(output_compression) = 0;
ZLIBG(compression_coding) = 0;
php_zlib_output_compression_start(TSRMLS_C);
Modified: php/php-src/trunk/ext/zlib/zlib.c
===
--- php/php-src/trunk/ext/zlib/zlib.c 2011-09-19 14:12:51 UTC (rev 316991)
+++ php/php-src/trunk/ext/zlib/zlib.c 2011-09-19 14:37:00 UTC (rev 316992)
@@ -847,6 +847,7 @@
/* {{{ PHP_RINIT_FUNCTION */
static PHP_RINIT_FUNCTION(zlib)
{
+ ZLIBG(output_compression) = 0;
ZLIBG(compression_coding) = 0;
php_zlib_output_compression_start(TSRMLS_C);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/zlib/zlib.c trunk/ext/zlib/zlib.c
mike Mon, 19 Sep 2011 15:20:38 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=316996
Log:
fix r316992
Changed paths:
U php/php-src/branches/PHP_5_4/ext/zlib/zlib.c
U php/php-src/trunk/ext/zlib/zlib.c
Modified: php/php-src/branches/PHP_5_4/ext/zlib/zlib.c
===
--- php/php-src/branches/PHP_5_4/ext/zlib/zlib.c2011-09-19 15:12:59 UTC
(rev 316995)
+++ php/php-src/branches/PHP_5_4/ext/zlib/zlib.c2011-09-19 15:20:38 UTC
(rev 316996)
@@ -847,7 +847,6 @@
/* {{{ PHP_RINIT_FUNCTION */
static PHP_RINIT_FUNCTION(zlib)
{
- ZLIBG(output_compression) = 0;
ZLIBG(compression_coding) = 0;
php_zlib_output_compression_start(TSRMLS_C);
@@ -856,6 +855,13 @@
}
/* }}} */
+static PHP_RSHUTDOWN_FUNCTION(zlib)
+{
+ ZLIBG(output_compression) = 0;
+
+return SUCCESS;
+}
+
/* {{{ PHP_MINFO_FUNCTION */
static PHP_MINFO_FUNCTION(zlib)
{
@@ -879,7 +885,7 @@
PHP_MINIT(zlib),
PHP_MSHUTDOWN(zlib),
PHP_RINIT(zlib),
- NULL,
+ PHP_RSHUTDOWN(zlib),
PHP_MINFO(zlib),
2.0,
PHP_MODULE_GLOBALS(zlib),
Modified: php/php-src/trunk/ext/zlib/zlib.c
===
--- php/php-src/trunk/ext/zlib/zlib.c 2011-09-19 15:12:59 UTC (rev 316995)
+++ php/php-src/trunk/ext/zlib/zlib.c 2011-09-19 15:20:38 UTC (rev 316996)
@@ -847,7 +847,6 @@
/* {{{ PHP_RINIT_FUNCTION */
static PHP_RINIT_FUNCTION(zlib)
{
- ZLIBG(output_compression) = 0;
ZLIBG(compression_coding) = 0;
php_zlib_output_compression_start(TSRMLS_C);
@@ -856,6 +855,13 @@
}
/* }}} */
+static PHP_RSHUTDOWN_FUNCTION(zlib)
+{
+ ZLIBG(output_compression) = 0;
+
+return SUCCESS;
+}
+
/* {{{ PHP_MINFO_FUNCTION */
static PHP_MINFO_FUNCTION(zlib)
{
@@ -879,7 +885,7 @@
PHP_MINIT(zlib),
PHP_MSHUTDOWN(zlib),
PHP_RINIT(zlib),
- NULL,
+ PHP_RSHUTDOWN(zlib),
PHP_MINFO(zlib),
2.0,
PHP_MODULE_GLOBALS(zlib),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/sapi/cli/php_cli_server.c trunk/sapi/cli/php_cli_server.c
laruence Tue, 20 Sep 2011 05:07:15 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=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
