cvs commit: apache-1.3/src/main http_config.c http_core.c
dougm 98/03/16 19:26:46
Modified:src/include http_config.h http_core.h
src/main http_config.c http_core.c
Log:
export a few functions so mod_perl's Perl config sections work under win32
Submitted by: Doug MacEachern
Reviewed by: Dean Gaudet
Revision ChangesPath
1.74 +6 -4 apache-1.3/src/include/http_config.h
Index: http_config.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- http_config.h 1998/03/13 19:20:10 1.73
+++ http_config.h 1998/03/17 03:26:41 1.74
@@ -267,7 +267,7 @@
* handle it back-compatibly, or at least signal an error).
*/
-#define MODULE_MAGIC_NUMBER 19980312
+#define MODULE_MAGIC_NUMBER 19980317
#define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL, NULL
/* Generic accessors for other modules to get at their own module-specific
@@ -302,6 +302,8 @@
#ifdef CORE_PRIVATE
+extern API_VAR_EXPORT module *top_module;
+
extern module *prelinked_modules[];
extern module *preloaded_modules[];
@@ -318,7 +320,7 @@
/* For http_request.c... */
void *create_request_config(pool *p);
-void *create_per_dir_config(pool *p);
+API_EXPORT(void *) create_per_dir_config(pool *p);
void *merge_per_dir_configs(pool *p, void *base, void *new);
void *create_empty_config(pool *p);
@@ -328,9 +330,9 @@
int parse_htaccess(void **result, request_rec *r, int override,
const char *path, const char *access_name);
-const char *srm_command_loop(cmd_parms *parms, void *config);
+API_EXPORT(const char *) srm_command_loop(cmd_parms *parms, void *config);
-const char *init_virtual_host(pool *p, const char *hostname,
+API_EXPORT(const char *) init_virtual_host(pool *p, const char *hostname,
server_rec *main_server, server_rec **);
void process_resource_config(server_rec *s, char *fname, pool *p, pool
*ptemp);
1.37 +1 -1 apache-1.3/src/include/http_core.h
Index: http_core.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/http_core.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- http_core.h 1998/02/21 01:42:36 1.36
+++ http_core.h 1998/03/17 03:26:42 1.37
@@ -132,7 +132,7 @@
char *response_code_string (request_rec *r, int error_index);
-extern module core_module;
+extern API_VAR_EXPORT module core_module;
/* Per-directory configuration */
1.107 +7 -7 apache-1.3/src/main/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- http_config.c 1998/03/16 12:09:52 1.106
+++ http_config.c 1998/03/17 03:26:44 1.107
@@ -94,7 +94,7 @@
* than DYNAMIC_MODULE_LIMIT.
*/
static int dynamic_modules = 0;
-module *top_module = NULL;
+API_VAR_EXPORT module *top_module = NULL;
typedef int (*handler_func) (request_rec *);
typedef void *(*dir_maker_func) (pool *, char *);
@@ -213,7 +213,7 @@
return create_empty_config(p);
}
-void *create_per_dir_config(pool *p)
+API_EXPORT(void *) create_per_dir_config(pool *p)
{
return create_empty_config(p);
}
@@ -861,7 +861,7 @@
}
}
-const command_rec *find_command(const char *name, const command_rec *cmds)
+API_EXPORT(const command_rec *) find_command(const char *name, const
command_rec *cmds)
{
while (cmds-name)
if (!strcasecmp(name, cmds-name))
@@ -872,7 +872,7 @@
return NULL;
}
-const command_rec *find_command_in_modules(const char *cmd_name, module
**mod)
+API_EXPORT(const command_rec *) find_command_in_modules(const char
*cmd_name, module **mod)
{
const command_rec *cmdp;
module *modp;
@@ -886,7 +886,7 @@
return NULL;
}
-const char *handle_command(cmd_parms *parms, void *config, const char *l)
+API_EXPORT(const char *) handle_command(cmd_parms *parms, void *config,
const char *l)
{
const char *args, *cmd_name, *retval;
const command_rec *cmd;
@@ -931,7 +931,7 @@
return retval;
}
-const char *srm_command_loop(cmd_parms *parms, void *config)
+API_EXPORT(const char *) srm_command_loop(cmd_parms *parms, void *config)
{
char l[MAX_STRING_LEN];
@@ -1201,7 +1201,7 @@
}
-const char *init_virtual_host(pool *p, const char *hostname,
+API_EXPORT(const char *) init_virtual_host(pool *p, const char *hostname,
server_rec
cvs commit: apache-devsite mmn.txt
dougm 98/03/16 19:29:34 Modified:.mmn.txt Log: bump for new API_EXPORTs Revision ChangesPath 1.14 +1 -0 apache-devsite/mmn.txt Index: mmn.txt === RCS file: /export/home/cvs/apache-devsite/mmn.txt,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mmn.txt 1998/03/12 10:36:38 1.13 +++ mmn.txt 1998/03/17 03:29:33 1.14 @@ -43,3 +43,4 @@ content_languages MUST all be lowercase strings, and MAY NOT be modified in place -- modifications require pstrdup(). +19980317 (1.3b6-dev) - API_EXPORTS for win32 and Perl
cvs commit: apache-1.3/src/main util.c
dgaudet 98/03/16 23:39:58
Modified:src/main util.c
Log:
remove spacetoplus and plustospace, unused and not declared in any .h
Revision ChangesPath
1.106 +0 -18 apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- util.c1998/03/16 00:24:14 1.105
+++ util.c1998/03/17 07:39:57 1.106
@@ -1055,24 +1055,6 @@
return cmd;
}
-void plustospace(char *str)
-{
-register int x;
-
-for (x = 0; str[x]; x++)
- if (str[x] == '+')
- str[x] = ' ';
-}
-
-void spacetoplus(char *str)
-{
-register int x;
-
-for (x = 0; str[x]; x++)
- if (str[x] == ' ')
- str[x] = '+';
-}
-
static char x2c(const char *what)
{
register char digit;
cvs commit: apache-1.3/src/os/unix os.c os.h
dgaudet 98/03/16 23:54:29
Modified:src/ap ap_execve.c
src/include alloc.h conf.h hide.h http_config.h http_core.h
http_protocol.h httpd.h
src/main alloc.c http_config.c http_core.c http_log.c
http_main.c http_protocol.c http_request.c
http_vhost.c
src/os/unix os.c os.h
Log:
- staticization! (Doug I know this breaks your dce thing -- but we talked
about you changing STANDALONE_MAIN to be a #include instead.)
- change API_EXPORT to CORE_EXPORT for the functions Doug needed for
mod_perl
- basic_http_header is API_EXPORT
- send_header_field is API_EXPORT_NONSTD
- srm_command_loop is API_EXPORT
Revision ChangesPath
1.8 +1 -0 apache-1.3/src/ap/ap_execve.c
Index: ap_execve.c
===
RCS file: /export/home/cvs/apache-1.3/src/ap/ap_execve.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ap_execve.c 1998/02/27 09:46:31 1.7
+++ ap_execve.c 1998/03/17 07:54:09 1.8
@@ -331,5 +331,6 @@
return NULL;
}
#else
+extern void ap_execve_is_not_here(void);
void ap_execve_is_not_here(void) {}
#endif /* NEED_HASHBANG_EMUL */
1.49 +1 -2 apache-1.3/src/include/alloc.h
Index: alloc.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/alloc.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- alloc.h 1998/03/14 00:32:05 1.48
+++ alloc.h 1998/03/17 07:54:10 1.49
@@ -82,8 +82,7 @@
typedef struct pool pool;
-extern pool *permanent_pool;
-void init_alloc(void); /* Set up everything */
+pool * init_alloc(void); /* Set up everything */
API_EXPORT(pool *) make_sub_pool(pool *);/* All pools are subpools of
permanent_pool */
API_EXPORT(void) destroy_pool(pool *);
1.191 +5 -0 apache-1.3/src/include/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- conf.h1998/03/13 23:44:42 1.190
+++ conf.h1998/03/17 07:54:10 1.191
@@ -759,6 +759,11 @@
#define API_VAR_EXPORT
#endif
+/* modules should not used functions marked CORE_EXPORT */
+#ifndef CORE_EXPORT
+#define CORE_EXPORT API_EXPORT
+#endif
+
/* So that we can use inline on some critical functions, and use
* GNUC attributes (such as to get -Wall warnings for printf-like
* functions). Only do this in gcc 2.7 or later ... it may work
1.12 +4 -53 apache-1.3/src/include/hide.h
Index: hide.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/hide.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- hide.h1998/03/14 12:22:10 1.11
+++ hide.h1998/03/17 07:54:11 1.12
@@ -117,6 +117,7 @@
#define cgi_module AP_cgi_module
#define config_log_module AP_config_log_module
#define core_moduleAP_core_module
+#define day_snames AP_day_snames
#define db_auth_module AP_db_auth_module
#define dbm_auth_moduleAP_dbm_auth_module
#define digest_module AP_digest_module
@@ -131,6 +132,7 @@
#define info_moduleAP_info_module
#define mime_magic_module AP_mime_magic_module
#define mime_moduleAP_mime_module
+#define month_snames AP_month_snames
#define negotiation_module AP_negotiation_module
#define prelinked_modules AP_prelinked_modules
#define preloaded_modules AP_preloaded_modules
@@ -152,14 +154,11 @@
/*
* Text segment symbols
*/
-#define AMCSocketCleanup AP_AMCSocketCleanup
-#define AMCSocketInitializeAP_AMCSocketInitialize
#define MD5Final AP_MD5Final
#define MD5InitAP_MD5Init
#define MD5Update AP_MD5Update
#define add_cgi_vars AP_add_cgi_vars
#define add_common_varsAP_add_common_vars
-#define add_file_conf AP_add_file_conf
#define add_module AP_add_module
#define add_named_module AP_add_named_module
#define add_per_dir_conf AP_add_per_dir_conf
@@ -192,7 +191,6 @@
#define bskiplfAP_bskiplf
#define bvputs AP_bvputs
#define bwrite
cvs commit: apache-devsite mmn.txt
dgaudet 98/03/16 23:55:59 Modified:.mmn.txt Log: hey, the 17th is the time on the other side of the dateline! Revision ChangesPath 1.15 +4 -1 apache-devsite/mmn.txt Index: mmn.txt === RCS file: /export/home/cvs/apache-devsite/mmn.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mmn.txt 1998/03/17 03:29:33 1.14 +++ mmn.txt 1998/03/17 07:55:59 1.15 @@ -43,4 +43,7 @@ content_languages MUST all be lowercase strings, and MAY NOT be modified in place -- modifications require pstrdup(). -19980317 (1.3b6-dev) - API_EXPORTS for win32 and Perl +19980317 (1.3b6-dev) - CORE_EXPORTs for win32 and Perl + - basic_http_header is API_EXPORT + - send_header_field is API_EXPORT_NONSTD + - srm_command_loop is API_EXPORT
cvs commit: apache-1.3/src/main alloc.c http_config.c http_core.c http_main.c http_protocol.c rfc1413.c util_date.c
dgaudet 98/03/17 00:21:11 Modified:src/helpers UpdateHide src/include http_config.h http_protocol.h http_request.h util_date.h src/main alloc.c http_config.c http_core.c http_main.c http_protocol.c rfc1413.c util_date.c Log: more cleanups, more statics, more exports Revision ChangesPath 1.8 +1 -0 apache-1.3/src/helpers/UpdateHide Index: UpdateHide === RCS file: /export/home/cvs/apache-1.3/src/helpers/UpdateHide,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- UpdateHide1998/03/12 13:52:05 1.7 +++ UpdateHide1998/03/17 08:20:48 1.8 @@ -88,6 +88,7 @@ T:find_pool T:pool_is_ancestor T:pool_join +T:check_alarm ); # determine os-dependend stuff 1.76 +1 -2 apache-1.3/src/include/http_config.h Index: http_config.h === RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- http_config.h 1998/03/17 07:54:11 1.75 +++ http_config.h 1998/03/17 08:20:50 1.76 @@ -325,7 +325,6 @@ void *create_request_config(pool *p); CORE_EXPORT(void *) create_per_dir_config(pool *p); void *merge_per_dir_configs(pool *p, void *base, void *new); -void *create_empty_config(pool *p); /* For http_core.c... (Directory command and virtual hosts) */ @@ -337,7 +336,7 @@ void process_resource_config(server_rec *s, char *fname, pool *p, pool *ptemp); /* check_cmd_context() definitions: */ -extern const char *check_cmd_context(cmd_parms *cmd, unsigned forbidden); +API_EXPORT(const char *) check_cmd_context(cmd_parms *cmd, unsigned forbidden); /* check_cmd_context(): Forbidden in: */ #define NOT_IN_VIRTUALHOST 0x01 /* Virtualhost */ 1.36 +1 -11 apache-1.3/src/include/http_protocol.h Index: http_protocol.h === RCS file: /export/home/cvs/apache-1.3/src/include/http_protocol.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- http_protocol.h 1998/03/17 07:54:12 1.35 +++ http_protocol.h 1998/03/17 08:20:51 1.36 @@ -105,7 +105,7 @@ */ API_EXPORT(int) set_content_length(request_rec *r, long length); -int set_keepalive(request_rec *r); +API_EXPORT(int) set_keepalive(request_rec *r); API_EXPORT(time_t) rationalize_mtime(request_rec *r, time_t mtime); API_EXPORT(void) set_etag(request_rec *r); API_EXPORT(void) set_last_modified(request_rec *r); @@ -161,16 +161,6 @@ API_EXPORT(int) set_byterange(request_rec *r); API_EXPORT(int) each_byterange(request_rec *r, long *offset, long *length); - -/* Finally, this charming little number is here to encapsulate the - * degree to which nph- scripts completely escape from any discipline - * the protocol code might care to impose (this as opposed to other - * scripts, which *partially* escape to the extent that they may try - * to explicitly set the status line). - */ - -API_EXPORT(void) client_to_stdout(conn_rec *c); - /* Support for the Basic authentication protocol. Note that there's * nothing that prevents these from being in mod_auth.c, except that other 1.21 +0 -1 apache-1.3/src/include/http_request.h Index: http_request.h === RCS file: /export/home/cvs/apache-1.3/src/include/http_request.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- http_request.h1998/01/21 19:17:39 1.20 +++ http_request.h1998/03/17 08:20:52 1.21 @@ -96,7 +96,6 @@ #ifdef CORE_PRIVATE /* Function called by main.c to handle first-level request */ void process_request(request_rec *); -int default_handler(request_rec *); void die(int type, request_rec *r); #endif 1.10 +1 -1 apache-1.3/src/include/util_date.h Index: util_date.h === RCS file: /export/home/cvs/apache-1.3/src/include/util_date.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- util_date.h 1998/01/21 19:17:44 1.9 +++ util_date.h 1998/03/17 08:20:52 1.10 @@ -67,7 +67,7 @@ #define BAD_DATE (time_t)0 API_EXPORT(int) checkmask(const char *data, const char *mask); -time_t tm2sec(const struct tm *t); +API_EXPORT(time_t) tm2sec(const struct tm *t); API_EXPORT(time_t) parseHTTPdate(const char *date); #endif /* !APACHE_UTIL_DATE_H */ 1.79 +1 -1
cvs commit: apache-1.3/src/include hide.h
dgaudet 98/03/17 00:22:41 Modified:src/include hide.h Log: to go with the cleanup Revision ChangesPath 1.13 +0 -10 apache-1.3/src/include/hide.h Index: hide.h === RCS file: /export/home/cvs/apache-1.3/src/include/hide.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- hide.h1998/03/17 07:54:11 1.12 +++ hide.h1998/03/17 08:22:40 1.13 @@ -78,27 +78,20 @@ #define daemons_to_start AP_daemons_to_start #define excess_requests_per_child AP_excess_requests_per_child #define group_id AP_group_id -#define jmpbuffer AP_jmpbuffer #define listenbacklog AP_listenbacklog #define listeners AP_listeners #define lock_fname AP_lock_fname #define max_requests_per_child AP_max_requests_per_child -#define my_pid AP_my_pid -#define permanent_pool AP_permanent_pool -#define pgrp AP_pgrp #define pid_fname AP_pid_fname #define restart_time AP_restart_time #define scoreboard_fname AP_scoreboard_fname -#define sd AP_sd #define server_argv0 AP_server_argv0 -#define server_confAP_server_conf #define server_confnameAP_server_confname #define server_post_read_configAP_server_post_read_config #define server_pre_read_config AP_server_pre_read_config #define server_rootAP_server_root #define standalone AP_standalone #define threads_per_child AP_threads_per_child -#define timebufAP_timebuf #define user_idAP_user_id #define user_name AP_user_name @@ -212,7 +205,6 @@ #define clear_module_list AP_clear_module_list #define clear_pool AP_clear_pool #define clear_tableAP_clear_table -#define client_to_stdout AP_client_to_stdout #define close_piped_logAP_close_piped_log #define construct_server AP_construct_server #define construct_url AP_construct_url @@ -221,11 +213,9 @@ #define copy_table AP_copy_table #define core_reorder_directories AP_core_reorder_directories #define count_dirs AP_count_dirs -#define create_empty_configAP_create_empty_config #define create_environment AP_create_environment #define create_per_dir_config AP_create_per_dir_config #define create_request_config AP_create_request_config -#define default_handlerAP_default_handler #define default_port_for_request AP_default_port_for_request #define default_port_for_schemeAP_default_port_for_scheme #define default_type AP_default_type
cvs commit: apache-devsite mmn.txt
dgaudet 98/03/17 00:22:57 Modified:.mmn.txt Log: still going Revision ChangesPath 1.16 +4 -3 apache-devsite/mmn.txt Index: mmn.txt === RCS file: /export/home/cvs/apache-devsite/mmn.txt,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mmn.txt 1998/03/17 07:55:59 1.15 +++ mmn.txt 1998/03/17 08:22:57 1.16 @@ -44,6 +44,7 @@ and MAY NOT be modified in place -- modifications require pstrdup(). 19980317 (1.3b6-dev) - CORE_EXPORTs for win32 and Perl - - basic_http_header is API_EXPORT - - send_header_field is API_EXPORT_NONSTD - - srm_command_loop is API_EXPORT + - API export basic_http_header, send_header_field, + set_keepalive, srm_command_loop, check_cmd_context, + tm2sec + - spacetoplus(), plustospace(), client_to_stdout() removed
cvs commit: apache-1.3/src/os/unix Makefile.tmpl
dgaudet 98/03/17 00:28:03 Modified:src/ap Makefile.tmpl src/main Makefile.tmpl src Makefile.tmpl src/modules/experimental Makefile.tmpl src/modules/proxy Makefile.tmpl src/modules/standard Makefile.tmpl src/modules/test Makefile.tmpl src/os/unix Makefile.tmpl Log: update Revision ChangesPath 1.16 +16 -12apache-1.3/src/ap/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile.tmpl 1998/03/13 12:44:47 1.15 +++ Makefile.tmpl 1998/03/17 08:27:55 1.16 @@ -37,20 +37,24 @@ # DO NOT REMOVE ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h + ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h + ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h + ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ - $(INCDIR)/http_log.h + ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h $(INCDIR)/http_log.h ap_snprintf.o: ap_snprintf.c $(INCDIR)/conf.h ../os/unix/os.h \ - $(INCDIR)/hsregex.h + $(INCDIR)/hide.h $(INCDIR)/hsregex.h ap_strings.o: ap_strings.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h + ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h 1.18 +69 -64apache-1.3/src/main/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Makefile.tmpl 1998/03/13 12:44:46 1.17 +++ Makefile.tmpl 1998/03/17 08:27:56 1.18 @@ -51,92 +51,97 @@ # DO NOT REMOVE alloc.o: alloc.c $(INCDIR)/httpd.h $(INCDIR)/conf.h ../os/unix/os.h \ - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ - $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/multithread.h \ - $(INCDIR)/http_log.h + $(INCDIR)/hide.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/multithread.h $(INCDIR)/http_log.h buff.o: buff.c $(INCDIR)/httpd.h $(INCDIR)/conf.h ../os/unix/os.h \ - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ - $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_main.h \ - $(INCDIR)/http_log.h + $(INCDIR)/hide.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_main.h $(INCDIR)/http_log.h fnmatch.o: fnmatch.c $(INCDIR)/conf.h ../os/unix/os.h \ - $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h + $(INCDIR)/hide.h $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h http_bprintf.o: http_bprintf.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h + ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h http_config.o: http_config.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ - $(INCDIR)/http_config.h $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_request.h $(INCDIR)/http_conf_globals.h \ - $(INCDIR)/http_vhost.h $(INCDIR)/explain.h + ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_log.h
cvs commit: apache-1.3/src CHANGES
dgaudet 98/03/17 00:31:03 Modified:src CHANGES Log: time for bed Revision ChangesPath 1.718 +5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.717 retrieving revision 1.718 diff -u -r1.717 -r1.718 --- CHANGES 1998/03/16 19:34:56 1.717 +++ CHANGES 1998/03/17 08:31:00 1.718 @@ -1,5 +1,10 @@ Changes with Apache 1.3b6 + *) API: Various core functions that are definately not part of the API + have been made static, and a few have been marked API_EXPORT. Still + more have been marked CORE_EXPORT and are not intended for general + use by modules. [Doug MacEachern, Dean Gaudet] + *) mod_proxy was not clearing the Proxy-Connection header from requests; now it does. This did not violate any spec, however causes poor interactions when you are talking to remote proxies.
cvs commit: apache-1.3 STATUS
pcs 98/03/17 01:02:02 Modified:.STATUS Log: Mild, patchy cloud, sunny spells, light W to NW wind. Max temp 13-15C (55-59F). Revision ChangesPath 1.192 +5 -5 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- STATUS1998/03/16 16:18:49 1.191 +++ STATUS1998/03/17 09:02:01 1.192 @@ -175,10 +175,10 @@ * Provide consistant prefixes; suggestions: Apache provided general functions (e.g., ap_cpystrn) - ap_xxx: Ken +1, Brian +1, Ralf +1, Martin +1 + ap_xxx: Ken +1, Brian +1, Ralf +1, Martin +1, Paul +1 Public API functions (e.g., palloc) - apapi_xxx: Ken +1, Brian +1, Ralf +1, Martin +1 + apapi_xxx: Ken +1, Brian +1, Ralf +1, Martin +1, Paul appublic_xxx: appub_xxx: @@ -214,7 +214,7 @@ * Maybe a http_paths.h file? See [EMAIL PROTECTED] - Dean +1, Brian +1 + Dean +1, Brian +1, Paul +1 * Release builds: Should we provide Configuration or not? Should we 'make all suexec' in src/support? @@ -248,7 +248,7 @@ field is r-content_languages. Heck it's not even mentioned in apache-devsite/mmn.txt when we got content_languages (note the s!). The proposal is to remove r-content_language: - Status: Dean +1 + Status: Dean +1, Paul +1 - child_exit() is redundant, it can be implemented via cleanups. It is not symmetric in the sense that there is no exit API method to go @@ -257,7 +257,7 @@ mod_mmap_static, and mod_php3 for example). The proposal is to remove the child_exit() method and document cleanups as the method of handling this need. - Status: Dean +1, Rasmus +1 + Status: Dean +1, Rasmus +1, Paul +1 Win32 specific issues:
cvs commit: apache-1.3 STATUS
rse 98/03/17 01:59:31 Modified:.STATUS Log: update for our lazy guys ;-) Revision ChangesPath 1.193 +2 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- STATUS1998/03/17 09:02:01 1.192 +++ STATUS1998/03/17 09:59:30 1.193 @@ -91,6 +91,8 @@ * Performance tweak to mod_log_config * Marc's cfg_getline() fix for lines without the termination char * Ralf's Various cleanups to the command line interface and manual pages +* Marc's mod_proxy was not clearing the Proxy-Connection header +* Dean's API_EXPORT and CORE_EXPORT cleanup for core functions Available Patches:
cvs commit: apache-1.3/src Configuration.tmpl
coar98/03/17 03:33:42 Modified:src Configuration.tmpl Log: The majority feeling seems to be that Rule HIDE should default to yes; make it so. People who are debugging can turn it off for ease of name-typing, but the default as distributed should try to play well with others. Revision ChangesPath 1.89 +1 -1 apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- Configuration.tmpl1998/03/13 23:29:05 1.88 +++ Configuration.tmpl1998/03/17 11:33:41 1.89 @@ -135,7 +135,7 @@ Rule IRIXNIS=no Rule IRIXN32=yes Rule PARANOID=no -Rule HIDE=no +Rule HIDE=yes # The following rules should be set automatically by Configure. However, if # they are not set by Configure (because we don't know the correct value for
cvs commit: apache-1.3/src/support ab.c ab.1 Makefile.tmpl
rse 98/03/17 04:46:42 Modified:.STATUS src CHANGES src/support Makefile.tmpl Added: src/support ab.c ab.1 Log: Include of the new ApacheBench support program: o base is ZeusBench 1.0 from Adam Twiss, Zeus Technology Ltd. o includes enhancements by Dean from November 1997 for keepalive, SunOS4, etc. pp. which were already committed to src/test/zb.c o cleanups and enhancements by Ralf from March 1998: command line parsing, new options, URL-like target specification, manual page, Apache-style code indentation, etc. o !!IMPORTANT!! personal license agreement from March 1998 with Adam Twiss from Zeus Technology (see message [EMAIL PROTECTED] in apache-core mailing list for reference) to include this version into the Apache distribution the way it currently is. So, don't change copyright messages or other license stuff there, please. The program itself can now be enhanced or changed in any way. Revision ChangesPath 1.194 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.193 retrieving revision 1.194 diff -u -r1.193 -r1.194 --- STATUS1998/03/17 09:59:30 1.193 +++ STATUS1998/03/17 12:46:36 1.194 @@ -93,6 +93,7 @@ * Ralf's Various cleanups to the command line interface and manual pages * Marc's mod_proxy was not clearing the Proxy-Connection header * Dean's API_EXPORT and CORE_EXPORT cleanup for core functions +* Ralf's new ApacheBench support program (src/support/ab.c) Available Patches: 1.719 +7 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.718 retrieving revision 1.719 diff -u -r1.718 -r1.719 --- CHANGES 1998/03/17 08:31:00 1.718 +++ CHANGES 1998/03/17 12:46:38 1.719 @@ -1,5 +1,12 @@ Changes with Apache 1.3b6 + *) Add the new ApacheBench program ab to src/support/: This is derived + from the ZeusBench benchmarking program and can be used to determine the + response performance of an Apache installation. This version is + officially licensed with Zeus Technology, Ltd. See the license agreement + statements in [EMAIL PROTECTED] in apache-core. + [Ralf S. Engelschall] + *) API: Various core functions that are definately not part of the API have been made static, and a few have been marked API_EXPORT. Still more have been marked CORE_EXPORT and are not intended for general 1.11 +5 -2 apache-1.3/src/support/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/support/Makefile.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile.tmpl 1998/03/13 08:15:26 1.10 +++ Makefile.tmpl 1998/03/17 12:46:41 1.11 @@ -9,9 +9,9 @@ LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) -L../ap INCDIR=../include -TARGETS=htpasswd htdigest rotatelogs logresolve +TARGETS=htpasswd htdigest rotatelogs logresolve ab -OBJS=htpasswd.o htdigest.o rotatelogs.o logresolve.o +OBJS=htpasswd.o htdigest.o rotatelogs.o logresolve.o ab.o .c.o: $(CC) -c $(CFLAGS) $(INCLUDES) $ @@ -29,6 +29,9 @@ logresolve: logresolve.o $(CC) $(INCLUDES) $(CFLAGS) logresolve.o -o logresolve $(LDFLAGS) $(LIBS) + +ab: ab.o + $(CC) $(INCLUDES) $(CFLAGS) ab.o -o ab $(LDFLAGS) $(LIBS) clean: rm -f $(TARGETS) *.o 1.1 apache-1.3/src/support/ab.c Index: ab.c === /* * Copyright (c) 1998 The Apache Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright *notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in *the documentation and/or other materials provided with the *distribution. * * 3. All advertising materials mentioning features or use of this *software must display the following acknowledgment: *This product includes software developed by the Apache Group *for use in the Apache HTTP server project (http://www.apache.org/). *
cvs commit: apache-1.3/src/test zb.c
rse 98/03/17 04:53:32
Modified:src/test zb.c
Log:
Backout my recent changes, because we now have src/support/ab.[c1] which
already contains these changes together with a lot of other cleanups. Better
to leave the original zb.c as original as it can be... (BTW: This zb.c is
already not really original, because there were already two commits from Dean
in the past)
Revision ChangesPath
1.4 +16 -23apache-1.3/src/test/zb.c
Index: zb.c
===
RCS file: /export/home/cvs/apache-1.3/src/test/zb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zb.c 1998/03/16 15:23:24 1.3
+++ zb.c 1998/03/17 12:53:31 1.4
@@ -191,10 +191,9 @@
gettimeofday(endtime,0);
timetaken = timedif(endtime, start);
- printf(Server Hostname:%s\n, machine);
- printf(Server Software:%s\n, server_name);
- printf(Document Path: %s\n, file);
- printf(Document Length:%d bytes\n, doclen);
+ printf(\n---\n);
+ printf(Server: %s\n, server_name);
+ printf(Document Length:%d\n, doclen);
printf(Concurency Level: %d\n, concurrency);
printf(Time taken for tests: %d.%03d seconds\n,
timetaken/1000, timetaken%1000);
@@ -203,8 +202,8 @@
if(bad) printf( (Connect: %d, Length: %d, Exceptions: %d)\n,
err_conn, err_length, err_except);
if(keepalive) printf(Keep-Alive requests:%d\n, doneka);
- printf(Total transfered: %d bytes\n, totalread);
- printf(HTML transfered:%d bytes\n, totalbread);
+ printf(Bytes transfered: %d\n, totalread);
+ printf(HTML transfered:%d\n, totalbread);
/* avoid divide by zero */
if(timetaken) {
@@ -233,6 +232,7 @@
printf( min avg max\n);
printf(Connect: %5d %5d %5d\n,mincon, totalcon/requests, maxcon );
printf(Total: %5d %5d %5d\n, mintot, total/requests, maxtot);
+printf(---\n\n);
}
exit(0);
@@ -453,7 +453,7 @@
FD_ZERO(writebits);
/* setup request */
- sprintf(request,GET %s HTTP/1.0\r\nUser-Agent: ZeusBench/1.01\r\n
+ sprintf(request,GET %s HTTP/1.0\r\nUser-Agent: ZeusBench/1.0\r\n
%sHost: %s\r\nAccept: */*\r\n\r\n, file,
keepalive?Connection: Keep-Alive\r\n:, machine );
@@ -509,16 +509,10 @@
/* display usage information */
void usage(char *progname) {
- printf(This is ZeusBench, Version v1.01\n);
- printf(\n);
- printf(Usage: %s [options] machine path\n, progname);
- printf(-k KeepAlive\n);
- printf(-n requests Number of requests to peforms\n);
- printf(-t timelimitSeconds to max. wait for responses\n);
- printf(-c concurrency Number of multiple requests to make\n);
- printf(-p port Port number to use\n);
- printf(\n);
- printf(Path should start with a '/' e.g. /index.html\n\n);
+ printf(\nZeusBench v1.0\n\n);
+ printf(Usage: %s machine file [-k] [-n requests | -t timelimit (sec)]
+ \n\t\t[-c concurrency] [-p port] \n,progname);
+ printf(Filename should start with a '/' e.g. /index.html\n\n);
exit(EINVAL);
}
@@ -528,7 +522,11 @@
int main(int argc, char **argv) {
int c;
- optind = 1;
+ if (argc 3) usage(argv[0]);
+
+ machine = argv[1];
+ file = argv[2];
+ optind = 3;
while ((c = getopt(argc,argv,p:n:c:d:t:d:k))0) {
switch(c) {
case 'd':
@@ -558,11 +556,6 @@
break;
}
}
- if (optind != argc-2)
- usage(argv[0]);
-
- machine = argv[optind++];
- file = argv[optind++];
test();
return 0;
}
cvs commit: apache-1.3/src/include conf.h hide.h
coar98/03/17 05:08:56 Modified:.STATUS src CHANGES src/helpers UpdateHide src/include conf.h hide.h Log: Make sure that include/hide.h is included always. Dependencies from make depend are now stable regardless of the rule's setting. Revision ChangesPath 1.195 +1 -4 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- STATUS1998/03/17 12:46:36 1.194 +++ STATUS1998/03/17 13:08:49 1.195 @@ -94,13 +94,10 @@ * Marc's mod_proxy was not clearing the Proxy-Connection header * Dean's API_EXPORT and CORE_EXPORT cleanup for core functions * Ralf's new ApacheBench support program (src/support/ab.c) +* Ken's change HIDE default to yes, always include hide.h Available Patches: -* M.D.Parker's [PATCH] mod_status/1448: Status Information have version - [EMAIL PROTECTED] - Status: Dean +1, Martin +0 (duplicates /server-info?server), - Alexei -1 (shared lib concerns) Concepts: 1.720 +7 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.719 retrieving revision 1.720 diff -u -r1.719 -r1.720 --- CHANGES 1998/03/17 12:46:38 1.719 +++ CHANGES 1998/03/17 13:08:50 1.720 @@ -1,5 +1,11 @@ Changes with Apache 1.3b6 + *) The default for the HIDE rule is now yes to aid portability, and + include/hide.h is always included. It doesn't do anything if the + rule is no but the dependencies don't change now regardless. + Previously, a make depend would result in different dependencies + according to how the rule was set. [Ken Coar] + *) Add the new ApacheBench program ab to src/support/: This is derived from the ZeusBench benchmarking program and can be used to determine the response performance of an Apache installation. This version is @@ -173,7 +179,7 @@ at a different time from the core, the SERVER_VERSION and SERVER_BUILT symbols have been abstracted through the new API routines apapi_get_server_version() and apapi_get_server_built(). - [Ken Coar] + [Ken Coar] PR#1448 *) WIN32: Preserve trailing slash in canonical path (and hence in PATH_INFO). [Paul Sutton, Ben Laurie] 1.9 +1 -1 apache-1.3/src/helpers/UpdateHide Index: UpdateHide === RCS file: /export/home/cvs/apache-1.3/src/helpers/UpdateHide,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- UpdateHide1998/03/17 08:20:48 1.8 +++ UpdateHide1998/03/17 13:08:53 1.9 @@ -74,7 +74,7 @@ # configuration $listbegin = '\n#ifdef HIDE\n'; -$listend= '\n#endif\n'; +$listend= '\n#endif /* HIDE */\n'; @excluded = qw( main errno environ optarg dlclose dlerror dlopen dlsym 1.192 +6 -2 apache-1.3/src/include/conf.h Index: conf.h === RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- conf.h1998/03/17 07:54:10 1.191 +++ conf.h1998/03/17 13:08:54 1.192 @@ -879,9 +879,13 @@ #include regex.h #endif -#ifdef HIDE +/* We always include the name-concealer file, even if stealth-mode + * is off. This keeps the dependencies the same regardless of the + * setting of the HIDE rule. hide.h either does its thing or not + * internally depending on the rule, so it's safe to include under + * all circumstances. + */ #include hide.h -#endif #ifdef HAVE_SYS_RESOURCE_H #include sys/resource.h 1.14 +1 -1 apache-1.3/src/include/hide.h Index: hide.h === RCS file: /export/home/cvs/apache-1.3/src/include/hide.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- hide.h1998/03/17 08:22:40 1.13 +++ hide.h1998/03/17 13:08:55 1.14 @@ -487,7 +487,7 @@ /* __ * * DO NOT EDIT ANYTHING ABOVE THIS LINE - Any changes made here will be lost! - * The section below is updated by running the script hide.pl + * The section above is updated by running the script Helpers/UpdateHide */ #endif /* !APACHE_HTTP_HIDE_H */
cvs commit: apache-1.3/src/support .cvsignore
rse 98/03/17 05:59:02 Modified:src/support .cvsignore Log: Add ab. Revision ChangesPath 1.5 +1 -0 apache-1.3/src/support/.cvsignore Index: .cvsignore === RCS file: /export/home/cvs/apache-1.3/src/support/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore1997/02/19 23:35:10 1.4 +++ .cvsignore1998/03/17 13:59:01 1.5 @@ -7,3 +7,4 @@ httpd_monitor suexec logresolve +ab
cvs commit: apache-2.0 STATUS
jim 98/03/17 07:00:25 Modified:.STATUS Log: Ahhh... At this rate, Apache 2.0 should be called Apache 2000 :) Revision ChangesPath 1.29 +16 -7 apache-2.0/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-2.0/STATUS,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- STATUS1998/03/14 17:12:51 1.28 +++ STATUS1998/03/17 15:00:24 1.29 @@ -66,6 +66,16 @@ without. Status: Dean +1 + * One of the main restrictions on Apache has been that we must assume +a very low-level common denominator for the OSs out there. For example, +Configure is always being derided as crappy, but it is restricted, +by long tradition and common sense, to only use those capabilities +that existed in the System 7 'sh' (eg: no function, etc...). One +possible key to Apache's success is that it does not require any +more than basic UNIX tools (and an ANSI C compiler) to build, +compile and run. Many of the ideas floating around for 2.0 would, +by default, (drastically) change this. Is this a good idea? + FEATURE SET FOR 2.0 Here, we decide how many of the following feature ideas we will set for ourselves as work items for 2.0. We can't do everything we would want @@ -99,10 +109,7 @@ . bstdio This was written by Chris Provenzano as part of his implementation - of Posix threads... Jim can place a copy of the RST-hacked - version on dev.apache.org if needed and possible. --- RST never donated his hacks to the Group. Don't put it up for - download unless you've cleared it with him. --Brian + of Posix threads. . page flipping friendly, page-sized buffer oriented, zero copy I/O (In this model there are functions like readbuf() which return a @@ -113,7 +120,8 @@ style of stdio, which adds an extra user space copy.) Martin asks: Is there some software flying around where such a model has been tried? Or is it a totally new technique? - Status: Dean +1, Marc +1, Ben +1, Paul +1, Martin +1 + Jim asks: examples? Portability concerns? + Status: Dean +1, Marc +1, Ben +1, Paul +1, Martin +1, Jim 0 Volunteers: * API work @@ -124,7 +132,7 @@ . documented API Status: Ken +1, Sameer +1, Marc +1, Ralf +1, Paul +1, Dean +1, - Martin +1 + Martin +1, Jim +1 Volunteers: Ken . just new API phases @@ -143,7 +151,8 @@ Volunteers: . clearly identify API functions by renaming them - Status: Ken +1, Ralf +1, Ben +1, Paul +1 (plus back compat.), Dean +1 + Status: Ken +1, Ralf +1, Ben +1, Paul +1 (plus back compat.), Dean +1, + Jim +1 Volunteers: Ken . backward compatibility with 1.3 (just require a recompile)
cvs commit: apache-1.3/src/support Makefile.tmpl
rse 98/03/17 07:42:43 Modified:src CHANGES Configure Makefile.tmpl src/ap Makefile.tmpl src/main Makefile.tmpl src/modules/example Makefile.tmpl src/modules/experimental Makefile.tmpl src/modules/extra Makefile.tmpl src/modules/proxy Makefile.tmpl src/modules/standard Makefile.tmpl src/modules/test Makefile.tmpl src/os/bs2000 Makefile.tmpl src/os/emx Makefile.tmpl src/os/unix Makefile.tmpl src/regex Makefile.tmpl src/support Makefile.tmpl Log: Major Configure Cleanup === 1. Now every Makefile receives a SRCDIR option which is set to ., ... ../.. etc. for the various subdirs and thus shows the individual path to the root of our src/ directory. [MAJOR CHANGE] 2. Replaced ugly INCLUDES_DEPTH[0-2] kludge with a SRCDIR based INCLUDES0 option which now reads ``INCLUDES0=-I$(SRCDIR)/os/unix -I$(SRCDIR)/include'' [MAJOR CHANGE] 3. Now replaced all locally defined INCDIR's with a globally defined INCDIR=$(SRCDIR)/include 4. Removed the TARGET option from all Makefiles (because it is not needed there) except for the top-level one (where it is needed) 5. Stripped confusing comments (##RULE..., etc.) and consequently add Begin/End comments for the generated sections 6. All Makefiles now contain a header with inheritance information, i.e. from which files it was derived 7. Subdirectory movement messages is now built-in for easier following where the build process currently stays. 8. All comments now have the same style in the Configure script. 9. The Apache license header was added to the Configure script 10. Fixed a few bugs in Configure ([spacetab] vs. [spacespace], etc.) 11. Tested under FreeBSD, Linux, Solaris and SunOS to make sure no new bugs were introduced. Hmmm [Re-run the Configure script!] Revision ChangesPath 1.721 +9 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.720 retrieving revision 1.721 diff -u -r1.720 -r1.721 --- CHANGES 1998/03/17 13:08:50 1.720 +++ CHANGES 1998/03/17 15:42:22 1.721 @@ -1,5 +1,14 @@ Changes with Apache 1.3b6 + *) Major cleanups to the Configure script to make it and its generated + Makefiles again readable and maintainable: add SRCDIR option, removed + INCLUDES_DEPTH[0-2] kludge, cleanup of TARGET option, cleanup of + generated sections, consequently added Makefile headers with inheritance + information, added subdir movement messages for easier following where + the build process currently stays (more verbose then standard Make, less + verbose than GNU make), same style to comments in the Configure script, + added Apache license header, fixed a few bugs, etc. [Ralf S. Engelschall] + *) The default for the HIDE rule is now yes to aid portability, and include/hide.h is always included. It doesn't do anything if the rule is no but the dependencies don't change now regardless. 1.211 +335 -254 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.210 retrieving revision 1.211 diff -u -r1.210 -r1.211 --- Configure 1998/03/16 18:36:17 1.210 +++ Configure 1998/03/17 15:42:23 1.211 @@ -1,23 +1,80 @@ #!/bin/sh -exitcode=0 -trap 'rm -f $tmpfile $tmpfile2 $tmpfile3 $tmpconfig $awkfile; exit $exitcode' 0 1 2 3 15 +## +## Copyright (c) 1995-1998 The Apache Group. All rights reserved. +## +## Redistribution and use in source and binary forms, with or without +## modification, are permitted provided that the following conditions +## are met: +## +## 1. Redistributions of source code must retain the above copyright +##notice, this list of conditions and the following disclaimer. +## +## 2. Redistributions in binary form must reproduce the above copyright +##notice, this list of conditions and the following disclaimer in +##the documentation and/or other materials provided with the +##distribution. +## +## 3. All advertising materials mentioning features or use of this +##software must display the following acknowledgment: +##This product includes software developed by the Apache Group +##for use in the Apache HTTP server project (http://www.apache.org/). +## +## 4. The names Apache Server and Apache Group must not be used to
cvs commit: apache-1.3 STATUS
rse 98/03/17 07:47:31 Modified:.STATUS Log: The same weather as always in germany these days: gray in gray... Revision ChangesPath 1.196 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- STATUS1998/03/17 13:08:49 1.195 +++ STATUS1998/03/17 15:47:30 1.196 @@ -95,6 +95,7 @@ * Dean's API_EXPORT and CORE_EXPORT cleanup for core functions * Ralf's new ApacheBench support program (src/support/ab.c) * Ken's change HIDE default to yes, always include hide.h +* Ralf's major Configure cleanup Available Patches:
cvs commit: apache-1.3/src/include conf.h
dgaudet 98/03/17 11:51:49 Modified:src/include conf.h Log: notes about API_EXPORT and API_EXPORT_NONSTD Revision ChangesPath 1.194 +9 -0 apache-1.3/src/include/conf.h Index: conf.h === RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v retrieving revision 1.193 retrieving revision 1.194 diff -u -r1.193 -r1.194 --- conf.h1998/03/17 19:38:39 1.193 +++ conf.h1998/03/17 19:51:48 1.194 @@ -744,10 +744,19 @@ #undef NEED_STRDUP #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
cvs commit: apache-1.3/src/main http_main.c
marc98/03/17 15:24:16
Modified:src/main http_main.c
Log:
Fix warning on Solaris. Using a long format should be safer for
everything. I think.
Revision ChangesPath
1.308 +1 -1 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- http_main.c 1998/03/17 08:20:59 1.307
+++ http_main.c 1998/03/17 23:24:10 1.308
@@ -339,7 +339,7 @@
{
char buf[20];
-ap_snprintf(buf, sizeof(buf), .%u, getpid());
+ap_snprintf(buf, sizeof(buf), .%lu, getpid());
lock_fname = pstrcat(p, server_root_relative(p, lock_fname), buf, NULL);
}
#endif
