1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

254 Commits

Author SHA1 Message Date
Ryan Bloom
8c385f0dbd Make reliable piped logs work on 2.0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85136 13f79535-47bb-0310-9956-ffa450edef68
2000-05-04 04:02:37 +00:00
William A. Rowe Jr
85a9f216b6 Final .dsp changes to produce the lightest weight builds
without precompiled headers or source browse files under
  Win32.  Enabling these is straightforward, if that's what
  the user desires.  Also correct minor errors, and reset
  some project defaults to their current config.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85121 13f79535-47bb-0310-9956-ffa450edef68
2000-05-01 16:51:24 +00:00
Jim Jagielski
0ce9111af4 Allow for help messages for modules.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85105 13f79535-47bb-0310-9956-ffa450edef68
2000-04-30 15:19:30 +00:00
Sascha Schumann
99fa11cb5f Overall UNIX build system improvements:
* Makefile header is now completely dynamic
* Absolute paths everywhere
  (fixes Tru64 support)
* Get rid of LTLIBRARY_SHARED_NAME rule in library.mk
  (fixes Irix support, untested)
* VPATH does not contain variables anymore
  (fixes UnixWare support)
* Remove inclusion of program.mk in support/Makefile.in
  (PROGRAM_NAME is empty => breaks Irix and others)
* Call REENTRANCY_FLAGS earlier, so that flags are passed to header checks
  (might fix OpenBSD pthread.h-detection, untested)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85102 13f79535-47bb-0310-9956-ffa450edef68
2000-04-30 00:06:07 +00:00
William A. Rowe Jr
85845c9bcb PR:
Obtained from:
Submitted by:	William Rowe
Reviewed by:

  Created ap_base64.h to extract those declarations for clarity from ap.h

  CORE_PRIVATE, httpd.h do not belong in library functions, removed from ap.lib

  Use apr headers for declarations in ap.lib stuff, kill AP_LONG from ap_sha1.h

  Move credit to lib/apr/lib/ap_snprintf.c from ap.h for authorship


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85097 13f79535-47bb-0310-9956-ffa450edef68
2000-04-29 16:00:33 +00:00
William A. Rowe Jr
7d4602b4ae PR:
Obtained from:
Submitted by:	William Rowe
Reviewed by:

  First round of .cvsignore changes for Win32's droppings


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85086 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 19:58:06 +00:00
Doug MacEachern
2f45db7e82 back out APR_ prefix for TRUE,FALSE
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85081 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 18:27:55 +00:00
Doug MacEachern
f3a4cf49be prefix TRUE,FALSE with APR_
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85074 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 06:49:53 +00:00
William A. Rowe Jr
f7900eb9cf Replace ERROR constant with TODO_ERROR to flag these for review.
ERROR is a Windows.h constant of 0, or success, and is unrelated
  to the error codes!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85070 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 05:41:36 +00:00
Doug MacEachern
8d22638604 report dso_error if any
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85052 13f79535-47bb-0310-9956-ffa450edef68
2000-04-27 04:15:48 +00:00
Bill Stoddard
440ba7ba22 A bit of mod_file_cache cleanup. Eliminate mmap_static specific code, etc,
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85051 13f79535-47bb-0310-9956-ffa450edef68
2000-04-27 03:55:57 +00:00
Doug MacEachern
6644b34387 add AP_ prefix to *HOOK* macros
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85045 13f79535-47bb-0310-9956-ffa450edef68
2000-04-26 07:14:39 +00:00
Jeff Trawick
429098f3b4 Port a 1.3 EBCDIC fix to 2.0:
This is a port of my 1.3 patch which allows error response strings to be
translated from ebcdic to ascii.  This bug is triggered by trying to
access a non-existant .gif for example.  The content type starts out
being image/gif but is switched by error processing to text/html.
Without this patch, ap_checkconv() is called too early (before the error
processing), so the ebcdic conversion flag gets turned off and the
eventual "404 Not Found" error response is sent to the browser still in
ebcdic.  Not very pretty.

Submitted by:	Greg Ames
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85040 13f79535-47bb-0310-9956-ffa450edef68
2000-04-25 23:19:15 +00:00
Bill Stoddard
6b3fd8e36c Some Windows tweaks from William Rowe...
Submitted by:	William Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85034 13f79535-47bb-0310-9956-ffa450edef68
2000-04-25 21:18:04 +00:00
Bill Stoddard
8bfd06c6f5 Change names of strnatcmp & strnatcasecmp to cpmply with APR naming
conventions

Submitted by:	William Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85028 13f79535-47bb-0310-9956-ffa450edef68
2000-04-24 14:57:54 +00:00
Greg Stein
b97ec4c63a drop the "container" param from ap_walk_config(). callers should simply
pass the first child, rather than expecting the walker to do it.
remove the nasty "static" variable inside ap_walk_config(). it now walks the
    tree provided with no worries about bumping up/down levels.
