httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1209766 [4/12] - in /httpd/httpd/trunk: docs/log-message-tags/ modules/aaa/ modules/apreq/ modules/arch/netware/ modules/arch/unix/ modules/arch/win32/ modules/cache/ modules/cluster/ modules/core/ modules/database/ modules/dav/fs/ modules...
Date Fri, 02 Dec 2011 23:02:11 GMT
Modified: httpd/httpd/trunk/modules/filters/mod_deflate.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_deflate.c?rev=1209766&r1=1209765&r2=1209766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_deflate.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_deflate.c Fri Dec  2 23:02:04 2011
@@ -635,7 +635,7 @@ static apr_status_t deflate_out_filter(a
 
             if (zRC != Z_OK) {
                 deflateEnd(&ctx->stream);
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01383)
                               "unable to init Zlib: "
                               "deflateInit2 returned %d: URL %s",
                               zRC, r->uri);
@@ -736,7 +736,7 @@ static apr_status_t deflate_out_filter(a
             b = apr_bucket_pool_create(buf, VALIDATION_SIZE, r->pool,
                                        f->c->bucket_alloc);
             APR_BRIGADE_INSERT_TAIL(ctx->bb, b);
-            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01384)
                           "Zlib: Compressed %ld to %ld : URL %s",
                           ctx->stream.total_in, ctx->stream.total_out, r->uri);
 
@@ -788,7 +788,7 @@ static apr_status_t deflate_out_filter(a
             zRC = flush_libz_buffer(ctx, c, f->c->bucket_alloc, deflate,
                                     Z_SYNC_FLUSH, NO_UPDATE_CRC);
             if (zRC != Z_OK) {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01385)
                               "Zlib error %d flushing zlib output buffer (%s)",
                               zRC, ctx->stream.msg);
                 return APR_EGENERAL;
@@ -847,7 +847,7 @@ static apr_status_t deflate_out_filter(a
             zRC = deflate(&(ctx->stream), Z_NO_FLUSH);
 
             if (zRC != Z_OK) {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01386)
                               "Zlib error %d deflating data (%s)", zRC,
                               ctx->stream.msg);
                 return APR_EGENERAL;
@@ -933,13 +933,13 @@ static apr_status_t deflate_in_filter(ap
         if (len != 10 ||
             deflate_hdr[0] != deflate_magic[0] ||
             deflate_hdr[1] != deflate_magic[1]) {
-            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, "Zlib: Invalid header");
+            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01387) "Zlib: Invalid header");
             return APR_EGENERAL;
         }
 
         /* We can't handle flags for now. */
         if (deflate_hdr[3] != 0) {
-            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01388)
                           "Zlib: Unsupported flags %02x", (int)deflate_hdr[3]);
             return APR_EGENERAL;
         }
@@ -949,7 +949,7 @@ static apr_status_t deflate_in_filter(ap
         if (zRC != Z_OK) {
             f->ctx = NULL;
             inflateEnd(&ctx->stream);
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01389)
                           "unable to init Zlib: "
                           "inflateInit2 returned %d: URL %s",
                           zRC, r->uri);
@@ -983,7 +983,7 @@ static apr_status_t deflate_in_filter(ap
             /* If we actually see the EOS, that means we screwed up! */
             if (APR_BUCKET_IS_EOS(bkt)) {
                 inflateEnd(&ctx->stream);
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01390)
                               "Encountered EOS bucket in inflate filter (bug?)");
                 return APR_EGENERAL;
             }
@@ -993,7 +993,7 @@ static apr_status_t deflate_in_filter(ap
                 zRC = inflate(&(ctx->stream), Z_SYNC_FLUSH);
                 if (zRC != Z_OK) {
                     inflateEnd(&ctx->stream);
-                    ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+                    ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01391)
                                   "Zlib error %d inflating data (%s)", zRC,
                                   ctx->stream.msg);
                     return APR_EGENERAL;
@@ -1044,7 +1044,7 @@ static apr_status_t deflate_in_filter(ap
 
                 if (zRC != Z_OK) {
                     inflateEnd(&ctx->stream);
-                    ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+                    ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01392)
                                   "Zlib error %d inflating data (%s)", zRC,
                                   ctx->stream.msg);
                     return APR_EGENERAL;
@@ -1053,7 +1053,7 @@ static apr_status_t deflate_in_filter(ap
             if (zRC == Z_STREAM_END) {
                 apr_bucket *tmp_heap, *eos;
 
-                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01393)
                               "Zlib: Inflated %ld to %ld : URL %s",
                               ctx->stream.total_in, ctx->stream.total_out,
                               r->uri);
@@ -1072,7 +1072,7 @@ static apr_status_t deflate_in_filter(ap
                     compCRC = getLong(ctx->stream.next_in);
                     if (ctx->crc != compCRC) {
                         inflateEnd(&ctx->stream);
-                        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+                        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01394)
                                       "Zlib: CRC error inflating data");
                         return APR_EGENERAL;
                     }
@@ -1080,7 +1080,7 @@ static apr_status_t deflate_in_filter(ap
                     compLen = getLong(ctx->stream.next_in);
                     if (ctx->stream.total_out != compLen) {
                         inflateEnd(&ctx->stream);
-                        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+                        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01395)
                                       "Zlib: Length %ld of inflated data does "
                                       "not match expected value %ld",
                                       ctx->stream.total_out, compLen);
@@ -1091,7 +1091,7 @@ static apr_status_t deflate_in_filter(ap
                     /* FIXME: We need to grab the 8 verification bytes
                      * from the wire! */
                     inflateEnd(&ctx->stream);
-                    ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+                    ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01396)
                                   "Verification data not available (bug?)");
                     return APR_EGENERAL;
                 }
@@ -1202,7 +1202,7 @@ static apr_status_t inflate_out_filter(a
         if (zRC != Z_OK) {
             f->ctx = NULL;
             inflateEnd(&ctx->stream);
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01397)
                           "unable to init Zlib: "
                           "inflateInit2 returned %d: URL %s",
                           zRC, r->uri);
@@ -1256,7 +1256,7 @@ static apr_status_t inflate_out_filter(a
              */
             flush_libz_buffer(ctx, c, f->c->bucket_alloc, inflate, Z_SYNC_FLUSH,
                               UPDATE_CRC);
-            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01398)
                           "Zlib: Inflated %ld to %ld : URL %s",
                           ctx->stream.total_in, ctx->stream.total_out, r->uri);
 
@@ -1264,20 +1264,20 @@ static apr_status_t inflate_out_filter(a
                 unsigned long compCRC, compLen;
                 compCRC = getLong(ctx->validation_buffer);
                 if (ctx->crc != compCRC) {
-                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01399)
                                   "Zlib: Checksum of inflated stream invalid");
                     return APR_EGENERAL;
                 }
                 ctx->validation_buffer += VALIDATION_SIZE / 2;
                 compLen = getLong(ctx->validation_buffer);
                 if (ctx->stream.total_out != compLen) {
-                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01400)
                                   "Zlib: Length of inflated stream invalid");
                     return APR_EGENERAL;
                 }
             }
             else {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01401)
                               "Zlib: Validation bytes not present");
                 return APR_EGENERAL;
             }
