1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Commit Graph

167 Commits

Author SHA1 Message Date
William A. Rowe Jr
05fcc41a1f Update for latest structure changes for 2.0.21
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89644 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 20:00:50 +00:00
William A. Rowe Jr
f6f3f613e3 Refresh .mak files for tagging 2.0.19
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89458 13f79535-47bb-0310-9956-ffa450edef68
2001-06-28 00:31:04 +00:00
Martin Kraemer
4723ee4c43 Add description strings for AuthDb*File
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89246 13f79535-47bb-0310-9956-ffa450edef68
2001-05-30 10:22:19 +00:00
Roy T. Fielding
43b9634ceb Moved util_uri to apr-util/uri/apr_uri, which means adding the apr_
prefix to all of the uri functions (yuck), changing some includes,
and using APR error codes instead of HTTP-specific error codes.

Other notes to test this patch:
- You need to delete the util_uri.h file - exports picks up on this.
- I'd like to remove the apr_uri.h from httpd.h, but that might
  increase the complexity of this patch even further.  Once this patch
  is accepted (in some form), then I can focus on removing apr_uri.h
  from httpd.h entirely.  I need baby steps (heh) right now.
- I imagine that this might break a bunch of stuff in Win32 or other OS
  builds with foreign dependency files.  Any help here is appreciated.

This is a start...  -- justin

Submitted by:	Justin Erenkrantz
Reviewed by:	Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89198 13f79535-47bb-0310-9956-ffa450edef68
2001-05-22 01:31:12 +00:00
Ben Laurie
6dbc2131e3 Fix warnings.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89173 13f79535-47bb-0310-9956-ffa450edef68
2001-05-20 11:58:03 +00:00
Jeff Trawick
62ade41102 clean up DSO builds on OS/390 a bit by ignoring some generated files
and by passing libtool the OS/390-specific options needed to split
the main httpd executable into a small executable with main() and a
dll with everything else (previously this information was hard-coded
in the OS/390 libtool program)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89124 13f79535-47bb-0310-9956-ffa450edef68
2001-05-15 17:30:44 +00:00
Roy T. Fielding
8ea5039bdb Fix httpd's definition of LTFLAGS to be consistent with that of apr
and apr-util, allow it to be overridden by the configure command-line
(default="--silent") and introduce LT_LDFLAGS to replace what we were
formally abusing as LTFLAGS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89094 13f79535-47bb-0310-9956-ffa450edef68
2001-05-12 03:48:31 +00:00
Roy T. Fielding
f1f5f01fdb Completely revamp configure so that it preserves the standard make
variables CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS and LIBS by moving
the configure additions to EXTRA_* variables.  Also, allow the user
to specify NOTEST_* values for all of the above, which eliminates the
need for THREAD_CPPFLAGS, THREAD_CFLAGS, and OPTIM.  Fix the setting
of INCLUDES and EXTRA_INCLUDES.  Check flags as they are added to
avoid pointless duplications.  Fix the order in which flags are given
on the compile and link lines.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88960 13f79535-47bb-0310-9956-ffa450edef68
2001-04-29 05:24:11 +00:00
William A. Rowe Jr
6a6e54f29e Pass the perms arg to apr_dbm_open
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88959 13f79535-47bb-0310-9956-ffa450edef68
2001-04-28 00:26:38 +00:00
Brian Havard
c391427124 Add a few more modules to the "most" category.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88917 13f79535-47bb-0310-9956-ffa450edef68
2001-04-23 14:29:57 +00:00
Ryan Bloom
d7ba749612 We don't really treat this field as a const, and currently we are getting
warnings because on line 536, we are trying to assign a non-const to a
const.  This started happening after a fix for Windows.  This change should
solve the problem on all systems.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88860 13f79535-47bb-0310-9956-ffa450edef68
2001-04-14 23:00:28 +00:00
William A. Rowe Jr
b9d020553f More APR_STATUS_IS_ canonicalization
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88825 13f79535-47bb-0310-9956-ffa450edef68
2001-04-12 13:37:23 +00:00
William A. Rowe Jr
5cba2e14a8 Clean up a yet a couple more emits
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88798 13f79535-47bb-0310-9956-ffa450edef68
2001-04-10 20:45:39 +00:00
William A. Rowe Jr
5383bde83c Time to refresh mak on Win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88728 13f79535-47bb-0310-9956-ffa450edef68
2001-04-05 09:21:46 +00:00
William A. Rowe Jr
e935387c91 This should wrap this freshen up
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88559 13f79535-47bb-0310-9956-ffa450edef68
2001-03-22 05:56:59 +00:00
Chuck Murcko
93463cfc17 This is a fix that went into v1.3 quite a while back, but not into v2.0.
It sorts out the problem when a password protected reverse proxy URL
sends a Proxy-Authenticate to a browser instead of a WWW-Authenticate.

