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

192 Commits

Author SHA1 Message Date
Graham Leggett
2d122b4e55 Add specified user attributes to the environment when using
mod_auth_ldap. This allows you to use mod_include to embed specified
user attributes in a page like so:
Hello <!--#echo var="AUTHENTICATE_CN"-->, how are you?
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90775 13f79535-47bb-0310-9956-ffa450edef68
2001-08-28 23:16:12 +00:00
William A. Rowe Jr
f0362ccc07 Toggle the /Zi flag to allow all supportd versions of VC (5, 6, 7) to
build 'out of the box' in debugging mode.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90686 13f79535-47bb-0310-9956-ffa450edef68
2001-08-26 05:21:50 +00:00
Martin Kraemer
e811bc50a1 Use uniform wrapping for unistd.h, and don't include it if it's aready included via fileio.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90491 13f79535-47bb-0310-9956-ffa450edef68
2001-08-22 15:40:29 +00:00
Roy T. Fielding
897c1006cd I don't like underscore as a name prefix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90452 13f79535-47bb-0310-9956-ffa450edef68
2001-08-21 01:00:23 +00:00
Justin Erenkrantz
cc7269a4c2 Roy beat me to the commit.
Anyway, fix the version numbers in the comment so that it reflects reality
(so I think).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90449 13f79535-47bb-0310-9956-ffa450edef68
2001-08-21 00:42:47 +00:00
Roy T. Fielding
aa13640d3a Due to some lunacy in ndbm.h on some platforms, we need to find the right
include directory for db.h if we include ndbm.h.

Submitted by:	Justin Erenkrantz
Reviewed by:	Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90448 13f79535-47bb-0310-9956-ffa450edef68
2001-08-21 00:39:56 +00:00
Justin Erenkrantz
dce3cf900f Fix build breakage on Linux glibc 2.1+ systems that prevented db1 from being
correctly found for mod_auth_dbm.  This is similar to the mod_auth_db check.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90442 13f79535-47bb-0310-9956-ffa450edef68
2001-08-20 23:32:34 +00:00
Justin Erenkrantz
d222204546 - Switch to AC_SEARCH_LIBS to check multiple libraries for mod_auth_db
(the AC_* way of doing what Martin committed)

