Merge r1741310, r1741461 from trunk:

[apache] / server / util_cookies.c

diff --git a/server/util_cookies.c b/server/util_cookies.c
index 3b3c952382780ad4c51dd22bd19e9f1bf89df171..5139aecd4c48ec210025d8324647492fd78a80d0 100644 (file)
--- a/server/util_cookies.c
+++ b/server/util_cookies.c
@@ -18,11 +18,14 @@
 #include "apr_lib.h"
 #include "apr_strings.h"
 #include "http_config.h"
+#include "http_core.h"
 #include "http_log.h"
 
 #define LOG_PREFIX "ap_cookie: "
 
-APLOG_USE_MODULE(core);
+/* we know core's module_index is 0 */
+#undef APLOG_MODULE_INDEX
+#define APLOG_MODULE_INDEX AP_CORE_MODULE_INDEX
 
 /**
  * Write an RFC2109 compliant cookie.
@@ -52,7 +55,7 @@ AP_DECLARE(apr_status_t) ap_cookie_write(request_rec * r, const char *name, cons
     /* create RFC2109 compliant cookie */
     rfc2109 = apr_pstrcat(r->pool, name, "=", val, ";", buffer,
                           attrs && *attrs ? attrs : DEFAULT_ATTRS, NULL);
-    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, LOG_PREFIX
+    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(00007) LOG_PREFIX
                   "user '%s' set cookie: '%s'", r->user, rfc2109);
 
     /* write the cookie to the header table(s) provided */
@@ -94,7 +97,7 @@ AP_DECLARE(apr_status_t) ap_cookie_write2(request_rec * r, const char *name2, co
     /* create RFC2965 compliant cookie */
     rfc2965 = apr_pstrcat(r->pool, name2, "=", val, ";", buffer,
                           attrs2 && *attrs2 ? attrs2 : DEFAULT_ATTRS, NULL);
-    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, LOG_PREFIX
+    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(00008) LOG_PREFIX
                   "user '%s' set cookie2: '%s'", r->user, rfc2965);
 
     /* write the cookie to the header table(s) provided */
@@ -122,7 +125,7 @@ AP_DECLARE(apr_status_t) ap_cookie_remove(request_rec * r, const char *name, con
     /* create RFC2109 compliant cookie */
     const char *rfc2109 = apr_pstrcat(r->pool, name, "=;Max-Age=0;",
                                 attrs ? attrs : CLEAR_ATTRS, NULL);
-    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, LOG_PREFIX
+    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(00009) LOG_PREFIX
                   "user '%s' removed cookie: '%s'", r->user, rfc2109);
 
     /* write the cookie to the header table(s) provided */
@@ -150,7 +153,7 @@ AP_DECLARE(apr_status_t) ap_cookie_remove2(request_rec * r, const char *name2, c
     /* create RFC2965 compliant cookie */
     const char *rfc2965 = apr_pstrcat(r->pool, name2, "=;Max-Age=0;",
                                 attrs2 ? attrs2 : CLEAR_ATTRS, NULL);
-    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, LOG_PREFIX
+    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(00010) LOG_PREFIX
                   "user '%s' removed cookie2: '%s'", r->user, rfc2965);
 
     /* write the cookie to the header table(s) provided */
@@ -176,7 +179,7 @@ static int extract_cookie_line(ap_cookie_do * v, const char *key, const char *va
     char *last1, *last2;
     char *cookie = apr_pstrdup(v->r->pool, val);
     const char *name = apr_pstrcat(v->r->pool, v->name ? v->name : "", "=", NULL);
-    size_t len = strlen(name);
+    apr_size_t len = strlen(name);
     const char *new_cookie = "";
     const char *comma = ",";
     char *next1;
@@ -253,7 +256,7 @@ AP_DECLARE(apr_status_t) ap_cookie_read(request_rec * r, const char *name, const
                  extract_cookie_line, (void *) &v, r->headers_in,
                  "Cookie", "Cookie2", NULL);
     if (v.duplicated) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, LOG_PREFIX
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00011) LOG_PREFIX
          "client submitted cookie '%s' more than once: %s", v.name, r->uri);
         return APR_EGENERAL;
     }