www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Code Activity
16,115 Commits 62 Branches 313 Tags
httpd-pid-table
Commit Graph

409 Commits

Author SHA1 Message Date
Bradley Nicholes
2874d54f16 re-introduce ap_satisfies API back into core and modify how the access_checker, check_user_id and auth_checker hooks are called so that they respect the precedence that is set through the satisfy ALL/ANY directive. This also restores the directives order, allow, deny, satisfyas supported directives rather than being deprecated. These directives still remain in mod_access_compat however. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@534533 13f79535-47bb-0310-9956-ffa450edef68
 2007-05-02 16:31:39 +00:00
André Malo
ff601f03ec newlines 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@531920 13f79535-47bb-0310-9956-ffa450edef68
 2007-04-24 13:07:44 +00:00
Jeff Trawick
0082457202 log the uri for some access-denied paths when r->filename is 
unset


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@529626 13f79535-47bb-0310-9956-ffa450edef68
 2007-04-17 14:36:12 +00:00
Guenter Knauf
47fff8d790 removed obsolete -prefix; minor cosmetic changes. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@521264 13f79535-47bb-0310-9956-ffa450edef68
 2007-03-22 13:45:54 +00:00
Bradley Nicholes
ba4156cadd Implement a BASEDIR build environment variable to allow the NetWare build to relocate the install files 
Submitted by: Guenter Knauf <fuankg apache org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@502051 13f79535-47bb-0310-9956-ffa450edef68
 2007-01-31 23:55:44 +00:00
William A. Rowe Jr
1fc3b01590 Embed the .manifest files of all httpd binaries as a post-build 
operation.  This ensures the exported (Studio 97 generated) .mak
files create a usable Apache directly from the VC 8 (Studio 2005)
command line environment.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@495126 13f79535-47bb-0310-9956-ffa450edef68
 2007-01-11 05:37:20 +00:00
William A. Rowe Jr
cd2c7ce611 Fix bogus lineends. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@494332 13f79535-47bb-0310-9956-ffa450edef68
 2007-01-09 07:06:31 +00:00
Justin Erenkrantz
aba471074a Compile mod_authn_core on Win32. (The authz-dev branch forgot to add this.) 
* modules/aaa/mod_authn_core.dsp: New DSP file for mod_authn_core.
* Apache.dsw: Add mod_authn_core as a dependency.
* Makefile.win: Add install targets


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@490066 13f79535-47bb-0310-9956-ffa450edef68
 2006-12-24 19:40:48 +00:00
Justin Erenkrantz
c4cd688b6b Fix comment to allow modules using the new authz scheme to work on Win32. 
* mod_auth.h: Fix up blurb on how to retrieve ap_satisfies to match what
  mod_authz_core and friends use which does work on Windows.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@490054 13f79535-47bb-0310-9956-ffa450edef68
 2006-12-24 17:52:15 +00:00
Bradley Nicholes
9362559bc1 Move the assignment statements after the #if code to eliminate the C++ style inline variable declarations 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@468042 13f79535-47bb-0310-9956-ffa450edef68
 2006-10-26 15:39:41 +00:00
Graham Leggett
2d79512131 mod_authn_dbd: Export any additional columns queried in the SQL select 
into the environment with the name AUTHENTICATE_<COLUMN>. This brings
mod_authn_dbd behaviour in line with mod_authnz_ldap.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@466865 13f79535-47bb-0310-9956-ffa450edef68
 2006-10-22 19:11:51 +00:00
Graham Leggett
488411491b mod_authnz_ldap: Add an AuthLDAPRemoteUserAttribute directive. If 
set, REMOTE_USER will be set to this attribute, rather than the
username supplied by the user. Useful for example when you want users
to log in using an email address, but need to supply a userid instead
to the backend.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@463427 13f79535-47bb-0310-9956-ffa450edef68
 2006-10-12 20:52:37 +00:00
William A. Rowe Jr
f4d7f73505 Observed by hunter - fix the cut n paste errors in some .res compilation 
steps of the win32 build.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@429038 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-05 20:04:40 +00:00
Bradley Nicholes
7159a46f37 revert the reject directive is definitive patch and normalize the logic lists. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428798 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-04 17:53:27 +00:00
Bradley Nicholes
6b831e7059 Converted the reject directive to be definitive and enabled directory_merge to merge all of the authorization rules and logic. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427780 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-01 22:54:38 +00:00
Mladen Turk
98ff0f9c1b Add missing svn:eol-style native properties. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425648 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-26 07:15:32 +00:00
Mladen Turk
fb43394819 Add mod_authz_core module to the build. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425433 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-25 15:59:43 +00:00
Mladen Turk
11e590efd8 Add mod_access_conf to the build. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425422 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-25 15:27:17 +00:00
Bradley Nicholes
82c0c621f6 Add a check to make sure that the base provider and the alias names are different and also that the alias has not been registered before 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425210 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-24 22:33:43 +00:00
Roy T. Fielding
de659cbed0 update license header text 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-11 20:33:53 +00:00
William A. Rowe Jr
6df9b82d20 Revert Revision 397647 
While it solves the studio 2005 (we desire this), it breaks
the studio 6 packaging (we require this).  Discussion on list
of practical solutions.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419644 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-06 18:36:23 +00:00
Jeff Trawick
4b0c598d3c spellcheck 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413730 13f79535-47bb-0310-9956-ffa450edef68
 2006-06-12 19:35:09 +00:00
Bradley Nicholes
da77cf5678 Fix a problem with invalid auth error detection for LDAP client SDKs that don't support LDAP_SECURITY_ERROR macro. PR#39529 
Submitted by: [Ray Price <dohrayme yahoo.com>], [Josh Fenlason <jfenlason ptc.com>]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@411306 13f79535-47bb-0310-9956-ffa450edef68
 2006-06-02 22:01:53 +00:00
