Commits · d78fa3817a9e6be9a43026c569599529d272d856 · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

Mar 10, 1998

And finally a bunch of new comments and cosmetics for mod_so. · d78fa381
Ralf S. Engelschall authored Mar 10, 1998
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80462 13f79535-47bb-0310-9956-ffa450edef68
```
d78fa381

Enhance Shared Object Loading (II) · bb54252a

Ralf S. Engelschall authored Mar 10, 1998

----------------------------------

mod_so now keeps track itself of which modules are actually loaded and which
are not by remembering both the module pointer and the module name. This fixes
two problems:

1. Because our server configuration is read twice the modules
   were loaded twice which is both not needed and leads to confusion later on
   unload because the OS-internal load counter increases. Then on unload the
   module pointer was removed from the Apache core structure on the first
   unloads but (because of the load counter) the modules were removed later.
   Although this worked, it was very ugly. The only consequence is that we now
   keep track of loaded modules ourself and don't rely on the dynamic loader
   of the platform. This now also avoids multiply tries to unload an already
   unloaded module and thus removes harmless but irritating error_log entries
   ``[error] Cannot remove module mod_setenvif.c: not found in module list''.
   as shown below.

2. Because we now keep track of the module names we used on loading we now can
   give correct corresponding log messages even on unloading.

To illustrate the change, here is the old error_log:
(the first unloads correspond to the first loads which
 are printed on stderr unless mod_log_config is present)

[debug] mod_so.c(163): unloaded module mod_setenvif.c
[debug] mod_so.c(163): unloaded module mod_access.c
[debug] mod_so.c(163): unloaded module mod_userdir.c
[debug] mod_so.c(163): unloaded module mod_dir.c
[debug] mod_so.c(163): unloaded module mod_autoindex.c
[debug] mod_so.c(163): unloaded module mod_negotiation.c
[debug] mod_so.c(163): unloaded module mod_log_config.c
[error] Cannot remove module mod_setenvif.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_setenvif.c
[error] Cannot remove module mod_access.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_access.c
[error] Cannot remove module mod_userdir.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_userdir.c
[error] Cannot remove module mod_dir.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_dir.c
[error] Cannot remove module mod_autoindex.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_autoindex.c
[error] Cannot remove module mod_negotiation.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_negotiation.c
[error] Cannot remove module mod_log_config.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_log_config.c
[error] Cannot remove module mod_setenvif.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_setenvif.c
[error] Cannot remove module mod_access.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_access.c
[error] Cannot remove module mod_userdir.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_userdir.c
[error] Cannot remove module mod_dir.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_dir.c
[error] Cannot remove module mod_autoindex.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_autoindex.c
[error] Cannot remove module mod_negotiation.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_negotiation.c
[error] Cannot remove module mod_log_config.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_log_config.c
[debug] mod_so.c(211): loaded module config_log_module
[debug] mod_so.c(211): loaded module negotiation_module
[debug] mod_so.c(211): loaded module autoindex_module
[debug] mod_so.c(211): loaded module dir_module
[debug] mod_so.c(211): loaded module userdir_module
[debug] mod_so.c(211): loaded module access_module
[debug] mod_so.c(211): loaded module setenvif_module
[debug] mod_so.c(211): loaded module config_log_module
[debug] mod_so.c(211): loaded module negotiation_module
[debug] mod_so.c(211): loaded module autoindex_module
[debug] mod_so.c(211): loaded module dir_module
[debug] mod_so.c(211): loaded module userdir_module
[debug] mod_so.c(211): loaded module access_module
[debug] mod_so.c(211): loaded module setenvif_module
[debug] mod_so.c(211): loaded module config_log_module
[debug] mod_so.c(211): loaded module negotiation_module
[debug] mod_so.c(211): loaded module autoindex_module
[debug] mod_so.c(211): loaded module dir_module
[debug] mod_so.c(211): loaded module userdir_module
[debug] mod_so.c(211): loaded module access_module
[debug] mod_so.c(211): loaded module setenvif_module
[notice] Apache/1.3b6-dev configured -- resuming normal operations
[notice] httpd: caught SIGTERM, shutting down
[debug] mod_so.c(163): unloaded module mod_setenvif.c
[debug] mod_so.c(163): unloaded module mod_access.c
[debug] mod_so.c(163): unloaded module mod_userdir.c
[debug] mod_so.c(163): unloaded module mod_dir.c
[debug] mod_so.c(163): unloaded module mod_autoindex.c
[debug] mod_so.c(163): unloaded module mod_negotiation.c
[debug] mod_so.c(163): unloaded module mod_log_config.c
[error] Cannot remove module mod_setenvif.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_setenvif.c
[error] Cannot remove module mod_access.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_access.c
[error] Cannot remove module mod_userdir.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_userdir.c
[error] Cannot remove module mod_dir.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_dir.c
[error] Cannot remove module mod_autoindex.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_autoindex.c
[error] Cannot remove module mod_negotiation.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_negotiation.c
[error] Cannot remove module mod_log_config.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_log_config.c
[error] Cannot remove module mod_setenvif.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_setenvif.c
[error] Cannot remove module mod_access.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_access.c
[error] Cannot remove module mod_userdir.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_userdir.c
[error] Cannot remove module mod_dir.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_dir.c
[error] Cannot remove module mod_autoindex.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_autoindex.c
[error] Cannot remove module mod_negotiation.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_negotiation.c
[error] Cannot remove module mod_log_config.c: not found in module list
[debug] mod_so.c(163): unloaded module mod_log_config.c

And this is the one with the new mod_so.c:
(again the first unloads correspond to the first loads which
 are printed on stderr unless mod_log_config is present)

[debug] mod_so.c(191): unloaded module setenvif_module
[debug] mod_so.c(191): unloaded module access_module
[debug] mod_so.c(191): unloaded module userdir_module
[debug] mod_so.c(191): unloaded module dir_module
[debug] mod_so.c(191): unloaded module autoindex_module
[debug] mod_so.c(191): unloaded module negotiation_module
[debug] mod_so.c(191): unloaded module config_log_module
[debug] mod_so.c(261): loaded module config_log_module
[debug] mod_so.c(261): loaded module negotiation_module
[debug] mod_so.c(261): loaded module autoindex_module
[debug] mod_so.c(261): loaded module dir_module
[debug] mod_so.c(261): loaded module userdir_module
[debug] mod_so.c(261): loaded module access_module
[debug] mod_so.c(261): loaded module setenvif_module
[notice] Apache/1.3b6-dev configured -- resuming normal operations
[notice] httpd: caught SIGTERM, shutting down
[debug] mod_so.c(191): unloaded module setenvif_module
[debug] mod_so.c(191): unloaded module access_module
[debug] mod_so.c(191): unloaded module userdir_module
[debug] mod_so.c(191): unloaded module dir_module
[debug] mod_so.c(191): unloaded module autoindex_module
[debug] mod_so.c(191): unloaded module negotiation_module
[debug] mod_so.c(191): unloaded module config_log_module


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80461 13f79535-47bb-0310-9956-ffa450edef68

bb54252a

Snow is falling down in germany but the Sun comes out... · 06c7a1f7

Ralf S. Engelschall authored Mar 10, 1998


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80460 13f79535-47bb-0310-9956-ffa450edef68

06c7a1f7

Prior to the existence of mod_setenv it was necessary to tweak the TZ · d2b17990

dgaudet authored Mar 10, 1998

environment variable in the apache core.  But that tweaking interferes
with mod_setenv.  So don't tweak if the user has specified an explicit
TZ variable.

PR:		1888
Submitted by:	Jay Soffian <jay@cimedia.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80459 13f79535-47bb-0310-9956-ffa450edef68

d2b17990

rputs() did not calculate r->sent_bodyct properly. · 84083d73

dgaudet authored Mar 10, 1998

PR:		1900
Submitted by:	Siegmund Stirnweiss <siegst@kat.ina.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80458 13f79535-47bb-0310-9956-ffa450edef68

84083d73

The CGI spec says that REMOTE_HOST should be set to the remote hosts's · 18989d6f

dgaudet authored Mar 10, 1998

name, or left unset if this value is unavailable.  Apache was setting
it to the IP address when unavailable.

PR:		1925
Submitted by:	Tony Fincg <fanf@demon.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80457 13f79535-47bb-0310-9956-ffa450edef68

18989d6f

The HTTP editorial group needs a checklist for what has been · 9a6c27df

Roy T. Fielding authored Mar 10, 1998

implemented in the latest release of Apache, since that will
influence what is included in the eventual "Draft Standard".

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80456 13f79535-47bb-0310-9956-ffa450edef68

9a6c27df

Pyto Tolice · ed876900

Marc Slemko authored Mar 10, 1998

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80455 13f79535-47bb-0310-9956-ffa450edef68

ed876900

Mar 09, 1998

Make things work on Win32 again. May include unneed Makefile changes (or may · f60d4b56

Ben Laurie authored Mar 09, 1998

not, who can say?).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80453 13f79535-47bb-0310-9956-ffa450edef68

f60d4b56

The generated CFLAGS line needs to end up looking like: · 9345fef4

rasmus authored Mar 09, 1998

-DSERVER_SUBVERSION=\"WHATEVER\"

Need to add a bunch of escapes here to achieve that.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80452 13f79535-47bb-0310-9956-ffa450edef68

9345fef4

Various Enhancements to the Shared Object support · f4997787

Ralf S. Engelschall authored Mar 09, 1998

-------------------------------------------------

1. Shared object support is compiler-dependend, so we have to
   move the XXX_SHLIB stuff _after_ the compiler checks in
   the Configure script.

3. Added entries for manual/custom shared object support to
   Configuration.tmpl file, so the user knows what he has to do.
   Configure already supported this in the past but nothing was
   documented here.

3. Added initial support for Solaris 2.x.

4. I've now tested shared object support under the following
   platform/compiler combinations:
      - FreeBSD 2.1.5 with gcc 2.8.0
      - Debian 1.3.1  with gcc 2.7.2
      - Solaris 2.6   with gcc 2.7.2
      - Solaris 2.5.1 with gcc 2.7.2
      - Solaris 2.5.1 with WorkShop Compilers 4.2 30 Oct 1996 C 4.2

   All ran out-the-box with my test procedure:
   [Yes, I really would like to see my configure stuff added...]
      $ gunzip <apache-1.3b6-dev.tar.gz
      $ cd apache-1.3b6-dev
      $ ./configure --prefix=/tmp/apache --enable-shared=max
      $ make
      $ make install
      $ /tmp/apache/sbin/apachectl start
      $ lynx -mime_header -source http://localhost:80/
      $ /tmp/apache/sbin/apachectl stop
      $ cd ..
      $ rm -rf apache-1.3b6-dev


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80451 13f79535-47bb-0310-9956-ffa450edef68

f4997787

ConfigStart/End sections were totally ignored for SharedModule · c6976924
Ralf S. Engelschall authored Mar 09, 1998
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80450 13f79535-47bb-0310-9956-ffa450edef68
```
c6976924

