www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity
34,177 Commits 62 Branches 304 Tags
trunk
Commit Graph

203 Commits

Author SHA1 Message Date
Ruediger Pluem
7c99ca3f93 * Another set of missed renames. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722544 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-02 17:57:46 +00:00
Bradley Nicholes
49c238ec40 Move the initialization of rebind to the post_config handler so that it is done during the actual module load stage rather than the preload stage. If done during the preload stage, the pool passed into the initialization function will be cleared and all allocations will be freed. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@646582 13f79535-47bb-0310-9956-ffa450edef68
 2008-04-09 22:49:31 +00:00
Eric Covener
2ac9128120 * mod_ldap: Correctly return all requested attribute values 
when some attributes have a null value.

PR: 44560 
Submitted by: Anders Kaseorg <anders kaseorg.com>
Reviewed by: covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@634821 13f79535-47bb-0310-9956-ffa450edef68
 2008-03-07 21:02:41 +00:00
Paul J. Reder
1b6f4a456a The ordering of arguments in the directive desctiptions of LDAPTrustedGlobalCert 
and LDAPTrustedClientCert were backwards.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@627637 13f79535-47bb-0310-9956-ffa450edef68
 2008-02-14 02:27:26 +00:00
Ruediger Pluem
c0ce91dc70 * Fix a typo (timout -> timeout) 
PR: 44360
Submitted by: Rainer Jung <rainer.jung kippdata.de>
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@619125 13f79535-47bb-0310-9956-ffa450edef68
 2008-02-06 19:52:04 +00:00
