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
14,899 Commits 62 Branches 313 Tags
async-dev
Commit Graph

84 Commits

Author SHA1 Message Date
Jim Jagielski
f2ed4fda66 Consistantly use APR_PID_T_FMT for getpid value 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265049 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-31 14:23:33 +00:00
Ian Holsman
8c1e315d3f Doxygen fixup / cleanup 
submited by: Neale Ranns neale ranns.org
reviewed by: Ian Holsman



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@263931 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-28 23:03:59 +00:00
Joe Orton
5143fec07d * modules/ldap/util_ldap.c (util_ldap_parse_cert_type): Fix gcc 4 
warning "type qualifiers ignored on function return type".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231014 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-09 08:21:39 +00:00
Joe Orton
e4ff0cc58d * modules/ldap/util_ldap.c (util_ldap_post_config): Pass NULL to 
apr_global_mutex_create if no cache file name is specified, rather
than inventing an inappropriate name with tmpnam().

PR: 30385


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@227230 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-03 14:44:29 +00:00
Joe Orton
e3ee8fb587 * modules/ldap/util_ldap_cache.c (util_ldap_cache_init): Only remove 
the shm segment by name if a name is configured.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@227012 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-02 14:15:35 +00:00
Joe Orton
9562ffb5cc * modules/ldap/util_ldap.c (util_ldap_post_config): Fail if 
util_ldap_cache_init fails; let ap_log_error call strerror.
Downgrade informational messages to APLOG_INFO from APLOG_NOTICE.
(util_ldap_child_init): Remove some noisy but fairly pointless
debugging output.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@226974 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-02 09:26:51 +00:00
Joe Orton
c1e4ed78b3 * modules/ldap/util_ldap_cache.c (util_ldap_url_node_display, 
util_ldap_search_node_display, util_ldap_compare_node_display,
util_ldap_dn_compare_node_display): Use ap_rprintf.  Terminate table
rows with "</tr>" not "<tr>".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@226825 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-01 15:46:46 +00:00
Joe Orton
1dbc14199b * modules/ldap/util_ldap_cache.c: Remove various casts-from-void *, 
fix various minor style nits.  No functional changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@226820 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-01 15:32:28 +00:00
Joe Orton
54b8395a53 * modules/ldap/util_ldap_cache.c (MODLDAP_SHMEM_CACHE): Remove unused 
macro.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@226811 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-01 14:57:35 +00:00
Joe Orton
01acb7f836 * modules/ldap/util_ldap.c (util_ldap_post_config): Don't attempt to 
remove the shm segment here.

* modules/ldap/util_ldap_cache.c (util_ldap_cache_init): Properly
remove the shm segment here before creating a new one; don't attach to
any existing shm segment if apr_shm_create() fails.
(util_ldap_cache_module_kill): Don't attempt to remove the shm segment
here; apr_shm_destroy() does that anyway.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@226809 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-01 14:50:21 +00:00
Joe Orton
d8af9c446c * modules/ldap/util_ldap_cache_mgr.c (util_ald_cache_display): Replace 
ap_rputs(apr_psprintf(...)) with simpler ap_rprintf(...).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225797 13f79535-47bb-0310-9956-ffa450edef68
 2005-07-28 15:13:51 +00:00
Joe Orton
1dc07b9e89 * modules/ldap/util_ldap.c, modules/aaa/mod_authnz_ldap.c: Stop using 
APLOG_NOERRNO throughout.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225794 13f79535-47bb-0310-9956-ffa450edef68
 2005-07-28 15:00:46 +00:00
Joe Orton
58c92d7dd7 * modules/ldap/util_ldap_cache.c (util_ldap_cache_module_kill): Make 
private function static.  (util_ldap_cache_child_kill): Remove
prototype for function which doesn't exist.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225756 13f79535-47bb-0310-9956-ffa450edef68
 2005-07-28 12:02:44 +00:00
Joe Orton
99bc6a8a77 * modules/ldap/util_ldap_cache.c (util_ldap_cache_init): Use the 
actual available size of the shm segment not the requested size.
Ensure the requested size is aligned.  Check errors from apr_rmm_init.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225753 13f79535-47bb-0310-9956-ffa450edef68
 2005-07-28 11:53:25 +00:00