@@ -1304,7 +1304,7 @@ static apr_status_t inflate_out_filter(a
             zRC = flush_libz_buffer(ctx, c, f->c->bucket_alloc, inflate,
                                     Z_SYNC_FLUSH, UPDATE_CRC);
             if (zRC != Z_OK) {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01402)
                               "Zlib error %d flushing inflate buffer (%s)",
                               zRC, ctx->stream.msg);
                 return APR_EGENERAL;
@@ -1336,7 +1336,7 @@ static apr_status_t inflate_out_filter(a
         /* first bucket contains zlib header */
         if (!ctx->inflate_init++) {
             if (len < 10) {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01403)
                               "Insufficient data for inflate");
                 return APR_EGENERAL;
             }
@@ -1344,7 +1344,7 @@ static apr_status_t inflate_out_filter(a
                 zlib_method = data[2];
                 zlib_flags = data[3];
                 if (zlib_method != Z_DEFLATED) {
-                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01404)
                                   "inflate: data not deflated!");
                     ap_remove_output_filter(f);
                     return ap_pass_brigade(f->next, bb);
@@ -1352,7 +1352,7 @@ static apr_status_t inflate_out_filter(a
                 if (data[0] != deflate_magic[0] ||
                     data[1] != deflate_magic[1] ||
                     (zlib_flags & RESERVED) != 0) {
-                        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01405)
                                       "inflate: bad header");
                     return APR_EGENERAL ;
                 }
@@ -1364,7 +1364,7 @@ static apr_status_t inflate_out_filter(a
                bytes += ((unsigned int)(data[1])) << 8;
                bytes += 2;
                if (len < bytes) {
-                   ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                   ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01406)
                                  "inflate: extra field too big (not "
                                  "supported)");
                    return APR_EGENERAL;
@@ -1402,7 +1402,7 @@ static apr_status_t inflate_out_filter(a
                 ctx->validation_buffer_length += copy_size;
             }
             if (ctx->stream.avail_in) {
-                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01407)
                               "Zlib: %d bytes of garbage at the end of "
                               "compressed stream.", ctx->stream.avail_in);
                 /*
@@ -1446,7 +1446,7 @@ static apr_status_t inflate_out_filter(a
                                                      VALIDATION_SIZE);
                 if (ctx->stream.avail_in > VALIDATION_SIZE) {
                     ctx->validation_buffer_length = VALIDATION_SIZE;
-                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01408)
                                   "Zlib: %d bytes of garbage at the end of "
                                   "compressed stream.",
                                   ctx->stream.avail_in - VALIDATION_SIZE);
@@ -1460,7 +1460,7 @@ static apr_status_t inflate_out_filter(a
             }
 
             if (zRC != Z_OK) {
-                ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+                ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01409)
                               "Zlib error %d inflating data (%s)", zRC,
                               ctx->stream.msg);
                 return APR_EGENERAL;

Modified: httpd/httpd/trunk/modules/filters/mod_ext_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_ext_filter.c?rev=1209766&r1=1209765&r2=1209766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_ext_filter.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_ext_filter.c Fri Dec  2 23:02:04 2011
@@ -477,7 +477,7 @@ static apr_status_t init_ext_filter_proc
                             ctx->procattr,
                             ctx->p);
     if (rc != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, f->r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, f->r, APLOGNO(01458)
                       "couldn't create child process to run `%s'",
                       ctx->filter->command);
         return rc;
@@ -565,7 +565,7 @@ static apr_status_t init_filter_instance
     /* look for the user-defined filter */
     ctx->filter = find_filter_def(f->r->server, f->frec->name);
     if (!ctx->filter) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, APLOGNO(01459)
                       "couldn't find definition of filter '%s'",
                       f->frec->name);
         return APR_EINVAL;
@@ -655,7 +655,7 @@ static apr_status_t drain_available_outp
         rv = apr_file_read(ctx->proc->out, buf, &len);
         if (rv && !APR_STATUS_IS_EAGAIN(rv))
            lvl = APLOG_DEBUG;
-        ap_log_rerror(APLOG_MARK, lvl, rv, r,
+        ap_log_rerror(APLOG_MARK, lvl, rv, r, APLOGNO(01460)
                       "apr_file_read(child output), len %" APR_SIZE_T_FMT,
                       !rv ? len : -1);
         if (rv != APR_SUCCESS) {
@@ -686,7 +686,7 @@ static apr_status_t pass_data_to_filter(
                        &tmplen);
         bytes_written += tmplen;
         if (rv != APR_SUCCESS && !APR_STATUS_IS_EAGAIN(rv)) {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r,
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, APLOGNO(01461)
                           "apr_file_write(child input), len %" APR_SIZE_T_FMT,
                           tmplen);
             return rv;
@@ -705,7 +705,7 @@ static apr_status_t pass_data_to_filter(
                 rv = apr_pollset_poll(ctx->pollset, f->r->server->timeout,
                                       &num_events, &pdesc);
                 if (rv != APR_SUCCESS && !APR_STATUS_IS_EINTR(rv)) {
-                    ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, f->r,
+                    ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, f->r, APLOGNO(01462)
                                   "apr_pollset_poll()");
                     /* some error such as APR_TIMEUP */
                     return rv;
@@ -760,7 +760,7 @@ static int ef_unified_filter(ap_filter_t
 
         rv = apr_bucket_read(b, &data, &len, APR_BLOCK_READ);
         if (rv != APR_SUCCESS) {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "apr_bucket_read()");
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01463) "apr_bucket_read()");
             return rv;
         }
 
@@ -781,7 +781,7 @@ static int ef_unified_filter(ap_filter_t
          * that will cause the child to finish generating output
          */
         if ((rv = apr_file_close(ctx->proc->in)) != APR_SUCCESS) {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01464)
                           "apr_file_close(child input)");
             return rv;
         }
@@ -791,7 +791,7 @@ static int ef_unified_filter(ap_filter_t
         rv = apr_file_pipe_timeout_set(ctx->proc->out,
                                        r->server->timeout);
         if (rv) {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01465)
                           "apr_file_pipe_timeout_set(child output)");
             return rv;
         }