William A. Rowe Jr
b2820e8da8 This resource /D syntax was pretty horridly imported into VS 2005, 
change the quotation to ensure a peaceful transition to sln/vcproj files.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397647 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-27 21:41:29 +00:00
William A. Rowe Jr
f65c47bd75 Remove all /machine:I386 references, these are getting in the way 
of switching linkers from the x86 (default linker) to x64 or other
  possible target platforms.  (Also, this commit cleans up lingering
  /GX switches from the 'BASE' options that are supposed to be unused).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397407 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-27 05:30:39 +00:00
William A. Rowe Jr
663687ae8e s|/GX |/EHsc | because they were always synonyms, and Visual Studio 
2005 edition complains bitterly and loudly that /GX is deprecated.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395419 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-19 22:51:02 +00:00
William A. Rowe Jr
862d0e231e Remove a host of dependencies upon awk, using the same template for 
nearly every .rc compilation (giving the output .res file a different
  name for each component).  Adds AP_SERVER_BASEPROJECT to ap_revision.h
  so we can display the proper name of "Apache HTTP Server" as opposed
  to AP_SERVER_BASEPRODUCT (which is, and should remain, simply "Apache"
  for the server string tokens.)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395418 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-19 22:47:49 +00:00
Colm MacCarthaigh
dd95d7c37c Update the copyright year in all .c, .h and .xml files 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-19 12:11:27 +00:00
André Malo
c4c06f5dc3 svn:eol-style = native 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@392380 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-07 20:20:50 +00:00
Garrett Rooney
292e59fa35 Clean up some stuff found by Coverity. 
* modules/aaa/mod_authz_core.c
  (check_provider_list): Remove redundant code.
* modules/aaa/mod_auth.h
  (AUTHZ_DEFAULT_PROVIDER): Remove redundant definition.

Submitted by: Max Bowsher <maxb apache.org>
Reviewed by: bnicholes, rooneg


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390506 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-31 21:35:44 +00:00
Bradley Nicholes
2a0a430efd Add mod_authz_dbd to the NetWare build 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@386486 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-17 00:04:43 +00:00
Jeff Trawick
144c3fe342 Clean up some string manipulation. 
Submitted by: Christophe JAILLET <christophe.jaillet wanadoo.fr>
Reviewed by: Jeff Trawick
PR: 38701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@386437 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-16 19:39:38 +00:00
William A. Rowe Jr
7e9ad095bf Not an extern; correct a build failure, static suggested by dreid. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@384643 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-09 23:29:41 +00:00
Bradley Nicholes
8566d62a03 Drop the LogLevel of the messages for the deprecated access control directives from WARN to INFO. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@384628 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-09 22:02:40 +00:00
Joe Orton
0670cffc27 * modules/aaa/mod_auth_digest.c (hdr): Remove function. 
(add_auth_info): Remove dead #if 0'ed code to support 2069-style
entity-digest.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@384467 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-09 09:07:08 +00:00
David Reid
d19aa9679d Add a note about the ap_satisfies mess we currently have. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@378792 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-18 22:50:51 +00:00
David Reid
76d5b7ebbc This should cure the build issues people are having and would 
seem to be closer to the correct solution.

Having this defined as a symbol without it being set seems
plain wrong.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@378790 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-18 22:44:30 +00:00
David Reid
91ac51bebd - tidy up some of the comments and make the file more readable 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@378400 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-17 00:04:05 +00:00
David Reid
1639407797 - add a define for ap_satisfies which is now an optional fn. Without 
this httpd crashes with a SIGBUS when calling ap_satisfies.

This gets mod_authz_svn working again with trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@378394 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-16 23:28:44 +00:00
André Malo
d1173d09b3 svn:eol-style = native 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@378299 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-16 17:02:29 +00:00
Justin Erenkrantz
947a41710a * modules/aaa/config.m4: Place mod_access_compat in the 'yes' list as not 
handling older auth configs out-of-the-box is badness.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@375678 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-07 19:58:48 +00:00
Joe Orton
61fafe6bad * modules/aaa/mod_auth.h: Include apr_optional.h for 
APR_DECLARE_OPTIONAL_FN definition.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@375596 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-07 13:21:45 +00:00
Joe Orton
4bd562595a * modules/aaa/mod_authz_core.c (add_authz_provider): Fix pointer cast 
warning on LP64 platforms.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@375549 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-07 08:53:37 +00:00
Bradley Nicholes
dd9a8075d1 The AuthnProviderAlias directive has been merged into mod_authn_core. mod_authn_alias is no longer needed. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@373055 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-28 01:00:32 +00:00
Bradley Nicholes
f593d8ed8b Remove NetWare makefiles that are no longer needed 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@371655 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-23 20:30:55 +00:00
Bradley Nicholes
2d132872c5 Build mod_access_compat on NetWare 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@371651 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-23 20:23:42 +00:00
Bradley Nicholes
5674f09238 Use the correct logging #define 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@371648 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-23 20:22:37 +00:00
Bradley Nicholes
82edb082c5 remove the unused per-dir-config structure. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@370521 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-19 16:15:44 +00:00
Bradley Nicholes
20aaaf04db Remove the call to ap_note_auth_failure() from the providers. mod_authz_core will make the call if it is necessary. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@370039 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-18 04:19:04 +00:00
Bradley Nicholes
0a7d8b69dd eliminate the import of the ap_satisfies optional function on every request. Just import it once if it exists. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@369124 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-15 00:26:20 +00:00