[PHP-CVS] com php-src: Pass the TSRMLS parameters to the sapi flush hook, this shaves off a few TSRMLS_FETCH() calls in our various SAPIs: main/SAPI.c main/SAPI.h sapi/apache/mod_php5.c sapi/apache2fi
Commit:ed5a8d510f6e4ae865008fe711efbbc5452adf42
Author:Kalle Sommer Nielsen ka...@php.net Wed, 18 Dec 2013
09:06:39 +0100
Parents: f70f89c1b1e0bbd2b2b6940bb0a4e12a2be07770
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=ed5a8d510f6e4ae865008fe711efbbc5452adf42
Log:
Pass the TSRMLS parameters to the sapi flush hook, this shaves off a few
TSRMLS_FETCH() calls in our various SAPIs
Changed paths:
M main/SAPI.c
M main/SAPI.h
M sapi/apache/mod_php5.c
M sapi/apache2filter/sapi_apache2.c
M sapi/apache2handler/sapi_apache2.c
M sapi/apache_hooks/mod_php5.c
M sapi/cgi/cgi_main.c
M sapi/cli/php_cli.c
M sapi/cli/php_cli_server.c
M sapi/embed/php_embed.c
M sapi/fpm/fpm/fpm_main.c
M sapi/litespeed/lsapi_main.c
M sapi/milter/php_milter.c
M sapi/nsapi/nsapi.c
Diff:
diff --git a/main/SAPI.c b/main/SAPI.c
index c9ba5d5..4cdb6f9 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -992,7 +992,7 @@ SAPI_API int sapi_register_input_filter(unsigned int
(*input_filter)(int arg, ch
SAPI_API int sapi_flush(TSRMLS_D)
{
if (sapi_module.flush) {
- sapi_module.flush(SG(server_context));
+ sapi_module.flush(SG(server_context) TSRMLS_CC);
return SUCCESS;
} else {
return FAILURE;
diff --git a/main/SAPI.h b/main/SAPI.h
index 928fca9..3097cf1 100644
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -227,7 +227,7 @@ struct _sapi_module_struct {
int (*deactivate)(TSRMLS_D);
int (*ub_write)(const char *str, unsigned int str_length TSRMLS_DC);
- void (*flush)(void *server_context);
+ void (*flush)(void *server_context TSRMLS_DC);
struct stat *(*get_stat)(TSRMLS_D);
char *(*getenv)(char *name, size_t name_len TSRMLS_DC);
diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c
index 8361f7f..2803903 100644
--- a/sapi/apache/mod_php5.c
+++ b/sapi/apache/mod_php5.c
@@ -108,7 +108,7 @@ static int sapi_apache_ub_write(const char *str, uint
str_length TSRMLS_DC)
/* {{{ sapi_apache_flush
*/
-static void sapi_apache_flush(void *server_context)
+static void sapi_apache_flush(void *server_context TSRMLS_DC)
{
if (server_context) {
#if MODULE_MAGIC_NUMBER 19970110
diff --git a/sapi/apache2filter/sapi_apache2.c
b/sapi/apache2filter/sapi_apache2.c
index 8ce490e..c992c1c 100644
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -245,14 +245,13 @@ php_apache_sapi_register_variables(zval *track_vars_array
TSRMLS_DC)
}
static void
-php_apache_sapi_flush(void *server_context)
+php_apache_sapi_flush(void *server_context TSRMLS_DC)
{
php_struct *ctx;
apr_bucket_brigade *bb;
apr_bucket_alloc_t *ba;
apr_bucket *b;
ap_filter_t *f; /* output filters */
- TSRMLS_FETCH();
ctx = server_context;
diff --git a/sapi/apache2handler/sapi_apache2.c
b/sapi/apache2handler/sapi_apache2.c
index b7f95e0..cf1a83f 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -287,11 +287,10 @@ php_apache_sapi_register_variables(zval *track_vars_array
TSRMLS_DC)
}
static void
-php_apache_sapi_flush(void *server_context)
+php_apache_sapi_flush(void *server_context TSRMLS_DC)
{
php_struct *ctx;
request_rec *r;
- TSRMLS_FETCH();
ctx = server_context;
diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c
index 66adb48..4827932 100644
--- a/sapi/apache_hooks/mod_php5.c
+++ b/sapi/apache_hooks/mod_php5.c
@@ -253,7 +253,7 @@ static int sapi_apache_ub_write(const char *str, uint
str_length TSRMLS_DC)
/* {{{ sapi_apache_flush
*/
-static void sapi_apache_flush(void *server_context)
+static void sapi_apache_flush(void *server_context TSRMLS_DC)
{
if (server_context) {
#if MODULE_MAGIC_NUMBER 19970110
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 66ecce6..6fc5a86 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -324,14 +324,14 @@ static int sapi_fcgi_ub_write(const char *str, uint
str_length TSRMLS_DC)
return str_length;
}
-static void sapi_cgi_flush(void *server_context)
+static void sapi_cgi_flush(void *server_context TSRMLS_DC)
{
if (fflush(stdout) == EOF) {
php_handle_aborted_connection();
}
}
-static void sapi_fcgi_flush(void *server_context)
+static void sapi_fcgi_flush(void *server_context TSRMLS_DC)
{
fcgi_request *request = (fcgi_request*) server_context;
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 2fd3dbe..cb52cd7 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -320,7 +320,7 @@ static int sapi_cli_ub_write(const char *str, uint
str_length TSRMLS_DC) /* {{{
}
/* }}} */
-static void sapi_cli_flush(void *server_context) /* {{{ */
+static void sapi_cli_flush(void *server_context TSRMLS_DC) /* {{{ */
{
/* Ignore EBADF here, it's caused by
[PHP-CVS] com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: Zend/zend.c Zend/zend.h Zend/zend_execute.h Zend/zend_execute_API.c Zend/zend_interfaces.c Zend/zend_object
Commit:8432557dcda79c298c1fcfd47440940e398afaa4
Author:Anatol Belski a...@php.net Wed, 18 Dec 2013 15:07:42 +0100
Parents: fcb28ea97f97cd85be1242fbb16ba5bca29f1cc7
a8a36b7d52bc8b00dd8a6cbe32b1875b4c41cbcf
Branches: str_size_and_int64
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=8432557dcda79c298c1fcfd47440940e398afaa4
Log:
Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
Zend/zend.c
Zend/zend.h
Zend/zend_execute.h
Zend/zend_vm_execute.h
main/SAPI.h
Changed paths:
MM Zend/zend.c
MM Zend/zend.h
MM Zend/zend_execute.h
MM Zend/zend_execute_API.c
MM Zend/zend_interfaces.c
MM Zend/zend_object_handlers.c
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
MM ext/dom/php_dom.c
MM ext/mysqlnd/mysqlnd_net.c
MM ext/opcache/Optimizer/block_pass.c
MM ext/pcntl/pcntl.c
MM ext/soap/php_encoding.c
MM ext/spl/spl_array.c
MM ext/spl/spl_directory.c
MM ext/spl/spl_fixedarray.c
MM ext/spl/spl_iterators.c
MM ext/standard/array.c
MM ext/standard/basic_functions.c
MM ext/standard/ftp_fopen_wrapper.c
MM ext/standard/http_fopen_wrapper.c
MM ext/standard/type.c
MM ext/zip/php_zip.c
MM main/SAPI.c
MM main/SAPI.h
MM main/php_ini.c
MM main/streams/streams.c
MM main/streams/transports.c
MM main/streams/userspace.c
MM sapi/apache2handler/sapi_apache2.c
MM sapi/cgi/cgi_main.c
MM sapi/cli/php_cli.c
MM sapi/cli/php_cli_server.c
MM sapi/embed/php_embed.c
diff --cc Zend/zend.c
index 13dec8a,ad45028..c20e1ba
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@@ -56,11 -56,11 +56,11 @@@ ZEND_API FILE *(*zend_fopen)(const cha
ZEND_API int (*zend_stream_open_function)(const char *filename,
zend_file_handle *handle TSRMLS_DC);
ZEND_API void (*zend_block_interruptions)(void);
ZEND_API void (*zend_unblock_interruptions)(void);
- ZEND_API void (*zend_ticks_function)(int ticks);
+ ZEND_API void (*zend_ticks_function)(int ticks TSRMLS_DC);
-ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const
uint error_lineno, const char *format, va_list args);
-int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format,
va_list ap);
+ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const
zend_str_size_uint error_lineno, const char *format, va_list args);
- zend_str_size_int (*zend_vspprintf)(char **pbuf, zend_str_size_size_t
max_len, const char *format, va_list ap);
++int (*zend_vspprintf)(char **pbuf, zend_str_size_size_t max_len, const char
*format, va_list ap);
ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
-ZEND_API char *(*zend_resolve_path)(const char *filename, int filename_len
TSRMLS_DC);
+ZEND_API char *(*zend_resolve_path)(const char *filename, zend_str_size_int
filename_len TSRMLS_DC);
void (*zend_on_timeout)(int seconds TSRMLS_DC);
diff --cc Zend/zend.h
index f002aeb,f60ef68..3773946
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@@ -542,20 -542,20 +542,20 @@@ struct _zend_class_entry
#include zend_stream.h
typedef struct _zend_utility_functions {
- void (*error_function)(int type, const char *error_filename, const uint
error_lineno, const char *format, va_list args)
ZEND_ATTRIBUTE_PTR_FORMAT(printf, 4, 0);
- int (*printf_function)(const char *format, ...)
ZEND_ATTRIBUTE_PTR_FORMAT(printf, 1, 2);
- int (*write_function)(const char *str, uint str_length);
+ void (*error_function)(int type, const char *error_filename, const
zend_str_size_uint error_lineno, const char *format, va_list args)
ZEND_ATTRIBUTE_PTR_FORMAT(printf, 4, 0);
+ zend_str_size_int (*printf_function)(const char *format, ...)
ZEND_ATTRIBUTE_PTR_FORMAT(printf, 1, 2);
+ zend_str_size_int (*write_function)(const char *str, zend_str_size_uint
str_length);
FILE *(*fopen_function)(const char *filename, char **opened_path
TSRMLS_DC);
- void (*message_handler)(long message, const void *data TSRMLS_DC);
+ void (*message_handler)(zend_int_t message, const void *data TSRMLS_DC);
void (*block_interruptions)(void);
void (*unblock_interruptions)(void);
- int (*get_configuration_directive)(const char *name, uint name_length,
zval *contents);
+ int (*get_configuration_directive)(const char *name, zend_str_size_uint
name_length, zval *contents);
- void (*ticks_function)(int ticks);
+ void (*ticks_function)(int ticks TSRMLS_DC);
void (*on_timeout)(int seconds TSRMLS_DC);
int (*stream_open_function)(const char *filename, zend_file_handle
*handle TSRMLS_DC);
- int (*vspprintf_function)(char **pbuf, size_t max_len, const char
*format, va_list ap);
- char *(*getenv_function)(char *name, size_t name_len TSRMLS_DC);
- char *(*resolve_path_function)(const char *filename, int filename_len
TSRMLS_DC);
+ zend_str_size_int (*vspprintf_function)(char **pbuf,
[PHP-CVS] com php-src: size_t part for *.y files: Zend/zend_ini_parser.y Zend/zend_language_parser.y
Commit:0b8f946ea5648da8ac0830fb64d14cf43827eee1
Author:Anatol Belski a...@php.net Wed, 18 Dec 2013 14:53:48 -0800
Parents: d5daea505f852e211ed097f1acbaf13fdf4d59b8
Branches: str_size_and_int64
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=0b8f946ea5648da8ac0830fb64d14cf43827eee1
Log:
size_t part for *.y files
Changed paths:
M Zend/zend_ini_parser.y
M Zend/zend_language_parser.y
Diff:
diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y
index 1fa70c6..f2bb419 100644
--- a/Zend/zend_ini_parser.y
+++ b/Zend/zend_ini_parser.y
@@ -104,7 +104,7 @@ static void zend_ini_init_string(zval *result)
*/
static void zend_ini_add_string(zval *result, zval *op1, zval *op2)
{
- zend_str_size length = Z_STRSIZE_P(op1) + Z_STRSIZE_P(op2);
+ zend_size_t length = Z_STRSIZE_P(op1) + Z_STRSIZE_P(op2);
Z_STRVAL_P(result) = (char *) realloc(Z_STRVAL_P(op1), length+1);
memcpy(Z_STRVAL_P(result)+Z_STRSIZE_P(op1), Z_STRVAL_P(op2),
Z_STRSIZE_P(op2));
@@ -163,7 +163,7 @@ static void zend_ini_get_var(zval *result, zval *name
TSRMLS_DC)
static void ini_error(char *msg)
{
char *error_buf;
- zend_str_size error_buf_len;
+ zend_size_t error_buf_len;
char *currently_parsed_filename;
TSRMLS_FETCH();
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 6028f8d..bf80230 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -1300,7 +1300,7 @@ static YYSIZE_T zend_yytnamerr(char *yyres, const char
*yystr)
if (CG(parse_error) == 0) {
char buffer[120];
const unsigned char *end, *str, *tok1 = NULL, *tok2 =
NULL;
- zend_str_size len = 0, toklen = 0, yystr_len;
+ zend_size_t len = 0, toklen = 0, yystr_len;
CG(parse_error) = 1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.6': ext/opcache/ZendAccelerator.c
Commit:26096aa73f4839878b1cb02161e80148c1b1e7a4 Author:Dmitry Stogov dmi...@zend.com Wed, 18 Dec 2013 19:22:05 +0400 Parents: a8a36b7d52bc8b00dd8a6cbe32b1875b4c41cbcf 436ca2d019ed3ec3183129f9a3a7e329446077e9 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=26096aa73f4839878b1cb02161e80148c1b1e7a4 Log: Merge branch 'PHP-5.6' * PHP-5.6: Fixed reavlidate_path=1 behavior to avoid caching of symlinks values. Changed paths: MM ext/opcache/ZendAccelerator.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed ZTS build. Needed to bump API version number.: Zend/zend_extensions.h ext/opcache/Optimizer/block_pass.c ext/opcache/Optimizer/pass2.c main/php.h
Commit:b11b3d201f083a335ae89f3fa0fdf942e5baea4a
Author:Bob Weinand bobw...@hotmail.com Wed, 18 Dec 2013 16:44:20
+0100
Parents: 26096aa73f4839878b1cb02161e80148c1b1e7a4
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=b11b3d201f083a335ae89f3fa0fdf942e5baea4a
Log:
Fixed ZTS build. Needed to bump API version number.
Changed paths:
M Zend/zend_extensions.h
M ext/opcache/Optimizer/block_pass.c
M ext/opcache/Optimizer/pass2.c
M main/php.h
Diff:
diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h
index 335eecd..3ef2880 100644
--- a/Zend/zend_extensions.h
+++ b/Zend/zend_extensions.h
@@ -28,7 +28,7 @@
/* The first number is the engine version and the rest is the date.
* This way engine 2/3 API no. is always greater than engine 1 API no..
*/
-#define ZEND_EXTENSION_API_NO 220131107
+#define ZEND_EXTENSION_API_NO 220131218
typedef struct _zend_extension_version_info {
int zend_extension_api_no;
diff --git a/ext/opcache/Optimizer/block_pass.c
b/ext/opcache/Optimizer/block_pass.c
index 919f4a9..835c9ee 100644
--- a/ext/opcache/Optimizer/block_pass.c
+++ b/ext/opcache/Optimizer/block_pass.c
@@ -1465,7 +1465,7 @@ static void zend_jmp_optimization(zend_code_block *block,
zend_op_array *op_arra
case ZEND_JMPNZ:
/* constant conditional JMPs */
if (ZEND_OP1_TYPE(last_op) == IS_CONST) {
-#if PHP_API_VERSION PHP_5_6_X_API_NO
+#if ZEND_EXTENSION_API_NO PHP_5_6_X_API_NO
int should_jmp =
zend_is_true(ZEND_OP1_LITERAL(last_op) TSRMLS_CC);
#else
int should_jmp =
zend_is_true(ZEND_OP1_LITERAL(last_op));
@@ -1613,7 +1613,7 @@ next_target:
case ZEND_JMPZ_EX:
/* constant conditional JMPs */
if (ZEND_OP1_TYPE(last_op) == IS_CONST) {
-#if PHP_API_VERSION PHP_5_6_X_API_NO
+#if ZEND_EXTENSION_API_NO PHP_5_6_X_API_NO
int should_jmp =
zend_is_true(ZEND_OP1_LITERAL(last_op) TSRMLS_CC);
#else
int should_jmp =
zend_is_true(ZEND_OP1_LITERAL(last_op));
@@ -1739,7 +1739,7 @@ next_target_ex:
}
if (ZEND_OP1_TYPE(last_op) == IS_CONST) {
-#if PHP_API_VERSION PHP_5_6_X_API_NO
+#if ZEND_EXTENSION_API_NO PHP_5_6_X_API_NO
if (!zend_is_true(ZEND_OP1_LITERAL(last_op)
TSRMLS_CC)) {
#else
if (!zend_is_true(ZEND_OP1_LITERAL(last_op))) {
diff --git a/ext/opcache/Optimizer/pass2.c b/ext/opcache/Optimizer/pass2.c
index 0f747aa..d5f4f04 100644
--- a/ext/opcache/Optimizer/pass2.c
+++ b/ext/opcache/Optimizer/pass2.c
@@ -89,7 +89,7 @@ if (ZEND_OPTIMIZER_PASS_2 OPTIMIZATION_LEVEL) {
/* convert Ti = JMPZ_EX(C, L) = Ti =
QM_ASSIGN(C)
in case we know it wouldn't jump */
} else if (ZEND_OP1_TYPE(opline) == IS_CONST) {
-#if PHP_API_VERSION PHP_5_6_X_API_NO
+#if ZEND_EXTENSION_API_NO PHP_5_6_X_API_NO
int should_jmp =
zend_is_true(ZEND_OP1_LITERAL(opline) TSRMLS_CC);
#else
int should_jmp =
zend_is_true(ZEND_OP1_LITERAL(opline));
@@ -107,7 +107,7 @@ if (ZEND_OPTIMIZER_PASS_2 OPTIMIZATION_LEVEL) {
case ZEND_JMPZ:
case ZEND_JMPNZ:
if (ZEND_OP1_TYPE(opline) == IS_CONST) {
-#if PHP_API_VERSION PHP_5_6_X_API_NO
+#if ZEND_EXTENSION_API_NO PHP_5_6_X_API_NO
int should_jmp =
zend_is_true(ZEND_OP1_LITERAL(opline) TSRMLS_CC);
#else
int should_jmp =
zend_is_true(ZEND_OP1_LITERAL(opline));
@@ -147,7 +147,7 @@ if (ZEND_OPTIMIZER_PASS_2 OPTIMIZATION_LEVEL) {
case ZEND_JMPZNZ:
if (ZEND_OP1_TYPE(opline) == IS_CONST) {
int opline_num;
-#if PHP_API_VERSION PHP_5_6_X_API_NO
+#if ZEND_EXTENSION_API_NO PHP_5_6_X_API_NO
if
(zend_is_true(ZEND_OP1_LITERAL(opline) TSRMLS_CC)) {
#else
if
(zend_is_true(ZEND_OP1_LITERAL(opline))) {
diff --git a/main/php.h b/main/php.h
index ed8a2bb..bfa148d 100644
--- a/main/php.h
+++ b/main/php.h
@@ -26,7 +26,7 @@
#include dmalloc.h
#endif
-#define PHP_API_VERSION 20131106
+#define PHP_API_VERSION 20131218
#define PHP_HAVE_STREAMS
#define YYDEBUG 0
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fix after merge: Zend/zend.c
Commit:74aea4e471aadeb854bf2a5dbc917f7ea783a281 Author:Anatol Belski a...@php.net Wed, 18 Dec 2013 15:18:02 +0100 Parents: 8432557dcda79c298c1fcfd47440940e398afaa4 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=74aea4e471aadeb854bf2a5dbc917f7ea783a281 Log: fix after merge Changed paths: M Zend/zend.c Diff: diff --git a/Zend/zend.c b/Zend/zend.c index c20e1ba..e16dbce 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -58,7 +58,7 @@ ZEND_API void (*zend_block_interruptions)(void); ZEND_API void (*zend_unblock_interruptions)(void); ZEND_API void (*zend_ticks_function)(int ticks TSRMLS_DC); ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const zend_str_size_uint error_lineno, const char *format, va_list args); -int (*zend_vspprintf)(char **pbuf, zend_str_size_size_t max_len, const char *format, va_list ap); +zend_str_size_int (*zend_vspprintf)(char **pbuf, zend_str_size_size_t max_len, const char *format, va_list ap); ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC); ZEND_API char *(*zend_resolve_path)(const char *filename, zend_str_size_int filename_len TSRMLS_DC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: size_t part for *.l files: Zend/zend_ini_scanner.l
Commit:8709cc6d600ffaef440b91b27ba1c6ebd4b23c7e
Author:Anatol Belski a...@php.net Wed, 18 Dec 2013 14:56:40 -0800
Parents: 0b8f946ea5648da8ac0830fb64d14cf43827eee1
Branches: str_size_and_int64
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=8709cc6d600ffaef440b91b27ba1c6ebd4b23c7e
Log:
size_t part for *.l files
Changed paths:
M Zend/zend_ini_scanner.l
Diff:
diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index cb59b5b..ed7d76a 100644
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -55,7 +55,7 @@
#define yytext ((char*)SCNG(yy_text))
#define yyleng SCNG(yy_leng)
#define yyless(x)do { YYCURSOR = (unsigned char*)yytext + x; \
- yyleng =
(zend_str_size)x; } while(0)
+ yyleng =
(zend_size_t)x; } while(0)
/* #define yymore() goto yymore_restart */
@@ -261,7 +261,7 @@ int zend_ini_prepare_string_for_scanning(char *str, int
scanner_mode TSRMLS_DC)
/* {{{ zend_ini_escape_string()
*/
-static void zend_ini_escape_string(zval *lval, char *str, zend_str_size_int
len, char quote_type TSRMLS_DC)
+static void zend_ini_escape_string(zval *lval, char *str, zend_size_t len,
char quote_type TSRMLS_DC)
{
register char *s, *t;
char *end;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix these SAPI hooks so that the TSRMLS parameters are correctly passed as required by the sapi struct: sapi/tux/php_tux.c
Commit:520d969feade9076bd93578992cee09c4e4a07ec
Author:Kalle Sommer Nielsen ka...@php.net Wed, 18 Dec 2013
09:01:44 +0100
Parents: 432e91f1121595e2dacd6f5ee6436b5f8c12dde6
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=520d969feade9076bd93578992cee09c4e4a07ec
Log:
Fix these SAPI hooks so that the TSRMLS parameters are correctly passed as
required by the sapi struct
# Not sure if this builds either
Changed paths:
M sapi/tux/php_tux.c
Diff:
diff --git a/sapi/tux/php_tux.c b/sapi/tux/php_tux.c
index 968dd9e..1dbcf38 100644
--- a/sapi/tux/php_tux.c
+++ b/sapi/tux/php_tux.c
@@ -96,7 +96,7 @@ static int sapi_tux_ub_write(const char *str, uint str_length
TSRMLS_DC)
return n;
}
-static int sapi_tux_send_headers(sapi_headers_struct *sapi_headers)
+static int sapi_tux_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
{
char buf[1024];
struct iovec *vec;
@@ -107,7 +107,6 @@ static int sapi_tux_send_headers(sapi_headers_struct
*sapi_headers)
size_t len;
char *status_line;
int locate_cl;
- TSRMLS_FETCH();
max_headers = 30;
n = 1;
@@ -158,11 +157,10 @@ static int sapi_tux_send_headers(sapi_headers_struct
*sapi_headers)
return SAPI_HEADER_SENT_SUCCESSFULLY;
}
-static int sapi_tux_read_post(char *buffer, uint count_bytes)
+static int sapi_tux_read_post(char *buffer, uint count_bytes TSRMLS_DC)
{
#if 0
int amount = 0;
- TSRMLS_FETCH();
TG(req)-objectlen = count_bytes;
TG(req)-object_addr = buffer;
@@ -177,10 +175,8 @@ static int sapi_tux_read_post(char *buffer, uint
count_bytes)
#endif
}
-static char *sapi_tux_read_cookies(void)
+static char *sapi_tux_read_cookies(TSRMLS_D)
{
- TSRMLS_FETCH();
-
return TG(req)-cookies;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: mass replacement for zend_size_t/php_size_t: Zend/zend.c Zend/zend.h Zend/zend_API.c Zend/zend_API.h Zend/zend_alloc.c Zend/zend_alloc.h Zend/zend_builtin_functions.c Zend/zend_
Commit:b1abe4ca21e10b04a8bae2d00e8113f4b2b02567 Author:Anatol Belski a...@php.net Wed, 18 Dec 2013 14:46:44 -0800 Parents: 6d938321ffc43a343b2afcee70d921cc931752d8 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b1abe4ca21e10b04a8bae2d00e8113f4b2b02567 Log: mass replacement for zend_size_t/php_size_t M Zend/zend.c M Zend/zend.h M Zend/zend_API.c M Zend/zend_API.h M Zend/zend_alloc.c M Zend/zend_alloc.h M Zend/zend_builtin_functions.c M Zend/zend_closures.c M Zend/zend_compile.c M Zend/zend_compile.h M Zend/zend_constants.c M Zend/zend_constants.h M Zend/zend_exceptions.c M Zend/zend_exceptions.h M Zend/zend_execute.h M Zend/zend_execute_API.c M Zend/zend_hash.c M Zend/zend_hash.h M Zend/zend_highlight.c M Zend/zend_highlight.h M Zend/zend_ini.c M Zend/zend_ini.h M Zend/zend_ini_scanner.c M Zend/zend_interfaces.c M Zend/zend_interfaces.h M Zend/zend_object_handlers.c M Zend/zend_object_handlers.h M Zend/zend_operators.c M Zend/zend_operators.h M Zend/zend_string.c M Zend/zend_string.h M Zend/zend_virtual_cwd.c M Zend/zend_virtual_cwd.h M Zend/zend_vm_def.h M Zend/zend_vm_execute.h M ext/bcmath/bcmath.c M ext/bz2/bz2.c M ext/com_dotnet/com_com.c M ext/com_dotnet/com_dotnet.c M ext/com_dotnet/com_handlers.c M ext/com_dotnet/com_olechar.c M ext/com_dotnet/com_persist.c M ext/com_dotnet/com_saproxy.c M ext/com_dotnet/com_typeinfo.c M ext/com_dotnet/com_variant.c M ext/com_dotnet/com_wrapper.c M ext/com_dotnet/php_com_dotnet_internal.h M ext/curl/curl_file.c M ext/curl/interface.c M ext/date/php_date.c M ext/date/php_date.h M ext/dba/dba.c M ext/dom/attr.c M ext/dom/cdatasection.c M ext/dom/characterdata.c M ext/dom/comment.c M ext/dom/document.c M ext/dom/documentfragment.c M ext/dom/domimplementation.c M ext/dom/element.c M ext/dom/entityreference.c M ext/dom/namednodemap.c M ext/dom/node.c M ext/dom/php_dom.c M ext/dom/processinginstruction.c M ext/dom/text.c M ext/dom/xpath.c M ext/enchant/enchant.c M ext/ereg/ereg.c M ext/exif/exif.c M ext/fileinfo/fileinfo.c M ext/fileinfo/libmagic/funcs.c M ext/filter/filter.c M ext/filter/logical_filters.c M ext/filter/sanitizing_filters.c M ext/ftp/ftp.c M ext/ftp/ftp.h M ext/ftp/php_ftp.c M ext/gd/gd.c M ext/gd/gd_ctx.c M ext/gettext/gettext.c M ext/gmp/gmp.c M ext/hash/hash.c M ext/hash/hash_haval.c M ext/hash/hash_joaat.c M ext/hash/hash_md.c M ext/hash/hash_ripemd.c M ext/hash/hash_sha.c M ext/hash/php_hash.h M ext/hash/php_hash_haval.h M ext/hash/php_hash_joaat.h M ext/hash/php_hash_md.h M ext/hash/php_hash_ripemd.h M ext/hash/php_hash_sha.h M ext/iconv/iconv.c M ext/imap/php_imap.c M ext/interbase/ibase_blobs.c M ext/interbase/ibase_query.c M ext/interbase/ibase_service.c M ext/interbase/interbase.c M ext/intl/collator/collator_compare.c M ext/intl/collator/collator_convert.c M ext/intl/collator/collator_create.c M ext/intl/collator/collator_is_numeric.c M ext/intl/collator/collator_is_numeric.h M ext/intl/collator/collator_sort.c M ext/intl/converter/converter.c M ext/intl/dateformat/dateformat_attr.c M ext/intl/dateformat/dateformat_parse.c M ext/intl/formatter/formatter_attr.c M ext/intl/formatter/formatter_format.c M ext/intl/formatter/formatter_main.c M ext/intl/formatter/formatter_parse.c M ext/intl/grapheme/grapheme_string.c M ext/intl/grapheme/grapheme_util.c M ext/intl/grapheme/grapheme_util.h M ext/intl/idn/idn.c M ext/intl/intl_convert.c M ext/intl/intl_convert.h M ext/intl/intl_convertcpp.h M ext/intl/intl_data.h M ext/intl/intl_error.c M ext/intl/locale/locale_methods.c M ext/intl/msgformat/msgformat.c M ext/intl/msgformat/msgformat_attr.c M ext/intl/msgformat/msgformat_format.c M ext/intl/msgformat/msgformat_parse.c M ext/intl/normalizer/normalizer_normalize.c M ext/intl/resourcebundle/resourcebundle_class.c M ext/intl/spoofchecker/spoofchecker_main.c M ext/intl/transliterator/transliterator_class.c M ext/intl/transliterator/transliterator_methods.c M ext/json/JSON_parser.c M ext/json/JSON_parser.h M ext/json/json.c M ext/json/php_json.h M ext/ldap/ldap.c M ext/libxml/libxml.c M ext/mbstring/mb_gpc.c M ext/mbstring/mbstring.c M ext/mbstring/php_mbregex.c M ext/mcrypt/mcrypt.c M ext/mssql/php_mssql.c M ext/mysql/php_mysql.c M ext/mysqli/mysqli.c M ext/mysqli/mysqli_api.c M ext/mysqli/mysqli_nonapi.c M ext/mysqlnd/mysqlnd_bt.c M ext/mysqlnd/mysqlnd_debug.c M ext/mysqlnd/mysqlnd_ps_codec.c M ext/mysqlnd/mysqlnd_wireprotocol.c M ext/mysqlnd/php_mysqlnd.c M ext/oci8/oci8.c M ext/oci8/oci8_collection.c M ext/oci8/oci8_interface.c M