@@ -803,7 +803,7 @@ static int ef_unified_filter(ap_filter_t
         rv = apr_file_read(ctx->proc->out, buf, &len);
         if (rv && !APR_STATUS_IS_EOF(rv) && !APR_STATUS_IS_EAGAIN(rv))
             lvl = APLOG_ERR;
-        ap_log_rerror(APLOG_MARK, lvl, rv, r,
+        ap_log_rerror(APLOG_MARK, lvl, rv, r, APLOGNO(01466)
                       "apr_file_read(child output), len %" APR_SIZE_T_FMT,
                       !rv ? len : -1);
         if (APR_STATUS_IS_EAGAIN(rv)) {
@@ -841,7 +841,7 @@ static apr_status_t ef_output_filter(ap_
     if (!ctx) {
         if ((rv = init_filter_instance(f)) != APR_SUCCESS) {
             ctx = f->ctx;
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01467)
                           "can't initialise output filter %s: %s",
                           f->frec->name,
                           (ctx->dc->onfail == 1) ? "removing" : "aborting");
@@ -873,12 +873,12 @@ static apr_status_t ef_output_filter(ap_
 
     rv = ef_unified_filter(f, bb);
     if (rv != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01468)
                       "ef_unified_filter() failed");
     }
 
     if ((rv = ap_pass_brigade(f->next, bb)) != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r,
+        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, APLOGNO(01469)
                       "ap_pass_brigade() failed");
     }
     return rv;
@@ -894,7 +894,7 @@ static int ef_input_filter(ap_filter_t *
     if (!ctx) {
         if ((rv = init_filter_instance(f)) != APR_SUCCESS) {
             ctx = f->ctx;
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r,
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, APLOGNO(01470)
                           "can't initialise input filter %s: %s",
                           f->frec->name,
                           (ctx->dc->onfail == 1) ? "removing" : "aborting");

Modified: httpd/httpd/trunk/modules/filters/mod_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_filter.c?rev=1209766&r1=1209765&r2=1209766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_filter.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_filter.c Fri Dec  2 23:02:04 2011
@@ -83,12 +83,12 @@ static void filter_trace(conn_rec *c, in
     case 0:        /* normal, operational use */
         return;
     case 1:        /* mod_diagnostics level */
-        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, "%s", fname);
+        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(01375) "%s", fname);
         for (b = APR_BRIGADE_FIRST(bb);
              b != APR_BRIGADE_SENTINEL(bb);
              b = APR_BUCKET_NEXT(b)) {
 
-            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c,
+            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(01376)
                           "%s: type: %s, length: %" APR_SIZE_T_FMT,
                           fname, b->type->name ? b->type->name : "(unknown)",
                           b->length);
@@ -107,14 +107,14 @@ static int filter_init(ap_filter_t *f)
     harness_ctx *fctx = apr_pcalloc(f->r->pool, sizeof(harness_ctx));
     for (p = filter->providers; p; p = p->next) {
         if (p->frec->filter_init_func == filter_init) {
-            ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, f->c,
+            ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, f->c, APLOGNO(01377)
                           "Chaining of FilterProviders not supported");
             return HTTP_INTERNAL_SERVER_ERROR;
         }
         else if (p->frec->filter_init_func) {
             f->ctx = NULL;
             if ((err = p->frec->filter_init_func(f)) != OK) {
-                ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, f->c,
+                ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, f->c, APLOGNO(01378)
                               "filter_init for %s failed", p->frec->name);
                 return err;   /* if anyone errors out here, so do we */
             }
@@ -150,7 +150,7 @@ static int filter_lookup(ap_filter_t *f,
         if (provider->expr) {
             match = ap_expr_exec(r, provider->expr, &err);
             if (err) {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01379)
                               "Error evaluating filter dispatch condition: %s",
                               err);
                 match = 0;
@@ -640,7 +640,7 @@ static void filter_insert(request_rec *r
     for (p = cfg->chain; p; p = p->next) {
         filter = apr_hash_get(cfg->live_filters, p->fname, APR_HASH_KEY_STRING);
         if (filter == NULL) {
-            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01380)
                           "Unknown filter %s not added", p->fname);
             continue;
         }

Modified: httpd/httpd/trunk/modules/filters/mod_include.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_include.c?rev=1209766&r1=1209765&r2=1209766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_include.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_include.c Fri Dec  2 23:02:04 2011
@@ -659,13 +659,13 @@ static const char *get_include_var(const
          * v.s. empty strings on an empty match is deliberate.
          */
         if (!re || !re->have_match) {
-            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01329)
                 "regex capture $%" APR_SIZE_T_FMT " refers to no regex in %s",
                 idx, r->filename);
             return NULL;
         }
         else if (re->nsub < idx || idx >= AP_MAX_REG_MATCH) {
-            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01330)
                           "regex capture $%" APR_SIZE_T_FMT
                           " is out of range (last regex was: '%s') in %s",
                           idx, re->rexp, r->filename);
@@ -828,7 +828,7 @@ static char *ap_ssi_parse_string(include
             if (*++p == '{') {
                 ep = ap_strchr_c(++p, '}');
                 if (!ep) {
-                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "Missing '}' on "
+                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01331) "Missing '}' on "
                                   "variable \"%s\" in %s", p, r->filename);
                     break;
                 }
@@ -1382,7 +1382,7 @@ static int parse_expr(include_ctx_t *ctx
         case TOKEN_AND:
         case TOKEN_OR:
             if (!current->left || !current->right) {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01332)
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                 *was_error = 1;
@@ -1447,7 +1447,7 @@ static int parse_expr(include_ctx_t *ctx
                 current->left->token.type != TOKEN_STRING ||
                 (current->right->token.type != TOKEN_STRING &&
                  current->right->token.type != TOKEN_RE)) {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01333)
                             "Invalid expression \"%s\" in file %s",
                             expr, r->filename);
                 *was_error = 1;
@@ -1482,7 +1482,7 @@ static int parse_expr(include_ctx_t *ctx
             if (!current->left || !current->right ||
                 current->left->token.type != TOKEN_STRING ||
                 current->right->token.type != TOKEN_STRING) {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01334)
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                 *was_error = 1;
@@ -1530,7 +1530,7 @@ static int parse_expr(include_ctx_t *ctx
             if (current->left || !current->right ||
                 (current->right->token.type != TOKEN_STRING &&
                  current->right->token.type != TOKEN_RE)) {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01335)
                             "Invalid expression \"%s\" in file %s: Token '-A' must be followed by a URI string.",
                             expr, r->filename);
                 *was_error = 1;
@@ -1546,7 +1546,7 @@ static int parse_expr(include_ctx_t *ctx
             }
             else {
                 current->value = 0;
-                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rr->status, r,
+                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rr->status, r, APLOGNO(01336)
                               "mod_include: The tested "
                               "subrequest -A \"%s\" returned an error code.",
                               current->right->token.value);
@@ -1596,7 +1596,7 @@ static int parse_ap_expr(include_ctx_t *
     err = ap_expr_parse(ctx->r->pool, ctx->r->pool, &expr_info, expr,
                         include_expr_lookup);
     if (err) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, APLOGNO(01337)
                       "Could not parse expr \"%s\" in %s: %s", expr,
                       ctx->r->filename, err);
         *was_error = 1;
@@ -1632,7 +1632,7 @@ static int parse_ap_expr(include_ctx_t *
     eval_ctx->info = &expr_info;
     ret = ap_expr_exec_ctx(eval_ctx);
     if (ret < 0) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, APLOGNO(01338)
                       "Could not evaluate expr \"%s\" in %s: %s", expr,
                       ctx->r->filename, ctx->intern->expr_err);
         *was_error = 1;
@@ -1743,7 +1743,7 @@ static int find_file(request_rec *r, con
             return 0;
         }
         else {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "unable to get "
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01339) "unable to get "
                           "information about \"%s\" in parsed file %s",
                           tag_val, r->filename);
             ap_destroy_sub_req(rr);
@@ -1751,7 +1751,7 @@ static int find_file(request_rec *r, con
         }
     }
     else {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "unknown parameter \"%s\" "
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01340) "unknown parameter \"%s\" "
                       "to tag %s in %s", tag, directive, r->filename);
         return -1;
     }
@@ -1776,7 +1776,8 @@ static apr_status_t handle_include(inclu
         ap_log_rerror(APLOG_MARK,
                       (ctx->flags & SSI_FLAG_PRINTING)
                           ? APLOG_ERR : APLOG_WARNING,
-                      0, r, "missing argument for include element in %s",
+                      0, r, APLOGNO(01341)
+                      "missing argument for include element in %s",
                       r->filename);
     }
 
@@ -1804,7 +1805,7 @@ static apr_status_t handle_include(inclu
 
         if (strcmp(tag, "virtual") && strcmp(tag, "file") && strcmp(tag,
                 "onerror")) {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "unknown parameter "
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01342) "unknown parameter "
                           "\"%s\" to tag include in %s", tag, r->filename);
             SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
             break;