typo · 62914521

Ralf S. Engelschall authored Mar 09, 1998


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80449 13f79535-47bb-0310-9956-ffa450edef68

62914521

Cosmetics and completion of module structure · 85444a56

Ralf S. Engelschall authored Mar 09, 1998


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80448 13f79535-47bb-0310-9956-ffa450edef68

85444a56

This patch lets modules append themselves to SERVER_SUBVERSION at · 285b0446

pcs authored Mar 09, 1998

configure time without interfering with other modules doing the same. It
is used like this in .module files or CONFIG_START/END sections:

SUBVERSION="$SUBVERSION mymodule/123"

At present multiple modules adding themselves to the version string get
confused, causing compile warnings and ending up with only one module in
the version. Module authors using -DSERVER_SUBVERSION in their $CFLAGS
will have to make a slight modification to the above format instead. This
will only affect modules designed for 1.3 betas.

Reviewed by: Dean Gaudet, Ralf S. Engelschall, Ken Coar

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80447 13f79535-47bb-0310-9956-ffa450edef68

285b0446

Mar 08, 1998

Fix Configure script: · 2eebb753

Ralf S. Engelschall authored Mar 08, 1998

1. move generation of ap_config.h to a later point in the script
   because else it doesn't pick up HIDE or STATUS correctly.

