[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/sapi/fpm/fpm/ fpm_main.c fpm_php.c

[Jérôme Loyet]

fat                                      Sat, 08 Oct 2011 13:57:31 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=317899

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

Changed paths:
    U   php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c
    U   php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_php.c

Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c        2011-10-08 
13:53:49 UTC (rev 317898)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c        2011-10-08 
13:57:31 UTC (rev 317899)
@@ -656,22 +656,7 @@
        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 @@
        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 @@
        }

        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 @@
        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);
        }
 }
 /* }}} */

Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_php.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_php.c 2011-10-08 13:53:49 UTC 
(rev 317898)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_php.c 2011-10-08 13:57:31 UTC 
(rev 317899)
@@ -120,13 +120,13 @@

        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);
                }
        }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php