Paul J. Reder
85b935b3df Reduced the bumpiness (from major to minor) and utilized #defines throughout 
(per Ruediger's suggestions). Still looking at the dir merge.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@614747 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-24 00:24:01 +00:00
Paul J. Reder
f4e5632d60 This adds Apache support (taking advantage of the new APR capability) 
for ldap rebind callback while chasing referrals. This allows direct
searches on LDAP servers (in particular MS Active Directory 2003+)
using referrals without the use of the global catalog.
This addresses PRs 26538, 40268, and 42557



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@614605 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-23 18:14:41 +00:00
Eric Covener
5df5e051d8 Review comments from Ruediger on r607766: 
Don't allow the ldap calls to be evaluated (twice) in the macro


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607841 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-01 13:53:03 +00:00
Eric Covener
7c9503a556 When using the MS SDK, re-establish LDAP backend connections on a 
return code of LDAP_UNAVAILABLE as if it were LDAP_SERVER_DOWN.

With this SDK, LDAP_UNAVAIALBLE is returned when the socket had been closed 
between LDAP API calls.

PR 39095



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607766 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-31 19:20:25 +00:00
Ruediger Pluem
b514669c7a * Set character set for HTML outputs generated by mod_ldap, 
mod_proxy_balancer, mod_proxy_ftp, mod_info, mod_dav without a character
  set to ISO-8859-1.

Submitted by: jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606693 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-24 11:45:22 +00:00
Paul J. Reder
29f637596b Final stage in this ldap commitathon. This fixes some problems 
associated with processing of subgroup lists. There were some
problems that arose when the cache was referenced across possible
expirations. As of this fix the nested group code (and the caching
of queries related to nested groups) should be working correctly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@600013 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-30 23:39:43 +00:00
Paul J. Reder
b22b6fbd2b Clear the reason pointer when the connection is cleaned. We don't 
need to be leaving historical info around.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@599657 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-30 00:21:06 +00:00
Paul J. Reder
9a99383c08 Get rid of some compiler warnings. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@599651 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-30 00:11:39 +00:00
Guenter Knauf
f09d5fb701 fixed var declaration in the middle of code. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@599425 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-29 12:56:52 +00:00
Eric Covener
4c46b08b82 Perform all per-LDAP-backend related memory allocations in a standalone pool, 
provide a local method to completely remove an LDAP backend connection so
we can someday manage/dispose of extra connections in a reasonable way.

Clarify some commentary around the existing murky close/cleanup API
methods.

Minor bump for new members appended to util_ldap_connection_t, which is not
allocated by consumers of the API.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@599164 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-28 22:19:00 +00:00
Ruediger Pluem
9384f140f7 * No functional change: Style. Fix linebreaks to make code more readable. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@599150 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-28 21:17:03 +00:00
Ruediger Pluem
419b6bb2f8 * Remove unused variable and thus remove compiler warning 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@599143 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-28 20:53:30 +00:00
Ruediger Pluem
41240cbb06 * No need for an else block here because we do a return above. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@599141 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-28 20:52:37 +00:00
Paul J. Reder
ef021964d1 Stage 3 of refactoring. This reverses a couple of if checks so that the code is 
easier to follow. The default svn diff looks ugle due to the spacing change. A
cleaner diff ignoring spacing changes can be found at:
http://people.apache.org/~rederpj/util_ldap_ignoring_spacing.diff


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@598846 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-28 01:43:57 +00:00
Paul J. Reder
effa2f7fef Refactoring stage 2. This commit moves a large chunk of utility code out to its own function 
to make reading and maintaining the actual subgroup function easier. This should just be
shuffling code around and shouldn't result in any semantic changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@598806 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-27 23:06:44 +00:00
Paul J. Reder
9ca30c79df Altered some comments and minor formatting of log calls in prep for a refactoring of this routine. 
I wanted the diffs to be human readable and understandable. This should just be formatting and
shouldn't alter any semantics.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@598500 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-27 03:01:25 +00:00
Eric Covener
6aad4298a0 fix to http://svn.apache.org/viewvc?rev=591499&view=rev to properly copy into 
char ***retvals when AuthLDAPUrl has extra attributes specified



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@593919 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-11 16:14:24 +00:00
Eric Covener
7efb84f750 while technically uldap_connection_cleanup() does leave an entry in the 
connection list, it is fully disconnected before it's put back.  My previous
commentary did more harm then good.





git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@593283 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-08 20:01:04 +00:00
Eric Covener
30ede8a9cd Stop registering a cleanup on each LDAP connection created, this cleanup was 
never called because it's registered against pconf in the child. LDAP
connections are created in the child and not shared between children, so no
action should be required at child exit

Additionally, clarify comments around uldap_connection_cleanup()



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@592764 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-07 14:43:26 +00:00
Eric Covener
6f970f48dc spurious 401s with message "DN has not been defined" when cache expiration happens in another thread 
PR 43786


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@591499 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-02 22:33:36 +00:00
Eric Covener
a2897ec7a5 fix pool misuse around mod_ldap's connection cache, previously pconf 
could be used during request processing

(the apr_ldap_foo only need a pool for temporary data anyway)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@591488 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-02 21:58:57 +00:00
Eric Covener
ad8cfa7300 AFAICT, LDAP_CACHE_LOCK was a no-op when virtualhosts were used 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@567091 13f79535-47bb-0310-9956-ffa450edef68
 2007-08-17 17:33:11 +00:00
Paul J. Reder
ca8e9d2988 A couple of cleanups to the nested group code based on review comments. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@562165 13f79535-47bb-0310-9956-ffa450edef68
 2007-08-02 16:17:17 +00:00
Paul J. Reder
cc4a706e61 mod_ldap, mod_authnzldap: Add support for nested groups (i.e. the ability 
to authorize an authenticated user via a "require ldap-group X" directive
     where the user is not in group X, but is in a subgroup contained in X.
     PR 42891 [Paul J. Reder]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@560373 13f79535-47bb-0310-9956-ffa450edef68
 2007-07-27 20:34:41 +00:00
Eric Covener
7853970441 Copy the enum into an integer before sending off to the LDAP SDK, to avoid 
passing the address of a short (seen on z/OS)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@557778 13f79535-47bb-0310-9956-ffa450edef68
 2007-07-19 21:13:36 +00:00
Eric Covener
f65de07e7e revert revision 555470 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@557772 13f79535-47bb-0310-9956-ffa450edef68
 2007-07-19 21:05:16 +00:00
Eric Covener
4a3fae2079 Remove dead macros for certificate types that are already replaced by 
APR-prefixed versions in apr-util (apr_ldap_option.h).

Submitted by: David Jones


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@555629 13f79535-47bb-0310-9956-ffa450edef68
 2007-07-12 14:00:33 +00:00
Eric Covener
ab845c1671 This data is passed in an unsafe way to the LDAP SDK if the compiler 
chooses to use shorts for the enum values.
http://www.redbooks.ibm.com/redbooks/SG245992/nn4/SG245992_88.html

Submitted by: David Jones


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@555470 13f79535-47bb-0310-9956-ffa450edef68
 2007-07-12 02:42:44 +00:00
Bradley Nicholes
f01effcaea Remove the hardcoded size limit parameter for ldap_search_ext_s 
and replace it with an APR_ defined value that is set according
to the LDAP SDK being used.

Submitted by: David Jones <oscaremma gmail com>



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@517788 13f79535-47bb-0310-9956-ffa450edef68
 2007-03-13 17:53:22 +00:00
Jeff Trawick
4d55f1f475 mod_ldap: Fix the search limit parameter to ldap_search_ext_s() 
for SDKs that define LDAP_NO_LIMIT to something other than -1.

Submitted by: David Jones <oscaremma gmail.com>
Reviewed by:  trawick



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@509237 13f79535-47bb-0310-9956-ffa450edef68
 2007-02-19 16:24:33 +00:00
Jim Jagielski
01fddca7f7 format change. no functional change. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@484985 13f79535-47bb-0310-9956-ffa450edef68
 2006-12-09 14:19:36 +00:00
Bradley Nicholes
73fb27c5df Better detection and clean up of ldap connection that have been 
terminated by the ldap server. PR#40878

Submitted by: Rob Baily <rbaily servicebench com>
Reviewed by: bnicholes



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@472633 13f79535-47bb-0310-9956-ffa450edef68
 2006-11-08 20:43:46 +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
Roy T. Fielding
778fd134e0 revert accidental copyright year changes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395423 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-19 23:03:26 +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
Greg Ames
b8370ab007 more explanation for a couple of subtle lines of code 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393236 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-11 14:41:53 +00:00
Greg Ames
e1fbc27d1a expand on a comment for a rather subtle line of code so I have a chance of 
understanding how it helps in the future


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393028 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-10 19:24:33 +00:00
Bradley Nicholes
23520cd701 revert the LDAPConnectionTimeout and LDAPVerifyServerCert directives back to GLOBAL_ONLY since the various LDAP SDK's don't allow these settings on a per-connection basis 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@387675 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-22 00:08:05 +00:00
Bradley Nicholes
a7c95e73b9 Remove the global only flag from the LDAPConnectionTimeout directive and add it to all of the caching directives 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@386751 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-17 22:52:21 +00:00
Bradley Nicholes
23c7395f3e Fix the server_merge so that the memory pools and mutexes that were created during the server_create, are used. Allow the settings that can be overwritten in a vhost to use the vhost values 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@386698 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-17 19:26:27 +00:00
Bradley Nicholes
dbc7dbe019 remove the race condition when creating the connection pool mutex. Also eliminate some unnecessary uses of the global memory pool 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@386477 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-16 23:02:57 +00:00
Bradley Nicholes
407ef2a3f5 Set the LDAP protocol before setting extended LDAP options. [PR38146] 
Submitted by: Aaron Richton <richton nbcs.rutgers.edu>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@370856 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-20 16:53:43 +00:00
Jim Jagielski
08c97ba290 No functional change: remove "internal" tab spacing/formatting. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345053 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-16 16:31:25 +00:00
Jim Jagielski
5061d9fa92 No functional Change: Removing trailing whitespace. This also 
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-10 15:11:44 +00:00
Jim Jagielski
5d2fae4818 No functional change: simple detabbing of indented code. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332305 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-10 15:05:51 +00:00