2. change the generation of shared objects from explicit rules to
   implicit rules: First the $< is only portable for implict
   rules (e.g. FreeBSD's make fails) and second we already build
   .o's implicitly, so we should do with .so's the same way.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80446 13f79535-47bb-0310-9956-ffa450edef68

2eebb753

http_main is way too big. Bleh. Some clean up on scoreboard stuff. · 87deb34c

dgaudet authored Mar 08, 1998


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80445 13f79535-47bb-0310-9956-ffa450edef68

87deb34c

autogenerated · 606b9494

dgaudet authored Mar 08, 1998


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80444 13f79535-47bb-0310-9956-ffa450edef68

606b9494

defend against possible sh lameness · 7719da3c

dgaudet authored Mar 08, 1998


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80443 13f79535-47bb-0310-9956-ffa450edef68

7719da3c

Mar 07, 1998

I should clearly not be coding today. · 29ef6f4e

dgaudet authored Mar 07, 1998


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80441 13f79535-47bb-0310-9956-ffa450edef68

29ef6f4e

Don't use strtoul. And defend against similar slipups in the future... I · 00d2cf4e

dgaudet authored Mar 07, 1998

know that define in httpd.h may annoy module authors...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80440 13f79535-47bb-0310-9956-ffa450edef68

00d2cf4e

and make it work for linux too · bab753d0

dgaudet authored Mar 07, 1998


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80439 13f79535-47bb-0310-9956-ffa450edef68

bab753d0

Fix a logic problem -- it was giving false positives because DBM_LIB is · c0a0109d

dgaudet authored Mar 07, 1998

sometimes set when it shouldn't be... it's set by default in Configure.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80438 13f79535-47bb-0310-9956-ffa450edef68

c0a0109d

Document the change to the SERVER_VERSION symbol usage. · 95a6ff3b

Ken Coar authored Mar 07, 1998


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80437 13f79535-47bb-0310-9956-ffa450edef68

95a6ff3b

Mar 06, 1998

I think we do more harm than good by including every directive in this · b41cd842

dgaudet authored Mar 06, 1998

file.  This encourages people to skip reading the manuals.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80436 13f79535-47bb-0310-9956-ffa450edef68

b41cd842

Oh sheesh. No wonder we still get so many reports of problems from folks · 797e5c94

dgaudet authored Mar 06, 1998

who haven't read the docs about NameVirtualHost. Those messages are
warnings, because the server is still functioning. And the default loglevel
is err. No way. Warnings should be in the default too. In fact I'd
say everything except debug should be the default.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80435 13f79535-47bb-0310-9956-ffa450edef68

797e5c94

tweak warnings for vhost stuff · 174b34c8

dgaudet authored Mar 06, 1998


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80434 13f79535-47bb-0310-9956-ffa450edef68

174b34c8

Inline the proxy availability check because the existence of the function · f8eb9ca6

Ralf S. Engelschall authored Mar 06, 1998

is_proxy_available() is historical and from days where no find_linked_module()
function existed and where this was a bigger function.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80433 13f79535-47bb-0310-9956-ffa450edef68

f8eb9ca6

SVR4 has <dlfcn.h> · f6bfeca5

Martin Kraemer authored Mar 06, 1998


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80432 13f79535-47bb-0310-9956-ffa450edef68

f6bfeca5

This is disgusting - we must change the include order as soon as possible · 24b13144
Martin Kraemer authored Mar 06, 1998
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80431 13f79535-47bb-0310-9956-ffa450edef68
```
24b13144

Again cold days in germany... · 4e919b6d

Ralf S. Engelschall authored Mar 06, 1998


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80430 13f79535-47bb-0310-9956-ffa450edef68

4e919b6d

Avoid the flock()<->fork() problematic by giving each child an · ae3fd56a

Ralf S. Engelschall authored Mar 06, 1998

own file descriptor instead of a shared one.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80429 13f79535-47bb-0310-9956-ffa450edef68

ae3fd56a

Hazy and cool · 87b29e9e

Martin Kraemer authored Mar 06, 1998


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80428 13f79535-47bb-0310-9956-ffa450edef68

87b29e9e

Change to the multiple-slash behaviour of LocationMatch for consistency · 779e6329

dgaudet authored Mar 06, 1998

with AliasMatch and RewriteRule. This was discussed in nh.9711, search
for subject "mod_rewrite/1440". My proposed change had the support of
Roy, Ken and Dirk... I modified it slightly here so that it wouldn't
break every single existing config that has <Location /server-status>.

PR: 1440

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80427 13f79535-47bb-0310-9956-ffa450edef68

779e6329

Slight mistake in mod_mime_magic. If you tried to request a 0-length file · 4a8a7b06

dgaudet authored Mar 06, 1998

it would return DONE all the way back to the core... which would interpret
that to mean "oh no need to send any response".

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80425 13f79535-47bb-0310-9956-ffa450edef68

4a8a7b06

No functional difference, other than to short-circuit earlier if there are · e3318f36

dgaudet authored Mar 06, 1998

no Location sections. I wanted to do this before I made another change
which will have functional difference.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80424 13f79535-47bb-0310-9956-ffa450edef68

e3318f36

Fix a bug pointed out by Lars on new-httpd in message-id · 65cc663d

dgaudet authored Mar 06, 1998

<XFMail.971109183845.sfx@unix-ag.org>.  I'm not sure how this ever worked
before.  Luck I guess.

If a request matches the vhost of a proxy then it's quite possible that
various other modules such as mod_alias will get their grubby hands on
the uri and play games like Alias or ScriptAlias and then short-circuit
the translate_names phase before mod_proxy gets to handle
"ProxyRequests on".  So instead mod_proxy handles "ProxyRequests on"
in the post_read_request phase... which can't be short-circuited.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80423 13f79535-47bb-0310-9956-ffa450edef68

65cc663d

indent · 3a32f659

dgaudet authored Mar 06, 1998


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80422 13f79535-47bb-0310-9956-ffa450edef68

3a32f659

Mar 05, 1998

Due to the order of inclusion, it isn't feasible to move this check · 4977f45e

rasmus authored Mar 05, 1998

to conf.h. So, reverse this part of my last patch. The whole DLFCN
thing could be moved to conf.h, but I will leave that for another battle.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80419 13f79535-47bb-0310-9956-ffa450edef68

4977f45e

These patches make Configure create src/include/ap_config.h and they also · 1251b918

rasmus authored Mar 05, 1998

clean up the various autoconf symbol clashes I was getting. I bumped the
MODULE_MAGIC_NUMBER so an external module will now that it can expect to
find ap_config.h after today. The patches have been tested on
Solaris 2.5.1 and a generic Linux 2.1.79 box both with and without the
external module compiled in. Nothing here should affect anybody, but
it allows people to correctly build external modules outside of the
Apache build environment.

Reviewed by: Concept ok'ed, at least in part, by Jim and Dean

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80418 13f79535-47bb-0310-9956-ffa450edef68

1251b918