Joe Orton
3bf62178e5 * modules/ldap/util_ldap_cache_mgr.c (util_ald_cache_insert, 
util_ald_cache_remove, util_ald_cache_fetch): Always use "unsigned
long" for hash values, for consistency.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225749 13f79535-47bb-0310-9956-ffa450edef68
 2005-07-28 10:52:52 +00:00
Joe Orton
9a76da4fef * modules/ldap/util_ldap_cache_mgr.c (util_ald_cache_insert): Fix a 
cache corruption case: ensure that there is room in the cache for a
copy of the payload before inserting the node.

PR: 34209


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225746 13f79535-47bb-0310-9956-ffa450edef68
 2005-07-28 10:45:59 +00:00
Joe Orton
93004fd4d8 * modules/ldap/util_ldap.c: Remove DOCTYPE_* macros duplicated from 
httpd.h.  Remove redundant prototypes of static functions which aren't
used before they are declared.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225734 13f79535-47bb-0310-9956-ffa450edef68
 2005-07-28 09:50:16 +00:00
Joe Orton
8a8be2dde5 * modules/ldap/util_ldap.c (util_ldap_cmds): Make static const. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225733 13f79535-47bb-0310-9956-ffa450edef68
 2005-07-28 09:43:01 +00:00
Joe Orton
9afa1542f0 * modules/ldap/util_ldap.c (LDAP_CACHE_LOCK, LDAP_CACHE_UNLOCK): 
Wrap in do/while for safety.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225732 13f79535-47bb-0310-9956-ffa450edef68
 2005-07-28 09:40:08 +00:00
William A. Rowe Jr
d2ff850241 End abuse of apr_strnat[case]cmp - it isn't str[case]cmp. 
Unsure if apr_strnatcasecmp(conf_ip, uri_ip) was intentional, on the
  off chance that the left or right hand ip string happens to contain
  leading zeros.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@216111 13f79535-47bb-0310-9956-ffa450edef68
 2005-07-13 04:43:59 +00:00
William A. Rowe Jr
20d06d7a06 Reintroduce stack frame construction with /Oy- (removal was implied by /O2). 
This makes binaries far easier to debug, during operation and for post-crash
  .dmp analysis.  Do not alter /Gs optimizations per brane.

Reviewed by: stoddard, brane

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170253 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-15 19:11:57 +00:00
Bradley Nicholes
b119277791 Make sure that the LDAPVerifyServerCert patch is compatibile with apr-util 1.1.x. Once apr-util 1.2 is released, the ifdef's need to be removed and apr_ldap_set_option() will handle the SDK differences. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@169834 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-12 15:35:55 +00:00
Bradley Nicholes
1439ca9d5c Add the LDAPVerifyServerCert directive to util_ldap to force 
verification of a server certificate when establishing an SSL connection
to the LDAP server


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@169705 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-11 22:34:18 +00:00
Bradley Nicholes
c153cbd6c2 Fix the static function declarations in the prototypes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168023 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-03 23:51:05 +00:00
Bradley Nicholes
f05f8523c4 Move the ldap_set_option() call to set the connection time from being global to being connection specific. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@164919 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-26 23:52:41 +00:00
Bradley Nicholes
6905d3d9d5 Allow httpd on NetWare to build using either the standard socket libraries or the Winsock libraries. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161368 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-14 23:42:21 +00:00
Bradley Nicholes
dcd6c011f2 Remove the unnecessary exported api's from the NetWare make file 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160559 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-08 16:10:43 +00:00
William A. Rowe Jr
9a692d5f71 An aggressive visit by the style faerie. Sprinkled some comment cleanups 
and tightened the 'single line result' of the error message for LDAP
directives (which also broke the 80 column gospel in source.)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160552 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-08 12:55:23 +00:00
William A. Rowe Jr
2f91875b05 Fix Win32 breakage - these hook providers can't be _DECLARE()ed, 
they -would- be _DECLARE_NONSTD ... except that no functions within
  mod_ldap need to be exported at all.  All functions can be static,
  as they are registered via callbacks.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160498 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-08 00:18:36 +00:00
