- get rid of FPM_AUTOCONFIG_H which has never existed since FPM integration into...

diff --git a/sapi/fpm/fpm/fastcgi.c b/sapi/fpm/fpm/fastcgi.c
index ffa310daf673968222775bd7ef56a8aa083af09d..4f3974de310cf4099285335baf5509b04350e05f 100644 (file)
--- a/sapi/fpm/fpm/fastcgi.c
+++ b/sapi/fpm/fpm/fastcgi.c
@@ -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 @@ static int fcgi_get_params(fcgi_request *req, unsigned char *p, unsigned char *e
                        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;
        }

diff --git a/sapi/fpm/fpm/fpm_config.h b/sapi/fpm/fpm/fpm_config.h
index 3637f376c29d26167a1570d632788b53d2983126..856414a920246ab3a929ef5a37137df56ea6d249 100644 (file)
--- a/sapi/fpm/fpm/fpm_config.h
+++ b/sapi/fpm/fpm/fpm_config.h
@@ -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)

diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index aac63bd853e1b5ffdd3ddde64f1223659b044f27..c7ad49e40fad10decce8787060b380d48e1ba9a0 100644 (file)
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -99,11 +99,7 @@ int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
 
 #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>