@@ -1906,7 +1907,8 @@ static apr_status_t handle_echo(include_
         ap_log_rerror(APLOG_MARK,
                       (ctx->flags & SSI_FLAG_PRINTING)
                           ? APLOG_ERR : APLOG_WARNING,
-                      0, r, "missing argument for echo element in %s",
+                      0, r, APLOGNO(01343)
+                      "missing argument for echo element in %s",
                       r->filename);
     }
 
@@ -1969,7 +1971,7 @@ static apr_status_t handle_echo(include_
                         echo_text = ap_pbase64decode(ctx->dpool, echo_text);
                     }
                     else {
-                        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "unknown value "
+                        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01344) "unknown value "
                                       "\"%s\" to parameter \"decoding\" of tag echo in "
                                       "%s", token, r->filename);
                         SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
@@ -2001,7 +2003,7 @@ static apr_status_t handle_echo(include_
                         echo_text = buf;
                     }
                     else {
-                        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "unknown value "
+                        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01345) "unknown value "
                                       "\"%s\" to parameter \"encoding\" of tag echo in "
                                       "%s", token, r->filename);
                         SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
@@ -2033,7 +2035,7 @@ static apr_status_t handle_echo(include_
             encoding = tag_val;
         }
         else {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "unknown parameter "
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01346) "unknown parameter "
                           "\"%s\" in tag echo of %s", tag, r->filename);
             SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
             break;
@@ -2057,7 +2059,8 @@ static apr_status_t handle_config(includ
         ap_log_rerror(APLOG_MARK,
                       (ctx->flags & SSI_FLAG_PRINTING)
                           ? APLOG_ERR : APLOG_WARNING,
-                      0, r, "missing argument for config element in %s",
+                      0, r, APLOGNO(01347)
+                      "missing argument for config element in %s",
                       r->filename);
     }
 
@@ -2114,7 +2117,7 @@ static apr_status_t handle_config(includ
                 ctx->flags &= SSI_FLAG_SIZE_ABBREV;
             }
             else {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "unknown value "
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01348) "unknown value "
                               "\"%s\" to parameter \"sizefmt\" of tag config "
                               "in %s", parsed_string, r->filename);
                 SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
@@ -2122,7 +2125,7 @@ static apr_status_t handle_config(includ
             }
         }
         else {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "unknown parameter "
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01349) "unknown parameter "
                           "\"%s\" to tag config in %s", tag, r->filename);
             SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
             break;
@@ -2144,7 +2147,8 @@ static apr_status_t handle_fsize(include
         ap_log_rerror(APLOG_MARK,
                       (ctx->flags & SSI_FLAG_PRINTING)
                           ? APLOG_ERR : APLOG_WARNING,
-                      0, r, "missing argument for fsize element in %s",
+                      0, r, APLOGNO(01350)
+                      "missing argument for fsize element in %s",
                       r->filename);
     }
 
@@ -2231,7 +2235,8 @@ static apr_status_t handle_flastmod(incl
         ap_log_rerror(APLOG_MARK,
                       (ctx->flags & SSI_FLAG_PRINTING)
                           ? APLOG_ERR : APLOG_WARNING,
-                      0, r, "missing argument for flastmod element in %s",
+                      0, r, APLOGNO(01351)
+                      "missing argument for flastmod element in %s",
                       r->filename);
     }
 
@@ -2292,9 +2297,10 @@ static apr_status_t handle_if(include_ct
         ap_log_rerror(APLOG_MARK,
                       (ctx->flags & SSI_FLAG_PRINTING)
                           ? APLOG_ERR : APLOG_WARNING,
-                      0, r, (ctx->argc)
-                                ? "too many arguments for if element in %s"
-                                : "missing expr argument for if element in %s",
+                      0, r,
+                      (ctx->argc)
+                      ? APLOGNO(01352) "too many arguments for if element in %s"
+                      : APLOGNO(01353) "missing expr argument for if element in %s",
                       r->filename);
     }
 
@@ -2311,14 +2317,14 @@ static apr_status_t handle_if(include_ct
     ap_ssi_get_tag_and_value(ctx, &tag, &expr, SSI_VALUE_RAW);
 
     if (strcmp(tag, "expr")) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "unknown parameter \"%s\" "
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01354) "unknown parameter \"%s\" "
                       "to tag if in %s", tag, r->filename);
         SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
         return APR_SUCCESS;
     }
 
     if (!expr) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "missing expr value for if "
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01355) "missing expr value for if "
                       "element in %s", r->filename);
         SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
         return APR_SUCCESS;
@@ -2364,9 +2370,10 @@ static apr_status_t handle_elif(include_
     if (ctx->argc != 1) {
         ap_log_rerror(APLOG_MARK,
                       (!(ctx->if_nesting_level)) ? APLOG_ERR : APLOG_WARNING,
-                      0, r, (ctx->argc)
-                                ? "too many arguments for if element in %s"
-                                : "missing expr argument for if element in %s",
+                      0, r,
+                      (ctx->argc)
+                      ? APLOGNO(01356) "too many arguments for if element in %s"
+                      : APLOGNO(01357) "missing expr argument for if element in %s",
                       r->filename);
     }
 
@@ -2382,14 +2389,14 @@ static apr_status_t handle_elif(include_
     ap_ssi_get_tag_and_value(ctx, &tag, &expr, SSI_VALUE_RAW);
 
     if (strcmp(tag, "expr")) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "unknown parameter \"%s\" "
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01358) "unknown parameter \"%s\" "
                       "to tag if in %s", tag, r->filename);
         SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
         return APR_SUCCESS;
     }
 
     if (!expr) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "missing expr in elif "
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01359) "missing expr in elif "
                       "statement: %s", r->filename);
         SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
         return APR_SUCCESS;
@@ -2433,7 +2440,8 @@ static apr_status_t handle_else(include_
     if (ctx->argc) {
         ap_log_rerror(APLOG_MARK,
                       (!(ctx->if_nesting_level)) ? APLOG_ERR : APLOG_WARNING,
-                      0, r, "else directive does not take tags in %s",
+                      0, r, APLOGNO(01360)
+                      "else directive does not take tags in %s",
                       r->filename);
     }
 
@@ -2472,7 +2480,8 @@ static apr_status_t handle_endif(include
     if (ctx->argc) {
         ap_log_rerror(APLOG_MARK,
                       (!(ctx->if_nesting_level)) ? APLOG_ERR : APLOG_WARNING,
-                      0, r, "endif directive does not take tags in %s",
+                      0, r, APLOGNO(01361)
+                      "endif directive does not take tags in %s",
                       r->filename);
     }
 
@@ -2510,7 +2519,8 @@ static apr_status_t handle_set(include_c
         ap_log_rerror(APLOG_MARK,
                       (ctx->flags & SSI_FLAG_PRINTING)
                           ? APLOG_ERR : APLOG_WARNING,
-                      0, r, "missing argument for set element in %s",
+                      0, r,
+                      APLOGNO(01362) "missing argument for set element in %s",
                       r->filename);
     }
 
@@ -2556,7 +2566,7 @@ static apr_status_t handle_set(include_c
             char *parsed_string;
 
             if (!var) {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "variable must "
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01363) "variable must "
                               "precede value in set directive in %s",
                               r->filename);
                 SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
@@ -2596,7 +2606,7 @@ static apr_status_t handle_set(include_c
                         parsed_string = ap_pbase64decode(ctx->dpool, parsed_string);
                     }
                     else {
-                        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "unknown value "
+                        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01364) "unknown value "
                                       "\"%s\" to parameter \"decoding\" of tag set in "
                                       "%s", token, r->filename);
                         SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
@@ -2628,7 +2638,7 @@ static apr_status_t handle_set(include_c
                         parsed_string = buf;
                     }
                     else {
-                        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "unknown value "
+                        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01365) "unknown value "
                                       "\"%s\" to parameter \"encoding\" of tag set in "
                                       "%s", token, r->filename);
                         SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
