date:19990827

cvs commit: apache-2.0/src/main http_config.c

1999-08-27 Thread fielding

fielding99/08/27 16:47:10

  Modified:src  CHANGES
   src/main http_config.c
  Log:
  Move "handler not found" warning message to below the check
  for a wildcard handler.  Gee, you'd think someone would have
  fixed it before seven PRs.
  
  PR: 2584, 3349, 3436, 3548, 4384, 4795, 4807
  Submitted by: Dirk <[EMAIL PROTECTED]>, Roy Fielding
  
  Revision  ChangesPath
  1.3   +4 -0  apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CHANGES   1999/08/27 14:37:13 1.2
  +++ CHANGES   1999/08/27 23:47:08 1.3
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0-dev
   
  +  *) Move "handler not found" warning message to below the check
  + for a wildcard handler.  [Dirk <[EMAIL PROTECTED]>, Roy Fielding]
  + PR#2584, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807
  +
 *) Support line-continuation feature in config.option file.
[Ralf S. Engelschall]
   
  
  
  
  1.7   +4 -5  apache-2.0/src/main/http_config.c
  
  Index: http_config.c
  ===
  RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- http_config.c 1999/08/27 22:03:06 1.6
  +++ http_config.c 1999/08/27 23:47:09 1.7
  @@ -338,11 +338,6 @@
   }
   }
   
  -if (result == HTTP_INTERNAL_SERVER_ERROR && r->handler) {
  -ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
  -"handler \"%s\" not found for: %s", r->handler, r->filename);
  -}
  -
   /* Pass two --- wildcard matches */
   
   for (handp = wildhandlers; handp->hr.content_type; ++handp) {
  @@ -355,6 +350,10 @@
}
   }
   
  +if (result == HTTP_INTERNAL_SERVER_ERROR && r->handler && r->filename) {
  +ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
  +"handler \"%s\" not found for: %s", r->handler, r->filename);
  +}
   return HTTP_INTERNAL_SERVER_ERROR;
   }

cvs commit: apache-1.3/src/main http_config.c

1999-08-27 Thread fielding

fielding99/08/27 16:38:11

  Modified:src  CHANGES
   src/main http_config.c
  Log:
  Move "handler not found" warning message to below the check
  for a wildcard handler.  Gee, you'd think someone would have
  fixed it before seven PRs.
  
  PR: 2584, 3349, 3436, 3548, 4384, 4795, 4807
  Submitted by: Dirk <[EMAIL PROTECTED]>, Roy Fielding
  
  Revision  ChangesPath
  1.1425+4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1424
  retrieving revision 1.1425
  diff -u -r1.1424 -r1.1425
  --- CHANGES   1999/08/19 09:07:32 1.1424
  +++ CHANGES   1999/08/27 23:38:05 1.1425
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.10
   
  +  *) Move "handler not found" warning message to below the check
  + for a wildcard handler.  [Dirk <[EMAIL PROTECTED]>, Roy Fielding]
  + PR#2584, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807
  +
 *) Build errors in src/support stop with an error, just like all the
other recursive make calls. [David Harris <[EMAIL PROTECTED]>]
   
  
  
  
  1.147 +4 -5  apache-1.3/src/main/http_config.c
  
  Index: http_config.c
  ===
  RCS file: /home/cvs/apache-1.3/src/main/http_config.c,v
  retrieving revision 1.146
  retrieving revision 1.147
  diff -u -r1.146 -r1.147
  --- http_config.c 1999/08/06 16:21:33 1.146
  +++ http_config.c 1999/08/27 23:38:10 1.147
  @@ -512,11 +512,6 @@
   }
   }
   
  -if (result == HTTP_INTERNAL_SERVER_ERROR && r->handler) {
  -ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
  -"handler \"%s\" not found for: %s", r->handler, r->filename);
  -}
  -
   /* Pass two --- wildcard matches */
   
   for (handp = wildhandlers; handp->hr.content_type; ++handp) {
  @@ -529,6 +524,10 @@
}
   }
   
  +if (result == HTTP_INTERNAL_SERVER_ERROR && r->handler && r->filename) {
  +ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
  +"handler \"%s\" not found for: %s", r->handler, r->filename);
  +}
   return HTTP_INTERNAL_SERVER_ERROR;
   }

cvs commit: apache-1.3/src/support apxs.pl

1999-08-27 Thread wsanchez

wsanchez99/08/27 16:31:09

  Modified:src/support apxs.pl
  Log:
  When apxs compiles a .o file, it cc puts it into the current working 
directory. But then we're looking for the .o file in the directory that 
contains the .c file, and the link line breaks. So lets remove the path to the 
.c file when adding to @objs.
  
  Revision  ChangesPath
  1.26  +1 -0  apache-1.3/src/support/apxs.pl
  
  Index: apxs.pl
  ===
  RCS file: /home/cvs/apache-1.3/src/support/apxs.pl,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- apxs.pl   1999/07/24 18:05:02 1.25
  +++ apxs.pl   1999/08/27 23:31:00 1.26
  @@ -369,6 +369,7 @@
   foreach $s (@srcs) {
   my $o = $s;
   $o =~ s|\.c$|.o|;
  +$o =~ s|^.*/||;
   push(@cmds, "$CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c $s");
   unshift(@objs, $o);
   }

cvs commit: apache-2.0/src/os/win32 modules.c os.c os.h

1999-08-27 Thread stoddard

stoddard99/08/27 15:57:37

  Modified:src  ApacheCore.def ApacheCore.dsp ApacheCore.mak
Makefile.nt
   src/ap   ap.dsp ap.mak
   src/include ap_config.h
   src/main alloc.c http_main.c
   src/modules/mpm/winnt winnt.c
   src/os/win32 modules.c os.c os.h
  Log:
  A bunch of changes to get the server compiling on WIN32. mod_cgi, mod_include,
  mod_isapi and mod_so don't work so I am not making them. Moved a lot of code 
out
  of multithread.*  and into os.* (didn't want to add multithread to the new 
repository).
  Much of this can be cleaned up when APR is stable.
  
  And Dean's gonna but me for sure for the http_main hit. It's may be
  possible to name a DLL entry point 'main()'. Just havent tried it yet.
  
  Enjoy!
  
  Revision  ChangesPath
  1.2   +47 -44apache-2.0/src/ApacheCore.def
  
  Index: ApacheCore.def
  ===
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.def,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ApacheCore.def1999/08/24 05:34:13 1.1
  +++ ApacheCore.def1999/08/27 22:56:35 1.2
  @@ -16,7 +16,7 @@
ap_add_named_module   @9
ap_add_per_dir_conf   @10
ap_add_per_url_conf   @11
  - ap_add_version_component   @12
  + ;ap_add_version_component   @12
ap_allow_options   @13
ap_allow_overrides   @14
ap_append_arrays   @15
  @@ -27,34 +27,34 @@
ap_bclose   @20
ap_bcreate   @21
ap_bfilbuf   @22
  - ap_bfileno   @23
  + ;ap_bfileno   @23
ap_bflsbuf   @24
ap_bflush   @25
ap_bgetopt   @26
ap_bgets   @27
  - ap_bhalfduplex   @28
  - ap_block_alarms   @29
  + ;ap_bhalfduplex   @28
  + ;ap_block_alarms   @29
ap_blookc   @30
  - ap_bnonblock   @31
  + ;ap_bnonblock   @31
ap_bonerror   @32
  - ap_bpushfd   @33
  - ap_bpushh   @34
  + ;ap_bpushfd   @33
  + ;ap_bpushh   @34
ap_bputs   @35
ap_bread   @36
ap_bsetflag   @37
ap_bsetopt   @38
  - ap_bskiplf   @39
  + ;ap_bskiplf   @39
ap_bspawn_child   @40
ap_bwrite   @41
  - ap_bytes_in_free_blocks   @42
  - ap_bytes_in_pool   @43
  + ;ap_bytes_in_free_blocks   @42
  + ;ap_bytes_in_pool   @43
ap_call_exec   @44
  - ap_can_exec   @45
  + ;ap_can_exec   @45
ap_cfg_closefile   @46
ap_cfg_getc   @47
ap_cfg_getline   @48
ap_chdir_file   @49
  - ap_check_alarm   @50
  + ;ap_check_alarm   @50
ap_check_cmd_context   @51
ap_checkmask   @52
ap_cleanup_for_exec   @53
  @@ -89,7 +89,7 @@
ap_escape_path_segment   @82
ap_escape_quotes   @83
ap_escape_shell_cmd   @84
  - ap_exists_scoreboard_image   @85
  + ;ap_exists_scoreboard_image   @85
ap_finalize_request_protocol   @86
ap_find_command   @87
ap_find_command_in_modules   @88
  @@ -107,7 +107,7 @@
ap_get_server_built   @100
ap_get_server_name   @101
ap_get_server_port   @102
  - ap_get_server_version   @103
  + ;ap_get_server_version   @103
