cvs commit: apache-2.0/src/regex config.m4

[rbb]

rbb 00/01/18 17:16:35

  Modified:src/ap   ap_base64.c ap_hooks.c ap_sha1.c
   src/include ap.h ap_ac_config.h buff.h conf.h explain.h
http_conf_globals.h http_connection.h http_core.h
http_log.h httpd.h util_date.h util_md5.h
   src/lib/apr configure.in
   src/lib/apr/include apr.h.in apr_general.h apr_network_io.h
   src/main http_config.c http_connection.c http_core.c
http_log.c http_main.c http_protocol.c
http_request.c http_vhost.c iol_file.c listen.c
rfc1413.c util.c util_date.c util_script.c
util_uri.c
   src/modules/mpm/dexter dexter.c mpm_default.h scoreboard.c
   src/modules/mpm/mpmt_beos mpm_default.h
   src/modules/mpm/mpmt_pthread mpm_default.h mpmt_pthread.c
scoreboard.c scoreboard.h
   src/modules/mpm/prefork mpm_default.h prefork.c scoreboard.h
   src/modules/mpm/spmt_os2 mpm_default.h scoreboard.h
   src/modules/mpm/winnt mpm_default.h
   src/os/beos beosd.h os.h
   src/os/os2 os.h
   src/os/unix iol_socket.c os.h unixd.c unixd.h
   src/os/win32 os.h
   src/regex config.m4
  Log:
  Finish the commits for the change in the header files.  Basically, this hides
  all of the Apache macros that modules don't need access to.  This should
  have been committed with the modules, but I wasn't paying attention to the
  directory I was in when I ran the commit.
  Submitted by: Manoj Kasichainula and Ryan Bloom
  
  Revision  ChangesPath
  1.3   +2 -1  apache-2.0/src/ap/ap_base64.c
  
  Index: ap_base64.c
  ===
  RCS file: /home/cvs/apache-2.0/src/ap/ap_base64.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ap_base64.c   1999/09/11 07:15:56 1.2
  +++ ap_base64.c   2000/01/19 01:14:21 1.3
  @@ -61,14 +61,15 @@