@@ -2648,7 +2658,7 @@ static apr_status_t handle_set(include_c
                            apr_pstrdup(p, parsed_string));
         }
         else {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "Invalid tag for set "
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01366) "Invalid tag for set "
                           "directive in %s", r->filename);
             SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
             break;
@@ -2673,7 +2683,8 @@ static apr_status_t handle_printenv(incl
         ap_log_rerror(APLOG_MARK,
                       (ctx->flags & SSI_FLAG_PRINTING)
                           ? APLOG_ERR : APLOG_WARNING,
-                      0, r, "printenv directive does not take tags in %s",
+                      0, r,
+                      APLOGNO(01367) "printenv directive does not take tags in %s",
                       r->filename);
     }
 
@@ -3045,7 +3056,7 @@ static apr_size_t find_directive(include
 
         if (!intern->directive_len) {
             intern->error = 1;
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, "missing "
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, APLOGNO(01368) "missing "
                           "directive name in parsed document %s",
                           ctx->r->filename);
         }
@@ -3181,7 +3192,7 @@ static apr_size_t find_argument(include_
             intern->current_arg->name_len = 0;
             intern->error = 1;
 
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, "missing "
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, APLOGNO(01369) "missing "
                           "argument name for value to tag %s in %s",
                           apr_pstrmemdup(ctx->r->pool, intern->directive,
                                          intern->directive_len),
@@ -3213,7 +3224,7 @@ static apr_size_t find_argument(include_
                                                  intern->current_arg->name_len);
         if (!intern->current_arg->name_len) {
             intern->error = 1;
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, "missing "
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, APLOGNO(01370) "missing "
                           "argument name for value to tag %s in %s",
                           apr_pstrmemdup(ctx->r->pool, intern->directive,
                                          intern->directive_len),
@@ -3689,7 +3700,7 @@ static apr_status_t send_parsed_content(
                     }
                 }
                 else {
-                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01371)
                                   "unknown directive \"%s\" in parsed doc %s",
                                   apr_pstrmemdup(r->pool, intern->directive,
                                                  intern->directive_len),
@@ -3726,7 +3737,7 @@ static apr_status_t send_parsed_content(
             }
         }
         else if (PARSE_PRE_HEAD != intern->state) {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01372)
                           "SSI directive was not properly finished at the end "
                           "of parsed document %s", r->filename);
             if (ctx->flags & SSI_FLAG_PRINTING) {
@@ -3735,7 +3746,7 @@ static apr_status_t send_parsed_content(
         }
 
         if (!(ctx->flags & SSI_FLAG_PRINTING)) {
-            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01373)
                           "missing closing endif directive in parsed document"
                           " %s", r->filename);
         }
@@ -3807,7 +3818,7 @@ static apr_status_t includes_filter(ap_f
                                                        &include_module);
 
     if (!(ap_allow_options(r) & OPT_INCLUDES)) {
-        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01374)
                       "mod_include: Options +Includes (or IncludesNoExec) "
                       "wasn't set, INCLUDES filter removed");
         ap_remove_output_filter(f);

Modified: httpd/httpd/trunk/modules/filters/mod_proxy_html.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_proxy_html.c?rev=1209766&r1=1209765&r2=1209766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_proxy_html.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_proxy_html.c Fri Dec  2 23:02:04 2011
@@ -385,12 +385,12 @@ static void pstartElement(void *ctxt, co
         }
     }
     if (!desc && enforce) {
-        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->f->r,
+        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->f->r, APLOGNO(01416)
                       "Bogus HTML element %s dropped", name);
         return;
     }
     if (desc && desc->depr && (enforce == 2)) {
-        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->f->r,
+        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->f->r, APLOGNO(01417)
                       "Deprecated HTML element %s dropped", name);
         return;
     }
@@ -414,12 +414,12 @@ static void pstartElement(void *ctxt, co
             if (desc && enforce > 0) {
                 switch (htmlAttrAllowed(desc, (xmlChar*)*a, 2-enforce)) {
                 case HTML_INVALID:
-                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->f->r,
+                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->f->r, APLOGNO(01418)
                                   "Bogus HTML attribute %s of %s dropped",
                                   *a, name);
                     continue;
                 case HTML_DEPRECATED:
-                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->f->r,
+                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->f->r, APLOGNO(01419)
                                   "Deprecated HTML attribute %s of %s dropped",
                                   *a, name);
                     continue;
@@ -636,7 +636,7 @@ static void pstartElement(void *ctxt, co
 
     if ((enforce > 0) && (required_attrs > 0)) {
         /* if there are more required attributes than we found then complain */
-        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->f->r,
+        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->f->r, APLOGNO(01420)
                       "HTML element %s is missing %d required attributes",
                       name, required_attrs);
     }
@@ -753,7 +753,7 @@ static void fixup_rules(saxctxt *ctx)
             const char *err;
             int ok = ap_expr_exec(r, p->cond, &err);
             if (err) {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01421)
                               "Error evaluating expr: %s", err);
             }
             if (ok == 0) {
@@ -887,7 +887,7 @@ static int proxy_html_filter(ap_filter_t
                 if (!xml2enc_charset ||
                     (xml2enc_charset(f->r, &enc, &cenc) != APR_SUCCESS)) {
                     if (!xml2enc_charset)
-                        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, f->r,
+                        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, f->r, APLOGNO(01422)
                      "No i18n support found.  Install mod_xml2enc if required");
                     enc = XML_CHAR_ENCODING_NONE;
                     ap_set_content_type(f->r, "text/html;charset=utf-8");
@@ -924,7 +924,7 @@ static int proxy_html_filter(ap_filter_t
                                           apr_pool_cleanup_null);
 #ifndef USE_OLD_LIBXML2
                 if (xmlopts = xmlCtxtUseOptions(ctxt->parser, xmlopts), xmlopts)
-                    ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, f->r,
+                    ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, f->r, APLOGNO(01423)
                                   "Unsupported parser opts %x", xmlopts);
 #endif
                 if (ctxt->cfg->metafix)
@@ -942,7 +942,7 @@ static int proxy_html_filter(ap_filter_t
             }
         }
         else {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r,
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, APLOGNO(01424)
                           "Error in bucket read");
         }
     }
