diff options
-rw-r--r-- | CHANGELOG | 3 | ||||
-rw-r--r-- | mod_log_sql.c | 9 |
2 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,6 @@ | |||
1 | 1.101: 2005-02-18? | ||
2 | * fix empty comparison on itemsets for solaris issue #41 | ||
3 | |||
1 | 1.100: 2005-01-11 | 4 | 1.100: 2005-01-11 |
2 | * fixes for NULL fields (empty request_args) | 5 | * fixes for NULL fields (empty request_args) |
3 | * fixed a mysql reconnect bug | 6 | * fixed a mysql reconnect bug |
diff --git a/mod_log_sql.c b/mod_log_sql.c index 5b86147..d92df49 100644 --- a/mod_log_sql.c +++ b/mod_log_sql.c | |||
@@ -666,6 +666,7 @@ static int in_array(apr_array_header_t *ary, const char *elem) | |||
666 | 666 | ||
667 | 667 | ||
668 | /* Parse through cookie lists and merge based on +/- prefixes */ | 668 | /* Parse through cookie lists and merge based on +/- prefixes */ |
669 | /* TODO: rewrite as a function */ | ||
669 | #define DO_MERGE_ARRAY(parent,child,pool) \ | 670 | #define DO_MERGE_ARRAY(parent,child,pool) \ |
670 | if (apr_is_empty_array(child)) { \ | 671 | if (apr_is_empty_array(child)) { \ |
671 | apr_array_cat(child, parent); \ | 672 | apr_array_cat(child, parent); \ |
@@ -930,7 +931,7 @@ static int log_sql_transaction(request_rec *orig) | |||
930 | i++; | 931 | i++; |
931 | } | 932 | } |
932 | } | 933 | } |
933 | if ( itemsets != "" ) { | 934 | if ( *itemsets != '\0' ) { |
934 | note_query = apr_psprintf(r->pool, "insert %s into %s (id, item, val) values %s", | 935 | note_query = apr_psprintf(r->pool, "insert %s into %s (id, item, val) values %s", |
935 | /*global_config.insertdelayed?"delayed":*/"", notes_tablename, itemsets); | 936 | /*global_config.insertdelayed?"delayed":*/"", notes_tablename, itemsets); |
936 | 937 | ||
@@ -958,7 +959,7 @@ static int log_sql_transaction(request_rec *orig) | |||
958 | i++; | 959 | i++; |
959 | } | 960 | } |
960 | } | 961 | } |
961 | if ( itemsets != "" ) { | 962 | if ( *itemsets != '\0' ) { |
962 | hout_query = apr_psprintf(r->pool, "insert %s into %s (id, item, val) values %s", | 963 | hout_query = apr_psprintf(r->pool, "insert %s into %s (id, item, val) values %s", |
963 | /*global_config.insertdelayed?"delayed":*/"", hout_tablename, itemsets); | 964 | /*global_config.insertdelayed?"delayed":*/"", hout_tablename, itemsets); |
964 | 965 | ||
@@ -987,7 +988,7 @@ static int log_sql_transaction(request_rec *orig) | |||
987 | i++; | 988 | i++; |
988 | } | 989 | } |
989 | } | 990 | } |
990 | if ( itemsets != "" ) { | 991 | if ( *itemsets != '\0' ) { |
991 | hin_query = apr_psprintf(r->pool, "insert %s into %s (id, item, val) values %s", | 992 | hin_query = apr_psprintf(r->pool, "insert %s into %s (id, item, val) values %s", |
992 | /*global_config.insertdelayed?"delayed":*/"", hin_tablename, itemsets); | 993 | /*global_config.insertdelayed?"delayed":*/"", hin_tablename, itemsets); |
993 | 994 | ||
@@ -1017,7 +1018,7 @@ static int log_sql_transaction(request_rec *orig) | |||
1017 | } | 1018 | } |
1018 | 1019 | ||
1019 | } | 1020 | } |
1020 | if ( itemsets != "" ) { | 1021 | if ( *itemsets != '\0' ) { |
1021 | cookie_query = apr_psprintf(r->pool, "insert %s into %s (id, item, val) values %s", | 1022 | cookie_query = apr_psprintf(r->pool, "insert %s into %s (id, item, val) values %s", |
1022 | /*global_config.insertdelayed?"delayed":*/"", cookie_tablename, itemsets); | 1023 | /*global_config.insertdelayed?"delayed":*/"", cookie_tablename, itemsets); |
1023 | 1024 | ||