kalle Wed, 18 Aug 2010 13:34:40 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=302441
Log:
Pass the TSRMS pointers to sapi_module_struct.log_message, this saves some
TSRMLS_FETCH() calls in a few of our SAPI's
Changed paths:
U php/php-src/trunk/ext/standard/basic_functions.c
U php/php-src/trunk/main/SAPI.h
U php/php-src/trunk/main/main.c
U php/php-src/trunk/sapi/apache/mod_php5.c
U php/php-src/trunk/sapi/apache2filter/sapi_apache2.c
U php/php-src/trunk/sapi/apache2handler/sapi_apache2.c
U php/php-src/trunk/sapi/apache_hooks/mod_php5.c
U php/php-src/trunk/sapi/cgi/cgi_main.c
U php/php-src/trunk/sapi/cli/php_cli.c
U php/php-src/trunk/sapi/continuity/capi.c
U php/php-src/trunk/sapi/embed/php_embed.c
U php/php-src/trunk/sapi/fpm/fpm/fpm_main.c
U php/php-src/trunk/sapi/litespeed/lsapi_main.c
U php/php-src/trunk/sapi/nsapi/nsapi.c
Modified: php/php-src/trunk/ext/standard/basic_functions.c
===================================================================
--- php/php-src/trunk/ext/standard/basic_functions.c 2010-08-18 12:59:52 UTC (rev 302440)
+++ php/php-src/trunk/ext/standard/basic_functions.c 2010-08-18 13:34:40 UTC (rev 302441)
@@ -4633,7 +4633,7 @@
case 4: /* send to SAPI */
if (sapi_module.log_message) {
- sapi_module.log_message(message);
+ sapi_module.log_message(message TSRMLS_CC);
} else {
return FAILURE;
}
Modified: php/php-src/trunk/main/SAPI.h
===================================================================
--- php/php-src/trunk/main/SAPI.h 2010-08-18 12:59:52 UTC (rev 302440)
+++ php/php-src/trunk/main/SAPI.h 2010-08-18 13:34:40 UTC (rev 302441)
@@ -237,7 +237,7 @@
char *(*read_cookies)(TSRMLS_D);
void (*register_server_variables)(zval *track_vars_array TSRMLS_DC);
- void (*log_message)(char *message);
+ void (*log_message)(char *message TSRMLS_DC);
time_t (*get_request_time)(TSRMLS_D);
void (*terminate_process)(TSRMLS_D);
Modified: php/php-src/trunk/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c 2010-08-18 12:59:52 UTC (rev 302440)
+++ php/php-src/trunk/main/main.c 2010-08-18 13:34:40 UTC (rev 302441)
@@ -567,7 +567,7 @@
/* Otherwise fall back to the default logging location, if we have one */
if (sapi_module.log_message) {
- sapi_module.log_message(log_message);
+ sapi_module.log_message(log_message TSRMLS_CC);
}
PG(in_error_log) = 0;
}
Modified: php/php-src/trunk/sapi/apache/mod_php5.c
===================================================================
--- php/php-src/trunk/sapi/apache/mod_php5.c 2010-08-18 12:59:52 UTC (rev 302440)
+++ php/php-src/trunk/sapi/apache/mod_php5.c 2010-08-18 13:34:40 UTC (rev 302441)
@@ -307,10 +307,8 @@
/* {{{ php_apache_log_message
*/
-static void php_apache_log_message(char *message)
+static void php_apache_log_message(char *message TSRMLS_DC)
{
- TSRMLS_FETCH();
-
if (SG(server_context)) {
#if MODULE_MAGIC_NUMBER >= 19970831
aplog_error(NULL, 0, APLOG_ERR | APLOG_NOERRNO, ((request_rec *) SG(server_context))->server, "%s", message);
Modified: php/php-src/trunk/sapi/apache2filter/sapi_apache2.c
===================================================================
--- php/php-src/trunk/sapi/apache2filter/sapi_apache2.c 2010-08-18 12:59:52 UTC (rev 302440)
+++ php/php-src/trunk/sapi/apache2filter/sapi_apache2.c 2010-08-18 13:34:40 UTC (rev 302441)
@@ -282,10 +282,9 @@
}
}
-static void php_apache_sapi_log_message(char *msg)
+static void php_apache_sapi_log_message(char *msg TSRMLS_DC)
{
php_struct *ctx;
- TSRMLS_FETCH();
ctx = SG(server_context);
Modified: php/php-src/trunk/sapi/apache2handler/sapi_apache2.c
===================================================================
--- php/php-src/trunk/sapi/apache2handler/sapi_apache2.c 2010-08-18 12:59:52 UTC (rev 302440)
+++ php/php-src/trunk/sapi/apache2handler/sapi_apache2.c 2010-08-18 13:34:40 UTC (rev 302441)
@@ -313,10 +313,9 @@
}
}
-static void php_apache_sapi_log_message(char *msg)
+static void php_apache_sapi_log_message(char *msg TSRMLS_DC)
{
php_struct *ctx;
- TSRMLS_FETCH();
ctx = SG(server_context);
@@ -327,12 +326,12 @@
}
}
-static void php_apache_sapi_log_message_ex(char *msg, request_rec *r)
+static void php_apache_sapi_log_message_ex(char *msg, request_rec *r TSRMLS_DC)
{
if (r) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, msg, r->filename);
} else {
- php_apache_sapi_log_message(msg);
+ php_apache_sapi_log_message(msg TSRMLS_CC);
}
}
@@ -589,12 +588,12 @@
}
if (r->finfo.filetype == 0) {
- php_apache_sapi_log_message_ex("script '%s' not found or unable to stat", r);
+ php_apache_sapi_log_message_ex("script '%s' not found or unable to stat", r TSRMLS_CC);
PHPAP_INI_OFF;
return HTTP_NOT_FOUND;
}
if (r->finfo.filetype == APR_DIR) {
- php_apache_sapi_log_message_ex("attempt to invoke directory '%s' as script", r);
+ php_apache_sapi_log_message_ex("attempt to invoke directory '%s' as script", r TSRMLS_CC);
PHPAP_INI_OFF;
return HTTP_FORBIDDEN;
}
Modified: php/php-src/trunk/sapi/apache_hooks/mod_php5.c
===================================================================
--- php/php-src/trunk/sapi/apache_hooks/mod_php5.c 2010-08-18 12:59:52 UTC (rev 302440)
+++ php/php-src/trunk/sapi/apache_hooks/mod_php5.c 2010-08-18 13:34:40 UTC (rev 302441)
@@ -430,10 +430,8 @@
/* {{{ php_apache_log_message
*/
-static void php_apache_log_message(char *message)
+static void php_apache_log_message(char *message TSRMLS_DC)
{
- TSRMLS_FETCH();
-
if (SG(server_context)) {
#if MODULE_MAGIC_NUMBER >= 19970831
aplog_error(NULL, 0, APLOG_ERR | APLOG_NOERRNO, ((request_rec *) SG(server_context))->server, "%s", message);
Modified: php/php-src/trunk/sapi/cgi/cgi_main.c
===================================================================
--- php/php-src/trunk/sapi/cgi/cgi_main.c 2010-08-18 12:59:52 UTC (rev 302440)
+++ php/php-src/trunk/sapi/cgi/cgi_main.c 2010-08-18 13:34:40 UTC (rev 302441)
@@ -676,10 +676,8 @@
}
}
-static void sapi_cgi_log_message(char *message)
+static void sapi_cgi_log_message(char *message TSRMLS_DC)
{
- TSRMLS_FETCH();
-
if (fcgi_is_fastcgi() && CGIG(fcgi_logging)) {
fcgi_request *request;
Modified: php/php-src/trunk/sapi/cli/php_cli.c
===================================================================
--- php/php-src/trunk/sapi/cli/php_cli.c 2010-08-18 12:59:52 UTC (rev 302440)
+++ php/php-src/trunk/sapi/cli/php_cli.c 2010-08-18 13:34:40 UTC (rev 302441)
@@ -374,7 +374,7 @@
}
/* }}} */
-static void sapi_cli_log_message(char *message) /* {{{ */
+static void sapi_cli_log_message(char *message TSRMLS_DC) /* {{{ */
{
fprintf(stderr, "%s\n", message);
}
@@ -476,7 +476,7 @@
sapi_cli_log_message, /* Log message */
NULL, /* Get request time */
NULL, /* Child terminate */
-
+
STANDARD_SAPI_MODULE_PROPERTIES
};
/* }}} */
Modified: php/php-src/trunk/sapi/continuity/capi.c
===================================================================
--- php/php-src/trunk/sapi/continuity/capi.c 2010-08-18 12:59:52 UTC (rev 302440)
+++ php/php-src/trunk/sapi/continuity/capi.c 2010-08-18 13:34:40 UTC (rev 302441)
@@ -343,9 +343,8 @@
}
-static void capi_log_message(char *message)
+static void capi_log_message(char *message TSRMLS_DC)
{
- TSRMLS_FETCH();
capi_request_context *rc = (capi_request_context *) SG(server_context);
logFmsg(0, "mod/php: %s", message);
}
Modified: php/php-src/trunk/sapi/embed/php_embed.c
===================================================================
--- php/php-src/trunk/sapi/embed/php_embed.c 2010-08-18 12:59:52 UTC (rev 302440)
+++ php/php-src/trunk/sapi/embed/php_embed.c 2010-08-18 13:34:40 UTC (rev 302441)
@@ -90,7 +90,7 @@
{
}
-static void php_embed_log_message(char *message)
+static void php_embed_log_message(char *message TSRMLS_DC)
{
fprintf (stderr, "%s\n", message);
}
Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_main.c 2010-08-18 12:59:52 UTC (rev 302440)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_main.c 2010-08-18 13:34:40 UTC (rev 302441)
@@ -698,10 +698,8 @@
}
}
-static void sapi_cgi_log_message(char *message)
+static void sapi_cgi_log_message(char *message TSRMLS_DC)
{
- TSRMLS_FETCH();
-
if (fcgi_is_fastcgi() && CGIG(fcgi_logging)) {
fcgi_request *request;
Modified: php/php-src/trunk/sapi/litespeed/lsapi_main.c
===================================================================
--- php/php-src/trunk/sapi/litespeed/lsapi_main.c 2010-08-18 12:59:52 UTC (rev 302440)
+++ php/php-src/trunk/sapi/litespeed/lsapi_main.c 2010-08-18 13:34:40 UTC (rev 302441)
@@ -268,7 +268,7 @@
/* {{{ sapi_lsapi_send_headers
*/
-static void sapi_lsapi_log_message(char *message)
+static void sapi_lsapi_log_message(char *message TSRMLS_DC)
{
int len = strlen( message );
LSAPI_Write_Stderr( message, len);
Modified: php/php-src/trunk/sapi/nsapi/nsapi.c
===================================================================
--- php/php-src/trunk/sapi/nsapi/nsapi.c 2010-08-18 12:59:52 UTC (rev 302440)
+++ php/php-src/trunk/sapi/nsapi/nsapi.c 2010-08-18 13:34:40 UTC (rev 302441)
@@ -773,9 +773,8 @@
}
}
-static void nsapi_log_message(char *message)
+static void nsapi_log_message(char *message TSRMLS_DC)
{
- TSRMLS_FETCH();
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
if (rc) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
