Merge r599651, r608508, r611376 from trunk:

Get rid of some compiler warnings.

* Silence a compiler warning by using the correct format.

* Hex pids are bogus anyway and on environments with APR_PID_T_FMT d this
  breaks and print x.

Submitted by: rpluem
Reviewed by: rpluem, covener, trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@614661 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 7906bd25c77c6cd4323661fd3a5f6dc463259ea7..6fddb1fa5bc93af6feb10829c378b4be47c8ae5d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -88,15 +88,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         http://people.apache.org/~trawick/r529626_to_22x.txt
       +1: trawick, rpluem, covener
 
-  * various modules: Silence some compiler warnings
-      Trunk version of patch:
-         http://svn.apache.org/viewvc?rev=599651&view=rev
-         http://svn.apache.org/viewvc?rev=608508&view=rev
-         http://svn.apache.org/viewvc?rev=611376&view=rev
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem, covener, trawick
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index 2f6519310b8a7d81c63a9f68a3fce8bd9027a90f..b04511f4b8a8653d9c096ea742b3fd2ba1ffe828 100644 (file)
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -212,7 +212,9 @@ static int uldap_connection_init(request_rec *r,
     int rc = 0, ldap_option = 0;
     int version  = LDAP_VERSION3;
     apr_ldap_err_t *result = NULL;
+#ifdef LDAP_OPT_NETWORK_TIMEOUT
     struct timeval timeOut = {10,0};    /* 10 second connection timeout */
+#endif
     util_ldap_state_t *st =
         (util_ldap_state_t *)ap_get_module_config(r->server->module_config,
         &ldap_module);
@@ -1773,9 +1775,11 @@ static const char *util_ldap_set_connection_timeout(cmd_parms *cmd,
                                                     void *dummy,
                                                     const char *ttl)
 {
+#ifdef LDAP_OPT_NETWORK_TIMEOUT
     util_ldap_state_t *st =
         (util_ldap_state_t *)ap_get_module_config(cmd->server->module_config,
                                                   &ldap_module);
+#endif
     const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
 
     if (err != NULL) {

diff --git a/modules/loggers/mod_log_forensic.c b/modules/loggers/mod_log_forensic.c
index 3fad35a70b8ae3a20534cbe92a13a6b164ec2023..f44f0b465ebdd203d5957f3af1603edf499c5b66 100644 (file)
--- a/modules/loggers/mod_log_forensic.c
+++ b/modules/loggers/mod_log_forensic.c
@@ -195,8 +195,8 @@ static int log_before(request_rec *r)
     if (!(id = apr_table_get(r->subprocess_env, "UNIQUE_ID"))) {
         /* we make the assumption that we can't go through all the PIDs in
            under 1 second */
-        id = apr_psprintf(r->pool, "%x:%lx:%x", getpid(), time(NULL),
-                          apr_atomic_inc32(&next_id));
+        id = apr_psprintf(r->pool, "%" APR_PID_T_FMT ":%lx:%x", getpid(), 
+                          time(NULL), apr_atomic_inc32(&next_id));
     }
     ap_set_module_config(r->request_config, &log_forensic_module, (char *)id);