summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorEdward Rudd <urkle@outoforder.cc>2008-10-25 16:53:01 (GMT)
committer Edward Rudd <urkle@outoforder.cc>2008-10-25 16:53:01 (GMT)
commitc694bd17981c10ffbfe67684afed1cdef432302d (patch)
treeb5749da116a2021bb0f1e488c9680995b7c162bf
parent4fb176a9f4fcb3f67924dce64681c2c49ec74152 (diff)
rename autoheader config file to autoconfig.h instead of config.h
-rw-r--r--configure.ac2
-rw-r--r--src/mod_log_sql.c4
-rw-r--r--src/mod_log_sql_dbd.c8
-rw-r--r--src/mod_log_sql_dbi.c2
-rw-r--r--src/mod_log_sql_logio.c2
-rw-r--r--src/mod_log_sql_mysql.c4
-rw-r--r--src/mod_log_sql_pgsql.c4
-rw-r--r--src/mod_log_sql_ssl.c4
8 files changed, 15 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac
index e706103..c5e7b5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Required initializer
2AC_INIT([mod_log_sql],[1.102]) 2AC_INIT([mod_log_sql],[1.102])
3OOO_CONFIG_NICE(config.nice) 3OOO_CONFIG_NICE(config.nice)
4AC_PREREQ(2.59) 4AC_PREREQ(2.59)
5AC_CONFIG_HEADERS(include/config.h) 5AC_CONFIG_HEADERS(include/autoconfig.h)
6AC_CONFIG_SRCDIR(src/mod_log_sql.c) 6AC_CONFIG_SRCDIR(src/mod_log_sql.c)
7 7
8OOO_MAINTAIN_MODE 8OOO_MAINTAIN_MODE
diff --git a/src/mod_log_sql.c b/src/mod_log_sql.c
index d319e97..be4e1f9 100644
--- a/src/mod_log_sql.c
+++ b/src/mod_log_sql.c
@@ -1,4 +1,4 @@
1/* $Id$ */ 1/* $Id:mod_log_sql.c 180 2008-09-21 15:54:12Z urkle@drip.ws $ */
2 2
3#if defined(WITH_APACHE20) 3#if defined(WITH_APACHE20)
4# include "apache20.h" 4# include "apache20.h"
@@ -18,7 +18,7 @@
18#undef PACKAGE_TARNAME 18#undef PACKAGE_TARNAME
19#undef PACKAGE_VERSION 19#undef PACKAGE_VERSION
20 20
21#include "config.h" 21#include "autoconfig.h"
22#endif 22#endif
23 23
24#if APR_HAVE_UNISTD_H 24#if APR_HAVE_UNISTD_H
diff --git a/src/mod_log_sql_dbd.c b/src/mod_log_sql_dbd.c
index c78a128..e641c35 100644
--- a/src/mod_log_sql_dbd.c
+++ b/src/mod_log_sql_dbd.c
@@ -8,7 +8,7 @@
8 8
9 9
10#ifdef HAVE_CONFIG_H 10#ifdef HAVE_CONFIG_H
11/* Undefine these to prevent conflicts between Apache ap_config_auto.h and 11/* Undefine these to prevent conflicts between Apache ap_config_auto.h and
12 * my config.h. Only really needed for Apache < 2.0.48, but it can't hurt. 12 * my config.h. Only really needed for Apache < 2.0.48, but it can't hurt.
13 */ 13 */
14#undef PACKAGE_BUGREPORT 14#undef PACKAGE_BUGREPORT
@@ -17,7 +17,7 @@
17#undef PACKAGE_TARNAME 17#undef PACKAGE_TARNAME
18#undef PACKAGE_VERSION 18#undef PACKAGE_VERSION
19 19
20#include "config.h" 20#include "autoconfig.h"
21#endif 21#endif
22 22
23#include "mod_log_sql.h" 23#include "mod_log_sql.h"
@@ -66,7 +66,7 @@ static void log_sql_dbd_close(logsql_dbconnection *db)
66/* Routine to escape the 'dangerous' characters that would otherwise 66/* Routine to escape the 'dangerous' characters that would otherwise
67 * corrupt the INSERT string: ', \, and " 67 * corrupt the INSERT string: ', \, and "
68 */ 68 */
69static const char *log_sql_dbd_escape(request_rec *r, const char *from_str, apr_pool_t *p, 69static const char *log_sql_dbd_escape(request_rec *r, const char *from_str, apr_pool_t *p,
70 logsql_dbconnection *db) 70 logsql_dbconnection *db)
71{ 71{
72 // Acquire a DBD connection from mod_dbd 72 // Acquire a DBD connection from mod_dbd
@@ -90,7 +90,7 @@ static logsql_query_ret log_sql_dbd_query(request_rec *r,logsql_dbconnection *db
90 ap_dbd_t *dbd = log_sql_dbd_getconnection(r); 90 ap_dbd_t *dbd = log_sql_dbd_getconnection(r);
91 if (!dbd) return LOGSQL_QUERY_NOLINK; 91 if (!dbd) return LOGSQL_QUERY_NOLINK;
92 92
93 // Run the query 93 // Run the query
94 ret = apr_dbd_query(dbd->driver, dbd->handle, &affected, query); 94 ret = apr_dbd_query(dbd->driver, dbd->handle, &affected, query);
95 if (ret == 0) { 95 if (ret == 0) {
96 return LOGSQL_QUERY_SUCCESS; 96 return LOGSQL_QUERY_SUCCESS;
diff --git a/src/mod_log_sql_dbi.c b/src/mod_log_sql_dbi.c
index 40a972b..5b83836 100644
--- a/src/mod_log_sql_dbi.c
+++ b/src/mod_log_sql_dbi.c
@@ -19,7 +19,7 @@
19#undef PACKAGE_TARNAME 19#undef PACKAGE_TARNAME
20#undef PACKAGE_VERSION 20#undef PACKAGE_VERSION
21 21
22#include "config.h" 22#include "autoconfig.h"
23#endif 23#endif
24 24
25#include "mod_log_sql.h" 25#include "mod_log_sql.h"
diff --git a/src/mod_log_sql_logio.c b/src/mod_log_sql_logio.c
index ed69acf..ebdeddd 100644
--- a/src/mod_log_sql_logio.c
+++ b/src/mod_log_sql_logio.c
@@ -16,7 +16,7 @@
16#undef PACKAGE_TARNAME 16#undef PACKAGE_TARNAME
17#undef PACKAGE_VERSION 17#undef PACKAGE_VERSION
18 18
19#include "config.h" 19#include "autoconfig.h"
20#endif 20#endif
21 21
22#include "mod_log_sql.h" 22#include "mod_log_sql.h"
diff --git a/src/mod_log_sql_mysql.c b/src/mod_log_sql_mysql.c
index 942c03a..902cadf 100644
--- a/src/mod_log_sql_mysql.c
+++ b/src/mod_log_sql_mysql.c
@@ -1,4 +1,4 @@
1/* $Id$ */ 1/* $Id:mod_log_sql_mysql.c 180 2008-09-21 15:54:12Z urkle@drip.ws $ */
2 2
3#if defined(WITH_APACHE20) 3#if defined(WITH_APACHE20)
4# include "apache20.h" 4# include "apache20.h"
@@ -18,7 +18,7 @@
18#undef PACKAGE_TARNAME 18#undef PACKAGE_TARNAME
19#undef PACKAGE_VERSION 19#undef PACKAGE_VERSION
20 20
21#include "config.h" 21#include "autoconfig.h"
22#endif 22#endif
23 23
24#include "mod_log_sql.h" 24#include "mod_log_sql.h"
diff --git a/src/mod_log_sql_pgsql.c b/src/mod_log_sql_pgsql.c
index 4e12920..dcfbd73 100644
--- a/src/mod_log_sql_pgsql.c
+++ b/src/mod_log_sql_pgsql.c
@@ -1,4 +1,4 @@
1/* $Id$ */ 1/* $Id:mod_log_sql_pgsql.c 180 2008-09-21 15:54:12Z urkle@drip.ws $ */
2 2
3#if defined(WITH_APACHE20) 3#if defined(WITH_APACHE20)
4# include "apache20.h" 4# include "apache20.h"
@@ -19,7 +19,7 @@
19#undef PACKAGE_TARNAME 19#undef PACKAGE_TARNAME
20#undef PACKAGE_VERSION 20#undef PACKAGE_VERSION
21 21
22#include "config.h" 22#include "autoconfig.h"
23#endif 23#endif
24 24
25#include "mod_log_sql.h" 25#include "mod_log_sql.h"
diff --git a/src/mod_log_sql_ssl.c b/src/mod_log_sql_ssl.c
index 47bba8b..b3a4929 100644
--- a/src/mod_log_sql_ssl.c
+++ b/src/mod_log_sql_ssl.c
@@ -1,4 +1,4 @@
1/* $Id$ */ 1/* $Id:mod_log_sql_ssl.c 180 2008-09-21 15:54:12Z urkle@drip.ws $ */
2 2
3#if defined(WITH_APACHE20) 3#if defined(WITH_APACHE20)
4# include "apache20.h" 4# include "apache20.h"
@@ -18,7 +18,7 @@
18#undef PACKAGE_TARNAME 18#undef PACKAGE_TARNAME
19#undef PACKAGE_VERSION 19#undef PACKAGE_VERSION
20 20
21#include "config.h" 21#include "autoconfig.h"
22#endif 22#endif
23 23
24#include "mod_log_sql.h" 24#include "mod_log_sql.h"