Return-Path: Delivered-To: apmail-apache-cvs-archive@apache.org Received: (qmail 21830 invoked by uid 500); 26 Jul 2000 15:31:32 -0000 Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm Precedence: bulk X-No-Archive: yes Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list apache-cvs@apache.org Received: (qmail 21819 invoked by uid 500); 26 Jul 2000 15:31:31 -0000 Delivered-To: apmail-apache-2.0-cvs@apache.org Date: 26 Jul 2000 15:31:31 -0000 Message-ID: <20000726153131.21815.qmail@locus.apache.org> From: rbb@locus.apache.org To: apache-2.0-cvs@apache.org Subject: cvs commit: apache-2.0/src/modules/standard mod_auth_digest.c mod_mime.c rbb 00/07/26 08:31:31 Modified: src/include ap_config.h http_config.h src/lib/apr configure.in src/lib/apr/include apr.h.in apr_lib.h src/main gen_test_char.c src/modules/dav/main opaquelock.c src/modules/standard mod_auth_digest.c mod_mime.c Log: Remove all of the ap_is* functions from Apache. They were already in APR, and we all hate duplicate code. :-) This also required adding ap_isascii to APR. Revision Changes Path 1.40 +1 -3 apache-2.0/src/include/ap_config.h Index: ap_config.h =================================================================== RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- ap_config.h 2000/06/27 21:35:27 1.39 +++ ap_config.h 2000/07/26 15:31:28 1.40 @@ -56,6 +56,7 @@ #define AP_AC_CONFIG_H #include "ap_mmn.h" /* MODULE_MAGIC_NUMBER_ */ +#include "apr_lib.h" /* ap_isfoo() macros */ /* Implemented flags for dynamic library bindings. * @@ -99,9 +100,6 @@ #include #include #endif - -/* ap_ versions of ctype macros to make sure they deal with 8-bit chars */ -#include "ap_ctype.h" #ifdef SIGWAIT_TAKES_ONE_ARG #define ap_sigwait(a,b) ((*(b)=sigwait((a)))<0?-1:0) 1.39 +6 -0 apache-2.0/src/include/http_config.h Index: http_config.h =================================================================== RCS file: /home/cvs/apache-2.0/src/include/http_config.h,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- http_config.h 2000/06/24 17:33:53 1.38 +++ http_config.h 2000/07/26 15:31:28 1.39 @@ -301,6 +301,12 @@ * It's mainly important for the DSO facility * (see also mod_so). */ + unsigned int module_type /* What type of module is this? Currently + * this can be: + * AP_MODULE_TYPE_MPM + * AP_MODULE_TYPE_STANDARD + * AP_MODULE_TYPE_PROTOCOL + */ void (*rewrite_args) (process_rec *process); void *(*create_dir_config) (ap_pool_t *p, char *dir); void *(*merge_dir_config) (ap_pool_t *p, void *base_conf, void *new_conf); 1.141 +2 -1 apache-2.0/src/lib/apr/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- configure.in 2000/07/24 23:28:02 1.140 +++ configure.in 2000/07/26 15:31:28 1.141 @@ -238,7 +238,7 @@ AC_CHECK_HEADERS(ByteOrder.h) AC_CHECK_HEADERS(conio.h) AC_CHECK_HEADERS(crypt.h) -AC_CHECK_HEADERS(ctype.h) +AC_CHECK_HEADERS(ctype.h, ctypeh="1", ctypeh="0") AC_CHECK_HEADERS(dir.h) AC_CHECK_HEADERS(dirent.h, direnth="1", dirent="0") AC_CHECK_HEADERS(errno.h, errnoh="1", errnoh="0") @@ -290,6 +290,7 @@ AC_CHECK_HEADERS(kernel/OS.h) +AC_SUBST(ctypeh) AC_SUBST(errnoh) AC_SUBST(direnth) AC_SUBST(fcntlh) 1.36 +1 -0 apache-2.0/src/lib/apr/include/apr.h.in Index: apr.h.in =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.h.in,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- apr.h.in 2000/07/25 01:06:26 1.35 +++ apr.h.in 2000/07/26 15:31:29 1.36 @@ -24,6 +24,7 @@ #define ENUM_BITFIELD(e,n,w) e n : w #endif +#define APR_HAVE_CTYPE_H @ctypeh@ #define APR_HAVE_ERRNO_H @errnoh@ #define APR_HAVE_DIRENT_H @direnth@ #define APR_HAVE_FCNTL_H @fcntlh@ 1.40 +4 -0 apache-2.0/src/lib/apr/include/apr_lib.h Index: apr_lib.h =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lib.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- apr_lib.h 2000/07/25 01:33:27 1.39 +++ apr_lib.h 2000/07/26 15:31:29 1.40 @@ -62,6 +62,9 @@ #include "apr_file_io.h" #include "apr_thread_proc.h" +#if APR_HAVE_CTYPE_H +#include +#endif #if APR_HAVE_STDARG_H #include #endif @@ -117,6 +120,7 @@ #define ap_isdigit(c) (isdigit(((unsigned char)(c)))) #define ap_isgraph(c) (isgraph(((unsigned char)(c)))) #define ap_islower(c) (islower(((unsigned char)(c)))) +#define ap_isascii(c) (isascii(((unsigned char)(c)))) #define ap_isprint(c) (isprint(((unsigned char)(c)))) #define ap_ispunct(c) (ispunct(((unsigned char)(c)))) #define ap_isspace(c) (isspace(((unsigned char)(c)))) 1.4 +1 -0 apache-2.0/src/main/gen_test_char.c Index: gen_test_char.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/gen_test_char.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gen_test_char.c 2000/03/31 08:44:19 1.3 +++ gen_test_char.c 2000/07/26 15:31:29 1.4 @@ -58,6 +58,7 @@ /* we need some of the portability definitions... for strchr */ #include "ap_config.h" +#include "apr_lib.h" #include "httpd.h" /* A bunch of functions in util.c scan strings looking for certain characters. 1.4 +1 -1 apache-2.0/src/modules/dav/main/opaquelock.c Index: opaquelock.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/dav/main/opaquelock.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- opaquelock.c 2000/06/28 11:23:53 1.3 +++ opaquelock.c 2000/07/26 15:31:30 1.4 @@ -87,7 +87,7 @@ #include "httpd.h" #include "apr_md5.h" -#include "ap_ctype.h" +#include "apr_lib.h" #include "mod_dav.h" #include "dav_opaquelock.h" 1.22 +1 -1 apache-2.0/src/modules/standard/mod_auth_digest.c Index: mod_auth_digest.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_digest.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mod_auth_digest.c 2000/07/25 00:58:20 1.21 +++ mod_auth_digest.c 2000/07/26 15:31:30 1.22 @@ -106,11 +106,11 @@ #include "http_request.h" #include "http_log.h" #include "http_protocol.h" -#include "ap_ctype.h" #include "util_uri.h" #include "util_md5.h" #include "ap_sha1.h" #include "ap_base64.h" +#include "apr_lib.h" #include "apr_time.h" #include "apr_errno.h" #include "apr_lock.h" 1.22 +1 -0 apache-2.0/src/modules/standard/mod_mime.c Index: mod_mime.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_mime.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mod_mime.c 2000/07/21 19:50:54 1.21 +++ mod_mime.c 2000/07/26 15:31:30 1.22 @@ -66,6 +66,7 @@ #define MIME_PRIVATE #include "apr_strings.h" +#include "apr_lib.h" #include "ap_config.h" #include "httpd.h" #include "http_config.h"