Browse Source

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

pull/12/head
Jérôme Loyet 15 years ago
parent
commit
577d81faa2
  1. 6
      sapi/fpm/fpm/fastcgi.c
  2. 4
      sapi/fpm/fpm/fpm_config.h
  3. 4
      sapi/fpm/fpm/fpm_main.c

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

4
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)

4
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>

Loading…
Cancel
Save