On the trunk:

updated missing log tags.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1818030 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number
index 1c9ef75499f8e9894b6de595b586393a441b6678..15526045a739b6706e94f3690959ff66d8c2380e 100644 (file)
--- a/docs/log-message-tags/next-number
+++ b/docs/log-message-tags/next-number
@@ -1 +1 @@
-10102
+10111

diff --git a/modules/md/mod_md.c b/modules/md/mod_md.c
index f1447995c4a4846f901da87d0df8dd401905abc1..e01c9ea61eac0c61d48cb2697d0f972c06996fe2 100644 (file)
--- a/modules/md/mod_md.c
+++ b/modules/md/mod_md.c
@@ -282,7 +282,7 @@ static apr_status_t assign_to_servers(md_t *md, server_rec *base_server,
                 /* We require https for this MD, but do we have port 443 (or a mapped one)
                  * available? */
                 if (mc->local_443 <= 0) {
-                    ap_log_error(APLOG_MARK, APLOG_ERR, 0, base_server, APLOGNO()
+                    ap_log_error(APLOG_MARK, APLOG_ERR, 0, base_server, APLOGNO(10105)
                                  "MDPortMap says there is no port for https (443), "
                                  "but MD %s is configured to require https. This "
                                  "only works when a 443 port is available.", md->name);
@@ -304,7 +304,7 @@ static apr_status_t assign_to_servers(md_t *md, server_rec *base_server,
                 if (!s_https) {
                     /* Did not find any server_rec that matches this MD *and* has an
                      * s->addrs match for the https port. Suspicious. */
-                    ap_log_error(APLOG_MARK, APLOG_WARNING, 0, base_server, APLOGNO()
+                    ap_log_error(APLOG_MARK, APLOG_WARNING, 0, base_server, APLOGNO(10106)
                                  "MD %s is configured to require https, but there seems to be "
                                  "no VirtualHost for it that has port %d in its address list. "
                                  "This looks as if it will not work.", 
@@ -781,7 +781,7 @@ static apr_status_t run_watchdog(int state, void *baton, apr_pool_t *ptemp)
 
             now = apr_time_now();
             if (APLOGdebug(wd->s)) {
-                ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, wd->s, APLOGNO()
+                ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, wd->s, APLOGNO(10107)
                              "next run in %s", md_print_duration(ptemp, next_run - now));
             }
             wd_set_interval(wd->watchdog, next_run - now, wd, run_watchdog);
@@ -824,12 +824,12 @@ static apr_status_t run_watchdog(int state, void *baton, apr_pool_t *ptemp)
                 cmdline = apr_psprintf(ptemp, "%s %s", wd->mc->notify_cmd, names); 
                 apr_tokenize_to_argv(cmdline, (char***)&argv, ptemp);
                 if (APR_SUCCESS == (rv = md_util_exec(ptemp, argv[0], argv, &exit_code))) {
-                    ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, wd->s, APLOGNO() 
+                    ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, wd->s, APLOGNO(10108) 
                                  "notify command '%s' returned %d", 
                                  wd->mc->notify_cmd, exit_code);
                 }
                 else {
-                    ap_log_error(APLOG_MARK, APLOG_ERR, rv, wd->s, APLOGNO() 
+                    ap_log_error(APLOG_MARK, APLOG_ERR, rv, wd->s, APLOGNO(10109) 
                                  "executing configured MDNotifyCmd %s", wd->mc->notify_cmd);
                     notified = 0;
                 } 
@@ -1170,7 +1170,7 @@ static apr_status_t md_get_certificate(server_rec *s, apr_pool_t *p,
         md = md_reg_get(reg, sc->assigned->name, p);
             
         if (APR_SUCCESS != (rv = md_reg_get_cred_files(reg, md, p, pkeyfile, pcertfile))) {
-            ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO() 
+            ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10110) 
                          "retrieving credentials for MD %s", md->name);
             return rv;
         }

diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index f26090814e3e6afe9109937de303a12c49fc4b7f..868b760c123713e953845036d4db4f381ca8a615 100644 (file)
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -256,7 +256,7 @@ apr_status_t ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
         if (sc->vhost_id) {
             /* already set. This should only happen if this config rec is
              * shared with another server. Argh! */
-            ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO() 
+            ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(10104) 
                          "%s, SSLSrvConfigRec shared from %s", 
                          ssl_util_vhostid(p, s), sc->vhost_id);
         }

diff --git a/server/listen.c b/server/listen.c
index 6632be3a353bd5943c72344333557fb0b82386d6..2d1db6dc291f863fdc66e052fcbbdd529cb1ab33 100644 (file)
--- a/server/listen.c
+++ b/server/listen.c
@@ -536,7 +536,7 @@ static const char *alloc_listener(process_rec *process, const char *addr,
         if (scope_id) {
             status = apr_sockaddr_zone_set(new->bind_addr, scope_id);
             if (status) {
-                ap_log_perror(APLOG_MARK, APLOG_CRIT, status, process->pool, APLOGNO()
+                ap_log_perror(APLOG_MARK, APLOG_CRIT, status, process->pool, APLOGNO(10102)
                               "alloc_listener: failed to set scope for %pI to %s",
                               new->bind_addr, scope_id);
                 return "Listen step failed";

diff --git a/server/vhost.c b/server/vhost.c
index 15ba3bbb9379d48da557979d0814d86b34739f5d..ac6d3a605b96f221242b923925c9c1c2bd1a0bc3 100644 (file)
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -212,7 +212,7 @@ static const char *get_addresses(apr_pool_t *p, const char *w_,
         if (scope_id) {
             rv = apr_sockaddr_zone_set(my_addr, scope_id);
             if (rv) {
-                ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL, APLOGNO()
+                ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL, APLOGNO(10103)
                              "Could not set scope ID %s for %pI -- ignoring!",
                              scope_id, my_addr);
                 return NULL;