ap_get_time   @104
ap_get_token   @105
ap_getparents   @106
  @@ -122,7 +122,7 @@
ap_gm_timestr_822   @115
ap_gname2id   @116
ap_handle_command   @117
  - ap_hard_timeout   @118
  + ;ap_hard_timeout   @118
ap_ht_time   @119
ap_ind   @120
ap_index_of_response   @121
  @@ -137,7 +137,7 @@
ap_kill_cleanup   @130
ap_kill_cleanups_for_fd   @131
ap_kill_cleanups_for_socket   @132
  - ap_kill_timeout   @133
  + ;ap_kill_timeout   @133
ap_log_assert   @134
ap_log_error_old   @135
ap_log_reason   @136
  @@ -204,7 +204,7 @@
ap_remove_loaded_module   @197
ap_remove_module   @198
ap_requires   @199
  - ap_reset_timeout   @200
  + ;ap_reset_timeout   @200
ap_rflush   @201
ap_rind   @202
ap_rputc   @203
  @@ -216,8 +216,8 @@
ap_scan_script_header_err   @209
ap_scan_script_header_err_buff   @210
ap_scan_script_header_err_core   @211
  - ap_send_fb   @212
  - ap_send_fb_length   @213
  + ;ap_send_fb   @212
  + ;ap_send_fb_length   @213
ap_send_fd   @214
ap_send_fd_length   @215
ap_send_http_header   @216
  @@ -232,7 +232,7 @@
ap_set_last_modified   @225
ap_setup_client_block   @226
ap_should_client_block   @227
  - ap_soft_timeout   @228
  + ;ap_soft_timeout   @228
ap_some_auth_required   @229
ap_spawn_child   @230
ap_srm_command_loop   @231
  @@ -241,7 +241,7 @@
ap_strcmp_match   @234
ap_sub_req_lookup_file   @235
ap_sub_req_lookup_uri   @236

cvs commit: apache-2.0/src/modules/proxy proxy_cache.c

1999-08-27 Thread fielding

fielding99/08/27 15:18:59

  Modified:src/include util_date.h
   src/main http_protocol.c util_date.c util_script.c
   src/modules/proxy proxy_cache.c
  Log:
  Reverse the unnecessary change to the interface of ap_parseHTTPdate()
  that was discovered while rebuilding the repository.
  
  Revision  ChangesPath
  1.3   +1 -1  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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- util_date.h   1999/08/26 14:53:20 1.2
  +++ util_date.h   1999/08/27 22:18:45 1.3
  @@ -76,7 +76,7 @@
   
   API_EXPORT(int) ap_checkmask(const char *data, const char *mask);
   API_EXPORT(time_t) ap_tm2sec(const struct tm *t);
  -API_EXPORT(time_t) ap_parseHTTPdate(const char *date, time_t * retval);
  +API_EXPORT(time_t) ap_parseHTTPdate(const char *date);
   
   #ifdef __cplusplus
   }
  
  
  
  1.11  +7 -12 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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- http_protocol.c   1999/08/27 22:03:06 1.10
  +++ http_protocol.c   1999/08/27 22:18:48 1.11
  @@ -428,12 +428,10 @@
*/
   if_unmodified = ap_table_get(r->headers_in, "If-Unmodified-Since");
   if (if_unmodified != NULL) {
  - /* ZZZ we are changing time funcs to AP time thread funcs.
  -and we need to check return values of ap_parseHTTPdate. */
  -time_t ius ;
  - if (ap_parseHTTPdate(if_unmodified, &ius) == 1
  - && (mtime > ius)) {
  - return HTTP_PRECONDITION_FAILED;
  +time_t ius = ap_parseHTTPdate(if_unmodified);
  +
  +if ((ius != BAD_DATE) && (mtime > ius)) {
  +return HTTP_PRECONDITION_FAILED;
   }
   }
   }
  @@ -483,12 +481,9 @@
   else if ((r->method_number == M_GET)
&& ((if_modified_since =
 ap_table_get(r->headers_in, "If-Modified-Since")) != 
NULL)) {
  -time_t ims;
  - if (ap_parseHTTPdate(if_modified_since, &ims) != 1) {
  - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING,
  -  r->server, "bogus if-modified-since-header");
  - }
  -else if ((ims >= mtime) && (ims <= r->request_time)) {
  +time_t ims = ap_parseHTTPdate(if_modified_since);
  +
  +if ((ims >= mtime) && (ims <= r->request_time)) {
   return HTTP_NOT_MODIFIED;
   }
   }
  
  
  
  1.3   +3 -5  apache-2.0/src/main/util_date.c
  
  Index: util_date.c
  ===
  RCS file: /home/cvs/apache-2.0/src/main/util_date.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- util_date.c   1999/08/26 14:53:23 1.2
  +++ util_date.c   1999/08/27 22:18:49 1.3
  @@ -214,7 +214,7 @@
* but many changes since then.
*
*/
  -API_EXPORT(time_t) ap_parseHTTPdate(const char *date, time_t * retval)
  +API_EXPORT(time_t) ap_parseHTTPdate(const char *date)
   {
   struct tm ds;
   int mint, mon;
  @@ -228,7 +228,7 @@
('S' << 16) | ('e' << 8) | 'p', ('O' << 16) | ('c' << 8) | 't',
('N' << 16) | ('o' << 8) | 'v', ('D' << 16) | ('e' << 8) | 'c'};
   
  -if (!date)  /* ZZZ return AP_FAILURE on all errors. */
  +if (!date)
return BAD_DATE;
   
   while (*date && ap_isspace(*date))   /* Find first non-whitespace 
char */
  @@ -317,7 +317,5 @@
   
   ds.tm_mon = mon;
   
  -/* ZZZ return AP_SUCCESS.  use AP Implode time func for this. */
  -*retval = ap_tm2sec(&ds);
  -return 1;
  +return ap_tm2sec(&ds);
   }
  
  
  
  1.6   +4 -5  apache-2.0/src/main/util_script.c
  
  Index: util_script.c
  ===
  RCS file: /home/cvs/apache-2.0/src/main/util_script.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- util_script.c 1999/08/26 14:53:24 1.5
  +++ util_script.c 1999/08/27 22:18:49 1.6
  @@ -588,11 +588,10 @@
 * pass it on blindly because of restrictions on future values.
 */
