httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject cvs commit: httpd-2.0/modules/proxy mod_proxy.h
Date Sat, 10 Feb 2001 14:04:21 GMT
gstein      01/02/10 06:04:21

  Modified:    server   config.c config.m4 connection.c listen.c
                        util_filter.c util_uri.c
               server/mpm/mpmt_pthread mpmt_pthread.c
               server/mpm/prefork prefork.c
               modules/cache mod_file_cache.c
               modules/filters mod_include.c
               modules/generators mod_cgi.c mod_cgid.c
               modules/http http_core.c mod_mime.c
               modules/mappers mod_speling.c mod_userdir.c
                        mod_vhost_alias.c
               modules/metadata mod_cern_meta.c mod_env.c mod_expires.c
                        mod_headers.c mod_mime_magic.c mod_setenvif.c
                        mod_unique_id.c mod_usertrack.c
               modules/proxy mod_proxy.h
  Log:
  *) continued header revamping
  *) torch some headers (and some libs) from the autoconf stuff
  
  Revision  Changes    Path
  1.111     +4 -9      httpd-2.0/server/config.c
  
  Index: config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/config.c,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -u -r1.110 -r1.111
  --- config.c	2001/02/08 07:44:17	1.110
  +++ config.c	2001/02/10 14:04:17	1.111
  @@ -76,9 +76,9 @@
   #include "apr_portable.h"
   #include "apr_file_io.h"
   
  -#if APR_HAVE_STDIO_H
  -#include <stdio.h>
  -#endif
  +#define APR_WANT_STDIO
  +#define APR_WANT_STRFUNC
  +#include "apr_want.h"
   
   #define CORE_PRIVATE
   
  @@ -92,12 +92,7 @@
   #include "http_main.h"
   #include "http_vhost.h"
   #include "util_cfgtree.h"
  -#ifdef HAVE_ARPA_INET_H
  -#include <arpa/inet.h>
  -#endif
  -#ifdef HAVE_STRINGS_H
  -#include <strings.h>
  -#endif
  +
   
   AP_DECLARE_DATA const char *ap_server_argv0;
   
  
  
  
  1.9       +2 -22     httpd-2.0/server/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/config.m4,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -u -r1.8 -r1.9
  --- config.m4	2001/02/01 21:54:23	1.8
  +++ config.m4	2001/02/10 14:04:17	1.9
  @@ -1,7 +1,5 @@
   dnl ## Check for libraries
   
  -AC_DEFUN(APACHE_DEFINE_HAVE_CRYPT, [
  -])
   AC_CHECK_LIB(nsl, gethostname, [
    AC_ADD_LIBRARY(nsl) ], [])
   
  @@ -11,29 +9,13 @@
   AC_CHECK_LIB(nsl, gethostbyaddr, [
    AC_ADD_LIBRARY(nsl) ], [])
   
  -AC_CHECK_LIB(crypt, crypt, [
  - AC_ADD_LIBRARY(crypt) 
  -], [
  -  AC_CHECK_LIB(ufc, crypt, [
  -   AC_ADD_LIBRARY(ufc) 
  -  ], [])
  -])
   
   dnl ## Check for header files
   
  -AC_HEADER_STDC
  -AC_CHECK_HEADERS(
  -bstring.h \
  -crypt.h \
  -unistd.h \
  -sys/resource.h \
  -sys/select.h \
  -sys/processor.h \
  -)
  +AC_CHECK_HEADERS(bstring.h unistd.h)
   
   dnl ## Check for typedefs, structures, and compiler characteristics.
   
  -AC_TYPE_RLIM_T
   AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
   [AC_TRY_COMPILE([#include <sys/types.h>
   #include <$ac_cv_struct_tm>], [struct tm tm; tm.tm_gmtoff;],
  @@ -46,9 +28,7 @@
   
   dnl ## Check for library functions
   
  -AC_CHECK_FUNCS(
  -syslog \
  -)
  +AC_CHECK_FUNCS(syslog)
   
   dnl Obsolete scoreboard code uses this.
       AC_CHECK_HEADERS(sys/times.h)
  
  
  
  1.74      +3 -8      httpd-2.0/server/connection.c
  
  Index: connection.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/connection.c,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -u -r1.73 -r1.74
  --- connection.c	2001/02/08 07:44:17	1.73
  +++ connection.c	2001/02/10 14:04:17	1.74
  @@ -56,9 +56,11 @@
    * University of Illinois, Urbana-Champaign.
    */
   
  +#include "apr.h"
  +#include "apr_strings.h"
  +
   #define CORE_PRIVATE
   #include "ap_config.h"
  -#include "apr_strings.h"
   #include "httpd.h"
   #include "http_connection.h"
   #include "http_request.h"
  @@ -70,13 +72,6 @@
   #include "scoreboard.h"
   #include "http_log.h"
   #include "util_filter.h"
  -
  -#ifdef HAVE_NETINET_IN_H
  -#include <netinet/in.h>
  -#endif
  -#ifdef HAVE_ARPA_INET_H
  -#include <arpa/inet.h>
  -#endif
   
   APR_HOOK_STRUCT(
   	    APR_HOOK_LINK(pre_connection)
  
  
  
  1.48      +5 -4      httpd-2.0/server/listen.c
  
  Index: listen.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/listen.c,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -u -r1.47 -r1.48
  --- listen.c	2001/02/08 07:44:17	1.47
  +++ listen.c	2001/02/10 14:04:17	1.48
  @@ -57,19 +57,20 @@
    */
   
   #include "apr_network_io.h"
  +#include "apr_strings.h"
  +
  +#define APR_WANT_STRFUNC
  +#include "apr_want.h"
   
   #define CORE_PRIVATE
   #include "ap_config.h"
   #include "httpd.h"
   #include "http_config.h"
   #include "ap_listen.h"
  -#include "apr_strings.h"
   #include "http_log.h"
   #include "mpm.h"
   #include "mpm_common.h"
  -#ifdef HAVE_STRING_H
  -#include <string.h>
  -#endif
  +
   
   ap_listen_rec *ap_listeners;
   #if APR_HAVE_IPV6
  
  
  
  1.51      +3 -4      httpd-2.0/server/util_filter.c
  
  Index: util_filter.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/util_filter.c,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -u -r1.50 -r1.51
  --- util_filter.c	2001/02/09 22:57:50	1.50
  +++ util_filter.c	2001/02/10 14:04:17	1.51
  @@ -52,13 +52,12 @@
    * <http://www.apache.org/>.
    */
   
  +#define APR_WANT_STRFUNC
  +#include "apr_want.h"
  +
   #include "httpd.h"
   #include "http_log.h"
   #include "util_filter.h"
  -
  -#ifdef HAVE_STRINGS_H
  -#include <strings.h>
  -#endif
   
   /* ### make this visible for direct manipulation?
    * ### use a hash table
  
  
  
  1.22      +6 -10     httpd-2.0/server/util_uri.c
  
  Index: util_uri.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/util_uri.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -u -r1.21 -r1.22
  --- util_uri.c	2000/12/18 17:51:59	1.21
  +++ util_uri.c	2001/02/10 14:04:17	1.22
  @@ -61,20 +61,16 @@
    * 
    */
   
  -#include "ap_config.h"
  +#include "apr.h"
   #include "apr_strings.h"
  +
  +#define APR_WANT_STRFUNC
  +#include "apr_want.h"
  +
  +#include "ap_config.h"
   #include "httpd.h"
   #include "http_log.h"
   #include "util_uri.h"
  -#ifdef HAVE_STRING_H
  -#include <string.h>
  -#endif
  -#ifdef HAVE_STRINGS_H
  -#include <strings.h>
  -#endif
  -#ifdef HAVE_NETDB_H
  -#include <netdb.h>
  -#endif
   
   /* Some WWW schemes and their default ports; this is basically /etc/services */
   /* This will become global when the protocol abstraction comes */
  
  
  
  1.144     +12 -8     httpd-2.0/server/mpm/mpmt_pthread/mpmt_pthread.c
  
  Index: mpmt_pthread.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_pthread/mpmt_pthread.c,v
  retrieving revision 1.143
  retrieving revision 1.144
  diff -u -u -r1.143 -r1.144
  --- mpmt_pthread.c	2001/02/09 16:11:48	1.143
  +++ mpmt_pthread.c	2001/02/10 14:04:18	1.144
  @@ -56,12 +56,21 @@
    * University of Illinois, Urbana-Champaign.
    */
   
  -#define CORE_PRIVATE 
  - 
  +#include "apr.h"
   #include "apr_portable.h"
   #include "apr_strings.h"
   #include "apr_file_io.h"
   #include "apr_thread_proc.h"
  +
  +#if APR_HAVE_SYS_SOCKET_H
  +#include <sys/socket.h>
  +#endif
  +#if APR_HAVE_SYS_WAIT_H
  +#include <sys/wait.h> 
  +#endif
  +
  +#define CORE_PRIVATE 
  + 
   #include "ap_config.h"
   #include "httpd.h" 
   #include "http_main.h" 
  @@ -77,13 +86,8 @@
   
   #ifdef HAVE_NETINET_TCP_H
   #include <netinet/tcp.h>
  -#endif
  -#ifdef HAVE_SYS_SOCKET_H
  -#include <sys/socket.h>
   #endif
  -#ifdef HAVE_SYS_WAIT_H
  -#include <sys/wait.h> 
  -#endif
  +
   #include <pthread.h>
   #include <signal.h>
   
  
  
  
  1.159     +8 -19     httpd-2.0/server/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
  retrieving revision 1.158
  retrieving revision 1.159
  diff -u -u -r1.158 -r1.159
  --- prefork.c	2001/02/09 16:11:50	1.158
  +++ prefork.c	2001/02/10 14:04:18	1.159
  @@ -89,14 +89,15 @@
   #include "apr_strings.h"
   #include "apr_thread_proc.h"
   
  -#if APR_HAVE_STDIO_H
  -#include <stdio.h>              /* for perror() */
  -#endif
  -#if APR_HAVE_SYS_WAIT_H
  -#include <sys/wait.h>
  +#define APR_WANT_STDIO
  +#define APR_WANT_STRFUNC
  +#include "apr_want.h"
  +
  +#if APR_HAVE_UNISTD_H
  +#include <unistd.h>
   #endif
  -#if APR_HAVE_SYS_SOCKET_H
  -#include <sys/socket.h>
  +#if APR_HAVE_SYS_TYPES_H
  +#include <sys/types.h>
   #endif
   
   #define CORE_PRIVATE
  @@ -115,21 +116,9 @@
   #include "mpm_common.h"
   #include "ap_listen.h"
   #include "ap_mmn.h"
  -#ifdef HAVE_SYS_TYPES_H
  -#include <sys/types.h>
  -#endif
  -#ifdef HAVE_UNISTD_H
  -#include <unistd.h>
  -#endif
  -#ifdef HAVE_NETINET_TCP_H
  -#include <netinet/tcp.h>	/* for TCP_NODELAY */
  -#endif
   
   #ifdef HAVE_BSTRING_H
   #include <bstring.h>		/* for IRIX, FD_SET calls bzero() */
  -#endif
  -#ifdef HAVE_STRINGS_H
  -#include <strings.h> 
   #endif
   #ifdef HAVE_TIME_H
   #include <time.h>
  
  
  
  1.45      +8 -9      httpd-2.0/modules/cache/mod_file_cache.c
  
  Index: mod_file_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/cache/mod_file_cache.c,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -u -r1.44 -r1.45
  --- mod_file_cache.c	2001/02/08 07:43:59	1.44
  +++ mod_file_cache.c	2001/02/10 14:04:18	1.45
  @@ -109,15 +109,16 @@
       an extra stat() that's a waste.
   */
   
  -#ifdef HAVE_STDIOP_H
  -#include <stdio.h>
  -#endif
  -#ifdef HAVE_SYS_TYPES_H
  +#include "apr.h"
  +#include "apr_mmap.h"
  +#include "apr_strings.h"
  +
  +#define APR_WANT_STRFUNC
  +#include "apr_want.h"
  +
  +#if APR_HAVE_SYS_TYPES_H
   #include <sys/types.h>
   #endif
  -#ifdef HAVE_STRING_H
  -#include <string.h>
  -#endif
   
   #define CORE_PRIVATE
   
  @@ -127,8 +128,6 @@
   #include "http_protocol.h"
   #include "http_request.h"
   #include "http_core.h"
  -#include "apr_mmap.h"
  -#include "apr_strings.h"
   
   module AP_MODULE_DECLARE_DATA file_cache_module;
   
  
  
  
  1.97      +4 -7      httpd-2.0/modules/filters/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -u -r1.96 -r1.97
  --- mod_include.c	2001/02/10 13:05:24	1.96
  +++ mod_include.c	2001/02/10 14:04:18	1.97
  @@ -70,6 +70,10 @@
   #include "apr_hash.h"
   #include "apr_user.h"
   #include "apr_lib.h"
  +#include "apr_optional.h"
  +
  +#define APR_WANT_STRFUNC
  +#include "apr_want.h"
   
   #define CORE_PRIVATE
   
  @@ -84,14 +88,7 @@
   #include "http_main.h"
   #include "util_script.h"
   #include "http_core.h"
  -#include "apr_optional.h"
   #include "mod_include.h"
  -#ifdef HAVE_STRING_H
  -#include <string.h>
  -#endif
  -#ifdef HAVE_STRINGS_H
  -#include <strings.h>
  -#endif
   #include "util_ebcdic.h"
   
   module AP_MODULE_DECLARE_DATA includes_module;
  
  
  
  1.87      +6 -8      httpd-2.0/modules/generators/mod_cgi.c
  
  Index: mod_cgi.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgi.c,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -u -r1.86 -r1.87
  --- mod_cgi.c	2001/02/10 03:03:17	1.86
  +++ mod_cgi.c	2001/02/10 14:04:19	1.87
  @@ -72,10 +72,14 @@
   #include "apr.h"
   #include "apr_strings.h"
   #include "apr_thread_proc.h"    /* for RLIMIT stuff */
  +#include "apr_optional.h"
  +#include "apr_buckets.h"
  +
  +#define APR_WANT_STRFUNC
  +#include "apr_want.h"
   
   #define CORE_PRIVATE
   
  -#include "apr_buckets.h"
   #include "util_filter.h"
   #include "ap_config.h"
   #include "httpd.h"
  @@ -87,14 +91,8 @@
   #include "http_log.h"
   #include "util_script.h"
   #include "ap_mpm.h"
  -#include "apr_optional.h"
   #include "../filters/mod_include.h"
  -#ifdef HAVE_STRING_H
  -#include <string.h>
  -#endif
  -#ifdef HAVE_STRINGS_H
  -#include <strings.h>
  -#endif
  +
   
   module AP_MODULE_DECLARE_DATA cgi_module;
   
  
  
  
  1.71      +20 -15    httpd-2.0/modules/generators/mod_cgid.c
  
  Index: mod_cgid.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgid.c,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -u -r1.70 -r1.71
  --- mod_cgid.c	2001/02/10 03:03:18	1.70
  +++ mod_cgid.c	2001/02/10 14:04:19	1.71
  @@ -69,16 +69,29 @@
    * they fail. 
    */ 
   
  -
  -
  -#define CORE_PRIVATE 
  -
   #include "apr_lib.h"
   #include "apr_strings.h"
   #include "apr_general.h"
   #include "apr_file_io.h"
   #include "apr_portable.h"
   #include "apr_buckets.h"
  +#include "apr_optional.h"
  +
  +#define APR_WANT_STRFUNC
  +#include "apr_want.h"
  +
  +#if APR_HAVE_SYS_SOCKET_H
  +#include <sys/socket.h>
  +#endif
  +#if APR_HAVE_UNISTD_H
  +#include <unistd.h>
  +#endif
  +#if APR_HAVE_SYS_TYPES_H
  +#include <sys/types.h>
  +#endif
  +
  +#define CORE_PRIVATE 
  +
   #include "util_filter.h"
   #include "httpd.h" 
   #include "http_config.h" 
  @@ -91,20 +104,12 @@
   #include "ap_mpm.h"
   #include "unixd.h"
   #include "mod_suexec.h"
  -#include "apr_optional.h"
   #include "../filters/mod_include.h"
  +
  +/* ### should be tossed in favor of APR */
   #include <sys/stat.h>
  -#ifdef HAVE_SYS_SOCKET_H
  -#include <sys/socket.h>
  -#endif
  -#ifdef HAVE_UNISTD_H
  -#include <unistd.h>
  -#endif
  -#ifdef HAVE_STRINGS_H
  -#include <strings.h>
  -#endif
   #include <sys/un.h> /* for sockaddr_un */
  -#include <sys/types.h>
  +
   
   module AP_MODULE_DECLARE_DATA cgid_module; 
   
  
  
  
  1.257     +0 -7      httpd-2.0/modules/http/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_core.c,v
  retrieving revision 1.256
  retrieving revision 1.257
  diff -u -u -r1.256 -r1.257
  --- http_core.c	2001/02/10 00:33:38	1.256
  +++ http_core.c	2001/02/10 14:04:19	1.257
  @@ -87,13 +87,6 @@
   
   #include "mod_core.h"
   
  -#ifdef HAVE_SYS_SOCKET_H
  -#include <sys/socket.h>
  -#endif
  -#ifdef HAVE_ARPA_INET_H
  -#include <arpa/inet.h>
  -#endif
  -
   
   /* LimitXMLRequestBody handling */
   #define AP_LIMIT_UNSET                  ((long) -1)
  
  
  
  1.37      +6 -5      httpd-2.0/modules/http/mod_mime.c
  
  Index: mod_mime.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/mod_mime.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -u -r1.36 -r1.37
  --- mod_mime.c	2001/02/10 05:30:51	1.36
  +++ mod_mime.c	2001/02/10 14:04:19	1.37
  @@ -63,18 +63,19 @@
    * 
    */
   
  -#define MIME_PRIVATE
  -
  +#include "apr.h"
   #include "apr_strings.h"
   #include "apr_lib.h"
  +
  +#define APR_WANT_STRFUNC
  +#include "apr_want.h"
  +
   #include "ap_config.h"
   #include "httpd.h"
   #include "http_config.h"
   #include "http_log.h"
   #include "http_request.h"
  -#ifdef HAVE_STRING_H
  -#include <string.h>
  -#endif
  +
   
   /* XXXX - fix me / EBCDIC
    *        there was a cludge here which would use its
  
  
  
  1.30      +7 -6      httpd-2.0/modules/mappers/mod_speling.c
  
  Index: mod_speling.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_speling.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -u -r1.29 -r1.30
  --- mod_speling.c	2001/02/08 07:44:06	1.29
  +++ mod_speling.c	2001/02/10 14:04:19	1.30
  @@ -56,6 +56,13 @@
    * University of Illinois, Urbana-Champaign.
    */
   
  +#include "apr.h"
  +#include "apr_file_io.h"
  +#include "apr_strings.h"
  +
  +#define APR_WANT_STRFUNC
  +#include "apr_want.h"
  +
   #define WANT_BASENAME_MATCH
   
   #include "httpd.h"
  @@ -63,12 +70,6 @@
   #include "http_config.h"
   #include "http_request.h"
   #include "http_log.h"
  -#include "apr_file_io.h"
  -#include "apr_strings.h"
  -
  -#ifdef HAVE_STRINGS_H
  -#include <strings.h>
  -#endif
   
   /* mod_speling.c - by Alexei Kosut <akosut@organic.com> June, 1996
    *
  
  
  
  1.35      +14 -10    httpd-2.0/modules/mappers/mod_userdir.c
  
  Index: mod_userdir.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_userdir.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -u -r1.34 -r1.35
  --- mod_userdir.c	2001/02/08 07:44:06	1.34
  +++ mod_userdir.c	2001/02/10 14:04:20	1.35
  @@ -91,25 +91,29 @@
    * disabled, except those explicitly turned on with the "enabled" keyword.
    */
   
  -#if !defined(WIN32) && !defined(OS2) && !defined(BEOS)
  -#define HAVE_UNIX_SUEXEC
  -#endif
  -
   #include "apr_strings.h"
   #include "apr_user.h"
  +
  +#define APR_WANT_STRFUNC
  +#include "apr_want.h"
  +
  +#if APR_HAVE_UNISTD_H
  +#include <unistd.h>
  +#endif
  +
   #include "ap_config.h"
   #include "httpd.h"
   #include "http_config.h"
   #include "http_request.h"
  +
  +#if !defined(WIN32) && !defined(OS2) && !defined(BEOS)
  +#define HAVE_UNIX_SUEXEC
  +#endif
  +
   #ifdef HAVE_UNIX_SUEXEC
   #include "unixd.h"        /* Contains the suexec_identity hook used on Unix */
   #endif
  -#ifdef HAVE_UNISTD_H
  -#include <unistd.h>
  -#endif
  -#ifdef HAVE_STRINGS_H
  -#include <strings.h>
  -#endif
  +
   
   /* The default directory in user's home dir */
   #ifndef DEFAULT_USER_DIR
  
  
  
  1.22      +5 -3      httpd-2.0/modules/mappers/mod_vhost_alias.c
  
  Index: mod_vhost_alias.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_vhost_alias.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -u -r1.21 -r1.22
  --- mod_vhost_alias.c	2001/01/19 07:04:23	1.21
  +++ mod_vhost_alias.c	2001/02/10 14:04:20	1.22
  @@ -75,16 +75,18 @@
    * both written by James Grinter <jrg@blodwen.demon.co.uk>.
    */
   
  +#include "apr.h"
   #include "apr_strings.h"
   #include "apr_hooks.h"
  +
  +#define APR_WANT_STRFUNC
  +#include "apr_want.h"
  +
   #include "httpd.h"
   #include "http_config.h"
   #include "http_core.h"
   #include "http_request.h"  /* for ap_hook_translate_name */
   
  -#ifdef HAVE_STRINGS_H
  -#include <strings.h>
  -#endif
   
   module AP_MODULE_DECLARE_DATA vhost_alias_module;
   
  
  
  
  1.31      +10 -7     httpd-2.0/modules/metadata/mod_cern_meta.c
  
  Index: mod_cern_meta.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_cern_meta.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -u -r1.30 -r1.31
  --- mod_cern_meta.c	2001/02/08 07:44:07	1.30
  +++ mod_cern_meta.c	2001/02/10 14:04:20	1.31
  @@ -149,20 +149,23 @@
    * 29.Jun.96 All directives made per-directory.
    */
   
  +#include "apr.h"
  +#include "apr_strings.h"
  +
  +#define APR_WANT_STRFUNC
  +#include "apr_want.h"
  +
  +#if APR_HAVE_SYS_TYPES_H
  +#include <sys/types.h>
  +#endif
  +
   #include "ap_config.h"
   #include "httpd.h"
   #include "http_config.h"
   #include "util_script.h"
   #include "http_log.h"
   #include "http_request.h"
  -#include "apr_strings.h"
   
  -#ifdef HAVE_SYS_TYPES_H
  -#include <sys/types.h>
  -#endif
  -#ifdef HAVE_STRINGS_H
  -#include <strings.h>
  -#endif
   
   #define DIR_CMD_PERMS OR_INDEXES
   
  
  
  
  1.21      +7 -3      httpd-2.0/modules/metadata/mod_env.c
  
  Index: mod_env.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_env.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -u -r1.20 -r1.21
  --- mod_env.c	2001/02/08 07:44:07	1.20
  +++ mod_env.c	2001/02/10 14:04:20	1.21
  @@ -99,14 +99,18 @@
    *       *** older versions of the module.                        ***
    */
   
  +#include "apr.h"
   #include "apr_strings.h"
  +
  +#if APR_HAVE_STDLIB_H
  +#include <stdlib.h>
  +#endif
  +
   #include "ap_config.h"
   #include "httpd.h"
   #include "http_config.h"
   #include "http_request.h"
  -#ifdef HAVE_STDLIB_H
  -#include <stdlib.h>
  -#endif
  +
   
   typedef struct {
       apr_table_t *vars;
  
  
  
  1.30      +7 -7      httpd-2.0/modules/metadata/mod_expires.c
  
  Index: mod_expires.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_expires.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -u -r1.29 -r1.30
  --- mod_expires.c	2001/02/08 07:44:08	1.29
  +++ mod_expires.c	2001/02/10 14:04:20	1.30
  @@ -193,18 +193,18 @@
    * Hi, welcome to the internet.
    */
   
  +#include "apr.h"
  +#include "apr_strings.h"
  +#include "apr_lib.h"
  +
  +#define APR_WANT_STRFUNC
  +#include "apr_want.h"
  +
   #include "ap_config.h"
  -#ifdef HAVE_CTYPE_H
  -#include <ctype.h>
  -#endif
  -#ifdef HAVE_STRINGS_H
  -#include <strings.h>
  -#endif
   #include "httpd.h"
   #include "http_config.h"
   #include "http_log.h"
   #include "http_request.h"
  -#include "apr_strings.h"
   
   typedef struct {
       int active;
  
  
  
  1.19      +5 -3      httpd-2.0/modules/metadata/mod_headers.c
  
  Index: mod_headers.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_headers.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -u -r1.18 -r1.19
  --- mod_headers.c	2001/02/08 07:44:08	1.18
  +++ mod_headers.c	2001/02/10 14:04:20	1.19
  @@ -102,14 +102,16 @@
    *
    */
   
  +#include "apr.h"
   #include "apr_strings.h"
  +
  +#define APR_WANT_STRFUNC
  +#include "apr_want.h"
  +
   #include "httpd.h"
   #include "http_config.h"
   #include "http_request.h"
   
  -#ifdef HAVE_STRINGS_H
  -#include <strings.h>
  -#endif
   
   typedef enum {
       hdr_add = 'a',              /* add header (could mean multiple hdrs) */
  
  
  
  1.40      +8 -3      httpd-2.0/modules/metadata/mod_mime_magic.c
  
  Index: mod_mime_magic.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_mime_magic.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -u -r1.39 -r1.40
  --- mod_mime_magic.c	2001/02/09 18:34:24	1.39
  +++ mod_mime_magic.c	2001/02/10 14:04:20	1.40
  @@ -124,7 +124,13 @@
    *
    */
   
  +#include "apr.h"
   #include "apr_strings.h"
  +
  +#if APR_HAVE_UNISTD_H
  +#include <unistd.h>
  +#endif
  +
   #include "ap_config.h"
   #include "httpd.h"
   #include "http_config.h"
  @@ -133,9 +139,8 @@
   #include "http_log.h"
   #include "http_protocol.h"
   #include "util_script.h"
  -#ifdef HAVE_UNISTD_H
  -#include <unistd.h>
  -#endif
  +
  +/* ### this isn't set by configure? does anybody set this? */
   #ifdef HAVE_UTIME_H
   #include <utime.h>
   #endif
  
  
  
  1.24      +6 -3      httpd-2.0/modules/metadata/mod_setenvif.c
  
  Index: mod_setenvif.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_setenvif.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -u -r1.23 -r1.24
  --- mod_setenvif.c	2001/02/08 07:44:08	1.23
  +++ mod_setenvif.c	2001/02/10 14:04:20	1.24
  @@ -115,16 +115,19 @@
    *    SetEnvIf remote_addr (127.0.0.1|192.168.10.) LOCAL
    */
   
  +#include "apr.h"
   #include "apr_strings.h"
  +
  +#define APR_WANT_STRFUNC
  +#include "apr_want.h"
  +
   #include "ap_config.h"
   #include "httpd.h"
   #include "http_config.h"
   #include "http_core.h"
   #include "http_log.h"
   #include "http_protocol.h"
  -#ifdef HAVE_STRINGS_H
  -#include <strings.h>
  -#endif
  +
   
   enum special {
       SPECIAL_NOT,
  
  
  
  1.25      +2 -14     httpd-2.0/modules/metadata/mod_unique_id.c
  
  Index: mod_unique_id.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_unique_id.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -u -r1.24 -r1.25
  --- mod_unique_id.c	2001/02/08 07:44:08	1.24
  +++ mod_unique_id.c	2001/02/10 14:04:20	1.25
  @@ -63,25 +63,13 @@
    * UUencoding modified by: Alvaro Martinez Echevarria <alvaro@lander.es>
    */
   
  +#include "apr_general.h"    /* for XtOffsetOf                */
  +
   #include "httpd.h"
   #include "http_config.h"
   #include "http_log.h"
   #include "http_protocol.h"  /* for ap_hook_post_read_request */
   
  -#include "apr_general.h"    /* for XtOffsetOf                */
  -
  -#ifdef HAVE_NETDB_H
  -#include <netdb.h>
  -#endif
  -#ifdef HAVE_UNISTD_H
  -#include <unistd.h>
  -#endif
  -#ifdef HAVE_NETINET_IN_H
  -#include <netinet/in.h>
  -#endif
  -#ifdef HAVE_ARPA_INET_H
  -#include <arpa/inet.h>
  -#endif
   
   typedef struct {
       unsigned int stamp;
  
  
  
  1.27      +6 -4      httpd-2.0/modules/metadata/mod_usertrack.c
  
  Index: mod_usertrack.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_usertrack.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -u -r1.26 -r1.27
  --- mod_usertrack.c	2001/02/08 07:44:08	1.26
  +++ mod_usertrack.c	2001/02/10 14:04:20	1.27
  @@ -100,15 +100,17 @@
    * This file replaces mod_cookies.c
    */
   
  +#include "apr.h"
  +#include "apr_strings.h"
  +
  +#define APR_WANT_STRFUNC
  +#include "apr_want.h"
  +
   #include "httpd.h"
   #include "http_config.h"
   #include "http_core.h"
   #include "http_request.h"
  -#include "apr_strings.h"
   
  -#ifdef HAVE_STRINGS_H
  -#include <strings.h>
  -#endif
   
   module AP_MODULE_DECLARE_DATA usertrack_module;
   
  
  
  
  1.25      +10 -12    httpd-2.0/modules/proxy/mod_proxy.h
  
  Index: mod_proxy.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.h,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -u -r1.24 -r1.25
  --- mod_proxy.h	2001/02/07 05:40:12	1.24
  +++ mod_proxy.h	2001/02/10 14:04:21	1.25
  @@ -88,29 +88,27 @@
   #define TESTING	0
   #undef EXPLAIN
   
  -#include "httpd.h"
  -#include "http_config.h"
  -#include "http_protocol.h"
  -#include "proxy_cache.h"
  -
   #include "apr_compat.h"
   #include "apr_strings.h"
   
  -#ifdef HAVE_NETDB_H
  +#if APR_HAVE_NETDB_H
   #include <netdb.h>
   #endif
  -
  -#ifdef HAVE_SYS_SOCKET_H
  +#if APR_HAVE_SYS_SOCKET_H
   #include <sys/socket.h>
   #endif
  -
  -#ifdef HAVE_NETINET_IN_H
  +#if APR_HAVE_NETINET_IN_H
   #include <netinet/in.h>
   #endif
  -
  -#ifdef HAVE_ARPA_INET_H
  +#if APR_HAVE_ARPA_INET_H
   #include <arpa/inet.h>
   #endif
  +
  +#include "httpd.h"
  +#include "http_config.h"
  +#include "http_protocol.h"
  +#include "proxy_cache.h"
  +
   
   extern module AP_MODULE_DECLARE_DATA proxy_module;
   
  
  
  

Mime
View raw message