aharvey                                  Fri, 26 Feb 2010 18:01:03 +0000

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

Log:
Fix for bug #23229 (syslog function truncates messages): remove the hard-coded
500 character error message limit imposed when using error_log=syslog.

Bug: http://bugs.php.net/23229 (error getting bug information)
      
Changed paths:
    U   php/php-src/branches/PHP_5_2/main/main.c
    U   php/php-src/branches/PHP_5_3/main/main.c
    U   php/php-src/trunk/main/main.c

Modified: php/php-src/branches/PHP_5_2/main/main.c
===================================================================
--- php/php-src/branches/PHP_5_2/main/main.c    2010-02-26 17:12:32 UTC (rev 
295540)
+++ php/php-src/branches/PHP_5_2/main/main.c    2010-02-26 18:01:03 UTC (rev 
295541)
@@ -501,7 +501,7 @@
        if (PG(error_log) != NULL) {
 #ifdef HAVE_SYSLOG_H
                if (!strcmp(PG(error_log), "syslog")) {
-                       php_syslog(LOG_NOTICE, "%.500s", log_message);
+                       php_syslog(LOG_NOTICE, "%s", log_message);
                        PG(in_error_log) = 0;
                        return;
                }

Modified: php/php-src/branches/PHP_5_3/main/main.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/main.c    2010-02-26 17:12:32 UTC (rev 
295540)
+++ php/php-src/branches/PHP_5_3/main/main.c    2010-02-26 18:01:03 UTC (rev 
295541)
@@ -568,7 +568,7 @@
        if (PG(error_log) != NULL) {
 #ifdef HAVE_SYSLOG_H
                if (!strcmp(PG(error_log), "syslog")) {
-                       php_syslog(LOG_NOTICE, "%.500s", log_message);
+                       php_syslog(LOG_NOTICE, "%s", log_message);
                        PG(in_error_log) = 0;
                        return;
                }

Modified: php/php-src/trunk/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c       2010-02-26 17:12:32 UTC (rev 295540)
+++ php/php-src/trunk/main/main.c       2010-02-26 18:01:03 UTC (rev 295541)
@@ -655,7 +655,7 @@
        if (PG(error_log) != NULL) {
 #ifdef HAVE_SYSLOG_H
                if (!strcmp(PG(error_log), "syslog")) {
-                       php_syslog(LOG_NOTICE, "%.500s", log_message);
+                       php_syslog(LOG_NOTICE, "%s", log_message);
                        PG(in_error_log) = 0;
                        return;
                }

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

Reply via email to