else if (!strcasecmp(w, "Last-Modified")) {
  - time_t mtime;
  - if (ap_parseHTTPdate(l, &mtime) == 1) {
  - ap_update_mtime(r, mtime);
  - ap_set_last_modified(r);
  - }
  + time_t mtime = ap_parseHTTPdate(l);
  +
  + ap_update_mtime(r, mtime);
  + ap_set_last_modified(r);
}
else if (!strcasecmp(w, "Set-Cookie")) {
ap_table

cvs commit: apache-2.0/src/modules/mpm/dexter Makefile.tmpl dexter.c scoreboard.c scoreboard.h

1999-08-27 Thread manoj

manoj   99/08/27 15:16:21

  Modified:src/modules/mpm/dexter Makefile.tmpl dexter.c
  Removed: src/modules/mpm/dexter scoreboard.c scoreboard.h
  Log:
  Some cleanups. Among other things:
- The scoreboard is gond, so we don't call it that anymore
- We were accessing the child table through a weird combination of
  wrappers and direct access; just switch to direct access and get rid
  of scoreboard.[ch]
  
  Revision  ChangesPath
  1.2   +4 -15 apache-2.0/src/modules/mpm/dexter/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/Makefile.tmpl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -d -u -r1.1 -r1.2
  --- Makefile.tmpl 1999/07/21 19:07:05 1.1
  +++ Makefile.tmpl 1999/08/27 22:16:16 1.2
  @@ -2,9 +2,9 @@
   LIB=libdexter.$(LIBEXT)
   
   OBJS=\
  - dexter.o acceptlock.o scoreboard.o
  + dexter.o acceptlock.o
   OBJS_PIC=\
  - dexter.lo acceptlock.lo scoreboard.lo
  + dexter.lo acceptlock.lo
   
   all: lib
   
  @@ -81,16 +81,5 @@
$(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
$(INCDIR)/http_connection.h $(INCDIR)/ap_mpm.h \
$(OSDIR)/unixd.h $(OSDIR)/iol_socket.h \
  - $(INCDIR)/ap_listen.h scoreboard.h mpm_default.h acceptlock.h
  -scoreboard.o: scoreboard.c $(INCDIR)/httpd.h \
  - $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
  - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h \
  - $(INCDIR)/util_uri.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
  - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
  - $(OSDIR)/unixd.h $(INCDIR)/http_conf_globals.h \
  - dexter.h scoreboard.h mpm_default.h
  + $(INCDIR)/ap_listen.h mpm_default.h acceptlock.h \
  + dexter.h mpm_default.h
  
  
  
  1.30  +47 -24apache-2.0/src/modules/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -d -u -r1.29 -r1.30
  --- dexter.c  1999/08/27 21:28:16 1.29
  +++ dexter.c  1999/08/27 22:16:17 1.30
  @@ -67,8 +67,8 @@
   #include "unixd.h"
   #include "iol_socket.h"
   #include "ap_listen.h"
  -#include "scoreboard.h" 
   #include "acceptlock.h"
  +#include "mpm_default.h"
   
   #include 
   #include  
  @@ -90,6 +90,16 @@
   static int num_listenfds = 0;
   static struct pollfd *listenfds;
   
  +/* Table of child status */
  +#define SERVER_DEAD 0
  +#define SERVER_DYING 1
  +#define SERVER_ALIVE 2
  +
  +static struct {
  +pid_t pid;
  +unsigned char status;
  +} child_table[HARD_SERVER_LIMIT];
  +
   #if 0
   #define SAFE_ACCEPT(stmt) do {if (ap_listeners->next != NULL) {stmt;}} while 
(0)
   #else
  @@ -99,7 +109,7 @@
   /*
* The max child slot ever assigned, preserved across restarts.  Necessary
* to deal with NumServers changes across SIGWINCH restarts.  We use this
  - * value to optimize routines that have to scan the entire scoreboard.
  + * value to optimize routines that have to scan the entire child table.
*
* XXX - It might not be worth keeping this code in. There aren't very
* many child processes in this MPM.
  @@ -134,7 +144,7 @@
   #endif
   
   #ifdef HAS_OTHER_CHILD
  -/* used to maintain list of children which aren't part of the scoreboard */
  +/* used to maintain list of children which aren't part of the child table */
   typedef struct other_child_rec other_child_rec;
   struct other_child_rec {
   other_child_rec *next;
  @@ -317,14 +327,16 @@
/* now see who is done */
not_dead_yet = 0;
for (i = 0; i < max_daemons_limit; ++i) {
  - int pid = ap_scoreboard_image[i].pid;
  + int pid;
   
  - if (ap_scoreboard_image[i].status == SERVER_DEAD)
  + if (child_table[i].status == SERVER_DEAD)
continue;
   
  +pid = child_table[i].pid;
  +
waitret = waitpid(pid, &status, WNOHANG);
if (waitret == pid || waitret == -1) {
  - ap_scoreboard_image[i].status = SERVER_DEAD;
  + child_table[i].status = SERVER_DEAD;
continue;
}
++not_dead_yet;
  @@ -1048,15 +1060,14 @@
   {
   int pid;
   
  -(void) ap_update_child_status(slot, SERVER_ALIVE);
  -
   if (slot + 1 > max_daemons_limit) {
   max_daemons_limit = slot + 1;
   }
   
   if (one_process) {
set_signals();
  -ap_scoreboard_image[slot].pid = getpid();
  +child_table[slot].pid = getpid();
  +child_table[slot].status = SERVER_ALIVE;
child_main(slot);
   }
   
  @@ -1093,7 +1104,9 @@
return 0;

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

1999-08-27 Thread fielding

fielding99/08/27 15:03:20

  Modified:src/main alloc.c http_config.c http_protocol.c
  Log:
  Reverse the errors from bad merges that were found while
  rebuilding the repository.
  
  Revision  ChangesPath
  1.5   +7 -7  apache-2.0/src/main/alloc.c
  
  Index: alloc.c
  ===
  RCS file: /home/cvs/apache-2.0/src/main/alloc.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- alloc.c   1999/08/26 15:17:06 1.4
  +++ alloc.c   1999/08/27 22:03:05 1.5
  @@ -2074,14 +2074,14 @@
if (pipe_in) {
close(in_fds[0]);
close(in_fds[1]);
  - }
  + }
if (pipe_out) {
close(out_fds[0]);
close(out_fds[1]);
  - }
  + }
errno = save_errno;
return 0;
  - }
  +}
   
   #ifdef WIN32
   
  @@ -2230,10 +2230,10 @@
close(out_fds[0]);
close(out_fds[1]);
}
  - if (pipe_err) {
  + if (pipe_err) {
close(err_fds[0]);
close(err_fds[1]);
  - }
  + }
errno = save_errno;
return 0;
   }
  @@ -2254,11 +2254,11 @@
close(in_fds[0]);
}
   
  - if (pipe_err) {
  + if (pipe_err) {
close(err_fds[0]);
dup2(err_fds[1], STDERR_FILENO);
close(err_fds[1]);
  - }
  + }
   
