httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-2.0/src/modules/standard mod_access.c mod_auth_db.c mod_autoindex.c mod_cern_meta.c mod_cgi.c mod_env.c mod_expires.c mod_imap.c mod_include.c mod_log_config.c mod_mime.c mod_mime_magic.c mod_negotiation.c mod_rewrite.c mod_userdir.c
Date Wed, 19 Jan 2000 02:43:09 GMT
rbb         00/01/18 18:43:02

  Modified:    src/include httpd.h
               src/modules/standard mod_access.c mod_auth_db.c
                        mod_autoindex.c mod_cern_meta.c mod_cgi.c mod_env.c
                        mod_expires.c mod_imap.c mod_include.c
                        mod_log_config.c mod_mime.c mod_mime_magic.c
                        mod_negotiation.c mod_rewrite.c mod_userdir.c
  Log:
  Manoj has been pushing for this for a while, but I've been too dense
  to understand that he was right.  :-)  Basically, this makes the modules
  use ap_config to test for header file inclusion.  This method is not to
  be used for larger modules that run autoconf theirselves.  Including
  ap_config is only valid for modules which rely on Apache to do their
  configuration.  Currently, this is only the core modules.
  
  Revision  Changes    Path
  1.20      +1 -1      apache-2.0/src/include/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- httpd.h	2000/01/19 01:14:31	1.19
  +++ httpd.h	2000/01/19 02:41:49	1.20
  @@ -377,7 +377,7 @@
   API_EXPORT(const char *) ap_get_server_version(void);
   API_EXPORT(void) ap_add_version_component(const char *component);
   #else
  -#define ap_get_server_version()	(SERVER_BASEVERSION)
  +#define ap_get_server_version()	(AP_SERVER_BASEVERSION)
   #define ap_add_version_component(x) ((void)0)
   #endif
   API_EXPORT(const char *) ap_get_server_built(void);
  
  
  
  1.6       +3 -0      apache-2.0/src/modules/standard/mod_access.c
  
  Index: mod_access.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_access.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_access.c	2000/01/18 23:41:51	1.5
  +++ mod_access.c	2000/01/19 02:41:52	1.6
  @@ -63,12 +63,15 @@
    */
   
   #include "apr_network_io.h"
  +#include "ap_config.h"
   #include "httpd.h"
   #include "http_core.h"
   #include "http_config.h"
   #include "http_log.h"
   #include "http_request.h"
  +#ifdef HAVE_STRING_H
   #include <string.h>
  +#endif
   
   enum allowdeny_type {
       T_ENV,
  
  
  
  1.6       +3 -0      apache-2.0/src/modules/standard/mod_auth_db.c
  
  Index: mod_auth_db.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_db.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_auth_db.c	1999/10/22 16:01:24	1.5
  +++ mod_auth_db.c	2000/01/19 02:41:53	1.6
  @@ -90,12 +90,15 @@
    *         no control is passed along.
    */
   
  +#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_DB_H
   #include <db.h>
  +#endif
   
   #if defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 2)
   #define DB2
  
  
  
  1.22      +3 -0      apache-2.0/src/modules/standard/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_autoindex.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- mod_autoindex.c	2000/01/18 23:41:52	1.21
  +++ mod_autoindex.c	2000/01/19 02:41:53	1.22
  @@ -64,6 +64,7 @@
    * Adapted to Apache by rst.
    */
   
  +#include "ap_config.h"
   #include "httpd.h"
   #include "http_config.h"
   #include "http_core.h"
  @@ -73,7 +74,9 @@
   #include "http_main.h"
   #include "util_script.h"
   #include "apr_fnmatch.h"
  +#ifdef HAVE_STRING_H
   #include <string.h>
  +#endif
   
   module MODULE_VAR_EXPORT autoindex_module;
   
  
  
  
  1.8       +7 -2      apache-2.0/src/modules/standard/mod_cern_meta.c
  
  Index: mod_cern_meta.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cern_meta.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_cern_meta.c	2000/01/10 15:35:51	1.7
  +++ mod_cern_meta.c	2000/01/19 02:41:56	1.8
  @@ -148,13 +148,18 @@
    * 29.Jun.96 All directives made per-directory.
    */
   
  +#include "ap_config.h"
   #include "httpd.h"
   #include "http_config.h"
  -#include <sys/types.h>
  -#include <sys/stat.h>
   #include "util_script.h"
   #include "http_log.h"
   #include "http_request.h"
  +#ifdef HAVE_SYS_TYPES_H
  +#include <sys/types.h>
  +#endif
  +#ifdef HAVE_SYS_STAT_H
  +#include <sys/stat.h>
  +#endif
   
   #define DIR_CMD_PERMS OR_INDEXES
   
  
  
  
  1.27      +5 -0      apache-2.0/src/modules/standard/mod_cgi.c
  
  Index: mod_cgi.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgi.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- mod_cgi.c	2000/01/18 23:41:52	1.26
  +++ mod_cgi.c	2000/01/19 02:41:58	1.27
  @@ -68,6 +68,7 @@
    * they fail.
    */
   
  +#include "ap_config.h"
   #include "httpd.h"
   #include "http_config.h"
   #include "http_request.h"
  @@ -77,8 +78,12 @@
   #include "http_log.h"
   #include "util_script.h"
   #include "http_conf_globals.h"
  +#ifdef HAVE_SYS_STAT_H
   #include <sys/stat.h>
  +#endif
  +#ifdef HAVE_STRING_H
   #include <string.h>
  +#endif
   
   module MODULE_VAR_EXPORT cgi_module;
   
  
  
  
  1.5       +3 -0      apache-2.0/src/modules/standard/mod_env.c
  
  Index: mod_env.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_env.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_env.c	2000/01/18 23:41:54	1.4
  +++ mod_env.c	2000/01/19 02:41:58	1.5
  @@ -98,10 +98,13 @@
    *       *** older versions of the module.                        ***
    */
   
  +#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 {
       ap_table_t *vars;
  
  
  
  1.9       +3 -0      apache-2.0/src/modules/standard/mod_expires.c
  
  Index: mod_expires.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_expires.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mod_expires.c	2000/01/09 05:18:30	1.8
  +++ mod_expires.c	2000/01/19 02:41:59	1.9
  @@ -192,7 +192,10 @@
    * Hi, welcome to the internet.
    */
   
  +#include "ap_config.h"
  +#ifdef HAVE_CTYPE_H
   #include <ctype.h>
  +#endif
   #include "httpd.h"
   #include "http_config.h"
   #include "http_log.h"
  
  
  
  1.9       +3 -0      apache-2.0/src/modules/standard/mod_imap.c
  
  Index: mod_imap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_imap.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mod_imap.c	2000/01/18 23:41:55	1.8
  +++ mod_imap.c	2000/01/19 02:42:02	1.9
  @@ -91,6 +91,7 @@
    * Mark Cox, mark@ukweb.com, Allow relative URLs even when no base specified
    */
   
  +#include "ap_config.h"
   #include "httpd.h"
   #include "http_config.h"
   #include "http_request.h"
  @@ -99,7 +100,9 @@
   #include "http_main.h"
   #include "http_log.h"
   #include "util_script.h"
  +#ifdef HAVE_STRING_H
   #include <string.h>
  +#endif
   
   #define IMAP_MAGIC_TYPE "application/x-httpd-imap"
   #define MAXVERTS 100
  
  
  
  1.20      +2 -1      apache-2.0/src/modules/standard/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_include.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mod_include.c	2000/01/19 01:28:37	1.19
  +++ mod_include.c	2000/01/19 02:42:04	1.20
  @@ -84,6 +84,7 @@
   #endif
   #include "modules/perl/mod_perl.h"
   #else
  +#include "ap_config.h"
   #include "httpd.h"
   #include "http_config.h"
   #include "http_request.h"
  @@ -93,7 +94,7 @@
   #include "http_main.h"
   #include "util_script.h"
   #include <string.h>
  -#ifndef WIN32
  +#ifdef HAVE_PWD_H
   #include <pwd.h>
   #endif
   #endif
  
  
  
  1.14      +3 -0      apache-2.0/src/modules/standard/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_log_config.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_log_config.c	2000/01/09 05:18:31	1.13
  +++ mod_log_config.c	2000/01/19 02:42:07	1.14
  @@ -169,12 +169,15 @@
   
   #define DEFAULT_LOG_FORMAT "%h %l %u %t \"%r\" %>s %b"
   
  +#include "ap_config.h"
   #include "httpd.h"
   #include "http_config.h"
   #include "http_core.h"          /* For REMOTE_NAME */
   #include "http_log.h"
   #include "http_protocol.h"
  +#ifdef HAVE_LIMITS_H
   #include <limits.h>
  +#endif
   
   module MODULE_VAR_EXPORT config_log_module;
   
  
  
  
  1.9       +3 -1      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mod_mime.c	2000/01/18 23:41:56	1.8
  +++ mod_mime.c	2000/01/19 02:42:09	1.9
  @@ -64,12 +64,14 @@
   
   #define MIME_PRIVATE
   
  +#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
   
   typedef struct handlers_info {
       char *name;
  
  
  
  1.13      +3 -2      apache-2.0/src/modules/standard/mod_mime_magic.c
  
  Index: mod_mime_magic.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_mime_magic.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mod_mime_magic.c	2000/01/07 15:52:18	1.12
  +++ mod_mime_magic.c	2000/01/19 02:42:11	1.13
  @@ -123,6 +123,7 @@
    *
    */
   
  +#include "ap_config.h"
   #include "httpd.h"
   #include "http_config.h"
   #include "http_request.h"
  @@ -130,9 +131,9 @@
   #include "http_log.h"
   #include "http_protocol.h"
   #include "util_script.h"
  -
  +#ifdef HAVE_UTIME_H
   #include <utime.h>
  -
  +#endif
   
   /*
    * data structures and related constants
  
  
  
  1.18      +3 -0      apache-2.0/src/modules/standard/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_negotiation.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- mod_negotiation.c	2000/01/18 23:41:56	1.17
  +++ mod_negotiation.c	2000/01/19 02:42:13	1.18
  @@ -62,6 +62,7 @@
    * rst
    */
   
  +#include "ap_config.h"
   #include "apr_file_io.h"
   #include "httpd.h"
   #include "http_config.h"
  @@ -70,7 +71,9 @@
   #include "http_core.h"
   #include "http_log.h"
   #include "util_script.h"
  +#ifdef HAVE_STRING_H
   #include <string.h>
  +#endif
   
   #define MAP_FILE_MAGIC_TYPE "application/x-type-map"
   
  
  
  
  1.12      +5 -1      apache-2.0/src/modules/standard/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_rewrite.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_rewrite.c	2000/01/09 05:18:31	1.11
  +++ mod_rewrite.c	2000/01/19 02:42:14	1.12
  @@ -88,7 +88,7 @@
   **      www.engelschall.com
   */
   
  -
  +#include "ap_config.h"
   #include "httpd.h"
   #include "http_config.h"
   #include "http_request.h"
  @@ -103,9 +103,13 @@
   
   #ifndef NO_WRITEV
   #ifndef NETWARE
  +#ifdef HAVE_SYS_TYPES_H
   #include <sys/types.h>
   #endif
  +#endif
  +#ifdef HAVE_SYS_UIO_H
   #include <sys/uio.h>
  +#endif
   #endif
   
   /*
  
  
  
  1.7       +2 -1      apache-2.0/src/modules/standard/mod_userdir.c
  
  Index: mod_userdir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_userdir.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_userdir.c	2000/01/19 01:33:16	1.6
  +++ mod_userdir.c	2000/01/19 02:42:17	1.7
  @@ -90,10 +90,11 @@
    * disabled, except those explicitly turned on with the "enabled" keyword.
    */
   
  +#include "ap_config.h"
   #include "httpd.h"
   #include "http_config.h"
   #include "http_request.h"
  -#ifndef WIN32
  +#ifdef HAVE_PWD_H
   #include <pwd.h>
   #endif
   
  
  
  

Mime
View raw message