* ugly 'len' functions, which is quite a nasty cost.
*/
   
  +#define CORE_PRIVATE
   #include 
   
  -#include "ap_config.h"
   #include "ap.h"
   
   #ifdef CHARSET_EBCDIC
   #include "ebcdic.h"
   #endif   /* CHARSET_EBCDIC */
  +#include "ap_config.h"
   
   /* ck but it's fast and const should make it shared text page. */
   static const unsigned char pr2six[256] =
  
  
  
  1.9   +1 -0  apache-2.0/src/ap/ap_hooks.c
  
  Index: ap_hooks.c
  ===
  RCS file: /home/cvs/apache-2.0/src/ap/ap_hooks.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ap_hooks.c1999/11/28 13:32:15 1.8
  +++ ap_hooks.c2000/01/19 01:14:22 1.9
  @@ -1,6 +1,7 @@
   #include "httpd.h"
   #include "ap_hooks.h"
   #include 
  +#include 
   
   #if 0
   #define ap_palloc(pool,size) malloc(size)
  
  
  
  1.3   +1 -1  apache-2.0/src/ap/ap_sha1.c
  
  Index: ap_sha1.c
  ===
  RCS file: /home/cvs/apache-2.0/src/ap/ap_sha1.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ap_sha1.c 1999/09/13 18:22:20 1.2
  +++ ap_sha1.c 2000/01/19 01:14:22 1.3
  @@ -85,12 +85,12 @@
   #include 
   
   #include "httpd.h"
  -#include "ap_config.h"
   #include "ap_sha1.h"
   #include "ap.h"
   #ifdef CHARSET_EBCDIC
   #include "ebcdic.h"
   #endif /*CHARSET_EBCDIC*/
  +#include "ap_config.h"
   
   /* a bit faster & bigger, if defined */
   #define UNROLL_LOOPS
  
  
  
  1.8   +33 -0 apache-2.0/src/include/ap.h
  
  Index: ap.h
  ===
  RCS file: /home/cvs/apache-2.0/src/include/ap.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ap.h  1999/11/23 06:33:51 1.7
  +++ ap.h  2000/01/19 01:14:26 1.8
  @@ -65,6 +65,39 @@
   extern "C" {
   #endif
   
  +/* stuff marked API_EXPORT is part of the API, and intended for use
  + * by modules
  + */
  +#ifndef API_EXPORT
  +#define API_EXPORT(type)type
  +#endif
  +
  +/* Stuff marked API_EXPORT_NONSTD is part of the API, and intended for
  + * use by modules.  The difference between API_EXPORT and
  + * API_EXPORT_NONSTD is that the latter is required for any functions
  + * which use varargs or are used via indirect function call.  This
  + * is to accomodate the two calling conventions in windows dlls.
  + */
  +#ifndef API_EXPORT_NONSTD
  +#define API_EXPORT_NONSTD(type)type
  +#endif
  +
  +#ifndef MODULE_VAR_EXPORT
  +#define MODULE_VAR_EXPORT
  +#endif
  +#ifndef API_VAR_EXPORT
  +#define API_VAR_EXPORT
  +#endif
  +
  +/* modules should not used functions marked CORE_EXPORT
  + * or CORE_EXPORT_NONSTD */
  +#ifnde

cvs commit: apache-2.0/src/modules/standard mod_include.c

[stoddard]

stoddard00/01/18 17:28:43

  Modified:src/modules/standard mod_include.c
  Log:
  Fix compile break on Windows and update to use ap_stat()
  
  Revision  ChangesPath
  1.19  +12 -14apache-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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_include.c 2000/01/18 23:41:55 1.18
  +++ mod_include.c 2000/01/19 01:28:37 1.19
  @@ -92,10 +92,11 @@
   #include "http_log.h"
   #include "http_main.h"
   #include "util_script.h"
  -#include 
   #include 
  +#ifndef WIN32
   #include 
   #endif
  +#endif
   
   #define STARTING_SEQUENCE ""
  @@ -672,7 +673,7 @@
   /* be safe; only files in this directory or below allowed */
if (!is_only_below(parsed_string)) {
   error_fmt = "unable to include file \"%s\" "
  -"in parsed file %s";
  +"in parsed file %s";
   }
   else {
   rr = ap_sub_req_lookup_file(parsed_string, r);
  @@ -1056,7 +1057,7 @@
   
   
   static int find_file(request_rec *r, const char *directive, const char *tag,
  - char *tag_val, struct stat *finfo, const char *error)
  + char *tag_val, ap_finfo_t *finfo, const char *error)
   {
   char *to_send = tag_val;
   request_rec *rr = NULL;
  @@ -1075,9 +1076,9 @@
   
   if (rr->status == HTTP_OK && rr->finfo.protection != 0) {
   to_send = rr->filename;
  -if (stat(to_send, finfo)) {
  +if (ap_stat(finfo, to_send, rr->pool) != APR_SUCCESS) {
   error_fmt = "unable to get information about \"%s\" "
  -"in parsed file %s";
  +"in parsed file %s";
   }
   }
   else {
  @@ -1129,7 +1130,7 @@
   {
   char tag[MAX_STRING_LEN];
   char *tag_val;
  -struct stat finfo;
  +ap_finfo_t finfo;
   char parsed_string[MAX_STRING_LEN];
   
   while (1) {
  @@ -1143,14 +1144,14 @@
   parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 
0);
   if (!find_file(r, "fsize", tag, parsed_string, &finfo, error)) {
   if (sizefmt == SIZEFMT_KMG) {
  -ap_send_size(finfo.st_size, r);
  +ap_send_size(finfo.size, r);
   }
   else {
   int l, x;
   #if defined(AP_OFF_T_IS_QUAD)
  -ap_snprintf(tag, sizeof(tag), "%qd", finfo.st_size);
  +ap_snprintf(tag, sizeof(tag), "%qd", finfo.size);
   #else
  -ap_snprintf(tag, sizeof(tag), "%ld", finfo.st_size);
  +ap_snprintf(tag, sizeof(tag), "%ld", finfo.size);
   #endif
   l = strlen(tag);/* grrr */
   for (x = 0; x < l; x++) {
  @@ -1169,7 +1170,7 @@
   {
   char tag[MAX_STRING_LEN];
   char *tag_val;
  -struct stat finfo;
  +ap_finfo_t finfo;
   char parsed_string[MAX_STRING_LEN];
   
   while (1) {
  @@ -1182,10 +1183,7 @@
   else {
   parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 
0);
   if (!find_file(r, "flastmod", tag, parsed_string, &finfo, 
error)) {
  - ap_time_t mtime;
  -
  - ap_ansi_time_to_ap_time(&mtime, finfo.st_mtime);
  -ap_rputs(ap_ht_time(r->pool, mtime, tf, 0), r);
  +ap_rputs(ap_ht_time(r->pool, finfo.mtime, tf, 0), r);
   }
   }
   }
  
  
  

cvs commit: apache-2.0/src/modules/standard mod_userdir.c

[stoddard]

stoddard00/01/18 17:33:17

  Modified:src/modules/standard mod_userdir.c
  Log:
  Fix Windows compile break. Gotta find a better way to fix this.
  
  Revision  ChangesPath
  1.6   +2 -0  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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_userdir.c 2000/01/18 23:41:56 1.5
  +++ mod_userdir.c 2000/01/19 01:33:16 1.6
  @@ -93,7 +93,9 @@
   #include "httpd.h"
   #include "http_config.h"
   #include "http_request.h"
  +#ifndef WIN32
   #include 
  +#endif
   
   /* The default directory in user's home dir */
   #ifndef DEFAULT_USER_DIR
  
  
  

Re: cvs commit: apache-2.0/src/modules/standard mod_userdir.c

[Ryan Bloom]

The better way to fix it is for Apache to provide an AP_HAVE_PWD_H macro
depending on what autoconf finds.  This is all part of the autoconf not
protecting their own macros problem.  This will be fixed in time, but how
to do it is a real problem.  I am seriously considering doing what we did
for APR, which is to create another header file for public namespace
protected macros.  BTW, why are you bothering with userdir?  I didn't
think it worked on Windows.

Ryan


On 19 Jan 2000 [EMAIL PROTECTED] wrote:

> stoddard00/01/18 17:33:17
> 
>   Modified:src/modules/standard mod_userdir.c
>   Log:
>   Fix Windows compile break. Gotta find a better way to fix this.
>   
>   Revision  ChangesPath
>   1.6   +2 -0  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.5
>   retrieving revision 1.6
>   diff -u -r1.5 -r1.6
>   --- mod_userdir.c   2000/01/18 23:41:56 1.5
>   +++ mod_userdir.c   2000/01/19 01:33:16 1.6
>   @@ -93,7 +93,9 @@
>#include "httpd.h"
>#include "http_config.h"
>#include "http_request.h"
>   +#ifndef WIN32
>#include 
>   +#endif
>
>/* The default directory in user's home dir */
>#ifndef DEFAULT_USER_DIR
>   
>   
>   
> 

___
Ryan Bloom  [EMAIL PROTECTED]
4205 S Miami Blvd   
RTP, NC 27709   

Come to the first official Apache Software Foundation
Conference!  

cvs commit: apache-2.0/src/lib/apr/time/win32 timestr.c

[stoddard]

stoddard00/01/18 17:51:32

  Modified:src/lib/apr/time/unix timestr.c
   src/lib/apr/time/win32 timestr.c
  Log:
  Make change suggested by Ben
  
  Revision  ChangesPath
  1.7   +1 -1  apache-2.0/src/lib/apr/time/unix/timestr.c
  
  Index: timestr.c
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/timestr.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- timestr.c 2000/01/17 23:23:46 1.6
  +++ timestr.c 2000/01/19 01:51:30 1.7
  @@ -159,7 +159,7 @@
   const char *format, ap_exploded_time_t *xt)
   {
   struct tm tm;
  -memset(&tm, 0, sizeof(struct tm));
  +memset(&tm, 0, sizeof tm);
   tm.tm_sec  = xt->tm_sec;
   tm.tm_min  = xt->tm_min;
   tm.tm_hour = xt->tm_hour;
  
  
  
  1.2   +1 -1  apache-2.0/src/lib/apr/time/win32/timestr.c
  
  Index: timestr.c
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/timestr.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- timestr.c 2000/01/17 19:42:14 1.1
  +++ timestr.c 2000/01/19 01:51:31 1.2
  @@ -159,7 +159,7 @@
   const char *format, ap_exploded_time_t *xt)
   {
   struct tm tm;
  -memset(&tm, 0, sizeof(struct tm));
  +memset(&tm, 0, sizeof tm);
   tm.tm_sec  = xt->tm_sec;
   tm.tm_min  = xt->tm_min;
   tm.tm_hour = xt->tm_hour;
  
  
  

cvs commit: apache-2.0/src/main http_core.c http_protocol.c

[rbb]

rbb 00/01/18 18:09:08

  Modified:src/include ap_buf.h buff.h util_date.h
   src/main http_core.c http_protocol.c
  Log:
  Cleanup a few things with the compile.  There were also a few macro name
  changes I missed earlier.
  
  Revision  ChangesPath
  1.3   +2 -0  apache-2.0/src/include/ap_buf.h
  
  Index: ap_buf.h
  ===
  RCS file: /home/cvs/apache-2.0/src/include/ap_buf.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ap_buf.h  1999/06/20 19:34:28 1.2
  +++ ap_buf.h  2000/01/19 02:08:56 1.3
  @@ -58,7 +58,9 @@
   #ifndef AP_BUF_H
   #define AP_BUF_H
   
  +#ifdef HAVE_SYS_UIO_H
   #include  /* for struct iovec */
  +#endif
   
   typedef struct ap_bufel ap_bufel;
   struct ap_bufel {
  
  
  
  1.13  +2 -0  apache-2.0/src/include/buff.h
  
  Index: buff.h
  ===
  RCS file: /home/cvs/apache-2.0/src/include/buff.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- buff.h2000/01/19 01:14:27 1.12
  +++ buff.h2000/01/19 02:08:57 1.13
  @@ -62,7 +62,9 @@
   extern "C" {
   #endif
   
  +#ifdef HAVE_STDARG_H
   #include 
  +#endif
   #include "ap_iol.h"
   #include "apr_lib.h"
   #include "apr_general.h"
  
  
  
  1.8   +1 -10 apache-2.0/src/include/util_date.h
  
  Index: util_date.h
  ===
  RCS file: /home/cvs/apache-2.0/src/include/util_date.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- util_date.h   2000/01/19 01:14:31 1.7
  +++ util_date.h   2000/01/19 02:08:57 1.8
  @@ -67,17 +67,8 @@
*/
   
   #include "apr_time.h"
  -/* XXX - This section lists include files for OS-specific types that APR
  - * should replace. Once they are replaced, this section should be
  - * removed */
  -#ifndef NO_MORE_OS_TYPES_IN_THIS_FILE
  -#include "ap_config_auto.h"
  -#ifdef HAVE_SYS_TIME_H
  -#include 
  -#endif
  -#endif /* NO_MORE_OS_TYPES_IN_THIS_FILE */
   
  -#define BAD_DATE (time_t)0
  +#define BAD_DATE (ap_time_t)0
   
   API_EXPORT(int) ap_checkmask(const char *data, const char *mask);
   API_EXPORT(ap_time_t) ap_parseHTTPdate(const char *date);
  
  
  
  1.33  +2 -2  apache-2.0/src/main/http_core.c
  
  Index: http_core.c
  ===
  RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- http_core.c   2000/01/19 01:15:04 1.32
  +++ http_core.c   2000/01/19 02:09:01 1.33
  @@ -2060,13 +2060,13 @@
   ap_snprintf(sport, sizeof sport, "%u", (unsigned) ap_get_server_port(r));
   
   if (conf->server_signature == srv_sig_withmail) {
  - return ap_pstrcat(r->pool, prefix, "" SERVER_BASEVERSION
  + return ap_pstrcat(r->pool, prefix, "" AP_SERVER_BASEVERSION
  " Server at mailto:";,
  r->server->server_admin, "\">",
  ap_get_server_name(r), " Port ", sport,
  "\n", NULL);
   }
  -return ap_pstrcat(r->pool, prefix, "" SERVER_BASEVERSION
  +return ap_pstrcat(r->pool, prefix, "" AP_SERVER_BASEVERSION
  " Server at ", ap_get_server_name(r), " Port ", sport,
  "\n", NULL);
   }
  
  
  
  1.50  +2 -2  apache-2.0/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===
  RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- http_protocol.c   2000/01/19 01:15:09 1.49
  +++ http_protocol.c   2000/01/19 02:09:03 1.50
  @@ -1332,7 +1332,7 @@
   r->connection->keepalive = -1;
   }
   else
  -protocol = SERVER_PROTOCOL;
  +protocol = AP_SERVER_PROTOCOL;
   
   #ifdef CHARSET_EBCDIC
   ap_bsetflag(r->connection->client, B_EBCDIC2ASCII, 1);
  @@ -1775,7 +1775,7 @@
   
   if (r->expecting_100 && r->proto_num >= HTTP_VERSION(1,1)) {
   /* sending 100 Continue interim response */
  -ap_rvputs(r, SERVER_PROTOCOL, " ", status_lines[0], 
"\015\012\015\012",
  +ap_rvputs(r, AP_SERVER_PROTOCOL, " ", status_lines[0], 
"\015\012\015\012",
 NULL);
   ap_rflush(r);
   }
  
  
  

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

[rbb]

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  ChangesPath
  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 
  +#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 
  +#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 
  +#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 
  -#include 
   #include "util_script.h"
   #include "http_log.h"
   #include "http_request.h"
  +#ifdef HAVE_SYS_TYPES_H
  +#include 
  +#endif
  +#ifdef HAVE_SYS_STAT_H
  +#include 
  +#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/m

cvs commit: apache-1.3 Announcement

[jim]

jim 00/01/19 14:43:07

  Modified:.Announcement
  Log:
  Very soon will tag/roll 1.3.11. Until
  then, add a nice Apachecon reminder :)
  
  Revision  ChangesPath
  1.48  +4 -0  apache-1.3/Announcement
  
  Index: Announcement
  ===
  RCS file: /export/home/cvs/apache-1.3/Announcement,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- Announcement  2000/01/18 17:12:05 1.47
  +++ Announcement  2000/01/19 22:43:01 1.48
  @@ -99,3 +99,7 @@
   
   
   Thank you for using Apache.
  +--
  +See you at ApacheCon 2000 in Orlanda, Florida, March 8-10, 2000.
  +http://www.Apachecon.com/
  +