1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

105 Commits

Author SHA1 Message Date
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
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
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
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
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
b72e610410 No functional change: more indenting/formatting changes due to
tabbing


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332316 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 16:03:23 +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
Bradley Nicholes
f0a3ee8960 Remove an unnecessary module reference to LLDAPX
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@331897 13f79535-47bb-0310-9956-ffa450edef68
2005-11-08 21:42:46 +00:00
Paul Querna
00feac4b96 Do not set r->content_type directly, use our ap_set_content_type API, so that output filters can properly be applied.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@321436 13f79535-47bb-0310-9956-ffa450edef68
2005-10-15 18:48:03 +00:00
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