/* HP-UX SIGCHLD fix goes here, if someone will remind me what it is... 
*/
signal(SIGCHLD, SIG_DFL);   /* Was that it? */
  
  
  
  1.6   +22 -21apache-2.0/src/main/http_config.c
  
  Index: http_config.c
  ===
  RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- http_config.c 1999/08/26 16:30:34 1.5
  +++ http_config.c 1999/08/27 22:03:06 1.6
  @@ -1088,27 +1088,28 @@
   
   /* loop through the access names and find the first one */
   
  -while (!f && access_name[0]) {
  -char * w = ap_getword_conf(r->pool, &access_name);
  -filename = ap_make_full_path(r->pool, d, w);
  - f = ap_pcfg_openfile(r->pool, filename);
  -}
  -if (f) {
  -dc = ap_create_per_dir_config(r->pool);
  -
  - parms.config_file = f;
  -
  - errmsg = ap_srm_command_loop(&parms, dc);
  -
  - ap_cfg_closefile(f);
  -
  - if (errmsg) {
  - ap_log_rerror(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, r,
  -   "%s: %s", filename, errmsg);
  - return HTTP_INTERNAL_SERVER_ERROR;
  - }
  - *result = dc;
  -}
  +while (access_name[0]) {
  +filename = ap_make_full_path(r->pool, d,
  + ap_getword_conf(r->pool, &access_name));
  +
  +if ((f = ap_pcfg_openfile(r->pool, filename)) != NULL) {
  +
  +dc = ap_create_per_dir_config(r->pool);
  +
  +parms.config_file = f;
  +
  +errmsg = ap_srm_command_loop(&parms, dc);
  +
  +ap_cfg_closefile(f);
  +
  +if (errmsg) {
  +ap_log_rerror(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, r,
  +  "%s: %s", filename, errmsg);
  +return HTTP_INTERNAL_SERVER_ERROR;
  +}
  +*result = dc;
  +break;
  +}
   else if (errno != ENOENT && errno != ENOTDIR) {
   ap_log_rerror(APLOG_MARK, APLOG_CRIT, r,
 "%s pcfg_openfile: unable to check htaccess file, "
  
  
  
  1.10  +3 -3  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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- http_protocol.c   1999/08/26 16:30:36 1.9
  +++ http_protocol.c   1999/08/27 22:03:06 1.10
  @@ -1558,9 +1558,6 @@
   r->sent_bodyct = 1;
   return;
   }
  -else {
  - fixup_vary(r);
  -}
   
   /*
* Now that we are ready to send a response, we need to combine the two
  @@ -1580,6 +1577,9 @@
ap_table_unset(r->headers_out, "Vary");
r->proto_num = HTTP_VERSION(1,0);
ap_table_set(r->subprocess_env, "force-response-1.0", "1");
  +}
  +else {
  + fixup_vary(r);
   }
   
   ap_basic_http_header(r);

cvs commit: apache-2.0/src/modules/mpm/dexter dexter.c

1999-08-27 Thread manoj

manoj   99/08/27 14:28:17

  Modified:src/modules/mpm/dexter dexter.c
  Log:
  Be consistent with how we indicate child death and use status =
  SERVER_DEAD instead of pid = 0. I don't think this actually caused any
  bugs, but just in case...
  
  Revision  ChangesPath
  1.29  +2 -2  apache-2.0/src/modules/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -d -u -r1.28 -r1.29
  --- dexter.c  1999/08/27 21:22:28 1.28
  +++ dexter.c  1999/08/27 21:28:16 1.29
  @@ -319,12 +319,12 @@
for (i = 0; i < max_daemons_limit; ++i) {
int pid = ap_scoreboard_image[i].pid;
   
  - if (pid == my_pid || pid == 0)
  + if (ap_scoreboard_image[i].status == SERVER_DEAD)
continue;
   
waitret = waitpid(pid, &status, WNOHANG);
if (waitret == pid || waitret == -1) {
  - ap_scoreboard_image[i].pid = 0;
  + ap_scoreboard_image[i].status = SERVER_DEAD;
continue;
}
++not_dead_yet;

cvs commit: apache-2.0/src/modules/mpm/dexter dexter.c

1999-08-27 Thread manoj

manoj   99/08/27 14:22:30

  Modified:src/modules/mpm/dexter dexter.c
  Log:
  Fix a bug in setting max_daemons_limit that could lead to not noticing
  that a child has died in some cases.
  
  Revision  ChangesPath
  1.28  +8 -3  apache-2.0/src/modules/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -d -u -r1.27 -r1.28
  --- dexter.c  1999/08/17 22:04:54 1.27
  +++ dexter.c  1999/08/27 21:22:28 1.28
  @@ -100,6 +100,9 @@
* The max child slot ever assigned, preserved across restarts.  Necessary
* to deal with NumServers changes across SIGWINCH restarts.  We use this
* value to optimize routines that have to scan the entire scoreboard.
  + *
  + * XXX - It might not be worth keeping this code in. There aren't very
  + * many child processes in this MPM.
*/
   int max_daemons_limit = -1;
   
  @@ -1141,13 +1144,15 @@
   unsigned char status = ap_scoreboard_image[i].status;
   
   if (status == SERVER_DEAD) {
  -free_slots[free_length] = i;
  -++free_length;
  +if (free_length < spawn_rate) {
  +free_slots[free_length] = i;
  +++free_length;
  +}
   } else {
   last_non_dead = i;
   }
   
  - if (free_length >= spawn_rate) {
  + if (i >= max_daemons_limit && free_length >= spawn_rate) {
break;
}
   }

cvs commit: apache-2.0/src/support htpasswd.mak htdigest.mak htpasswd.dsp htdigest.dsp

1999-08-27 Thread stoddard

stoddard99/08/27 13:43:41

  Added:   src/support htpasswd.mak htdigest.mak htpasswd.dsp
htdigest.dsp
  Log:
  WIN32: htdigest and htpasswd project and make files for Win32 were deleted
  somewhere along the way. Adding them back...
  
  Revision  ChangesPath
  1.1  apache-2.0/src/support/htpasswd.mak
  
  Index: htpasswd.mak
  ===
  # Microsoft Developer Studio Generated NMAKE File, Based on htpasswd.dsp
  !IF "$(CFG)" == ""
  CFG=htpasswd - Win32 Debug
  !MESSAGE No configuration specified. Defaulting to htpasswd - Win32 Debug.
  !ENDIF 
  
  !IF "$(CFG)" != "htpasswd - Win32 Release" && "$(CFG)" !=\
   "htpasswd - Win32 Debug"
  !MESSAGE Invalid configuration "$(CFG)" specified.
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f "htpasswd.mak" CFG="htpasswd - Win32 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "htpasswd - Win32 Release" (based on\
   "Win32 (x86) Console Application")
  !MESSAGE "htpasswd - Win32 Debug" (based on "Win32 (x86) Console Application")
  !MESSAGE 
  !ERROR An invalid configuration is specified.
  !ENDIF 
  
  !IF "$(OS)" == "Windows_NT"
  NULL=
  !ELSE 
  NULL=nul
  !ENDIF 
  
  !IF  "$(CFG)" == "htpasswd - Win32 Release"
  
  OUTDIR=.\Release
  INTDIR=.\Release
  # Begin Custom Macros
  OutDir=.\Release
  # End Custom Macros
  
  !IF "$(RECURSE)" == "0" 
  
  ALL : "$(OUTDIR)\htpasswd.exe"
  
  !ELSE 
  
  ALL : "$(OUTDIR)\htpasswd.exe"
  
  !ENDIF 
  
  CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\ap_base64.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_checkpass.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_cpystrn.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_getpass.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_md5c.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_sha1.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj"
[EMAIL PROTECTED] "$(INTDIR)\htpasswd.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(OUTDIR)\htpasswd.exe"
  
  "$(OUTDIR)" :
  if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  
  CPP=cl.exe
  CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D\
   "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fp"$(INTDIR)\htpasswd.pch" 
/YX\
   /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  CPP_OBJS=.\Release/
  CPP_SBRS=.
  
  .c{$(CPP_OBJS)}.obj::
 $(CPP) @<<
 $(CPP_PROJ) $< 
  <<
  
  .cpp{$(CPP_OBJS)}.obj::
 $(CPP) @<<
 $(CPP_PROJ) $< 
  <<
  
  .cxx{$(CPP_OBJS)}.obj::
 $(CPP) @<<
 $(CPP_PROJ) $< 
  <<
  
  .c{$(CPP_SBRS)}.sbr::
 $(CPP) @<<
 $(CPP_PROJ) $< 
  <<
  
  .cpp{$(CPP_SBRS)}.sbr::
 $(CPP) @<<
 $(CPP_PROJ) $< 
  <<
  
  .cxx{$(CPP_SBRS)}.sbr::
 $(CPP) @<<
 $(CPP_PROJ) $< 
  <<
  
  RSC=rc.exe
  BSC32=bscmake.exe
  BSC32_FLAGS=/nologo /o"$(OUTDIR)\htpasswd.bsc" 
  BSC32_SBRS= \

  LINK32=link.exe
  LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
   advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console 
/incremental:no\
   /pdb:"$(OUTDIR)\htpasswd.pdb" /machine:I386 /out:"$(OUTDIR)\htpasswd.exe" 
  LINK32_OBJS= \
"$(INTDIR)\ap_base64.obj" \
"$(INTDIR)\ap_checkpass.obj" \
"$(INTDIR)\ap_cpystrn.obj" \
"$(INTDIR)\ap_getpass.obj" \
"$(INTDIR)\ap_md5c.obj" \
"$(INTDIR)\ap_sha1.obj" \
"$(INTDIR)\ap_snprintf.obj" \
"$(INTDIR)\htpasswd.obj"
  
  "$(OUTDIR)\htpasswd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  $(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
  <<
  
  !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
  
  OUTDIR=.\Debug
  INTDIR=.\Debug
  # Begin Custom Macros
  OutDir=.\Debug
  # End Custom Macros
  
  !IF "$(RECURSE)" == "0" 
  
  ALL : "$(OUTDIR)\htpasswd.exe"
  
  !ELSE 
  
  ALL : "$(OUTDIR)\htpasswd.exe"
  
  !ENDIF 
  
  CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\ap_base64.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_checkpass.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_cpystrn.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_getpass.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_md5c.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_sha1.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj"
[EMAIL PROTECTED] "$(INTDIR)\htpasswd.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(INTDIR)\vc50.pdb"
[EMAIL PROTECTED] "$(OUTDIR)\htpasswd.exe"
[EMAIL PROTECTED] "$(OUTDIR)\htpasswd.ilk"
[EMAIL PROTECTED] "$(OUTDIR)\htpasswd.pdb"
  
  "$(OUTDIR)" :
  if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  
  CPP=cl.exe
  CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "..\include" /D "_DEBUG" /D\
   "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN"\
   /Fp"$(INTDIR)\htpasswd.pch" /YX /Fo"$(IN

cvs commit: apache-1.3/src/modules/proxy proxy_cache.c proxy_connect.c proxy_util.c

1999-08-27 Thread stoddard

stoddard99/08/27 13:22:04

  Modified:src/modules/proxy proxy_cache.c proxy_connect.c proxy_util.c
  Log:
  Do not access fd directly, use ap_bfileno instead.
  
  Revision  ChangesPath
  1.63  +17 -18apache-1.3/src/modules/proxy/proxy_cache.c
  
  Index: proxy_cache.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_cache.c,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- proxy_cache.c 1999/08/02 10:45:33 1.62
  +++ proxy_cache.c 1999/08/27 20:21:49 1.63
  @@ -728,7 +728,7 @@
ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r,
 "proxy: bad (short?) cache file: %s", c->filename);
if (i != 1) {
  - ap_pclosef(r->pool, cachefp->fd);
  + ap_pclosef(r->pool, ap_bfileno(cachefp, B_WR));
cachefp = NULL;
}
   }
  @@ -754,7 +754,7 @@
if ((q = ap_table_get(c->hdrs, "Expires")) != NULL)
ap_table_set(r->headers_out, "Expires", q);
}
  - ap_pclosef(r->pool, cachefp->fd);
  + ap_pclosef(r->pool, ap_bfileno(cachefp, B_WR));
Explain0("Use local copy, cached file hasn't changed");
return HTTP_NOT_MODIFIED;
}
  @@ -772,7 +772,7 @@
r->sent_bodyct = 1;
if (!r->header_only)
ap_proxy_send_fb(cachefp, r, NULL);
  - ap_pclosef(r->pool, cachefp->fd);
  + ap_pclosef(r->pool, ap_bfileno(cachefp, B_WR));
return OK;
   }
   
  @@ -876,7 +876,7 @@
Explain1("Response is not cacheable, unlinking %s", c->filename);
   /* close the file */
if (c->fp != NULL) {
  - ap_pclosef(r->pool, c->fp->fd);
  + ap_pclosef(r->pool, ap_bfileno(c->fp, B_WR));
c->fp = NULL;
}
   /* delete the previously cached file */
  @@ -973,17 +973,17 @@
   /* set any changed headers somehow */
   /* update dates and version, but not content-length */
