diff options
author | Edward Rudd | 2004-06-03 04:32:08 +0000 |
---|---|---|
committer | Edward Rudd | 2004-06-03 04:32:08 +0000 |
commit | 21122f1bb734aa00fc14564d801ea9dc4804c793 (patch) | |
tree | 3d4920b9a47a3528de8c4ac80c402853e9d14719 /mod_log_sql.h | |
parent | f73dc64cd6dba290a7e062520a421de2b02f82a4 (diff) |
moved quoting of fields to DB driver
fixed segfault in the mysql escape string function
DBi driver working with postgresql.
Diffstat (limited to 'mod_log_sql.h')
-rw-r--r-- | mod_log_sql.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mod_log_sql.h b/mod_log_sql.h index 56aa2c3..e708f57 100644 --- a/mod_log_sql.h +++ b/mod_log_sql.h | |||
@@ -36,6 +36,7 @@ LOGSQL_DECLARE(void) log_sql_register_item(server_rec *s, apr_pool_t *p, | |||
36 | typedef struct { | 36 | typedef struct { |
37 | int connected; /* Are we connected to the DB */ | 37 | int connected; /* Are we connected to the DB */ |
38 | void *handle; /* DB specific connection pointer */ | 38 | void *handle; /* DB specific connection pointer */ |
39 | apr_pool_t *p; /* Pool to allocate handle off of */ | ||
39 | apr_table_t *parms; /* DB connection parameters */ | 40 | apr_table_t *parms; /* DB connection parameters */ |
40 | } logsql_dbconnection; | 41 | } logsql_dbconnection; |
41 | 42 | ||
@@ -79,7 +80,7 @@ typedef enum { | |||
79 | 80 | ||
80 | typedef struct { | 81 | typedef struct { |
81 | /* NULL terminated list of drivers strings */ | 82 | /* NULL terminated list of drivers strings */ |
82 | char **provided_drivers; | 83 | const char **provided_drivers; |
83 | /* create a connection to the underlying database layer */ | 84 | /* create a connection to the underlying database layer */ |
84 | logsql_opendb_ret (*connect)(server_rec *s, logsql_dbconnection *db); | 85 | logsql_opendb_ret (*connect)(server_rec *s, logsql_dbconnection *db); |
85 | /* disconnect from the underlying database layer */ | 86 | /* disconnect from the underlying database layer */ |
@@ -119,6 +120,12 @@ LOGSQL_DECLARE(void) log_sql_register_driver(apr_pool_t *p, | |||
119 | #endif | 120 | #endif |
120 | 121 | ||
121 | #if defined(WITH_APACHE20) | 122 | #if defined(WITH_APACHE20) |
123 | # define LOGSQL_SHUTDOWN \ | ||
124 | static | ||
125 | #endif | ||
126 | |||
127 | |||
128 | #if defined(WITH_APACHE20) | ||
122 | #define LOGSQL_REGISTER_RETURN return OK; | 129 | #define LOGSQL_REGISTER_RETURN return OK; |
123 | #elif defined(WITH_APACHE13) | 130 | #elif defined(WITH_APACHE13) |
124 | #define LOGSQL_REGISTER_RETURN | 131 | #define LOGSQL_REGISTER_RETURN |