Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 75597 invoked from network); 16 Nov 2003 02:22:27 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 16 Nov 2003 02:22:27 -0000 Received: (qmail 33669 invoked by uid 500); 16 Nov 2003 02:22:09 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 33636 invoked by uid 500); 16 Nov 2003 02:22:09 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 33623 invoked by uid 500); 16 Nov 2003 02:22:09 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 33620 invoked from network); 16 Nov 2003 02:22:09 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 16 Nov 2003 02:22:09 -0000 Received: (qmail 75584 invoked by uid 1327); 16 Nov 2003 02:22:26 -0000 Date: 16 Nov 2003 02:22:26 -0000 Message-ID: <20031116022226.75583.qmail@minotaur.apache.org> From: jerenkrantz@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/ssl mod_ssl.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jerenkrantz 2003/11/15 18:22:26 Modified: include util_ldap.h modules/aaa mod_auth_digest.c modules/experimental mod_auth_ldap.c util_ldap.c util_ldap_cache.c util_ldap_cache.h util_ldap_cache_mgr.c server util_md5.c modules/ssl mod_ssl.c Log: Sync with APR-util deprecated functions. Revision Changes Path 1.13 +2 -2 httpd-2.0/include/util_ldap.h Index: util_ldap.h =================================================================== RCS file: /home/cvs/httpd-2.0/include/util_ldap.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -u -r1.12 -r1.13 --- util_ldap.h 6 Nov 2003 20:45:56 -0000 1.12 +++ util_ldap.h 16 Nov 2003 02:22:25 -0000 1.13 @@ -58,7 +58,7 @@ #include /* this whole thing disappears if LDAP is not enabled */ -#ifdef APU_HAS_LDAP +#if APR_HAS_LDAP /* APR header files */ #include @@ -328,5 +328,5 @@ */ char *util_ald_cache_display(apr_pool_t *pool, util_ldap_state_t *st); -#endif /* APU_HAS_LDAP */ +#endif /* APR_HAS_LDAP */ #endif /* UTIL_LDAP_H */ 1.80 +1 -1 httpd-2.0/modules/aaa/mod_auth_digest.c Index: mod_auth_digest.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_digest.c,v retrieving revision 1.79 retrieving revision 1.80 diff -u -u -r1.79 -r1.80 --- mod_auth_digest.c 13 Feb 2003 02:28:57 -0000 1.79 +++ mod_auth_digest.c 16 Nov 2003 02:22:25 -0000 1.80 @@ -164,7 +164,7 @@ unsigned long key; /* the key for this entry */ struct hash_entry *next; /* next entry in the bucket */ unsigned long nonce_count; /* for nonce-count checking */ - char ha1[2*MD5_DIGESTSIZE+1]; /* for algorithm=MD5-sess */ + char ha1[2*APR_MD5_DIGESTSIZE+1]; /* for algorithm=MD5-sess */ char last_nonce[NONCE_LEN+1]; /* for one-time nonce's */ } client_entry; 1.17 +1 -1 httpd-2.0/modules/experimental/mod_auth_ldap.c Index: mod_auth_ldap.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_auth_ldap.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -u -r1.16 -r1.17 --- mod_auth_ldap.c 6 May 2003 01:13:47 -0000 1.16 +++ mod_auth_ldap.c 16 Nov 2003 02:22:25 -0000 1.17 @@ -81,7 +81,7 @@ #include "http_request.h" #include "util_ldap.h" -#ifndef APU_HAS_LDAP +#if !APR_HAS_LDAP #error mod_auth_ldap requires APR-util to have LDAP support built in #endif 1.17 +1 -1 httpd-2.0/modules/experimental/util_ldap.c Index: util_ldap.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/experimental/util_ldap.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -u -r1.16 -r1.17 --- util_ldap.c 11 Nov 2003 19:10:56 -0000 1.16 +++ util_ldap.c 16 Nov 2003 02:22:25 -0000 1.17 @@ -77,7 +77,7 @@ #include #endif -#ifndef APU_HAS_LDAP +#if !APR_HAS_LDAP #error mod_ldap requires APR-util to have LDAP support built in #endif 1.11 +2 -2 httpd-2.0/modules/experimental/util_ldap_cache.c Index: util_ldap_cache.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/experimental/util_ldap_cache.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -u -r1.10 -r1.11 --- util_ldap_cache.c 11 Nov 2003 19:10:56 -0000 1.10 +++ util_ldap_cache.c 16 Nov 2003 02:22:25 -0000 1.11 @@ -64,7 +64,7 @@ #include "util_ldap.h" #include "util_ldap_cache.h" -#ifdef APU_HAS_LDAP +#if APR_HAS_LDAP #if APR_HAS_SHARED_MEMORY #define MODLDAP_SHMEM_CACHE "/tmp/mod_ldap_cache" @@ -331,4 +331,4 @@ } -#endif /* APU_HAS_LDAP */ +#endif /* APR_HAS_LDAP */ 1.9 +2 -2 httpd-2.0/modules/experimental/util_ldap_cache.h Index: util_ldap_cache.h =================================================================== RCS file: /home/cvs/httpd-2.0/modules/experimental/util_ldap_cache.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -u -r1.8 -r1.9 --- util_ldap_cache.h 11 Nov 2003 19:10:56 -0000 1.8 +++ util_ldap_cache.h 16 Nov 2003 02:22:25 -0000 1.9 @@ -61,7 +61,7 @@ */ /* this whole thing disappears if LDAP is not enabled */ -#ifdef APU_HAS_LDAP +#if APR_HAS_LDAP /* @@ -235,5 +235,5 @@ char *util_ald_cache_display_stats(apr_pool_t *p, util_ald_cache_t *cache, char *name); -#endif /* APU_HAS_LDAP */ +#endif /* APR_HAS_LDAP */ #endif /* APU_LDAP_CACHE_H */ 1.9 +2 -2 httpd-2.0/modules/experimental/util_ldap_cache_mgr.c Index: util_ldap_cache_mgr.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/experimental/util_ldap_cache_mgr.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -u -r1.8 -r1.9 --- util_ldap_cache_mgr.c 11 Nov 2003 19:10:56 -0000 1.8 +++ util_ldap_cache_mgr.c 16 Nov 2003 02:22:25 -0000 1.9 @@ -65,7 +65,7 @@ #include "util_ldap_cache.h" #include -#ifdef APU_HAS_LDAP +#if APR_HAS_LDAP /* only here until strdup is gone */ #include @@ -552,4 +552,4 @@ return buf; } -#endif /* APU_HAS_LDAP */ +#endif /* APR_HAS_LDAP */ 1.31 +3 -3 httpd-2.0/server/util_md5.c Index: util_md5.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/util_md5.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -u -r1.30 -r1.31 --- util_md5.c 17 Jul 2003 16:17:04 -0000 1.30 +++ util_md5.c 16 Nov 2003 02:22:25 -0000 1.31 @@ -96,7 +96,7 @@ { const char *hex = "0123456789abcdef"; apr_md5_ctx_t my_md5; - unsigned char hash[MD5_DIGESTSIZE]; + unsigned char hash[APR_MD5_DIGESTSIZE]; char *r, result[33]; /* (MD5_DIGESTSIZE * 2) + 1 */ int i; @@ -111,13 +111,13 @@ apr_md5_update(&my_md5, buf, (unsigned int)length); apr_md5_final(hash, &my_md5); - for (i = 0, r = result; i < MD5_DIGESTSIZE; i++) { + for (i = 0, r = result; i < APR_MD5_DIGESTSIZE; i++) { *r++ = hex[hash[i] >> 4]; *r++ = hex[hash[i] & 0xF]; } *r = '\0'; - return apr_pstrndup(p, result, MD5_DIGESTSIZE*2); + return apr_pstrndup(p, result, APR_MD5_DIGESTSIZE*2); } AP_DECLARE(char *) ap_md5(apr_pool_t *p, const unsigned char *string) 1.89 +1 -1 httpd-2.0/modules/ssl/mod_ssl.c Index: mod_ssl.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.c,v retrieving revision 1.88 retrieving revision 1.89 diff -u -u -r1.88 -r1.89 --- mod_ssl.c 30 Oct 2003 12:07:06 -0000 1.88 +++ mod_ssl.c 16 Nov 2003 02:22:25 -0000 1.89 @@ -397,7 +397,7 @@ sc->vhost_id_len); if (!SSL_set_session_id_context(ssl, (unsigned char *)vhost_md5, - MD5_DIGESTSIZE*2)) + APR_MD5_DIGESTSIZE*2)) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, c->base_server, "Unable to set session id context to `%s'", vhost_md5);