if (lmod != c->lmod || expc != c->expire || date != c->date) {
  - off_t curpos = lseek(c->fp->fd, 0, SEEK_SET);
  + off_t curpos = lseek(ap_bfileno(c->fp, B_WR), 0, SEEK_SET);
if (curpos == -1)
ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
 "proxy: error seeking on cache file %s",
 c->filename);
  - else if (write(c->fp->fd, buff, 35) == -1)
  + else if (write(ap_bfileno(c->fp, B_WR), buff, 35) == -1)
ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
 "proxy: error updating cache file %s",
 c->filename);
}
  - ap_pclosef(r->pool, c->fp->fd);
  + ap_pclosef(r->pool, ap_bfileno(c->fp, B_WR));
Explain0("Remote document not modified, use local copy");
/* CHECKME: Is this right? Shouldn't we check IMS again here? */
return HTTP_NOT_MODIFIED;
  @@ -1005,25 +1005,24 @@
   /* set any changed headers somehow */
   /* update dates and version, but not content-length */
if (lmod != c->lmod || expc != c->expire || date != c->date) {
  - off_t curpos = lseek(c->fp->fd, 0, SEEK_SET);
  + off_t curpos = lseek(ap_bfileno(c->fp, B_WR), 0, SEEK_SET);
   
if (curpos == -1)
ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
 "proxy: error seeking on cache file %s",
 c->filename);
  - else if (write(c->fp->fd, buff, 35) == -1)
  + else if (write(ap_bfileno(c->fp, B_WR), buff, 35) == -1)
ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
 "proxy: error updating cache file %s",
 c->filename);
}
  - ap_pclosef(r->pool, c->fp->fd);
  + ap_pclosef(r->pool, ap_bfileno(c->fp, B_WR));
return OK;
}
   }
   /* new or modified file */
   if (c->fp != NULL) {
  - ap_pclosef(r->pool, c->fp->fd);
  - c->fp->fd = -1;
  + ap_pclosef(r->pool, ap_bfileno(c->fp, B_WR));
   }
   c->version = 0;
   ap_proxy_sec2hex(0, buff + 27);
  @@ -1057,7 +1056,7 @@
   if (ap_bvputs(c->fp, buff, "X-URL: ", c->url, "\n", NULL) == -1) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
 "proxy: error writing cache file(%s)", c->tempfile);
  - ap_pclosef(r->pool, c->fp->fd);
  + ap_pclosef(r->pool, ap_bfileno(c->fp, B_WR));