@@ -1233,7 +1233,7 @@ static int mod_proxy_html(apr_pool_t *p,
     xml2enc_charset = APR_RETRIEVE_OPTIONAL_FN(xml2enc_charset);
     xml2enc_filter = APR_RETRIEVE_OPTIONAL_FN(xml2enc_filter);
     if (!xml2enc_charset) {
-        ap_log_perror(APLOG_MARK, APLOG_NOTICE, 0, p2,
+        ap_log_perror(APLOG_MARK, APLOG_NOTICE, 0, p2, APLOGNO(01425)
                       "I18n support in mod_proxy_html requires mod_xml2enc. "
                       "Without it, non-ASCII characters in proxied pages are "
                       "likely to display incorrectly.");

Modified: httpd/httpd/trunk/modules/filters/mod_ratelimit.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_ratelimit.c?rev=1209766&r1=1209765&r2=1209766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_ratelimit.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_ratelimit.c Fri Dec  2 23:02:04 2011
@@ -66,7 +66,7 @@ rate_limit_filter(ap_filter_t *f, apr_bu
     apr_bucket_brigade *bb = input_bb;
 
     if (f->c->aborted) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, "rl: conn aborted");
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, APLOGNO(01454) "rl: conn aborted");
         apr_brigade_cleanup(bb);
         return APR_ECONNABORTED;
     }
@@ -146,7 +146,7 @@ rate_limit_filter(ap_filter_t *f, apr_bu
 
             if (rv != APR_SUCCESS) {
                 ctx->state = RATE_ERROR;
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r,
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, APLOGNO(01455)
                               "rl: full speed brigade pass failed.");
             }
         }
@@ -187,7 +187,7 @@ rate_limit_filter(ap_filter_t *f, apr_bu
                 rv = apr_brigade_partition(bb, ctx->chunk_size, &stop_point);
                 if (rv != APR_SUCCESS && rv != APR_INCOMPLETE) {
                     ctx->state = RATE_ERROR;
-                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r,
+                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, APLOGNO(01456)
                                   "rl: partition failed.");
                     break;
                 }
@@ -218,7 +218,7 @@ rate_limit_filter(ap_filter_t *f, apr_bu
 
                 if (rv != APR_SUCCESS) {
                     ctx->state = RATE_ERROR;
-                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r,
+                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, APLOGNO(01457)
                                   "rl: brigade pass failed.");
                     break;
                 }

Modified: httpd/httpd/trunk/modules/filters/mod_reflector.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_reflector.c?rev=1209766&r1=1209765&r2=1209766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_reflector.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_reflector.c Fri Dec  2 23:02:04 2011
@@ -157,7 +157,7 @@ static int reflector_handler(request_rec
                 status = ap_pass_brigade(r->output_filters, bbout);
                 if (status != APR_SUCCESS) {
                     /* no way to know what type of error occurred */
-                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, status, r,
+                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, status, r, APLOGNO(01410)
                              "reflector_handler: ap_pass_brigade returned %i",
                                   status);
                     return HTTP_INTERNAL_SERVER_ERROR;

Modified: httpd/httpd/trunk/modules/filters/mod_reqtimeout.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_reqtimeout.c?rev=1209766&r1=1209765&r2=1209766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_reqtimeout.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_reqtimeout.c Fri Dec  2 23:02:04 2011
@@ -310,7 +310,7 @@ static apr_status_t reqtimeout_filter(ap
 
 out:
     if (APR_STATUS_IS_TIMEUP(rv)) {
-        ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, f->c,
+        ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, f->c, APLOGNO(01382)
                       "Request %s read timeout", ccfg->type);
         /*
          * If we allow a normal lingering close, the client may keep this

Modified: httpd/httpd/trunk/modules/filters/mod_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_request.c?rev=1209766&r1=1209765&r2=1209766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_request.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_request.c Fri Dec  2 23:02:04 2011
@@ -98,7 +98,7 @@ static apr_status_t keep_body_filter(ap_
             if (apr_strtoff(&ctx->remaining, lenp, &endstr, 10)
                 || endstr == lenp || *endstr || ctx->remaining < 0) {
 
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r,
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, APLOGNO(01411)
                               "Invalid Content-Length");
 
                 ap_remove_input_filter(f);
@@ -109,7 +109,7 @@ static apr_status_t keep_body_filter(ap_
              * time, stop it here if it is invalid.
              */
             if (dconf->keep_body < ctx->remaining) {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r,
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, APLOGNO(01412)
                           "Requested content-length of %" APR_OFF_T_FMT
                           " is larger than the configured limit"
                           " of %" APR_OFF_T_FMT, ctx->remaining, dconf->keep_body);
@@ -136,7 +136,7 @@ static apr_status_t keep_body_filter(ap_
             apr_brigade_cleanup(f->r->kept_body);
             f->r->kept_body = NULL;
         }
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, APLOGNO(01413)
                       "Requested content-length of %" APR_OFF_T_FMT
                       " is larger than the configured limit"
                       " of %" APR_OFF_T_FMT, len, ctx->keep_body);
@@ -233,12 +233,12 @@ static apr_status_t kept_body_filter(ap_
 
     /* send part of the kept_body */
     if ((rv = apr_brigade_partition(kept_body, ctx->offset, &ec)) != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01414)
                       "apr_brigade_partition() failed on kept_body at %" APR_OFF_T_FMT, ctx->offset);
         return rv;
     }
     if ((rv = apr_brigade_partition(kept_body, ctx->offset + readbytes, &e2)) != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01415)
                       "apr_brigade_partition() failed on kept_body at %" APR_OFF_T_FMT, ctx->offset + readbytes);
         return rv;
     }

Modified: httpd/httpd/trunk/modules/filters/mod_sed.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_sed.c?rev=1209766&r1=1209765&r2=1209766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_sed.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_sed.c Fri Dec  2 23:02:04 2011
@@ -64,7 +64,7 @@ module AP_MODULE_DECLARE_DATA sed_module
 static apr_status_t log_sed_errf(void *data, const char *error)
 {
     request_rec *r = (request_rec *) data;
-    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "%s", error);
+    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01381) "%s", error);
     return APR_SUCCESS;
 }
 

Modified: httpd/httpd/trunk/modules/filters/mod_substitute.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_substitute.c?rev=1209766&r1=1209765&r2=1209766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_substitute.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_substitute.c Fri Dec  2 23:02:04 2011
@@ -531,7 +531,7 @@ static apr_status_t substitute_filter(ap
     return APR_SUCCESS;
 err:
     if (rv == APR_ENOMEM)
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, "Line too long, URI %s",
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, APLOGNO(01328) "Line too long, URI %s",
                       f->r->uri);
     apr_pool_clear(ctx->tpool);
     return rv;

Modified: httpd/httpd/trunk/modules/filters/mod_xml2enc.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_xml2enc.c?rev=1209766&r1=1209765&r2=1209766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_xml2enc.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_xml2enc.c Fri Dec  2 23:02:04 2011
@@ -101,7 +101,7 @@ static apr_status_t xml2enc_filter(reque
     }
     else {
         rv = APR_EGENERAL;
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01426)
                       "xml2enc: bad mode %x", mode);
     }
     if (rv == APR_SUCCESS) {
@@ -115,7 +115,7 @@ static apr_status_t xml2enc_filter(reque
         ap_add_output_filter("xml2enc", ctx, r, r->connection);
     }
     else {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01427)
                       "xml2enc: Charset %s not supported.", enc) ;
     }
     return rv;
@@ -148,7 +148,7 @@ static void fix_skipto(request_rec* r, x
                     ctx->bytes -= (p-ctx->buf);
                     ctx->buf = p ;
                     found = 1;
-                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01428)
                                   "Skipped to first <%s> element",
                                   starts[i].val) ;
                     break;