Bradley Nicholes
38e8b5da89 Implement the exported function from mod_ldap(util_ldap) as optional functions so that we can eliminate the load ordering of mod_ldap and mod_authnz_ldap. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159619 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-31 18:44:16 +00:00
Bradley Nicholes
aad2e44aae Actually use the compare_cache_size value that is being set by LDAPOpCacheEntries. The actual cache_size was previously defaulting to the value of search _cache_size set by LDAPCacheEntries. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159542 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-30 23:25:47 +00:00
Paul Querna
3982db6f2d Turn LDAPTrustedClientCert and LDAPTrustedMode into the RSRC_CONF context. The current code is broken for use as OR_ALL. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@158678 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-22 21:35:02 +00:00
Bradley Nicholes
9182642bfd Don't attempt to remove the cache_file if one was never specified. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156665 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-09 18:10:47 +00:00
Bradley Nicholes
a92c5fa98c Keep track of the number of attributes retrieved from LDAP so that all the values can be properly cached even if the value is NULL. [PR 33901] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156587 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-09 00:15:01 +00:00
Bradley Nicholes
803296f97c If the search fails due to a bad connection, make sure that we unbind the connection so that it will be recreated the next time it is used. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@155713 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-28 23:25:26 +00:00
Joe Orton
edb46b1de9 * include/util_ldap.h (util_ldap_state_t): Fix gcc format string 
warnings: use a long for connectionTimeout since the code expects a
long.

* modules/ldap/util_ldap.c (compare_client_certs): Make static to fix
gcc missing-prototype warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153390 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-11 12:22:16 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-04 20:28:49 +00:00
Bradley Nicholes
13050b4ff6 Allow AuthLDAPURL to override the default connection type with an option second parameter of NONE, SSL or TLS | STARTTLS 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151083 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-03 00:03:37 +00:00
Bradley Nicholes
de2792bc7d Fix a typo 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@149421 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-01 17:27:04 +00:00
Bradley Nicholes
cebf3cf9e9 Set the connection timeout for LDAP SDK's that support the option. For SDK's that don't, log a warning message. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@149419 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-01 17:09:56 +00:00
Bradley Nicholes
30eea48f9b Added a new LDAPConnectionTimeout directive to util_ldap so that the socket connection timeout value is configurable. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@126565 13f79535-47bb-0310-9956-ffa450edef68
 2005-01-27 01:13:15 +00:00
Graham Leggett
3d71c8de71 Remove the workaround that got client certificates to work with non 
Novell LDAP SDKs, as it is no longer needed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@125936 13f79535-47bb-0310-9956-ffa450edef68
 2005-01-21 15:42:53 +00:00
Bradley Nicholes
0a2c453dd2 Recognize the new certificate formats 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@125810 13f79535-47bb-0310-9956-ffa450edef68
 2005-01-20 20:22:31 +00:00
Graham Leggett
cd8d0204f7 Fix a problem where SSL was started twice when no client certificates were 
specified.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@125733 13f79535-47bb-0310-9956-ffa450edef68
 2005-01-20 08:15:46 +00:00
Bradley Nicholes
ee9eaa7f7c Fix some inline C++ style declarations that other compilers can't handle 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@125676 13f79535-47bb-0310-9956-ffa450edef68
 2005-01-19 22:39:19 +00:00
Graham Leggett
c78537114e mod_ldap: Updated to use the new apr-util v1.1 apr_ldap_*_option() 
API for the setting of server and client SSL certificates. Replaced
LDAPTrustedCA directive with LDAPTrustedGlobalCert and
LDAPTrustedClientCert directives to correctly support global certs
(CA certs / Netware client certs) and per connection client certs
as supported by Netware, OpenLDAP and Netscape/Mozilla.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@125645 13f79535-47bb-0310-9956-ffa450edef68
 2005-01-19 19:52:08 +00:00
William A. Rowe Jr
8aea7cff22 Correct the order of includes to follow httpd conventions, and get 
Win32 compiling again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124279 13f79535-47bb-0310-9956-ffa450edef68
 2005-01-05 21:35:51 +00:00
Graham Leggett
0dfcbc1ad8 Fix some compiler warnings inside the LDAP modules 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124187 13f79535-47bb-0310-9956-ffa450edef68
 2005-01-05 07:07:46 +00:00
Bradley Nicholes
804ff9ab22 Allow APR to exist and build outside of the httpd/srclib file structure 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106975 13f79535-47bb-0310-9956-ffa450edef68
 2004-11-30 00:12:39 +00:00
Joe Orton
c36ecfa64f Remove the .cvsignore files. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105796 13f79535-47bb-0310-9956-ffa450edef68
 2004-11-19 09:07:29 +00:00