httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1211669 - in /httpd/httpd/branches/2.4.x: ./ modules/cluster/ modules/debugging/ modules/examples/ modules/metadata/ modules/proxy/balancers/ modules/ssl/
Date Wed, 07 Dec 2011 22:06:41 GMT
Author: sf
Date: Wed Dec  7 22:06:41 2011
New Revision: 1211669

URL: http://svn.apache.org/viewvc?rev=1211669&view=rev
Log:
Merge r1211663:
Remove usage of APLOG_NOERRNO. It has been a no-op since at least 2.0.x

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c
    httpd/httpd/branches/2.4.x/modules/debugging/mod_dumpio.c
    httpd/httpd/branches/2.4.x/modules/examples/mod_example_ipc.c
    httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c
    httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c
    httpd/httpd/branches/2.4.x/modules/ssl/ssl_util.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec  7 22:06:41 2011
@@ -1,3 +1,3 @@
 /httpd/httpd/branches/revert-ap-ldap:1150158-1150173
 /httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528
+/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663

Modified: httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c?rev=1211669&r1=1211668&r2=1211669&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c Wed Dec  7 22:06:41 2011
@@ -684,7 +684,7 @@ static int hm_post_config(apr_pool_t *p,
             storage = ap_lookup_provider(AP_SLOTMEM_PROVIDER_GROUP, "shm",
                                          AP_SLOTMEM_PROVIDER_VERSION);
             if (!storage) {
-                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, s,
+                ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
                              "failed to lookup provider 'shm' for '%s', "
                              "maybe you need to load mod_slotmem_shm?",
                              AP_SLOTMEM_PROVIDER_GROUP);
@@ -692,7 +692,7 @@ static int hm_post_config(apr_pool_t *p,
             }
             storage->create(&slotmem, "mod_heartmonitor", sizeof(hm_slot_server_t),
maxworkers, AP_SLOTMEM_TYPE_PREGRAB, p);
             if (!slotmem) {
-                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, s, "slotmem_create
for status failed");
+                ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, "slotmem_create for status failed");
                 return !OK;
             }
         }

Modified: httpd/httpd/branches/2.4.x/modules/debugging/mod_dumpio.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/debugging/mod_dumpio.c?rev=1211669&r1=1211668&r2=1211669&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/debugging/mod_dumpio.c (original)
+++ httpd/httpd/branches/2.4.x/modules/debugging/mod_dumpio.c Wed Dec  7 22:06:41 2011
@@ -97,7 +97,7 @@ static void dumpit(ap_filter_t *f, apr_b
                  * within ap_log_error, and introduce new vformatter %-escapes
                  * for escaping text, and for binary text (fixed len strings).
                  */
-                ap_log_cerror(APLOG_MARK | APLOG_NOERRNO, APLOG_TRACE7, 0, c,
+                ap_log_cerror(APLOG_MARK, APLOG_TRACE7, 0, c,
                               "mod_dumpio:  %s (%s-%s): %.*s", f->frec->name,
                               (APR_BUCKET_IS_METADATA(b)) ? "metadata" : "data",
                               b->type->name, (int)logbytes, buf);

Modified: httpd/httpd/branches/2.4.x/modules/examples/mod_example_ipc.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/examples/mod_example_ipc.c?rev=1211669&r1=1211668&r2=1211669&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/examples/mod_example_ipc.c (original)
+++ httpd/httpd/branches/2.4.x/modules/examples/mod_example_ipc.c Wed Dec  7 22:06:41 2011
@@ -279,8 +279,8 @@ static int exipc_handler(request_rec *r)
          * and returned BUSY. So, bump the time and try again
          */
         timecamped += CAMPOUT;
-        ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_NOTICE,
-                     0, r->server, "Child %ld camping out on mutex for %" APR_INT64_T_FMT
+        ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, r->server,
+                     "Child %ld camping out on mutex for %" APR_INT64_T_FMT
                      " microseconds",
                      (long int) getpid(), timecamped);
     } /* Lock acquisition loop */

Modified: httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c?rev=1211669&r1=1211668&r2=1211669&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c (original)
+++ httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c Wed Dec  7 22:06:41 2011
@@ -397,7 +397,7 @@ static int remoteip_modify_request(reque
     r->client_addr = req->client_addr;
     r->client_ip = req->client_ip;
 
-    ap_log_rerror(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, r,
+    ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
                   req->proxy_ips
                       ? "Using %s as client's IP by proxies %s"
                       : "Using %s as client's IP by internal proxies",

Modified: httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c?rev=1211669&r1=1211668&r2=1211669&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c Wed Dec  7
22:06:41 2011
@@ -374,7 +374,7 @@ static int lb_hb_init(apr_pool_t *p, apr
     storage = ap_lookup_provider(AP_SLOTMEM_PROVIDER_GROUP, "shm",
                                  AP_SLOTMEM_PROVIDER_VERSION);
     if (!storage) {
-        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, s,
+        ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s,
                      "Failed to lookup provider 'shm' for '%s'. Maybe you "
                      "need to load mod_slotmem_shm?",
                      AP_SLOTMEM_PROVIDER_GROUP);
@@ -383,10 +383,12 @@ static int lb_hb_init(apr_pool_t *p, apr
 
     /* Try to use a slotmem created by mod_heartmonitor */
     storage->attach(&hm_serversmem, "mod_heartmonitor", &size, &num, p);
-    if (!hm_serversmem) {
-        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, s, "No slotmem from mod_heartmonitor");
-    } else
-        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, s, "Using slotmem from mod_heartmonitor");
+    if (!hm_serversmem)
+        ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s,
+                     "No slotmem from mod_heartmonitor");
+    else
+        ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s,
+                     "Using slotmem from mod_heartmonitor");
 
     if (hm_serversmem)
         ctx->path = "(slotmem)";

Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_util.c?rev=1211669&r1=1211668&r2=1211669&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/ssl_util.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_util.c Wed Dec  7 22:06:41 2011
@@ -292,7 +292,7 @@ STACK_OF(X509) *ssl_read_pkcs7(server_re
 
     p7 = PEM_read_PKCS7(f, NULL, NULL, NULL);
     if (!p7) {
-        ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s,
+        ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
                      "Can't read PKCS7 object %s", pkcs7);
         ssl_log_ssl_error(SSLLOG_MARK, APLOG_CRIT, s);
         exit(1);



Mime
View raw message