@@ -157,7 +157,7 @@ static void fix_skipto(request_rec* r, x
             p = ap_strchr(p+1, '<');
         }
         if (p == NULL) {
-            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01429)
                           "Failed to find start of recognised HTML!");
         }
     }
@@ -174,7 +174,7 @@ static void sniff_encoding(request_rec* 
     const char* ctype = r->content_type;
 
     if (ctype) {
-        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01430)
                       "Content-Type is %s", ctype) ;
 
         /* If we've got it in the HTTP headers, there's nothing to do */
@@ -182,7 +182,7 @@ static void sniff_encoding(request_rec* 
             p += 8 ;
             if (ctx->encoding = apr_pstrndup(r->pool, p, strcspn(p, " ;") ),
                 ctx->encoding) {
-                ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+                ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01431)
                               "Got charset %s from HTTP headers", ctx->encoding) ;
                 ctx->xml2enc = xmlParseCharEncoding(ctx->encoding);
             }
@@ -194,7 +194,7 @@ static void sniff_encoding(request_rec* 
         ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf,
                                              ctx->bytes); 
         if (HAVE_ENCODING(ctx->xml2enc)) {
-            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01432)
                           "Got charset from XML rules.") ;
             ctx->encoding = xmlGetCharEncodingName(ctx->xml2enc);
         }
@@ -219,7 +219,7 @@ static void sniff_encoding(request_rec* 
                     ctx->encoding) {
                     ctx->xml2enc = xmlParseCharEncoding(ctx->encoding);
                     if (HAVE_ENCODING(ctx->xml2enc))
-                        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+                        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01433)
                                       "Got charset %s from HTML META", ctx->encoding) ;
                 }
             }
@@ -249,14 +249,14 @@ static void sniff_encoding(request_rec* 
             ctx->encoding = cfg->default_charset?cfg->default_charset:"ISO-8859-1";
         }
         /* Unsupported charset. Can we get (iconv) support through apr_xlate? */
-        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01434)
                       "Charset %s not supported by libxml2; trying apr_xlate",
                       ctx->encoding);
         if (apr_xlate_open(&ctx->convset, "UTF-8", ctx->encoding, r->pool)
             == APR_SUCCESS) {
             ctx->xml2enc = XML_CHAR_ENCODING_UTF8 ;
         } else {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01435)
                           "Charset %s not supported.  Consider aliasing it?",
                           ctx->encoding) ;
         }
@@ -264,7 +264,7 @@ static void sniff_encoding(request_rec* 
 
     if (!HAVE_ENCODING(ctx->xml2enc)) {
         /* Use configuration default as a last resort */
-        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01436)
                   "No usable charset information; using configuration default");
         ctx->xml2enc = (cfg->default_encoding == XML_CHAR_ENCODING_NONE)
                         ? XML_CHAR_ENCODING_8859_1 : cfg->default_encoding ;
@@ -417,7 +417,7 @@ static apr_status_t xml2enc_ffunc(ap_fil
                      * Save remaining data for next time round
                      */
           
-                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, f->r,
+                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, f->r, APLOGNO(01437)
                                   "xml2enc: Setting aside %" APR_SIZE_T_FMT
                                   " unconverted bytes", bytes);
                     rv = ap_fflush(f->next, ctx->bbnext);
@@ -434,7 +434,7 @@ static apr_status_t xml2enc_ffunc(ap_fil
                     APR_BUCKET_REMOVE(b);
                     apr_bucket_destroy(b);
                 }
-                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, f->r,
+                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, f->r, APLOGNO(01438)
                               "xml2enc: consuming %" APR_SIZE_T_FMT
                               " bytes flattened", bytes);
             }
@@ -443,7 +443,7 @@ static apr_status_t xml2enc_ffunc(ap_fil
                                      APR_BLOCK_READ);
                 APR_BUCKET_REMOVE(b);
                 bdestroy = b;  /* can't destroy until finished with the data */
-                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, f->r,
+                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, f->r, APLOGNO(01439)
                               "xml2enc: consuming %" APR_SIZE_T_FMT
                               " bytes from bucket", bytes);
             }
@@ -461,7 +461,7 @@ static apr_status_t xml2enc_ffunc(ap_fil
                         b = apr_bucket_transient_create(buf+(bytes - insz), insz,
                                                         bb->bucket_alloc);
                         APR_BRIGADE_INSERT_HEAD(bb, b);
-                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, f->r,
+                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, f->r, APLOGNO(01440)
                                       "xml2enc: reinserting %" APR_SIZE_T_FMT
                                       " unconsumed bytes from bucket", insz);
                         break;
@@ -469,7 +469,7 @@ static apr_status_t xml2enc_ffunc(ap_fil
                     ctx->bytes = (apr_size_t)ctx->bblen;
                     rv = apr_xlate_conv_buffer(ctx->convset, buf+(bytes - insz),
                                                &insz, ctx->buf, &ctx->bytes);
-                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, f->r,
+                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, f->r, APLOGNO(01441)
                                   "xml2enc: converted %" APR_SIZE_T_FMT
                                   "/%" APR_OFF_T_FMT " bytes", consumed - insz,
                                   ctx->bblen - ctx->bytes);
@@ -477,7 +477,7 @@ static apr_status_t xml2enc_ffunc(ap_fil
                     rv2 = ap_fwrite(f->next, ctx->bbnext, ctx->buf,
                                     (apr_size_t)ctx->bblen - ctx->bytes);
                     if (rv2 != APR_SUCCESS) {
-                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv2, f->r,
+                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv2, f->r, APLOGNO(01442)
                                       "ap_fwrite failed");
                         return rv2;
                     }
@@ -485,14 +485,14 @@ static apr_status_t xml2enc_ffunc(ap_fil
                     case APR_SUCCESS:
                         continue;
                     case APR_EINCOMPLETE:
-                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, f->r,
+                        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, f->r, APLOGNO(01443)
                                       "INCOMPLETE");
                         continue;     /* If outbuf too small, go round again.
                                        * If it was inbuf, we'll break out when
                                        * we test ctx->bytes == ctx->bblen
                                        */
                     case APR_EINVAL: /* try skipping one bad byte */
-                        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r,
+                        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, APLOGNO(01444)
                                    "Skipping invalid byte(s) in input stream!");
                         --insz;
                         continue;
@@ -500,19 +500,19 @@ static apr_status_t xml2enc_ffunc(ap_fil
                         /* Erk!  What's this?
                          * Bail out, flush, and hope to eat the buf raw
                          */
-                        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r,
+                        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, APLOGNO(01445)
                                       "Failed to convert input; trying it raw") ;
                         ctx->convset = NULL;
                         rv = ap_fflush(f->next, ctx->bbnext);
                         if (rv != APR_SUCCESS)
-                            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, f->r,
+                            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, f->r, APLOGNO(01446)
                                           "ap_fflush failed");
                         else
                             rv = ap_pass_brigade(f->next, ctx->bbnext);
                     }
                 }
             } else {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r,
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, APLOGNO(01447)
                               "xml2enc: error reading data") ;
             }
             if (bdestroy)

