Newer
Older
11001
11002
11003
11004
11005
11006
11007
11008
11009
11010
11011
11012
11013
11014
11015
11016
11017
11018
11019
11020
11021
11022
11023
11024
11025
11026
11027
11028
11029
11030
11031
11032
11033
11034
11035
11036
11037
11038
11039
11040
11041
11042
11043
11044
11045
11046
11047
11048
11049
11050
11051
11052
11053
11054
11055
11056
11057
11058
11059
11060
11061
11062
11063
11064
11065
11066
11067
11068
11069
11070
11071
11072
11073
11074
11075
11076
11077
11078
11079
11080
11081
11082
11083
11084
11085
11086
11087
11088
11089
11090
11091
11092
11093
11094
11095
11096
11097
11098
11099
11100
11101
11102
11103
11104
11105
11106
11107
11108
11109
11110
11111
11112
11113
11114
11115
11116
11117
11118
11119
11120
11121
11122
11123
11124
11125
11126
11127
11128
11129
11130
11131
11132
11133
11134
11135
11136
11137
11138
11139
11140
11141
11142
11143
11144
11145
11146
11147
11148
11149
11150
11151
11152
11153
11154
11155
11156
11157
11158
11159
11160
11161
11162
11163
11164
11165
11166
11167
11168
11169
11170
11171
11172
11173
11174
11175
11176
11177
11178
11179
11180
11181
11182
11183
11184
11185
11186
11187
11188
11189
11190
11191
11192
11193
11194
11195
11196
11197
11198
11199
11200
11201
11202
11203
11204
11205
11206
11207
11208
11209
11210
11211
11212
11213
11214
11215
11216
11217
11218
11219
11220
11221
11222
11223
11224
11225
11226
11227
11228
11229
11230
11231
11232
11233
11234
11235
11236
11237
11238
11239
11240
11241
11242
11243
11244
11245
11246
11247
11248
11249
11250
11251
11252
11253
11254
11255
11256
11257
11258
11259
11260
11261
11262
11263
11264
11265
11266
11267
11268
11269
11270
11271
11272
11273
11274
11275
11276
11277
11278
11279
11280
11281
11282
11283
11284
11285
11286
11287
11288
11289
11290
11291
11292
11293
11294
11295
11296
11297
11298
11299
11300
11301
11302
11303
11304
11305
11306
11307
11308
11309
11310
11311
11312
11313
11314
11315
11316
11317
11318
11319
11320
11321
11322
11323
11324
11325
11326
11327
11328
11329
11330
11331
11332
11333
11334
11335
11336
11337
11338
11339
11340
11341
11342
11343
11344
11345
11346
11347
11348
*) Scoreboard mechanism for regulating the number of extant server
processes. MaxServers and StartServers defaults are the same as
for NCSA, but the meanings are slightly different. (Actually,
I should probably lower the MaxServers default to 10).
Before asking for a new connection, each server process checks
the number of other servers which are also waiting for a
connection. If there are more than MaxServers, it quietly dies
off. Conversely, every second, the root, or caretaker, process
looks to see how many servers are waiting for a new connection;
if there are fewer than StartServers, it starts a new one. This
does not depend on the number of server processes already extant.
The accounting is arranged through a "scoreboard" file, named
/tmp/htstatus.*, on which each process has an independent file
descriptor (they need to seek without interference).
The end effect is that MaxServers is the maximum number of
servers on an *inactive* server machine, but more will be forked
off to handle unusually heavy loads (or unusually slow clients);
these will die off when they are no longer needed --- without
reverting to the overhead of full forking operation. There is a
hard maximum of 150 server processes compiled in, largely to
avoid forking out of control and dragging the machine down.
(This is arguably too high).
In my server endurance tests, this mechanism did not appear to
impose any significant overhead, even after I forced it to put the
scoreboard file on a normal filesystem (which might have more
overhead than tmpfs). [Robert Thau]
*) Set HTTP_FOO variables for SSI <!--#exec cmd-->s, not just CGI scripts.
[Cliff Skolnick]
*) Read .htaccess files even in directory with <Directory> section.
(Former incompatibility noted on mailing list, now fixed). [Robert
Thau]
*) "HEAD /" gives the client a "Bad Request" error message, rather
than trying to send no body *and* no headers. [Cliff Skolnick].
*) Don't produce double error reports for some very obscure cases
mainly involving auth configuration (the "all modules decline to
handle" case which is a sure sign of a server bug in most cases,
but also happens when authentication is badly misconfigured).
[Robert Thau]
*) Moved FCNTL_SERIALIZED_ACCEPT defines into conf.h (that's what
it's *for*, and this sort of thing really shouldn't be cluttering
up the Makefile). [Robert Thau]
*) Incidental code cleanups in http_main.c --- stop dragging
sa_client around; just declare it where used. [Robert Thau]
*) Another acc-related fix. (It doesn't like const char
in some places...). [Mark Cox]
Changes with Shambhala 0.6.1 13 Jul 1995
*) Fixed auth_name-related typos in http_core.c [Brian Behlendorf]
Also, fixed auth typo in http_protocol.c unmasked by this fix.
*) Compiles clean with acc on SunOS [Paul Sutton]
*) Reordered modules in modules.c so that Redirect takes priority
over ScriptAlias, for NCSA bug-compatibility [Rob Hartill] ---
believe it or not, he has an actual site with a ScriptAlias and
a Redirect declared for the *exact same directory*. Even *my*
compatibility fetish wouldn't motivate me to fix this if the fix
required any effort, but it doesn't, so what the hey.
*) Fixed to properly default several server_rec fields for virtual
servers from the corresponding fields in the main server_rec.
[Cliff Skolnick --- 'port' was a particular irritant].
*) No longer kills off nph- child processes before they are
finished sending output. [Matthew Gray]
Changes with Shambhala 0.6.0 10 Jul 1995
*) Two styles of timeout --- hard and soft. soft_timeout()s just put
the connection to the client in an "aborted" state, but otherwise
allow whatever handlers are running to clean up. hard_timeout()s
abort the request in progress completely; anything not tied to some
resource pool cleanup will leak. They're still around because I
haven't yet come up with a more elegant way of handling
timeouts when talking to something that isn't the client. The
default_handler and the dir_handler now use soft timeouts, largely
so I can test the feature. [Robert Thau]
*) TransferLog "| my_postprocessor ..." seems to be there. Note that
the case of log handlers dying prematurely is probably handled VERY
gracelessly at this point, and if the logger stops reading input,
the server will hang. (It is known to correctly restart the
logging process on server restart; this is (should be!) going through
the same SIGTERM/pause/SIGKILL routine used to ding an errant CGI
script). [Robert Thau]
*) asis files supported (new module). [Robert Thau]
*) IdentityCheck code is compiled in, but has not been tested. (I
don't know anyone who runs identd). [Robert Thau]
*) PATH_INFO and PATH_TRANSLATED are not set unless some real PATH_INFO
came in with the request, for NCSA bug-compatibility. [Robert Thau]
*) Don't leak the DIR * on HEAD request for a directory. [Robert Thau]
*) Deleted the block_alarms() stuff from dbm_auth; no longer necessary,
as timeouts are not in scope. [Robert Thau]
*) quoted-string args in config files now handled correctly (doesn't drop
the last character). [Robert Thau; reported by Randy Terbush]
*) Fixed silly typo in http_main.c which was suddenly fatal in HP-UX.
How the hell did it ever work? [Robert Thau; reported by Rob Hartill]
*) mod_core.c --- default_type returns DEFAULT_TYPE (the compile-time
default default type); the former default default behavior when all
type-checkers defaulted had been a core dump. [Paul Sutton]
*) Copy filenames out of the struct dirent when indexing
directories. (On Linux, readdir() returns a pointer to the same
memory area every time). Fix is in mod_dir.c. [Paul Sutton]
Changes with Shambhala 0.5.3 [not released]
*) Default response handler notes "file not found" in the error log,
if the file was not found. [Cliff Skolnick].
*) Another Cliff bug --- "GET /~user" now properly redirects (the userdir
code no longer sets up bogus PATH_INFO which fakes out the directory
handler). [Cliff Skolnick]
Changes with Shambhala 0.5.2 06 Jul 1995
*) Changes to http_main.c --- root server no longer plays silly
games with SIGCHLD, and so now detects and replaces dying
children. Child processes just die on SIGTERM, without taking
the whole process group with them. Potential problem --- if any
child process refuses to die, we hang in restart.
MaxRequestsPerChild may still not work, but it certainly works
better than it did before this! [Robert Thau]
*) mod_dir.c bug fixes: ReadmeName and HeaderName
work (or work better, at least); over-long description lines
properly terminated. [Mark Cox]
*) http_request.c now calls unescape_url() more places where it
should [Paul Sutton].
*) More directory handling bugs (reported by Cox)
Parent Directory link is now set correctly. [Robert Thau]
Changes with Shambhala 0.5.1 04 Jul 1995
*) Generalized cleanup interface in alloc.c --- any function can be
registered with alloc.c as a cleanup for a resource pool;
tracking of files and file descriptors has been reimplemented in
terms of this interface, so I can give it some sort of a test.
[Robert Thau]
*) More changes in alloc.c --- new cleanup_for_exec() function,
which tracks down and closes all file descriptors which have been
registered with the alloc.c machinery before the server exec()s a
child process for CGI or <!--#exec-->. CGI children now get
started with exactly three file descriptors open. Hopefully,
this cures the problem Rob H. was having with overly persistent
CGI connections. [Robert Thau]
*) Mutual exclusion around the accept() in child_main() --- this is
required on at least SGI, Solaris and Linux, and is #ifdef'ed in
by default on those systems only (-DFCNTL_SERIALIZED_ACCEPT).
This uses fcntl(F_SETLK,...) on the error log descriptor because
flock() on that descriptor won't work on systems which have BSD
flock() semantics, including (I think) Linux 1.3 and Solaris.
This does work on SunOS (when the server is idle, only one
process in the pool is waiting on accept()); it *ought* to work
on the other systems. [Robert Thau]
*) FreeBSD and BSDI portability tweaks [Chuck Murcko]
*) sizeof(*sa_client) bugfix from [Rob Hartill]
*) pstrdup(..., NULL) returns NULL, [Randy Terbush]
*) block_alarms() to avoid leaking the DBM* in dbm auth (this should
be unnecessary if I go to the revised timeout-handling scheme).
[Robert Thau]
*) For NCSA bug-compatibility, set QUERY_STRING env var (to a null
string) even if none came in with the request. [Robert Thau]
*) CHANGES file added to distribution ;-).
Changes with Shambhala 0.4.5
*) mod_dld --- early dynamic loading support [rst]
*) Add wildcard content handlers for XBITHACK; default_hander now
invoked with that mechanism (as a handler hanging off mod_core) [rst]
*) XBITHACK supported as a wildcard content-handler, and
configurable at run-time (not just at compile time, as in the
"patchy server" releases) [rst]
Changes with Shambhala 0.4.4 30 Jun 1995
*) Fixed basic thinkos in mod_dbm_auth.c [rst, reported by Mark Cox]
*) Handle Addtype x/y .z [rst, reported by Cox]
Changes with Shambhala 0.4.3
*) Fixed very dumb bug in mod_alias; "Alias" and "Redirect" are not
synonymous [rst, terbush]
Changes with Shambhala 0.4.1 28 Jun 1995
*) First-cut virtual host implementation; some refit in the config
reading code, and log management, was necessary to support this [rst]
*) Sub-pool machinery, originally added to avoid excessive storage
allocation on listings of large directories (which turned out to
be the problem that the 0.3 storage accounting was added to
find). Subrequests and mod_dir changed to use subpools. [rst]
*) More memory debugging --- free list consistency checks. [rst]
*) Added err_headers to request_rec, with support elsewhere [rst]
*) Other fixes to minor bugs in mod_dir and mod_includes [rst, terbush]
Changes with Shambhala 0.3 19 Jun 1995
*) Switch ONE_PROCESS to a runtime command-line option (-X)
*) Don't compile in mod_ai_backcompat by default
*) Switch name of server from Apache to Shambhala in Makefile
*) Add some accounting routines to track memory usage in the pools,
for debugging
Changes with Shambhala 0.2
*) Set DOCUMENT_ROOT CGI variable
*) Add single-process debugging, as a compile-time option (ONE_PROCESS)
*) Add critical section protection to handling of cleanup structures
in alloc.c [rst]
*) Significant code reorg within the server core to group related
functions together [rst]
*) Correctly handle clients that hang up before sending any request
[rst]
*) Replace dying child processes. [rst]
Changes with Shambhala 0.1 12 Jun 1995
Major rewrite of the pre-existing "patchy server" codebase, by
Robert Thau (rst). Significant portions of the server code, such
as configuration-file handling and HTTP authentication support,
were ripped out and rewritten from scratch. Code that was not
completely rewritten was significantly altered.
Major changes with this release include:
*) Introduction of the module API; in request handling, the central
machinery just dispatches to various modules, which actually do
most of the work. Configuration handling is similar --- modules
declare their own commands, and the central machinery just
dispatches to them.
API features from shambhala/0.1 were substantially unchanged in
Apache 1.0 and 1.1. (1.0 API features not yet present in this
release, such as wildcard handlers and subpools, were added in
subsequent Shambhala releases, and were also generally rst's
work).
*) This release included the following modules:
mod_access (access control --- allow and deny directives),
mod_alias (Alias and Redirect commands),
mod_auth (straight HTTP authentication, based on flat-files)
mod_auth_dbm (same, with dbm files)
mod_cgi (CGI scripts and, in this release, ScriptAlias)
mod_common_log (CLF access logs; later renamed mod_log_common)
mod_dir (directory indexing)
mod_include (server-side includes)
mod_mime (AddType directives)
mod_negotiation (content negotiation)
mod_userdir (support for users' public_html directories)
It also included a mod_ai_backcompat, which was a private hack
for back-compatibility with rst's own AI-lab servers.
All of these modules were substantially complete, and functional
or nearly so (a few, which implemented features not in use at
Thau's site, required patches of a few lines).
*) sub-request machinery, to allow modules to determine how other
modules would assign MIME types to a given file, or optionally
serve its content (this is heavily used by mod_dir, mod_include
and mod_negotiation).
*) Resource pool system for keeping track of memory allocated and
files opened in service of a particular request. Much of the
code in the modules (when they weren't rewrites) was adjusted to
replace a pervasive convention of using fixed-size buffers on
the stack with an equally pervasive convention of using memory
allocated with palloc().
*) Reorganization of data structures associated with a given
request to eliminate use of global variables and the troublesome
unmunge_name function (used in NCSA and early Apache releases to
attempt to determine the URI which mapped to a given filename
--- a difficult proposition, given that it is easy to produce
setups in which multiple URIs map to the same file).
*) Source files renamed and rearranged
*) Very simple pre-forking behavior --- parent process forked off a
fixed number of children, and then just waited for SIGHUP.
*) Other more minor changes too numerous to list.
This release included modified versions of a lot of code from the
Apache 0.6.4 public release, plus an early pre-forking patch
codeveloped by Robert Thau and Rob Hartill.
Changes with Apache 0.7.3 20 Jun 1995
*) There were a bunch of changes between Apache 0.6.4 and 0.7.3 that
were incorporated by Rob Hartill on the main branch while Robert Thau
worked on the Shambhala rewrite above. Most were merged into the
Shambala architecture after Apache 0.8.0.
Changes with Apache 0.6.4 13 May 1995
*) Patches by Rob Hartill, Cliff Skolnick, Randy Terbush, Robert Thau,
and others.
Changes with Apache 0.5.1 10 Apr 1995
Changes with Apache 0.4 02 Apr 1995
*) Patches by Brian Behlendorf, Andrew Wilson, Robert Thau,
and Rob Hartill.
Changes with Apache 0.3 24 Mar 1995
*) Patches by Robert Thau, David Robinson, Rob Hartill, and
Carlos Varela.
Changes with Apache 0.2 18 Mar 1995
*) Based on NCSA httpd 1.3 by Rob McCool and patches by CERT,
Roy Fielding, Robert Thau, Nicolas Pioch, David Robinson,
Brian Behlendorf, Rob Hartill, and Cliff Skolnick.