This patch covers the changes to the httpd-2.0 tree.

Submitted by:	Graham Leggett
Reviewed by:	Chuck Murcko


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88527 13f79535-47bb-0310-9956-ffa450edef68
2001-03-16 07:28:08 +00:00
Jeff Trawick
67b33605ca Fix a security exposure in mod_access. Previously when IPv6
listening sockets were used, allow/deny-from-IPv4-address rules
were not evaluated properly (PR #7407).  Also, add the ability to
specify IPv6 address strings with optional prefix length on Allow
and Deny.

Note: A bit more of PR #7407 remains dealing with a problem with
double-reverse lookups when an IPv6 listening socket is used.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88522 13f79535-47bb-0310-9956-ffa450edef68
2001-03-15 22:09:27 +00:00
Jeff Trawick
d3dcba691d tweak ap_get_remote_host() so that the caller can find out if she got
back an IP address

mod_access needed to know this, but the old code didn't handle IPv6


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88484 13f79535-47bb-0310-9956-ffa450edef68
2001-03-09 20:30:34 +00:00
William A. Rowe Jr
070a459850 Refreshing the .mak files. Dang... should have done this in the a.m.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88472 13f79535-47bb-0310-9956-ffa450edef68
2001-03-08 05:38:17 +00:00
Greg Stein
8bcd220ae9 Don't directly include ap_config_auto.h directly. It isn't available on
Windows platforms. Including ap_config.h will pick it up, or it will grab
the appropriate Windows header/defines.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88402 13f79535-47bb-0310-9956-ffa450edef68
2001-03-01 00:55:03 +00:00
William A. Rowe Jr
d3fdebba53 A patch to clean up much bogusity in Win32. Eliminates absolute cd "/..."
references using build/fixwin32mak.pl, and the latest #if APR_HAVE_FOO_H
  fixes apparently worked, now that they no longer appear as dependencies
  [which had broken the build entirely.]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88336 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 22:20:25 +00:00
William A. Rowe Jr
77390b6985 Refresh all .mak files should we choose to roll again shortly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88317 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 02:53:30 +00:00
William A. Rowe Jr
5cccb4a478 Clean up namespace badness with s/configfile_t/ap_configfile_t/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88312 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 00:51:32 +00:00
Jeff Trawick
3351f1b91f clean up a call to apr_psprintf() (trailing NULL not needed)
previously:
mod_auth_digest.c: In function `set_shmem_size':
mod_auth_digest.c:625: warning: too many arguments for format


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88275 13f79535-47bb-0310-9956-ffa450edef68
2001-02-22 14:22:39 +00:00
Doug MacEachern
18f173e918 rename miss: s/apr_clear_pool/apr_pool_clear/g
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88232 13f79535-47bb-0310-9956-ffa450edef68
2001-02-19 02:06:58 +00:00
Roy T. Fielding
7b1b30525b Intermediate change of hardcoded "helpers" reference to "build"
until I get a chance to revamp this to use APR's variables directly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88230 13f79535-47bb-0310-9956-ffa450edef68
2001-02-18 16:07:31 +00:00
Greg Stein
dd9b08e321 *) Introduce "ap_conf_vector_t" type to assist with legibility and provide
some type safety. (unfortunately, our old "void*" is type-safe with the
   new one, but over time we should be better)

*) Propagate the new type to all appropriate functions.

*) Random cleaning, whitespace, stylistic nits.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88225 13f79535-47bb-0310-9956-ffa450edef68
2001-02-18 02:58:53 +00:00
Greg Stein
3e165f5503 use "conf" rather than "sec" for the configuration data. misc style,
whitespace, and other cleaning nits.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88222 13f79535-47bb-0310-9956-ffa450edef68
2001-02-18 02:07:26 +00:00
Greg Stein
c2e4c36695 Remove "no" from many APACHE_MODULE() invocations to allow them to be
selected by --enable-modules=all

Set some modules to "most" to allow --enable-modules=most


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88221 13f79535-47bb-0310-9956-ffa450edef68
2001-02-18 00:22:18 +00:00
Martin Kraemer
e7d5943f28 Rename the module structures so that the exported symbol matches
the file name, and it is easier to automate the installation
process (generating LoadModule directives from the module filenames).

Next step is to remove the 4th argument to the APACHE_MODULE macro
completely and require people to use the matching names, and to
reduce the LoadModule directive to 1 argument.... Objections?


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88189 13f79535-47bb-0310-9956-ffa450edef68
2001-02-16 13:38:31 +00:00
Roy T. Fielding
381f88d56a Update copyright to 2001
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88184 13f79535-47bb-0310-9956-ffa450edef68
2001-02-16 04:26:53 +00:00
Doug MacEachern
ac5b27b86d doh. need a spellchekker for these rename scripts. s/apr_lock_aquire/apr_lock_acquire/g;
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88150 13f79535-47bb-0310-9956-ffa450edef68
2001-02-13 23:32:28 +00:00
Jeff Trawick
0ce0376e0d Use apr_want.h to get the declarations for ntohs et al instead of
including the appropriate system header files directly.

This gets rid of a warning for props.c on FreeBSD 3.4 which cropped
up when I included the right header file to get OS/390 to build :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88132 13f79535-47bb-0310-9956-ffa450edef68
2001-02-13 12:13:33 +00:00
Jeff Trawick
9e95d8139c clean up more warnings and link problems after the header file
shuffle


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88075 13f79535-47bb-0310-9956-ffa450edef68
2001-02-11 00:09:40 +00:00
Jeff Trawick
c66500f5d2 more module build cleanup, removing warnings and some
link errors (from when apr_ ctype macros weren't available)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88070 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 22:21:23 +00:00
William A. Rowe Jr
5e934fbbed Fix more module breakage from header reorg
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88069 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 21:59:59 +00:00
Greg Stein
bb282b75f7 Clean up some of the includes:
- explicitly include apr_lib.h since ap_config.h doesn't
- use apr_want.h where possible
- use APR_HAVE_ where possible
- remove some unneeded includes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88060 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 13:05:29 +00:00
Jeff Trawick
09d03bf531 include strings.h for strcasecmp()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88025 13f79535-47bb-0310-9956-ffa450edef68
2001-02-08 19:24:15 +00:00
Jeff Trawick
4ab13e2afe Make a mod_auth_digest build fail in a less mysterious way on systems
without APR random number support (e.g., a stock Tru64 system).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88023 13f79535-47bb-0310-9956-ffa450edef68
2001-02-08 14:39:31 +00:00
Doug MacEachern
88d3406f9a renaming various functions for consistency sake
see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88019 13f79535-47bb-0310-9956-ffa450edef68
2001-02-08 07:45:33 +00:00
William A. Rowe Jr
59bbd68bec The big change. This is part 3 of the apr-util symbols rename, please
see the first commit of srclib/apr-util/include (cvs apr-util/include)
  for the quick glance at symbols changed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87731 13f79535-47bb-0310-9956-ffa450edef68
2001-01-19 07:04:36 +00:00
William A. Rowe Jr
40655f8641 Provide apr_pool_t arg to register_hooks, since anything they do in that
step -must- be done with a pool that will not outlive the cmd pool, from
  which they may have been dynamically loaded.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87697 13f79535-47bb-0310-9956-ffa450edef68
2001-01-17 15:52:12 +00:00
Jeff Trawick
fe3320ada9 use the apr_status_t instead of errno
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87629 13f79535-47bb-0310-9956-ffa450edef68
2001-01-09 05:03:42 +00:00
Doug MacEachern
40391fb9f2 adjust remaining modules to use the new handler hook method (Alan Edwards)
bring back the old handler prototype by reusing r->handler (dougm)
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87617 13f79535-47bb-0310-9956-ffa450edef68
2001-01-08 23:55:12 +00:00
Ben Laurie
45f620672d Make handlers use hooks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87604 13f79535-47bb-0310-9956-ffa450edef68
2001-01-07 19:55:59 +00:00
Ryan Bloom
b9d06deea4 Allow the auth modules to load into the server.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87510 13f79535-47bb-0310-9956-ffa450edef68
2000-12-22 21:34:09 +00:00
William A. Rowe Jr
8a5e3208d9 Last of the Win32 goodness I've noticed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87503 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 21:07:18 +00:00
William A. Rowe Jr
c876e8476a Out of the sandbox and into prime time. Note... these should always and
only be regenerated immediately prior to the tag and roll.  Do not assume
  they are current with the sources in the development tree.  They should
  be generated as vc5 make files, since only vc5 makefiles are readable by
  both vc5 and vc6.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87479 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 01:46:22 +00:00
William A. Rowe Jr
0a37cdf9fe Correction, commited the vc5. Need vc6 in the tree. Humble appologies.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87475 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 01:25:10 +00:00
William A. Rowe Jr
4315b0c706 The Win32 overhaul, in summary;
Modules are named mod_foo.so
    Dynamic Libraries are named libfoo.dll, and are stored in bin/
    The former ApacheCoreDll is now libhttpd.dll
    Apache.exe moves to bin/
    The make install now copies include, lib, and libexec
    All build options are normalized, filenames adjusted appropriately


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87471 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 01:04:49 +00:00