minor refactor between ap_walk_config() and ap_walk_config_sub() to clean up
    some logic and clarify the code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85025 13f79535-47bb-0310-9956-ffa450edef68
2000-04-24 12:27:02 +00:00
Greg Stein
c2c13c67c3 clean up cmd_parms: config_file is no longer valid; end_token is bogus;
add directive.
move configfile_t and functions from httpd.h to http_config.h
new signature for ap_build_config() (since config_file removed from cmd_parms)
add "data" to ap_directive_t for future use by modules. add filename.
syntax checking for section-close directives: a section-open must exist,
    the section-close must be </FOO>, and the open/close must match.
    the file as a whole must be properly balanced (issue errors for each
    unmatched section-open).
</FOO> command_rec structures are obsolete. Remove from http_core.c.
do not store </FOO> directives in the config tree.
clean out section-close logic from http_core.c (and old, related comments)
<Limit> and <LimitExcept> must walk their children.
new mechanism in ap_check_cmd_context() for testing enclosure in a
    Directory/Location/File: find_parent()
<IfModule> and <IfDefine> must pass cmd->context when walking the children
several places: we had a walk followed by ap_get_module_config(). that
    assumed the walk would create a config that we could fetch, which is not
    true -- it is possible that the children are all from other modules
    (e.g. the <Files> section in httpd.conf-dist has no "core" directives).
    using ap_set_config_vectors() ensures we get a structure, and it returns
    it to us.
    [ note: when we had </Directory> (and friends) in the tree, the config
      would get created; removing the directive removed the config; this
      was a bitch to track down :-) ]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85024 13f79535-47bb-0310-9956-ffa450edef68
2000-04-24 12:00:43 +00:00
Greg Stein
059ab7a790 handle error messages during building and processing of the configuration.
add missing return statements, wrap some lines, remove unused vars.
move syntax error reporting and exit(1) back to the right place (to be
    fixed in a future pass; the exit() is inappropriate for parsing
    .htaccess files).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85023 13f79535-47bb-0310-9956-ffa450edef68
