php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Backported from 5.4 branch (don't write directly to stderr, use the internal logger instead (zlog))

Browse Source
This commit is contained in:
Jérôme Loyet
2011-10-08 13:57:31 +00:00
parent 4ef746ae25
commit 7fc36a5210
2 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sapi/fpm/fpm/fpm_main.c
+5 -20
View File
@@ -656,22 +656,7 @@ static void sapi_cgi_log_message(char *message)
TSRMLS_FETCH();
if (CGIG(fcgi_logging)) {
fcgi_request *request;
request = (fcgi_request*) SG(server_context);
if (request) {
int len = strlen(message);
char *buf = malloc(len+2);
memcpy(buf, message, len);
memcpy(buf + len, "\n", sizeof("\n"));
fcgi_write(request, FCGI_STDERR, buf, len+1);
free(buf);
} else {
fprintf(stderr, "%s\n", message);
//FIXME zlog(ZLOG_NOTICE, "PHP message: %s", message);
}
/* ignore return code */
zlog(ZLOG_NOTICE, "PHP message: %s", message);
}
}
@@ -1385,14 +1370,14 @@ static void fastcgi_ini_parser(zval *arg1, zval *arg2, zval *arg3, int callback_
if (!mode || !arg1) return;
if (callback_type != ZEND_INI_PARSER_ENTRY) {
fprintf(stderr, "Passing INI directive through FastCGI: only classic entries are allowed\n");
zlog(ZLOG_ERROR, "Passing INI directive through FastCGI: only classic entries are allowed");
return;
}
key = Z_STRVAL_P(arg1);
if (!key || strlen(key) < 1) {
fprintf(stderr, "Passing INI directive through FastCGI: empty key\n");
zlog(ZLOG_ERROR, "Passing INI directive through FastCGI: empty key");
return;
}
@@ -1401,7 +1386,7 @@ static void fastcgi_ini_parser(zval *arg1, zval *arg2, zval *arg3, int callback_
}
if (!value) {
fprintf(stderr, "Passing INI directive through FastCGI: empty value for key '%s'\n", key);
zlog(ZLOG_ERROR, "Passing INI directive through FastCGI: empty value for key '%s'", key);
return;
}
@@ -1409,7 +1394,7 @@ static void fastcgi_ini_parser(zval *arg1, zval *arg2, zval *arg3, int callback_
kv.value = value;
kv.next = NULL;
if (fpm_php_apply_defines_ex(&kv, *mode) == -1) {
fprintf(stderr, "Passing INI directive through FastCGI: unable to set '%s'\n", key);
zlog(ZLOG_ERROR, "Passing INI directive through FastCGI: unable to set '%s'", key);
}
}
/* }}} */
sapi/fpm/fpm/fpm_php.c
+2 -2
View File
@@ -120,13 +120,13 @@ static int fpm_php_apply_defines(struct fpm_worker_pool_s *wp) /* {{{ */
for (kv = wp->config->php_values; kv; kv = kv->next) {
if (fpm_php_apply_defines_ex(kv, ZEND_INI_USER) == -1) {
fprintf(stderr, "Unable to set php_value '%s'", kv->key);
zlog(ZLOG_ERROR, "Unable to set php_value '%s'", kv->key);
}
}
for (kv = wp->config->php_admin_values; kv; kv = kv->next) {
if (fpm_php_apply_defines_ex(kv, ZEND_INI_SYSTEM) == -1) {
fprintf(stderr, "Unable to set php_admin_value '%s'", kv->key);
zlog(ZLOG_ERROR, "Unable to set php_admin_value '%s'", kv->key);
}
}