1 files changed, 23 insertions, 16 deletions

diff --git a/functions.h b/functions.h
index dcbc939..917a1f9 100644
--- a/functions.h
+++ b/functions.h
@@ -1,5 +1,4 @@
-/* $Id$ */
-
+/* $Header: /home/cvs/mod_log_sql/functions.h,v 1.2 2004/02/05 21:59:46 urkle Exp $ */
 /* Begin the individual functions that, given a request r,
  * extract the needed information from it and return the
  * value to the calling entity.
@@ -176,16 +175,20 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
         char *cookiebuf;
 
         if (a != NULL) {
-                log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server,
-                        "watching for cookie '%s'", a);
+                #ifdef DEBUG
+                        log_error(APLOG_MARK,APLOG_DEBUG,
+                                r->server,"watching for cookie '%s'", a);
+                #endif
 
                 /* Fetch out the cookie header */
                 cookiestr  = (char *)apr_table_get(r->headers_in,  "cookie2");
             if (cookiestr != NULL) {
-                        log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server,
-                                "Cookie2: [%s]", cookiestr);
+                        #ifdef DEBUG
+                                log_error(APLOG_MARK,APLOG_DEBUG,r->server,
+                                        "Cookie2: [%s]", cookiestr);
+                        #endif
                         /* Does the cookie string contain one with our name? */
-                        isvalid = ap_strstr_c(cookiestr, a);
+                        isvalid = strstr(cookiestr, a);
                         if (isvalid != NULL) {
                                 /* Move past the cookie name and equal sign */
                                 isvalid += strlen(a) + 1;
@@ -193,7 +196,7 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
                             cookiebuf = apr_pstrdup(r->pool, isvalid);
                                 /* Segregate just this cookie out of the string
                                  * with a terminating nul at the first semicolon */
-                            cookieend = ap_strchr(cookiebuf, ';');
+                            cookieend = strchr(cookiebuf, ';');
                             if (cookieend != NULL)
                                *cookieend = '\0';
                                 return cookiebuf;
@@ -202,13 +205,15 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
 
                 cookiestr  = (char *)apr_table_get(r->headers_in,  "cookie");
             if (cookiestr != NULL) {
-                        log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server,
-                                "Cookie: [%s]", cookiestr);
-                        isvalid = ap_strstr_c(cookiestr, a);
+                        #ifdef DEBUG
+                                log_error(APLOG_MARK,APLOG_DEBUG,r->server,
+                                        "Cookie: [%s]", cookiestr);
+                        #endif
+                        isvalid = strstr(cookiestr, a);
                         if (isvalid != NULL) {
                                 isvalid += strlen(a) + 1;
                             cookiebuf = apr_pstrdup(r->pool, isvalid);
-                            cookieend = ap_strchr(cookiebuf, ';');
+                            cookieend = strchr(cookiebuf, ';');
                             if (cookieend != NULL)
                                *cookieend = '\0';
                                 return cookiebuf;
@@ -217,13 +222,15 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
 
                 cookiestr = apr_table_get(r->headers_out,  "set-cookie");
             if (cookiestr != NULL) {
-                     log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server,
-                                "Set-Cookie: [%s]", cookiestr);
-                        isvalid = ap_strstr_c(cookiestr, a);
+                        #ifdef DEBUG
+                             log_error(APLOG_MARK,APLOG_DEBUG,r->server,
+                                        "Set-Cookie: [%s]", cookiestr);
+                        #endif
+                        isvalid = strstr(cookiestr, a);
                         if (isvalid != NULL) {
                             isvalid += strlen(a) + 1;
                             cookiebuf = apr_pstrdup(r->pool, isvalid);
-                            cookieend = ap_strchr(cookiebuf, ';');
+                            cookieend = strchr(cookiebuf, ';');
                             if (cookieend != NULL)
                                *cookieend = '\0';
                                 return cookiebuf;