fat                                      Sun, 17 Jul 2011 23:33:22 +0000

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

Log:
- get rid of FPM_AUTOCONFIG_H which has never existed since FPM integration 
into core

Changed paths:
    U   php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fastcgi.c
    U   php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_config.h
    U   php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c
    U   php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fastcgi.c
    U   php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_config.h
    U   php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_main.c
    U   php/php-src/trunk/sapi/fpm/fpm/fastcgi.c
    U   php/php-src/trunk/sapi/fpm/fpm/fpm_config.h
    U   php/php-src/trunk/sapi/fpm/fpm/fpm_main.c

Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fastcgi.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fastcgi.c 2011-07-17 23:26:02 UTC 
(rev 313346)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fastcgi.c 2011-07-17 23:33:22 UTC 
(rev 313347)
@@ -28,13 +28,10 @@
 #include <errno.h>
 #include <limits.h>

-#ifdef FPM_AUTOCONFIG_H
-#include <fpm_autoconfig.h>
-#else
 #include <php_config.h>
-#endif
 #include <fpm/fpm.h>
 #include <fpm/fpm_request.h>
+#include <fpm/zlog.h>

 #ifdef _WIN32

@@ -511,6 +508,7 @@
                        ret = 0;
                        break;
                }
+               zlog(ZLOG_DEBUG, "%s=%s", tmp, s);
                zend_hash_update(req->env, tmp, eff_name_len+1, &s, 
sizeof(char*), NULL);
                p += name_len + val_len;
        }

Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_config.h
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_config.h      2011-07-17 
23:26:02 UTC (rev 313346)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_config.h      2011-07-17 
23:33:22 UTC (rev 313347)
@@ -3,10 +3,6 @@

 #include <php_config.h>

-#ifdef FPM_AUTOCONFIG_H
-# include <fpm_autoconfig.h>
-#endif
-
 /* Solaris does not have it */
 #ifndef INADDR_NONE
 # define INADDR_NONE (-1)

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-07-17 
23:26:02 UTC (rev 313346)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c        2011-07-17 
23:33:22 UTC (rev 313347)
@@ -99,11 +99,7 @@

 #include "fastcgi.h"

-#ifdef FPM_AUTOCONFIG_H
-#include <fpm_autoconfig.h>
-#else
 #include <php_config.h>
-#endif
 #include <fpm/fpm.h>
 #include <fpm/fpm_request.h>
 #include <fpm/fpm_status.h>

Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fastcgi.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fastcgi.c 2011-07-17 23:26:02 UTC 
(rev 313346)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fastcgi.c 2011-07-17 23:33:22 UTC 
(rev 313347)
@@ -28,11 +28,7 @@
 #include <errno.h>
 #include <limits.h>

-#ifdef FPM_AUTOCONFIG_H
-#include <fpm_autoconfig.h>
-#else
 #include <php_config.h>
-#endif
 #include <fpm/fpm.h>
 #include <fpm/fpm_request.h>


Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_config.h
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_config.h      2011-07-17 
23:26:02 UTC (rev 313346)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_config.h      2011-07-17 
23:33:22 UTC (rev 313347)
@@ -3,10 +3,6 @@

 #include <php_config.h>

-#ifdef FPM_AUTOCONFIG_H
-# include <fpm_autoconfig.h>
-#endif
-
 /* Solaris does not have it */
 #ifndef INADDR_NONE
 # define INADDR_NONE (-1)

Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_main.c        2011-07-17 
23:26:02 UTC (rev 313346)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_main.c        2011-07-17 
23:33:22 UTC (rev 313347)
@@ -99,11 +99,7 @@

 #include "fastcgi.h"

-#ifdef FPM_AUTOCONFIG_H
-#include <fpm_autoconfig.h>
-#else
 #include <php_config.h>
-#endif
 #include <fpm/fpm.h>
 #include <fpm/fpm_request.h>
 #include <fpm/fpm_status.h>

Modified: php/php-src/trunk/sapi/fpm/fpm/fastcgi.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fastcgi.c    2011-07-17 23:26:02 UTC (rev 
313346)
+++ php/php-src/trunk/sapi/fpm/fpm/fastcgi.c    2011-07-17 23:33:22 UTC (rev 
313347)
@@ -28,11 +28,7 @@
 #include <errno.h>
 #include <limits.h>

-#ifdef FPM_AUTOCONFIG_H
-#include <fpm_autoconfig.h>
-#else
 #include <php_config.h>
-#endif
 #include <fpm/fpm.h>
 #include <fpm/fpm_request.h>


Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_config.h
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_config.h 2011-07-17 23:26:02 UTC (rev 
313346)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_config.h 2011-07-17 23:33:22 UTC (rev 
313347)
@@ -3,10 +3,6 @@

 #include <php_config.h>

-#ifdef FPM_AUTOCONFIG_H
-# include <fpm_autoconfig.h>
-#endif
-
 /* Solaris does not have it */
 #ifndef INADDR_NONE
 # define INADDR_NONE (-1)

Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_main.c   2011-07-17 23:26:02 UTC (rev 
313346)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_main.c   2011-07-17 23:33:22 UTC (rev 
313347)
@@ -99,11 +99,7 @@

 #include "fastcgi.h"

-#ifdef FPM_AUTOCONFIG_H
-#include <fpm_autoconfig.h>
-#else
 #include <php_config.h>
-#endif
 #include <fpm/fpm.h>
 #include <fpm/fpm_request.h>
 #include <fpm/fpm_status.h>

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

Reply via email to