2000-04-24 08:35:56 +00:00
dgaudet
89d7e60303 Add `IndexOptions +VersionSort', to nicely sort filenames
containing version numbers.

Submitted by:	Martin Pool <mbp@linuxcare.com.au>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85021 13f79535-47bb-0310-9956-ffa450edef68
2000-04-24 04:03:39 +00:00
Bill Stoddard
2f6ab67bce First cut at a file handle cache. It serves on Windows and should work on
Unix systems that implement sendfile.

It is still very rough around the edges (compile warnings, does an unnecessary
stat, not completely Unix friendly, leftover mod_mmap_static code, etc.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85020 13f79535-47bb-0310-9956-ffa450edef68
2000-04-23 17:42:22 +00:00
Jeff Trawick
3548f16478 Fix some problems on systems where EAGAIN != EWOULDBLOCK (e.g., OS/390).
ap_canonical_errror() for Unix now maps EWOULDBLOCK to EAGAIN/APR_EAGAIN
when appropriate so that the changes here (as well as bjh's changes from a
few days ago) to call ap_canonical_error() before comparing with EWOULDBLOCK
will work on Unix as well.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85019 13f79535-47bb-0310-9956-ffa450edef68
2000-04-23 13:22:08 +00:00
Jeff Trawick
dd4bfd87a2 ap_open(..,APR_OS_DEFAULT,..) uses perms 0666 instead of 0777 on
Unix; access_log and error_log now created with these perms; non-
Unix is unaffected


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85018 13f79535-47bb-0310-9956-ffa450edef68
2000-04-23 12:24:10 +00:00
Roy T. Fielding
7cbb1cb050 Finished move of ap_md5 routines to apr_md5. Removed ap_md5.h.
Replaced more magic numbers with MD5_DIGESTSIZE.  Yuck.

Submitted by:	William Rowe, Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85017 13f79535-47bb-0310-9956-ffa450edef68
2000-04-23 02:32:58 +00:00
Ryan Bloom
ab31187b8d Parse the config tree, instead of the config file. This is a first step there
are some big improvements to be made to this code, but this works now, and
it is a first step.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85015 13f79535-47bb-0310-9956-ffa450edef68
2000-04-22 22:54:30 +00:00
Bill Stoddard
9a6e32864a Add ApacheModAuthDigest to apache.dsw. Get rid of compile warnings.
Submitted by:	William Rowe
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85014 13f79535-47bb-0310-9956-ffa450edef68
2000-04-22 15:44:57 +00:00
Bill Stoddard
5eabf6240b Win32: Get mod_auth_digest compiling and added to the Windows
build environment. Not tested and I'd be suprised if it
actually works.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85012 13f79535-47bb-0310-9956-ffa450edef68
2000-04-21 22:12:43 +00:00
Bill Stoddard
17c5e3fb7a Revamp the Win32 make environment. Makefiles have been removed and
Apache.dsw created to bring together all the pieces. Create new file
os/win32/BaseAddr.ref to define module base addresses (to prevent
dll relocation at start-up).

Submitted by:	William Rowe
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85004 13f79535-47bb-0310-9956-ffa450edef68
2000-04-20 19:28:08 +00:00
Brian Havard
af789a8fd6 Another required ap_canonical_error().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85001 13f79535-47bb-0310-9956-ffa450edef68
2000-04-20 16:08:07 +00:00
Brian Havard
f5b782f5b8 Use ap_canonical_error() where appropriate.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85000 13f79535-47bb-0310-9956-ffa450edef68
2000-04-20 15:20:33 +00:00
Jeff Trawick
cc6e027c47 [EBCDIC] Port Paul Gilmartin's CRLF patch from 1.3. This replaces most
of the \015, \012, and \015\012 constants with macros.
Submitted by:	Greg Ames
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84998 13f79535-47bb-0310-9956-ffa450edef68
2000-04-20 14:36:01 +00:00
Ryan Bloom
07f387cc5a Add logic to timeout CGI scripts properly. This requires that APR pipes
can be timed out.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84986 13f79535-47bb-0310-9956-ffa450edef68
2000-04-18 00:08:30 +00:00
Bill Stoddard
e3784eb925 linkwin20.diffs Resolves:
1) Explicit /base: addresses by the following table...

  Required sizes are for debug builds.  It is assumed that
  as we increase the size of aprlib, we will be trimming
  the size of ApacheCore, and the 278A0000 base can move down.

  ApacheCore.dll            27800000  80000 required

  aprlib.dll                278A0000  40000 required

  ApacheModuleAuthAnon.dsp  27900000
  ApacheModuleCERNMeta.dsp  27910000
  ApacheModuleDigest.dsp    27920000
  ApacheModuleExpires.dsp   27930000
  ApacheModuleHeaders.dsp   27940000
  ApacheModuleInfo.dll      27950000
  ApacheModuleRewrite.dsp   27960000  20000 required

  ApacheModuleSpeling.dsp   27980000
  ApacheModuleStatus.dsp    27990000
  ApacheModuleUserTrack.dsp 279A0000
  ApacheModuleProxy.dsp     279B0000  20000 anticipated

  3 slots still available   279C0000

2) Make APR consistent with the rest of the API and
   not build septypes for debugging (in other words,
   roll in the debug symbols as every other module does.)

   If we decide we LIKE /pdbtype:septypes... then we
   should be using them throughout.

3) Slide the current path specs into /libpath: options
   so the library list is more ledgible.

4) Drop all the gui crud from the library list.  Everything
   listed is referenced, with the following exceptions:

   *) don't do anything with msvcrtd/oldnames today.
   *) aprlib and ApacheCore have the same list, since functions
      may still be moving between them.
   *) apache.exe looses networking (it doesn't), while it keeps
      advapi, which I don't think it needs, but it could later.
   *) add aprlib to ApacheModuleProxy, since it will need it.
   *) hang mswsock whereever ws2_32 is invoked.  I believe
      the most special case was ApacheModuleProxy, which may
      become entirely APR.  But for today we hang onto both.

5) MAP, MAP, MAP, everything gets a map.  I for one have an
   untold number of installed OS's and boot mappings, and the
   debugger isn't installed to all of them.  We gotta be able
   to track down those renegade GP faults.  (What faults...
   I know, it's clean, but I am overly cautious that way.)

6) Set the DEFAULT linkage to be this linkage.  Because
   "it's a vc thing" the defaults were not all that
   useful as a starting point (take, for example, the
   joke of linking to the OLE libraries).


Submitted by:	William Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84982 13f79535-47bb-0310-9956-ffa450edef68
2000-04-17 13:56:41 +00:00
Bill Stoddard
16e366cbfe Win32: First cut at getting mod_isapi working under 2.0
Submitted by:	William Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84976 13f79535-47bb-0310-9956-ffa450edef68
2000-04-15 19:23:08 +00:00
Bill Stoddard
f76bc22f67 Here's my first stab at getting mod_auth_digest working under 2.0
quick change summary:

 - moved the random byte generation into APR
   This patch adds ap_generate_random_bytes()
 - now uses ap_time_t
 - compiles and runs on linux
 - tested with amaya

still to do:

 - test win32 (This will have to be someone with a windows box :-)
   I think I did everything correctly.  APR_HAS_RANDOM should be defined
   on windows and there is a lib/apr/misc/win32/rand.c which is basically
   a copy of what mod_auth_digest used to use.
 - error handling cleanup
   Since there is not currently a usable ap_strerror it is commented out.
   win32 error handling is virtually non-existant.  I just don't know enough
   about win32 to touch this stuff.

Brian


Submitted by:	Brian Martin
Reviewed by:	Bill Stoddard (very quick review, moving in right direction)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84975 13f79535-47bb-0310-9956-ffa450edef68
2000-04-15 19:05:13 +00:00
Bill Stoddard
3f836c5723 Allow for the possibility of receiving data regardless of the pipe
error condition or receiving EOF on the pipe read. This patch
assumes that a read returning APR_SUCCESS with 0 bytes read is equivalent
to an EOF.

Submitted by:	Dean Gaudet
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84965 13f79535-47bb-0310-9956-ffa450edef68
2000-04-14 17:38:14 +00:00
Ryan Bloom
de3a77dc01 Change ap_context_t to ap_pool_t. This compiles, runs, and serves pages
on Linux, but probably breaks somewhere.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84963 13f79535-47bb-0310-9956-ffa450edef68
2000-04-14 15:59:20 +00:00
Jeff Trawick
cfbb9efb3c Get mod_rewrite to compile with no warnings on OS/390
(cc) and Linux (gcc -Wall).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84960 13f79535-47bb-0310-9956-ffa450edef68
2000-04-14 01:36:59 +00:00
Bill Stoddard
e0c99ce6c8 Get Apache on Windows compiling again after the patch eliminating
buffered file i/o.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84934 13f79535-47bb-0310-9956-ffa450edef68
2000-04-07 02:33:59 +00:00
Ryan Bloom
db9d037c36 Make the server work without asking for buffered file I/O. This removes
all APR_BUFFERED flags from the server, and it fixes a minor bug in the
ungetchar patch (I forgot a file when comitting).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84933 13f79535-47bb-0310-9956-ffa450edef68
2000-04-06 23:53:59 +00:00
Allan K. Edwards
4360cc7435 Get mod_rewrite building and running, and mod_status building for Win NT
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84928 13f79535-47bb-0310-9956-ffa450edef68
2000-04-05 21:01:07 +00:00
Allan K. Edwards
6f2baafe2d Get mod_negotiation working. We may ultimately need finer granularity
of type_checker hook ordering, but this will get MultiViews working for now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84922 13f79535-47bb-0310-9956-ffa450edef68
2000-04-05 19:24:46 +00:00
Bill Stoddard
9454276dd9 Patch to port mod_auth_db to the 2.0 api and also to support
Berlekey DB 3.0. It works for me with both Berkeley DB 3.0.55 and
2.7.7.  It should work with version 1 as well but I haven't tested it.

Submitted by:	Brian Martin <bmartin@penguincomputing.com>
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84921 13f79535-47bb-0310-9956-ffa450edef68
2000-04-05 17:27:57 +00:00
Bill Stoddard
ca0f151736 Get DSOs working on Windows. Required cross platform change to mod_so.c.
Tim tested on Windows. Not tested on other platforms.

Submitted by:	Tim Costello
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84920 13f79535-47bb-0310-9956-ffa450edef68
2000-04-05 15:45:33 +00:00
Jeff Trawick
a212f927b0 get rid of an unused variable from virtualhost_section()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84917 13f79535-47bb-0310-9956-ffa450edef68
2000-04-05 02:22:20 +00:00
Jeff Trawick
98730c630f stop relying on a macro to map signal() to ap_signal(); call
ap_signal() directly


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84916 13f79535-47bb-0310-9956-ffa450edef68
2000-04-05 02:09:44 +00:00
Jeff Trawick
92cafef56b stop relying on a macro to map signal() to ap_signal(); call
ap_signal() directly


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84914 13f79535-47bb-0310-9956-ffa450edef68
2000-04-05 01:23:51 +00:00
Bill Stoddard
2e7ac8ac5f Get APR DSO code working under Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84898 13f79535-47bb-0310-9956-ffa450edef68
2000-04-03 20:41:14 +00:00
David Reid
9cfe627f55 First pass at mod_so with the new APR dso calls. It builds OK, but as
I can't build any dynamic modules to properly test it with I'll let
others do that!  It'll need some work, but I wanted to get code in so
people can start hacking it around :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84893 13f79535-47bb-0310-9956-ffa450edef68
2000-04-02 18:15:00 +00:00
Roy T. Fielding
1be5367573 Update to Apache Software License version 1.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84880 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 09:17:18 +00:00
Roy T. Fielding
2bee4ad19d Update to Apache Software License version 1.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84879 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 09:05:25 +00:00