- Fix the configuration check for mod_auth_digest so that:
  - Everything is on separate lines so that the preprocessor doesn't scream
  - It adds the path to APR.  (APR_SOURCE_DIR looks right, but I'm not sure.)

By the time the modules are configured, the CPPFLAGS and such are not
setup to point at APR.  This should probably be rectified and then this
can be taken out - so you could assume that apr.h is in your CPPFLAGS
somewhere when configuring the modules.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90392 13f79535-47bb-0310-9956-ffa450edef68
2001-08-20 08:09:40 +00:00
Martin Kraemer
96c5f632ba On modern systems (e.g., FreeBSD), the db* functions reside in libc
rather than in libdb. Also, be more precise in telling what is actually
checked for (we are NOT testing for main(), but we are testing for dbopen(),
right?).
Without the first fix, configuration would fail completely for FreeBSD


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90391 13f79535-47bb-0310-9956-ffa450edef68
2001-08-20 07:00:23 +00:00
Doug MacEachern
2090fa8748 adjust to apr_uri_ rename
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90361 13f79535-47bb-0310-9956-ffa450edef68
2001-08-19 16:01:05 +00:00
Ryan Bloom
6fdd45dc48 Update the Apache code to account for the XtOffset change in APR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90356 13f79535-47bb-0310-9956-ffa450edef68
2001-08-19 05:48:19 +00:00
Graham Leggett
cb07d3357f Some small cleanups for consistency
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90349 13f79535-47bb-0310-9956-ffa450edef68
2001-08-19 01:03:26 +00:00
Graham Leggett
38c3d804d5 Enabled negative caching on attribute comparisons in the LDAP cache.
Fixed a problem where the default cache TTL was set in milliseconds
not microseconds causing the cache to time out almost immediately.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90340 13f79535-47bb-0310-9956-ffa450edef68
2001-08-18 21:10:03 +00:00
Graham Leggett
a52f6ea839 Landing of mod_auth_ldap - the LDAP based authentication module.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90324 13f79535-47bb-0310-9956-ffa450edef68
2001-08-18 16:55:14 +00:00
Graham Leggett
def0eda4a2 Oops - left off the apr_ldap.h file in the commit.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90323 13f79535-47bb-0310-9956-ffa450edef68
2001-08-18 16:52:02 +00:00
William A. Rowe Jr
6d654c07cd Based on the VC6 switch - and pulling the win32 make files from cvs
- some more ignores are in order.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90274 13f79535-47bb-0310-9956-ffa450edef68
2001-08-17 07:19:08 +00:00
William A. Rowe Jr
9062307073 The purpose of this patch is to toggle the debugging mode (default) to
Program Database (from Program Database for Modify on the fly debugging).

  The net effect of this patch is to clean up all of the irrelevant entries
  associated with either the debugging or release command line switches, and
  generally straighten the projects as they would be exported from VC6/SP5.

  The outcome of this patch is that VC5 users -should- be able to load and
  build the workspace without any errors (as they used to have no symbols
  database at all, the /ZI option doesn't work, they had to use cvtdsp.pl
  to toggle these to /Zi.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90269 13f79535-47bb-0310-9956-ffa450edef68
2001-08-17 03:45:35 +00:00
William A. Rowe Jr
9bd41098dd Given a choice between chasing my tail to keep these updated, and rolling
a set when we actually roll a tarball, I'll take the later, thank you.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90268 13f79535-47bb-0310-9956-ffa450edef68
2001-08-17 03:23:58 +00:00
Justin Erenkrantz
024d0191a5 Fix --enable-modules=all breakage with mod_auth_db and mod_auth_digest
by allowing a module to disable itself if its prerequisites are not met.

This introduces the subtle nuance that if you request a module and you
don't meet its prerequisites, it'll refuse to build itself.

mod_ssl exits if its prerequisites are not met.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90261 13f79535-47bb-0310-9956-ffa450edef68
2001-08-17 00:31:50 +00:00
William A. Rowe Jr
ebf7a3fe03 Ignore goodness
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90250 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 23:14:06 +00:00
William A. Rowe Jr
b0b0649108 More Versioning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90208 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 07:54:43 +00:00
Jeff Trawick
c216c2184a fix some homophonic issues in comments, as well as some
mispelings found near "its" or "it's"

(helping our 4th grader with homework, couldn't help but
grep)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90173 13f79535-47bb-0310-9956-ffa450edef68
2001-08-15 21:11:59 +00:00
Ryan Bloom
6e932b2870 Fix the new method code. We need to cast 1 to an apr_int64_t or it will
be treated as a 32-bit integer, and it will wrap after being shifted
32 times.
Submitted by:	Cody Sherr <csherr@covalent.net> and
		Ryan Morgan <rmorgan@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90090 13f79535-47bb-0310-9956-ffa450edef68
2001-08-11 04:04:13 +00:00
William A. Rowe Jr
3a2b78b469 Update for the 2.0.23 tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89994 13f79535-47bb-0310-9956-ffa450edef68
2001-08-07 17:21:21 +00:00
Ryan Bloom
85e8fbd0e2 Add the ability to extend the methods that Apache understands
and have those methods <limit>able in the httpd.conf. It uses
the same bit mask/shifted offset as the original HTTP methods
such as M_GET or M_POST, but expands the total bits from an int to
an ap_int64_t to handle more bits for new request methods than
an int provides.
Submitted by:	Cody Sherr <csherr@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89869 13f79535-47bb-0310-9956-ffa450edef68
2001-08-02 04:25:20 +00:00
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