unlink(c->tempfile);
c->fp = NULL;
   }
  @@ -1082,7 +1081,7 @@
   if (c->len != -1) {
   /* file lengths don't match; don't cache it */
if (bc != c->len) {
  - ap_pclosef(c->req->pool, c->fp->fd);/* no need to flush */
  + ap_pclosef(c->req->pool, ap_bfilen

cvs commit: apache-2.0 STATUS

1999-08-27 Thread manoj

manoj   99/08/27 12:02:52

  Modified:.STATUS
  Log:
  Yay! A whole new repository for silly comments about weather, pop
  culture, and spoons.
  
  Revision  ChangesPath
  1.2   +5 -7  apache-2.0/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-2.0/STATUS,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -d -u -r1.1 -r1.2
  --- STATUS1999/08/27 18:57:17 1.1
  +++ STATUS1999/08/27 19:02:51 1.2
  @@ -1,5 +1,5 @@
   Apache 2.0 STATUS:
  -Last modified at [$Date: 1999/08/27 18:57:17 $]
  +Last modified at [$Date: 1999/08/27 19:02:51 $]
   
   Release:
   
  @@ -39,7 +39,10 @@
   
   RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
   
  -(none listed)
  +* Switch to autoconf, et al. for configuration.
  +
  +* Use APR to get rid of more platform dependancies.
  +Status: Ryan Bloom <[EMAIL PROTECTED]> is working on this.
   
   Other bugs that need fixing:
   
  @@ -51,11 +54,6 @@
   completely.
   
   Other features that need writing:
  -
  -* Switch to autoconf, et al. for configuration.
  -
  -* Use APR to get rid of more platform dependancies.
  -Status: Ryan Bloom <[EMAIL PROTECTED]> is working on this.
   
   * Finish infrastructure in core for async MPMs
   Status: ?

cvs commit: apache-2.0 STATUS

1999-08-27 Thread manoj

manoj   99/08/27 11:57:20

  Added:   .STATUS
  Log:
  First crack at a status file for Apache 2.0. Please fix mistakes and
  add/rearrange your pet projects
  
  Revision  ChangesPath
  1.1  apache-2.0/STATUS
  
  Index: STATUS
  ===
  Apache 2.0 STATUS:
  Last modified at [$Date: 1999/08/27 18:57:17 $]
  
  Release:
  
  2.0: In pre-alpha development
  
  Plan:
  
  * Vague goal of an alpha or beta release in 1999. Commit-then-review
is active.
  
  RELEASE SHOWSTOPPERS:
  
  * CGI doesn't work
  Status: Ben Laurie is working on this.
  
  * mod_status doesn't work
  Status: Manoj Kasichainula <[EMAIL PROTECTED]> is working on this. A
  patch has been posted that starts to fix this:
  (<[EMAIL PROTECTED]> and
  <[EMAIL PROTECTED]>)
  
  * suEXEC doesn't work
  Ben Laurie's work to fix CGIs will also fix this.
  
  * Windows NT port isn't done
  Status: Bill is working on this through his MPM work, and Ryan
  is with APR.
  
  * Current 2.0 code is not tested on many Unix platforms. Make 2.0
work on most, if not all the systems 1.3 did
  
  Status: Autoconf and APR will get us most of the way there.
  
  * The module API is a weird combination of the old table and the new
hook system. Switch completely to the new hook system
  Status: Ben Laurie is working on this.
  
  RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
  
  (none listed)
  
  Other bugs that need fixing:
  
  * MaxRequestsPerChild measures connections, not requests.
  
  * Regex containers don't work in an intutive way
  Status: No one has come up with an efficient way to fix this
  behavior. Dean has suggested getting rid of regex containers
  completely.
  
  Other features that need writing:
  
  * Switch to autoconf, et al. for configuration.
  
  * Use APR to get rid of more platform dependancies.
  Status: Ryan Bloom <[EMAIL PROTECTED]> is working on this.
  
  * Finish infrastructure in core for async MPMs
  Status: ?
  
  * Work on other MPMs. Possible MPMs discussed or in progress include:
  
- David Reid's <[EMAIL PROTECTED]> Beos MPM
Status: in progress
  
- Dean Gaudet's async MPM
Status: ?
  
- Zach Brown's <[EMAIL PROTECTED]> Linux siginfo MPM
Status: ?
  
  Documentation that needs writing:
  
  * The concept of MPMs, especially if we ship more than one MPM for a
given platform
  
  * New directives in the various MPMs
  
  * API documentation
  Status: Ben Laurie has written some hooks documentation
  (apache-2.0/htdocs/hooks.html)
  
  Available Patches:
  
 * Mike Abbott's <[EMAIL PROTECTED]> patches to improve
   performance
 Status: These were written for 1.3, and are awaiting a port to
 2.0
  
  Open issues:
  
 * What do we do about mod_proxy?
  
 * Which MPMs will be included with Apache 2.0?

cvs commit: apache-2.0/src/lib/apr/time/unix Makefile.in

1999-08-27 Thread rbb

rbb 99/08/27 09:26:12

  Modified:src/lib/apr Makefile.in
   src/lib/apr/file_io/beos Makefile.in
   src/lib/apr/file_io/os2 Makefile.in
   src/lib/apr/file_io/unix Makefile.in
   src/lib/apr/inc apr_pools.h
   src/lib/apr/locks/beos Makefile.in
   src/lib/apr/locks/os2 Makefile.in
   src/lib/apr/locks/unix Makefile.in
   src/lib/apr/misc/beos Makefile.in misc.h start.c
   src/lib/apr/misc/os2 Makefile.in misc.h start.c
   src/lib/apr/misc/unix Makefile.in misc.h start.c
   src/lib/apr/misc/win32 misc.h start.c
   src/lib/apr/network_io/beos Makefile.in
   src/lib/apr/network_io/os2 Makefile.in
   src/lib/apr/network_io/unix Makefile.in
   src/lib/apr/shmem/unix Makefile.in
   src/lib/apr/signal/unix Makefile.in
   src/lib/apr/threadproc/beos Makefile.in
   src/lib/apr/threadproc/os2 Makefile.in
   src/lib/apr/threadproc/unix Makefile.in
   src/lib/apr/time/beos Makefile.in
   src/lib/apr/time/os2 Makefile.in
   src/lib/apr/time/unix Makefile.in
  Log:
  Fix compilation bugs in APR.  Move compiled libraries into a common libs
  directory after building.  Removed (signal|cancel)_safe flags from context.
  
  Revision  ChangesPath
  1.4   +3 -4  apache-2.0/src/lib/apr/Makefile.in
  
  Index: Makefile.in
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.in   1999/08/19 21:45:29 1.3
  +++ Makefile.in   1999/08/27 16:25:33 1.4
  @@ -23,7 +23,7 @@
   #
   # Macros for target determination
   #
  -MODULES=lib file_io network_io threadproc locks misc time sig
  +MODULES=lib file_io network_io threadproc locks misc time signal
   SUBDIRS=lib file_io/@OSDIR@ network_io/@OSDIR@ threadproc/@OSDIR@ \
   locks/@OSDIR@ misc/@OSDIR@ time/@OSDIR@ signal/@OSDIR@ 
   #shmem/@OSDIR@
  @@ -39,10 +39,9 @@
   # building the entire package.
   #
   all: Makefile $(MODULES) subdirs
  + rm -Rf libs
mkdir libs
  - @for i in $(SUBDIRS); do \
  - cp $$1/lib*.a libs \ 
  - done;
  + @for i in $(SUBDIRS); do cp $$i/lib*.a libs ; done;
@echo APR built.
   
   clean: subdirs_clean
  
  
  
  1.2   +1 -1  apache-2.0/src/lib/apr/file_io/beos/Makefile.in
  
  Index: Makefile.in
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/beos/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in   1999/08/17 15:59:35 1.1
  +++ Makefile.in   1999/08/27 16:25:34 1.2
  @@ -12,7 +12,7 @@
   INCDIR1=../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
   
  -LIB=../libfile.a
  +LIB=libfile.a
   
   OBJS=dir.o \
fileacc.o \
  
  
  
  1.2   +1 -1  apache-2.0/src/lib/apr/file_io/os2/Makefile.in
  
  Index: Makefile.in
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in   1999/08/17 15:59:36 1.1
  +++ Makefile.in   1999/08/27 16:25:35 1.2
  @@ -12,7 +12,7 @@
   INCDIR1=../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
   
  -LIB=../file.a
  +LIB=file.a
   
   OBJS=dir.o \
fileacc.o \
  
  
  
  1.4   +1 -1  apache-2.0/src/lib/apr/file_io/unix/Makefile.in
  
  Index: Makefile.in
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.in   1999/08/18 20:18:46 1.3
  +++ Makefile.in   1999/08/27 16:25:35 1.4
  @@ -13,7 +13,7 @@
   INCDIR1=../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
   
  -LIB=../libfile.a
  +LIB=libfile.a
   
   OBJS=dir.o \
fileacc.o \
  
  
  
  1.2   +0 -7  apache-2.0/src/lib/apr/inc/apr_pools.h
  
  Index: apr_pools.h
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/inc/apr_pools.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_pools.h   1999/08/17 15:59:37 1.1
  +++ apr_pools.h   1999/08/27 16:25:36 1.2
  @@ -141,13 +141,6 @@
* currently being used...
*/
   
  -typedef struct ap_table_entry_t {
  -char *key;   /* maybe NULL in future;
  -  * check when iterating thru table_elts
  -  */
  -char *val;
  -} ap_table_entry_t;
  -
   ap_pool_t *ap_init_alloc(vo

cvs commit: apache-1.3/htdocs index.html.en index.html

1999-08-27 Thread dirkx

dirkx   99/08/27 08:08:04

  Added:   htdocs   index.html.en
  Removed: htdocs   index.html
  Log:
  And this is the thing which potentially will cause grief allowing
  for the multiviews to do their job by removing the 'exact' match index.html
  and making it specific.
  
  Revision  ChangesPath
  1.1  apache-1.3/htdocs/index.html.en
  
  Index: index.html.en
  ===
  
  
   
Test Page for Apache Installation on Web Site
   
  
   

 It Worked!  The Apache Web Server is Installed on this Web Site!


If you can see this page, then the people who own this domain have just
installed the http://www.apache.org/httpd";>Apache Web server
software successfully.  They now have to add content to this directory
and replace this placeholder page, or else point the server at their real
content.



 If you are seeing this page instead of the site you expected, please
 contact the administrator of the site involved.
 (Try sending mail to .)
 Although this site is
 running the Apache software it almost certainly has no other connection
 to the Apache Group, so please do not send mail about this site or its
 contents to the Apache authors.  If you do, your message will be
 ignored.



The Apache
documentation
has been included with this distribution.


The Webmaster of this site is free to use the image below on
an Apache-powered Web server.  Thanks for using Apache!

cvs commit: apache-1.3/conf httpd.conf-dist-win

1999-08-27 Thread dirkx

dirkx   99/08/27 08:05:43

  Modified:conf httpd.conf-dist-win
  Log:
  Make sure we see the multi lang stuff.
  
  Revision  ChangesPath
  1.25  +1 -1  apache-1.3/conf/httpd.conf-dist-win
  
  Index: httpd.conf-dist-win
  ===
  RCS file: /x3/home/cvs/apache-1.3/conf/httpd.conf-dist-win,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- httpd.conf-dist-win   1999/08/27 15:04:16 1.24
  +++ httpd.conf-dist-win   1999/08/27 15:05:40 1.25
  @@ -270,7 +270,7 @@
   # Note that "MultiViews" must be named *explicitly* --- "Options All"
   # doesn't give it to you.
   #
  -Options Indexes FollowSymLinks
  +Options Indexes FollowSymLinks MultiViews
   
   #
   # This controls which options the .htaccess files in directories can

cvs commit: apache-1.3/conf httpd.conf-dist httpd.conf-dist-win

1999-08-27 Thread dirkx

dirkx   99/08/27 08:04:20

  Modified:conf httpd.conf-dist httpd.conf-dist-win
  Log:
  Just making sure that all the language's we currently have the welcome
  page as, are all available.
  
  Revision  ChangesPath
  1.43  +21 -10apache-1.3/conf/httpd.conf-dist
  
  Index: httpd.conf-dist
  ===
  RCS file: /x3/home/cvs/apache-1.3/conf/httpd.conf-dist,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- httpd.conf-dist   1999/05/05 20:17:59 1.42
  +++ httpd.conf-dist   1999/08/27 15:04:15 1.43
  @@ -308,7 +308,7 @@
   # Note that "MultiViews" must be named *explicitly* --- "Options All"
   # doesn't give it to you.
   #
  -Options Indexes FollowSymLinks
  +Options Indexes FollowSymLinks MultiViews
   
   #
   # This controls which options the .htaccess files in directories can
  @@ -632,19 +632,30 @@
   # net-standard language code is pl) may wish to use "AddLanguage pl .po" 
   # to avoid the ambiguity with the common suffix for perl scripts.
   #
  -AddLanguage en .en
  -AddLanguage fr .fr
  -AddLanguage de .de
  -AddLanguage da .da
  -AddLanguage el .el
  -AddLanguage it .it
  +# In the case of 'ltz' we violate the RFC by using a three char 
  +# specifier. But there is 'work in progress' to fix this and get 
  +# the reference data for rfc1766 cleaned up.
  +#
  +AddLanguage da .dk   # Danish
  +AddLanguage nl .nl   # Dutch
  +AddLanguage en .en   # English
  +AddLanguage et .ee   # Estonian
  +AddLanguage fr .fr   # Frech
  +AddLanguage de .de   # German
  +AddLanguage el .el   # Greek (Modern)
  +AddLanguage it .it   # Italian
  +AddLanguage pt .pl   # Portugese
  +AddLanguage ltz .lu  # Luxembourgeois* 
  +AddLanguage es .es   # Spanish
  +AddLanguage sv .se   # Swedish
   
  -#
   # LanguagePriority allows you to give precedence to some languages
   # in case of a tie during content negotiation.
  -# Just list the languages in decreasing order of preference.
  +#
  +# Just list the languages in decreasing order of preference. We have
  +# more or less alphabetized them here. You propably want to change this.
   #
  -LanguagePriority en fr de
  +LanguagePriority en da nl et fr de el it pt x-lux es sv
   
   #
   # AddType allows you to tweak mime.types without actually editing it, or to
  
  
  
  1.24  +20 -9 apache-1.3/conf/httpd.conf-dist-win
  
  Index: httpd.conf-dist-win
  ===
  RCS file: /x3/home/cvs/apache-1.3/conf/httpd.conf-dist-win,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- httpd.conf-dist-win   1999/05/05 20:18:00 1.23
  +++ httpd.conf-dist-win   1999/08/27 15:04:16 1.24
  @@ -569,19 +569,30 @@
   # net-standard language code is pl) may wish to use "AddLanguage pl .po" 
   # to avoid the ambiguity with the common suffix for perl scripts.
   #
  -AddLanguage en .en
  -AddLanguage fr .fr
  -AddLanguage de .de
  -AddLanguage da .da
  -AddLanguage el .el
  -AddLanguage it .it
  -
  +# In the case of 'ltz' we violate the RFC by using a three char 
  +# specifier. But there is 'work in progress' to fix this and get 
  +# the reference data for rfc1766 cleaned up.
   #
  +AddLanguage da .dk  # Danish
  +AddLanguage nl .nl  # Dutch
  +AddLanguage en .en  # English
  +AddLanguage et .ee  # Estonian
  +AddLanguage fr .fr  # Frech
  +AddLanguage de .de  # German
  +AddLanguage el .el  # Greek (Modern)
  +AddLanguage it .it  # Italian
  +AddLanguage pt .pl  # Portugese
  +AddLanguage ltz .lu # Luxembourgeois* 
  +AddLanguage es .es  # Spanish
  +AddLanguage sv .se  # Swedish
  +
   # LanguagePriority allows you to give precedence to some languages
   # in case of a tie during content negotiation.
  -# Just list the languages in decreasing order of preference.
  +#
  +# Just list the languages in decreasing order of preference. We have
  +# more or less alphabetized them here. You propably want to change this.
   #
  -LanguagePriority en fr de
  +LanguagePriority en da nl et fr de el it pt x-lux es sv
   
   #
   # AddType allows you to tweak mime.types without actually editing it, or to

cvs commit: apache-1.3 STATUS

1999-08-27 Thread martin

martin  99/08/27 05:10:58

  Modified:.STATUS
  Log:
  Please check whether the dates are correct.
  
  Revision  ChangesPath
  1.755 +3 -5  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.754
  retrieving revision 1.755
  diff -u -r1.754 -r1.755
  --- STATUS1999/08/23 13:39:53 1.754
  +++ STATUS1999/08/27 12:10:56 1.755
  @@ -1,13 +1,11 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/08/23 13:39:53 $]
  +  Last modified at [$Date: 1999/08/27 12:10:56 $]
   
   Release:
   
  -1.3.9-dev: COUNTDOWN restarted at 08/15 3:00pm PDT
  -   Tarball planned for Monday morning unless problems found.
  -   Votes for rolling: Ralf +1, Martin +1, Roy +1, Randy +1,
  -   Jim +1, Fred +1
  +1.3.10-dev: Current
   
  +1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th.
   1.3.8: Not released.
   1.3.7: Not released.
   1.3.6. Tagged and rolled on Mar. 22. Released and announced on 24th.

cvs commit: apache-1.3 Makefile.tmpl

1999-08-27 Thread martin

martin  99/08/27 04:26:13

  Modified:.Makefile.tmpl
  Log:
  Part 2 of David's detection of sub-make errors
  (slightly modified)
  
  Submitted by: "David Harris" <[EMAIL PROTECTED]>
  
  Revision  ChangesPath
  1.90  +2 -2  apache-1.3/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- Makefile.tmpl 1999/08/27 11:22:36 1.89
  +++ Makefile.tmpl 1999/08/27 11:26:12 1.90
  @@ -193,8 +193,8 @@
-DDOC_ROOT=\"$(suexec_docroot)\" \
-DSAFE_PATH=\"$(suexec_safepath)\" ' \
suexec; \
  - fi; \
  - echo "<=== $(SRC)/support"
  + fi
  + @echo "<=== $(SRC)/support"
   
   ## --
   ##   Installation Targets

cvs commit: apache-1.3 Makefile.tmpl

1999-08-27 Thread martin

martin  99/08/27 04:22:37

  Modified:.Makefile.tmpl
  Log:
  Add forgotten test of return code of subordinate make.
  
  Submitted by: "David Harris" <[EMAIL PROTECTED]>
  
  Revision  ChangesPath
  1.89  +1 -1  apache-1.3/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- Makefile.tmpl 1999/08/13 06:58:18 1.88
  +++ Makefile.tmpl 1999/08/27 11:22:36 1.89
  @@ -181,7 +181,7 @@
   #   build the additional support stuff
   build-support:
@echo "===> $(SRC)/support"; \
  - cd $(TOP)/$(SRC)/support; $(MAKE) $(MFLAGS) all; \
  + cd $(TOP)/$(SRC)/support; $(MAKE) $(MFLAGS) all || exit 1; \
if [ ".$(suexec)" = .1 ]; then \
$(MAKE) $(MFLAGS) \
EXTRA_CFLAGS='\

cvs commit: apache-1.3/htdocs index.html.es

1999-08-27 Thread martin

martin  99/08/27 04:08:59

  Modified:htdocs   index.html.es
  Log:
  Use verbose entities in place of numeric ones
  
  Revision  ChangesPath
  1.2   +12 -12apache-1.3/htdocs/index.html.es
  
  Index: index.html.es
  ===
  RCS file: /export/home/cvs/apache-1.3/htdocs/index.html.es,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.html.es 1999/08/27 11:06:31 1.1
  +++ index.html.es 1999/08/27 11:08:59 1.2
  @@ -1,7 +1,7 @@
   
   

  -  Pagína para probar la instalación de Apache
  +  Pagína para probar la instalación de Apache

   

 
  -   ¡Funcionó!  ¡El Servidor de Red Apache ha sido instalado 
en ese sitio!
  +   ¡Funcionó!  ¡El Servidor de Red Apache ha sido 
instalado en ese sitio!
 
 
  -  Si usted puede ver esta pagína, entonces los dueños de esta
  -  maquína han instalado el http://www.apache.org/";>Servidor de
  -  Red Apache con exíto.  Ahora deben añadir contenido a este 
directorio
  -  y reemplazar esta pagína, ó apuntar este servidor al contenido 
real.
  +  Si usted puede ver esta pagína, entonces los dueños de esta
  +  maquína han instalado el http://www.apache.org/";>Servidor 
de
  +  Red Apache con exíto.  Ahora deben añadir contenido a 
este directorio
  +  y reemplazar esta pagína, ó apuntar este servidor al 
contenido real.
 
 
 
  -   Si usted esta leyendo esta pagína y no es lo que esperaba, por favor
  +   Si usted esta leyendo esta pagína y no es lo que esperaba, por 
favor
  contacte el administrador de este sitio.
  -   (Trate de enviar correo electrónico a 
.)
  +   (Trate de enviar correo electrónico a 
.)
  Aunque este sitio esta utilizando el programa Apache es casi seguro
  -   que no tiene ninguna conexión con el Apache Group, por eso favor de
  +   que no tiene ninguna conexión con el Apache Group, por eso favor de
  no enviar correo sobre este sitio o su contenido a los autores de
  Apache.  Si lo hace, su mensaje sera
  ignorado.
  @@ -36,13 +36,13 @@
 La
 documentación
  -  de Apache ha sido incluida en esta distribución.
  +  >documentación
  +  de Apache ha sido incluida en esta distribución.
 
 
 El administrador del sitio esta invitado a usar la siguiente
 imagen para indicar que su sitio es servido por Apache.
  -  ¡Gracias por usar Apache!
  +  ¡Gracias por usar Apache!

cvs commit: apache-1.3/htdocs index.html.es

1999-08-27 Thread martin

martin  99/08/27 04:06:31

  Added:   htdocs   index.html.es
  Log:
  Spanish version of i18n'zed index.html
  
  Submitted By:   Mistik Networks <[EMAIL PROTECTED]>
  
  Revision  ChangesPath
  1.1  apache-1.3/htdocs/index.html.es
  
  Index: index.html.es
  ===
  
  
   
Pagína para probar la instalación de Apache
   
  
   

 ¡Funcionó!  ¡El Servidor de Red Apache ha sido instalado en 
ese sitio!


Si usted puede ver esta pagína, entonces los dueños de esta
maquína han instalado el http://www.apache.org/";>Servidor de
Red Apache con exíto.  Ahora deben añadir contenido a este 
directorio
y reemplazar esta pagína, ó apuntar este servidor al contenido 
real.



 Si usted esta leyendo esta pagína y no es lo que esperaba, por favor
 contacte el administrador de este sitio.
 (Trate de enviar correo electrónico a 
.)
 Aunque este sitio esta utilizando el programa Apache es casi seguro
 que no tiene ninguna conexión con el Apache Group, por eso favor de
 no enviar correo sobre este sitio o su contenido a los autores de
 Apache.  Si lo hace, su mensaje sera
 ignorado.



La
documentación
de Apache ha sido incluida en esta distribución.


El administrador del sitio esta invitado a usar la siguiente
imagen para indicar que su sitio es servido por Apache.
¡Gracias por usar Apache!

cvs commit: apache-2.0/src .cvsignore

1999-08-27 Thread rse

rse 99/08/27 03:25:28

  Modified:src  .cvsignore
  Log:
  Since months I see...
  
  | cvs update: Updating src
  | ? src/apache
  
  ...because I also often use --target=apache and now it becomes boring.
  
  Revision  ChangesPath
  1.2   +1 -0  apache-2.0/src/.cvsignore
  
  Index: .cvsignore
  ===
  RCS file: /home/cvs/apache-2.0/src/.cvsignore,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- .cvsignore1999/08/24 05:34:11 1.1
  +++ .cvsignore1999/08/27 10:25:27 1.2
  @@ -13,6 +13,7 @@
   CoreD
   CoreR
   httpd
  +apache
   libhttpd.*
   Makefile
   Makefile.config

cvs commit: apache-2.0/src/include httpd.h

1999-08-27 Thread rse

rse 99/08/27 03:20:41

  Modified:src/include httpd.h
  Log:
  Now that this beast was officially declared as the Apache 2.0 stuff, let it
  also say this in his Server headers while testing.  Those who dislike numbers:
  feel free to name it "foo" or whatever meaningless if it's important that we
  still do not use numbers. I just want that the version corresponds to the
  repository area, because I often get confused by running different Apache
  versions on my development box.
  
  Revision  ChangesPath
  1.6   +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- httpd.h   1999/08/26 16:43:55 1.5
  +++ httpd.h   1999/08/27 10:20:37 1.6
  @@ -378,7 +378,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
*/
   
  -#define SERVER_BASEVERSION "Apache/mpm-dev"   /* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION "Apache/2.0-dev"   /* SEE COMMENTS ABOVE */
   #define SERVER_VERSION  SERVER_BASEVERSION
   
   /* TODO: re-implement the server token/version stuff -- it's part of 
http_core

cvs commit: apache-2.0 README.rse config.option

1999-08-27 Thread rse

rse 99/08/27 03:11:31

  Modified:.README.rse config.option
  Log:
  Update paths for new repository structure.
  
  Revision  ChangesPath
  1.8   +19 -18apache-2.0/README.rse
  
  Index: README.rse
  ===
  RCS file: /home/cvs/apache-2.0/README.rse,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- README.rse1999/08/19 16:01:58 1.7
  +++ README.rse1999/08/27 10:11:30 1.8
  @@ -1,7 +1,7 @@
   
  -  Get the Apache/mpm beast running
  -  Ralf S. Engelschall, 12-Aug-1999
  -  
  +  Get the Apache 2.0 beast running
  +  Ralf S. Engelschall, 27-Aug-1999
  +  
   
 These are my instructions for getting Apache/mpm running under various
 platforms. For some background details see apache-apr/pthread/README.rse,
  @@ -10,11 +10,11 @@
 o  FooBar/OS + prefork MPM
[the portable preforking process model]
   
  - $ cd /apache-mpm/mpm/
  + $ cd /apache-2.0/
$ ./configure \
  --with-layout=GNU \
  --target=apache \
  -   --prefix=/tmp/apache-mpm \
  +   --prefix=/tmp/apache-2.0 \
  --set-rule=MPM_METHOD:prefork \
  --disable-module=status \
  --disable-module=include \
  @@ -24,7 +24,7 @@
   
Alternative:
   
  - $ cd /apache-mpm/mpm/
  + $ cd /apache-2.0/
$ ./configure --with-option=mpm-prefork
$ make 
$ make install
  @@ -32,10 +32,11 @@
 o  FooBar/OS + Ralf S. Engelschall's GNU Pth + dexter MPM
[the portable hybrid (preforking+prethreading) process model]
   
  - $ cd /apache-mpm
  + $ cd /apache-2.0/src/lib
$ lynx ftp://ftp.gnu.org/gnu/pth/pth-1.1.X.tar.gz
$ gunzip /apache-mpm/mpm
  - $ CFLAGS='-I\$(SRCDIR)/../pth-1.1.X -DPTHREAD_EVERYWHERE 
-DNO_SERIALIZED_ACCEPT' \
  -   LDFLAGS='-L\$(SRCDIR)/../pth-1.1.X/.libs' \
  + $ cd /apache-2.0/
  + $ CFLAGS='-I\$(SRCDIR)/lib/pth -DPTHREAD_EVERYWHERE 
-DNO_SERIALIZED_ACCEPT' \
  +   LDFLAGS='-L\$(SRCDIR)/lib/pth/.libs' \
  LIBS="-lpthread" \
  ./configure \
  --with-layout=GNU \
  --target=apache \
  -   --prefix=/tmp/apache-mpm
  +   --prefix=/tmp/apache-2.0
  --set-rule=MPM_METHOD:dexter \
  --disable-module=status \
  --disable-module=include \
  @@ -60,7 +61,7 @@
   
Alternative:
   
  - $ cd /apache-mpm/mpm/
  + $ cd /apache-2.0/
$ ./configure --with-option=mpm-dexter-pth
$ make 
$ make install
  @@ -72,16 +73,16 @@
$ ./configure 
$ make
   
  - $ cd /apache-mpm/mpm
  + $ cd /apache-2.0/
$ CC='cc' \
  OPTIM='-O2' \
  -   CFLAGS='-pthread -I\$(SRCDIR)/../../../apache-apr/poll 
-DNO_SERIALIZED_ACCEPT' \
  -   LDFLAGS='-pthread -L\$(SRCDIR)/../../../apache-apr/poll' \
  +   CFLAGS='-pthread -I\$(SRCDIR)/../../apache-apr/poll 
-DNO_SERIALIZED_ACCEPT' \
  +   LDFLAGS='-pthread -L\$(SRCDIR)/../../apache-apr/poll' \
  LIBS='-lpoll' \
  ./configure \
  --with-layout=GNU \
  --target=apache \
  -   --prefix=/tmp/apache-mpm \
  +   --prefix=/tmp/apache-2.0 \
  --set-rule=MPM_METHOD:dexter \
  --disable-module=status \
  --disable-module=include \
  @@ -91,7 +92,7 @@
   
Alternative:
   
  - $ cd /apache-mpm/mpm/
  + $ cd /apache-2.0/
$ ./configure --with-option=mpm-dexter-uthread
$ make 
$ make install
  
  
  
  1.5   +10 -10apache-2.0/config.option
  
  Index: config.option
  ===
  RCS file: /home/cvs/apache-2.0/config.option,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- config.option 1999/08/16 11:35:56 1.4
  +++ config.option 1999/08/27 10:11:30 1.5
  @@ -8,7 +8,7 @@
   
   OPTIM='-pipe -O2'
   --target=apache
  ---prefix=/tmp/apache-mpm
  +--prefix=/tmp/apache-2.0
   --disable-module=status
   --disable-module=include
   --disable-module=cgi
  @@ -27,7 +27,7 @@
   ##  Hybrid Variants
   ##
   ##  Assumptions for GNU Pth based variants: 
  -##   - Pth source tree was extracted to apache-mpm/pth/
  +##   - Pth source tree was extracted to apache-2.0/src/lib/pth/
   ##   - Pth was configured with ``--enable-pthread --enable-syscall-soft''
   ##   - Pth was already build (but needs not to be installed)
   ##  Assumptions for FreeBSD uthread based variants: 
  @@ -42,8 +42,8 @@
   
   #   pthread MPM with GNU Pth
   
  -CFLAGS='-I\$(SRCDIR)/../../pth -DPTHREAD_EVERYWHERE 
-DNO_SERIALIZED_ACCEPT'
  -LDFLAGS='-L\$(SRCDIR)/../../pth/.libs'
  +CFLAGS='-I\$(SRCDIR)/lib/pth -DPTHREAD_EVERYWHERE -DNO_SERIALIZED_ACCEPT'
  +LDFLAGS='-L\$(SRCDIR)/lib/pth/.libs'
   LIBS=-lpt

cvs commit: apache-2.0/src/main http_config.c

cvs commit: apache-1.3/src/main http_config.c

cvs commit: apache-1.3/src/support apxs.pl

cvs commit: apache-2.0/src/os/win32 modules.c os.c os.h

cvs commit: apache-2.0/src/modules/proxy proxy_cache.c

cvs commit: apache-2.0/src/modules/mpm/dexter Makefile.tmpl dexter.c scoreboard.c scoreboard.h

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

cvs commit: apache-2.0/src/modules/mpm/dexter dexter.c

cvs commit: apache-2.0/src/modules/mpm/dexter dexter.c

cvs commit: apache-2.0/src/support htpasswd.mak htdigest.mak htpasswd.dsp htdigest.dsp

cvs commit: apache-1.3/src/modules/proxy proxy_cache.c proxy_connect.c proxy_util.c

cvs commit: apache-2.0 STATUS

cvs commit: apache-2.0 STATUS

cvs commit: apache-2.0/src/lib/apr/time/unix Makefile.in

cvs commit: apache-1.3/htdocs index.html.en index.html

cvs commit: apache-1.3/conf httpd.conf-dist-win

cvs commit: apache-1.3/conf httpd.conf-dist httpd.conf-dist-win

cvs commit: apache-1.3 STATUS

cvs commit: apache-1.3 Makefile.tmpl

cvs commit: apache-1.3 Makefile.tmpl

cvs commit: apache-1.3/htdocs index.html.es

cvs commit: apache-1.3/htdocs index.html.es

cvs commit: apache-2.0/src .cvsignore

cvs commit: apache-2.0/src/include httpd.h

cvs commit: apache-2.0 README.rse config.option

25 matches

Site Navigation

Mail list logo

Footer information