consistent inclusion of config.h at top of files (fixes #2073)

From: Glenn Strauss <gstrauss@gluelogic.com>

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@3113 152afb58-edef-0310-8abb-c4023f1b3aa9

NEWS

@@ -41,6 +41,7 @@ NEWS
   * [autobuild] use AC_CANONICAL_HOST instead of AC_CANONICAL_TARGET (fixes #1866)
   * [core] fix request_start in keep-alive requests to mark time when received first byte (fixes #2412)
   * [core] truncate pidfile on exit (fixes #2695)
+  * consistent inclusion of config.h at top of files (fixes #2073)
 
 - 1.4.39 - 2016-01-02
   * [core] fix memset_s call (fixes #2698)

src/array.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "array.h"
 #include "buffer.h"
 

src/array.h

@@ -1,9 +1,6 @@
 #ifndef ARRAY_H
 #define ARRAY_H
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "first.h"
 
 #ifdef HAVE_PCRE_H
 # include <pcre.h>

src/base.h

@@ -1,9 +1,7 @@
 #ifndef _BASE_H_
 #define _BASE_H_
+#include "first.h"
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
 #include "settings.h"
 
 #include <sys/types.h>

src/base64.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base64.h"
 
 /* reverse mapping:

src/base64.h

@@ -1,5 +1,6 @@
 #ifndef _BASE64_H_
 #define _BASE64_H_
+#include "first.h"
 
 #include "buffer.h"
 

src/buffer.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "buffer.h"
 
 #include <stdlib.h>

src/buffer.h

@@ -1,9 +1,6 @@
 #ifndef _BUFFER_H_
 #define _BUFFER_H_
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "first.h"
 
 #include "settings.h"
 

src/chunk.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 /**
  * the network chunk-API
  *

src/chunk.h

@@ -1,5 +1,6 @@
 #ifndef _CHUNK_H_
 #define _CHUNK_H_
+#include "first.h"
 
 #include "buffer.h"
 #include "array.h"

src/configfile-glue.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "buffer.h"
 #include "array.h"

src/configfile.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "server.h"
 #include "log.h"
 #include "stream.h"

src/configfile.h

@@ -1,5 +1,6 @@
 #ifndef _CONFIG_PARSER_H_
 #define _CONFIG_PARSER_H_
+#include "first.h"
 
 #include "array.h"
 #include "buffer.h"

src/configparser.y

@@ -3,6 +3,7 @@
 %name configparser
 
 %include {
+#include "first.h"
 #include "configfile.h"
 #include "buffer.h"
 #include "array.h"

src/connections-glue.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "connections.h"
 

src/connections.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "buffer.h"
 #include "server.h"
 #include "log.h"

src/connections.h

@@ -1,5 +1,6 @@
 #ifndef _CONNECTIONS_H_
 #define _CONNECTIONS_H_
+#include "first.h"
 
 #include "server.h"
 #include "fdevent.h"

src/crc32.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "crc32.h"
 
 #define CRC32C(c,d) (c=(c>>8)^crc_c[(c^(d))&0xFF])

src/crc32.h

@@ -1,9 +1,6 @@
 #ifndef __crc32cr_table_h__
 #define __crc32cr_table_h__
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "first.h"
 
 #include <sys/types.h>
 

src/data_array.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "array.h"
 
 #include <string.h>

src/data_config.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "array.h"
 
 #include <string.h>

src/data_count.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "array.h"
 
 #include <string.h>

src/data_fastcgi.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "array.h"
 #include "fastcgi.h"
 

src/data_integer.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "array.h"
 
 #include <stdio.h>

src/data_string.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "array.h"
 
 #include <string.h>

src/etag.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "buffer.h"
 #include "etag.h"
 

src/etag.h

@@ -1,5 +1,6 @@
 #ifndef ETAG_H
 #define ETAG_H
+#include "first.h"
 
 #include "buffer.h"
 

src/fdevent.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 

src/fdevent.h

@@ -1,9 +1,6 @@
 #ifndef _FDEVENT_H_
 #define _FDEVENT_H_
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "first.h"
 
 #include "settings.h"
 

src/fdevent_freebsd_kqueue.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "fdevent.h"
 #include "buffer.h"
 #include "log.h"

src/fdevent_libev.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "fdevent.h"
 #include "buffer.h"
 #include "log.h"

src/fdevent_linux_sysepoll.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "fdevent.h"
 #include "buffer.h"
 #include "log.h"

src/fdevent_poll.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "fdevent.h"
 #include "buffer.h"
 #include "log.h"

src/fdevent_select.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "fdevent.h"
 #include "buffer.h"
 #include "log.h"

src/fdevent_solaris_devpoll.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "fdevent.h"
 #include "buffer.h"
 #include "log.h"

src/fdevent_solaris_port.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "fdevent.h"
 #include "buffer.h"
 #include "log.h"

src/first.h

@@ -0,0 +1,12 @@
+#ifndef LI_FIRST_H
+#define LI_FIRST_H
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
+# endif
+#endif
+
+#endif

src/http-header-glue.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "array.h"
 #include "buffer.h"

src/http_auth.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "server.h"
 #include "log.h"
 #include "http_auth.h"

src/http_auth.h

@@ -1,5 +1,6 @@
 #ifndef _HTTP_AUTH_H_
 #define _HTTP_AUTH_H_
+#include "first.h"
 
 #include "server.h"
 #include "plugin.h"

src/http_chunk.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 /**
  * the HTTP chunk-API
  *

src/http_chunk.h

@@ -1,5 +1,6 @@
 #ifndef _HTTP_CHUNK_H_
 #define _HTTP_CHUNK_H_
+#include "first.h"
 
 #include "server.h"
 #include <sys/types.h>

src/inet_ntop_cache.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "inet_ntop_cache.h"
 #include "sys-socket.h"

src/inet_ntop_cache.h

@@ -1,5 +1,6 @@
 #ifndef _INET_NTOP_CACHE_H_
 #define _INET_NTOP_CACHE_H_
+#include "first.h"
 
 #include "base.h"
 const char * inet_ntop_cache_get_ip(server *srv, sock_addr *addr);

src/joblist.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "joblist.h"
 #include "log.h"

src/joblist.h

@@ -1,5 +1,6 @@
 #ifndef _JOB_LIST_H_
 #define _JOB_LIST_H_
+#include "first.h"
 
 #include "base.h"
 

src/keyvalue.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "server.h"
 #include "keyvalue.h"
 #include "log.h"

src/keyvalue.h

@@ -1,9 +1,6 @@
 #ifndef _KEY_VALUE_H_
 #define _KEY_VALUE_H_
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "first.h"
 
 #ifdef HAVE_PCRE_H
 # include <pcre.h>

src/lemon.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 /*
 ** This file contains all sources (including headers) to the LEMON
 ** LALR(1) parser generator.  The sources have been combined into a
@@ -12,10 +14,6 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif

src/lempar.c

@@ -3,6 +3,7 @@
 */
 /* First off, code is include which follows the "include" declaration
 ** in the input file. */
+#include "first.h"
 #include <stdio.h>
 %%
 /* Next is all token values, in a form suitable for use by makeheaders.

src/lighttpd-angel.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 /**
  * angel process for lighttpd 
  *

src/log.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "array.h"

src/log.h

@@ -1,5 +1,6 @@
 #ifndef _LOG_H_
 #define _LOG_H_
+#include "first.h"
 
 #include "server.h"
 

src/md5.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 /* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
  */
 
@@ -23,15 +25,12 @@ These notices must be retained in any copies of any part of this
 documentation and/or software.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+
+#include "md5.h"
 
 #ifndef USE_OPENSSL
 #include <string.h>
 
-#include "md5.h"
-
 /* Constants for MD5Transform routine.
  */
 

src/md5.h

@@ -1,3 +1,7 @@
+#ifndef LI_MD5_H
+#define LI_MD5_H
+#include "first.h"
+
 /* MD5.H - header file for MD5C.C
  */
 
@@ -22,6 +26,7 @@ without express or implied warranty of any kind.
 These notices must be retained in any copies of any part of this
 documentation and/or software.
  */
+
 #include <limits.h>
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
@@ -44,3 +49,5 @@ typedef struct {
 void li_MD5_Init (li_MD5_CTX *);
 void li_MD5_Update (li_MD5_CTX *, const void *, unsigned int);
 void li_MD5_Final (unsigned char [16], li_MD5_CTX *);
+
+#endif

src/mod_access.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_accesslog.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_alias.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_auth.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "plugin.h"
 #include "http_auth.h"
 #include "log.h"

src/mod_cgi.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "server.h"
 #include "stat_cache.h"
 #include "keyvalue.h"

src/mod_cml.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "buffer.h"
 #include "server.h"
 #include "log.h"

src/mod_cml.h

@@ -1,5 +1,6 @@
 #ifndef _MOD_CACHE_H_
 #define _MOD_CACHE_H_
+#include "first.h"
 
 #include "buffer.h"
 #include "server.h"

src/mod_cml_funcs.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "buffer.h"
 #include "server.h"
 #include "log.h"

src/mod_cml_funcs.h

@@ -1,9 +1,6 @@
 #ifndef _MOD_CML_FUNCS_H_
 #define _MOD_CML_FUNCS_H_
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "first.h"
 
 #ifdef HAVE_LUA_H
 #include <lua.h>

src/mod_cml_lua.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "mod_cml.h"
 #include "mod_cml_funcs.h"
 #include "log.h"

src/mod_compress.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_dirlisting.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_evasive.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_evhost.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "plugin.h"
 #include "log.h"
 #include "response.h"

src/mod_expire.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_extforward.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"
@@ -7,10 +9,6 @@
 #include "inet_ntop_cache.h"
 #include "configfile.h"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>

src/mod_fastcgi.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "buffer.h"
 #include "server.h"
 #include "keyvalue.h"

src/mod_flv_streaming.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_indexfile.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_magnet.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_magnet_cache.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "mod_magnet_cache.h"
 #include "stat_cache.h"
 

src/mod_magnet_cache.h

@@ -1,5 +1,6 @@
 #ifndef _MOD_MAGNET_CACHE_H_
 #define _MOD_MAGNET_CACHE_H_
+#include "first.h"
 
 #include "buffer.h"
 #include "base.h"

src/mod_mysql_vhost.c

@@ -1,13 +1,11 @@
+#include "first.h"
+
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <strings.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #ifdef HAVE_MYSQL
 #include <mysql.h>
 #endif

src/mod_proxy.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "buffer.h"
 #include "server.h"
 #include "keyvalue.h"

src/mod_redirect.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_rewrite.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_rrdtool.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "server.h"
 #include "connections.h"
 #include "response.h"

src/mod_scgi.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "buffer.h"
 #include "server.h"
 #include "keyvalue.h"

src/mod_secdownload.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_setenv.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_simple_vhost.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_skeleton.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_ssi.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_ssi.h

@@ -1,5 +1,6 @@
 #ifndef _MOD_SSI_H_
 #define _MOD_SSI_H_
+#include "first.h"
 
 #include "base.h"
 #include "buffer.h"

src/mod_ssi_expr.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "buffer.h"
 #include "log.h"
 #include "mod_ssi.h"

src/mod_ssi_expr.h

@@ -1,5 +1,6 @@
 #ifndef _MOD_SSI_EXPR_H_
 #define _MOD_SSI_EXPR_H_
+#include "first.h"
 
 #include "buffer.h"
 

src/mod_ssi_exprparser.y

@@ -4,6 +4,7 @@
 %name ssiexprparser
 
 %include {
+#include "first.h"
 #include "mod_ssi_expr.h"
 #include "buffer.h"
 

src/mod_staticfile.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_status.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "server.h"
 #include "connections.h"
 #include "response.h"

src/mod_trigger_b4_dl.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_uploadprogress.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_userdir.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_usertrack.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/mod_webdav.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "base.h"
 #include "log.h"
 #include "buffer.h"

src/network.c

@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "network.h"
 #include "fdevent.h"
 #include "log.h"