Modified: httpd/httpd/trunk/modules/generators/mod_asis.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_asis.c?rev=1209766&r1=1209765&r2=1209766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_asis.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_asis.c Fri Dec  2 23:02:04 2011
@@ -44,14 +44,14 @@ static int asis_handler(request_rec *r)
     }
 
     if (r->finfo.filetype == APR_NOFILE) {
-        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01233)
                     "File does not exist: %s", r->filename);
         return HTTP_NOT_FOUND;
     }
 
     if ((rv = apr_file_open(&f, r->filename, APR_READ,
                 APR_OS_DEFAULT, r->pool)) != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01234)
                     "file permissions deny server access: %s", r->filename);
         return HTTP_FORBIDDEN;
     }
@@ -85,7 +85,7 @@ static int asis_handler(request_rec *r)
 
         rv = apr_file_seek(f, APR_CUR, &pos);
         if (rv != APR_SUCCESS) {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01235)
                           "mod_asis: failed to find end-of-headers position "
                           "for %s", r->filename);
             apr_file_close(f);
@@ -99,7 +99,7 @@ static int asis_handler(request_rec *r)
         APR_BRIGADE_INSERT_TAIL(bb, b);
         rv = ap_pass_brigade(r->output_filters, bb);
         if (rv != APR_SUCCESS) {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01236)
                           "mod_asis: ap_pass_brigade failed for file %s", r->filename);
             return HTTP_INTERNAL_SERVER_ERROR;
         }

Modified: httpd/httpd/trunk/modules/generators/mod_autoindex.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_autoindex.c?rev=1209766&r1=1209765&r2=1209766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_autoindex.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_autoindex.c Fri Dec  2 23:02:04 2011
@@ -2023,7 +2023,7 @@ static int index_directory(request_rec *
     char *charset;
 
     if ((status = apr_dir_open(&thedir, name, r->pool)) != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(01275)
                       "Can't open directory for index: %s", r->filename);
         return HTTP_FORBIDDEN;
     }
@@ -2310,7 +2310,7 @@ static int handle_autoindex(request_rec 
     else {
         const char *index_names = apr_table_get(r->notes, "dir-index-names");
 
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01276)
                       "Cannot serve directory %s: No matching DirectoryIndex (%s) found, and "
                       "server-generated directory index forbidden by "
                       "Options directive",

Modified: httpd/httpd/trunk/modules/generators/mod_cgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_cgi.c?rev=1209766&r1=1209765&r2=1209766&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_cgi.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_cgi.c Fri Dec  2 23:02:04 2011
@@ -210,7 +210,7 @@ static apr_status_t log_script_err(reque
         if (newline) {
             *newline = '\0';
         }
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01215)
                       "%s", argsbuffer);
     }
 
@@ -449,7 +449,7 @@ static apr_status_t run_cgi_child(apr_fi
                                         e_info->addrspace)) != APR_SUCCESS) ||
         ((rc = apr_procattr_child_errfn_set(procattr, cgi_child_errfn)) != APR_SUCCESS)) {
         /* Something bad happened, tell the world. */
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r, APLOGNO(01216)
                       "couldn't set child process attributes: %s", r->filename);
     }
     else {
@@ -587,7 +587,7 @@ static apr_bucket *cgi_bucket_create(req
     /* Create the pollset */
     rv = apr_pollset_create(&data->pollset, 2, r->pool, 0);
     if (rv != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01217)
                      "apr_pollset_create(); check system or user limits");
         return NULL;
     }
@@ -599,7 +599,7 @@ static apr_bucket *cgi_bucket_create(req
     fd.client_data = (void *)1;
     rv = apr_pollset_add(data->pollset, &fd);
     if (rv != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01218)
                      "apr_pollset_add(); check system or user limits");
         return NULL;
     }
@@ -608,7 +608,7 @@ static apr_bucket *cgi_bucket_create(req
     fd.client_data = (void *)2;
     rv = apr_pollset_add(data->pollset, &fd);
     if (rv != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01219)
                      "apr_pollset_add(); check system or user limits");
         return NULL;
     }
@@ -690,7 +690,7 @@ static apr_status_t cgi_bucket_read(apr_
         rv = apr_pollset_poll(data->pollset, timeout, &num, &results);
         if (APR_STATUS_IS_TIMEUP(rv)) {
             if (timeout) {
-                ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, data->r,
+                ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, data->r, APLOGNO(01220)
                               "Timeout waiting for output from CGI script %s",
                               data->r->filename);
                 return rv;
@@ -703,7 +703,7 @@ static apr_status_t cgi_bucket_read(apr_
             continue;
         }
         else if (rv != APR_SUCCESS) {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, data->r,
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, data->r, APLOGNO(01221)
                           "poll failed waiting for CGI child");
             return rv;
         }
@@ -820,7 +820,7 @@ static int cgi_handler(request_rec *r)
 
     /* build the command line */
     if ((rv = cgi_build_command(&command, &argv, r, p, &e_info)) != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01222)
                       "don't know how to spawn child process: %s",
                       r->filename);
         return HTTP_INTERNAL_SERVER_ERROR;
@@ -829,7 +829,7 @@ static int cgi_handler(request_rec *r)
     /* run the script in its own process */
     if ((rv = run_cgi_child(&script_out, &script_in, &script_err,
                             command, argv, r, p, &e_info)) != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01223)
                       "couldn't spawn child process: %s", r->filename);
         return HTTP_INTERNAL_SERVER_ERROR;
     }
@@ -852,11 +852,11 @@ static int cgi_handler(request_rec *r)
 
         if (rv != APR_SUCCESS) {
             if (APR_STATUS_IS_TIMEUP(rv)) {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01224)
                               "Timeout during reading request entity data");
                 return HTTP_REQUEST_TIME_OUT;
             }
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01225)
                           "Error reading request entity data");
             return HTTP_INTERNAL_SERVER_ERROR;
         }
@@ -1130,7 +1130,7 @@ static apr_status_t include_cmd(include_
 
     if ((rv = cgi_build_command(&command, &argv, r, r->pool,
                                 &e_info)) != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01226)
                       "don't know how to spawn cmd child process: %s",
                       r->filename);
         return rv;
@@ -1140,7 +1140,7 @@ static apr_status_t include_cmd(include_
     if ((rv = run_cgi_child(&script_out, &script_in, &script_err,
                             command, argv, r, r->pool,
                             &e_info)) != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01227)
                       "couldn't spawn child process: %s", r->filename);
         return rv;
     }
@@ -1183,7 +1183,7 @@ static apr_status_t handle_exec(include_
     }
 
     if (ctx->flags & SSI_FLAG_NO_EXEC) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "exec used but not allowed "
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01228) "exec used but not allowed "
                       "in %s", r->filename);
         SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
         return APR_SUCCESS;
@@ -1203,7 +1203,7 @@ static apr_status_t handle_exec(include_
 
             rv = include_cmd(ctx, f, bb, parsed_string);
             if (rv != APR_SUCCESS) {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "execution failure "
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01229) "execution failure "
                               "for parameter \"%s\" to tag exec in file %s",
                               tag, r->filename);
                 SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
@@ -1218,14 +1218,14 @@ static apr_status_t handle_exec(include_
 
             rv = include_cgi(ctx, f, bb, parsed_string);
             if (rv != APR_SUCCESS) {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "invalid CGI ref "
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01230) "invalid CGI ref "
                               "\"%s\" in %s", tag_val, file);
                 SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
                 break;
             }
         }
         else {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "unknown parameter "
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01231) "unknown parameter "
                           "\"%s\" to tag exec in %s", tag, file);
             SSI_CREATE_ERROR_BUCKET(ctx, f, bb);
             break;



Mime
View raw message