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
15,273 Commits 62 Branches 313 Tags
fips-dev
Commit Graph

4749 Commits

Author SHA1 Message Date
William A. Rowe Jr
2a33727b39 While eliminating all but TLSv1 (the only FIPS-complient handshaking 
mechansim), I noticed that we have several other single-case methods
  similar to the SSLv2 exception; use the explicit method in preference
  to the generic SSLv23_client|server_method() calls if exactly one
  method is supported.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fips-dev@264620 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-29 19:57:26 +00:00
Ben Laurie
0db2718513 Add --enable-fips, FIPSify everything. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fips-dev@190120 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-11 14:14:56 +00:00
Ben Laurie
e0f5748acd First cut, working FIPS mode. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fips-dev@189992 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-10 17:25:17 +00:00
Joe Orton
ac40284b85 * modules/http/byterange_filter.c (ap_byterange_filter): Refuse to 
byterange any response which may require the consumption of arbitrary
amounts of memory.

(functional changes split from whitespace/reflow changes which will
follow in a separate commit)

Reviewed by: jerenkrantz (several moons ago)
PR: 29962


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@188797 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-07 15:32:10 +00:00
Paul Querna
222d82ef5c * mod_cache.c: When 'Vary: *' is sent, do not cache, since revalidation is always required. 
PR: 16125


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@180341 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-06 16:53:15 +00:00
Paul Querna
85015ced14 'generate_name' is too generic to be in the public symbols. Rename it to ap_cache_generate_name. No functional changes. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179877 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-03 20:19:08 +00:00
Joe Orton
968bb860f9 * modules/ssl/ssl_engine_kernel.c (ssl_callback_SSLVerify_CRL): Fix 
off-by-one.

PR: 35081
Submitted by: Marc Stern <mstern csc.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179781 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-03 12:54:53 +00:00
Joe Orton
aad70a1145 * modules/filters/mod_include.c (handle_include): Fix possible 
variable corruption with nested includes.

PR: 12655


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179763 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-03 10:12:50 +00:00
Paul Querna
cf10bfaefa mod_proxy_ftp: Fix comparison of char* to '\0' 
PR: 34512


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179704 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-03 02:44:39 +00:00
Jeff Trawick
45e47b1a12 mod_mime_magic: Handle CRLF-format magic files so that it works with 
the default installation on Windows.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179622 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-02 18:24:27 +00:00
Paul Querna
df86e987f7 Fix segmentation fault in mod_auth_{basic,digest} when no provider is explicitly listed. 
Reported by: Ben Collins-Sussman <sussman collab.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178674 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-26 20:34:21 +00:00
Paul Querna
693107a967 - Use apr_uri_t to parse the proxy URL, instead of munging it by hand. Original code did not handle IPv6 Addresses correctly. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178391 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-25 06:42:33 +00:00
Jeff Trawick
e9323f0ebd EBCDIC: Handle chunked input from client or, with proxy, origin 
server.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178262 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-24 19:49:06 +00:00
Bradley Nicholes
0b49d42087 Add mod_authn_alias to the build 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178054 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-23 23:09:58 +00:00
Bradley Nicholes
556fb599b5 Add the auth provider name as a note in the request so that authn_provider_alias is able to look up the original provider along with the per_dir configuration. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178052 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-23 23:07:49 +00:00
Bradley Nicholes
79a282df9c authn_provider_alias adds the configuration block tag 
<AuthnProviderAlias baseProvider Alias>
Authentication directives contained within this block can be
referenced as a new authProvider using the AuthBasicProvider or
AuthDigestProvider directives.  These directives will be merged in to
the per_dir configuration just before the base provider is called.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@177985 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-23 17:43:10 +00:00
Jeff Trawick
39714846f7 fix typo in comment 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170914 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-19 11:53:48 +00:00
Nick Kew
e696c7a4cf Fix up header in mod_dbd.h (I remembered .c but not .h before previous commit) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170730 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-18 09:23:20 +00:00
Nick Kew
b5198abba6 Committing mod_dbd as new. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170729 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-18 09:19:34 +00:00
Jeff Trawick
7ae218a5bf Support the suppress-error-charset setting, as with Apache 1.3.x. 
With Apache 1.3.x, it is a bit simpler as the request does
not go through ap_make_content_type().

Modules can set custom error responses but not be able to
set the charset, so they have to code the charset in the
html.  Thus, it is useful to preserve 1.3.x behavior exactly.

PR: 26467


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170354 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-16 10:41:42 +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
Paul Querna
19c2fda63f Show the Quick Handlers in mod_info. Commit it to trunk, instead of the 
Listen-Protocol Branch that my -dev workspace was using. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@169789 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-12 07:45:39 +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
Paul Querna
c84966321a Make sure mod_rewrite always runs before mod_proxy in the translate_name hook. This makes doing RewriteRules on a Reverse Proxy.. Slightly more predictable than the order of LoadModules. 
Reported By: David D. Miller <justdave bugzilla.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@169692 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-11 20:11:44 +00:00
Bradley Nicholes
549cf1e255 Backing out the AuthLDAPAllowDNAuth patch from r168016. Because of LDAP filter issues this patch still can't guarantee unique results. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168644 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-06 19:50:57 +00:00
Paul Querna
da9a8de753 Add AP_INIT_TAKE_ARGV. There can be some inconsistent results because of the behavoir of ap_getword_conf. Do not rely upon any last argument that is "". If the argument is in the middle of the line, it should work correctly. 
This is updated from the version sent to dev@httpd to fix the behavoir with 0 arguments.

* include/http_config.h: minor MMN bump for the new interface.
* modules/generators/mod_autoindex.c: Migrate IndexOptions to the new ARGV command type.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168202 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-04 22:23:00 +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
3a3447622c Add the directive AuthLDAPAllowDNAuth to allow a user to authenticate against an LDAP directory using a full user DN. This directive allows a user to authenticate against a subcontext that may contain non-unique user IDs. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168016 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-03 23:07:43 +00:00
Joe Orton
d4f34c59f7 * modules/mappers/mod_userdir.c (get_suexec_id_doer): Fix allocation 
size.

PR: 34588


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@165151 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-28 15:19:06 +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
Paul Querna
af9ae7c2d7 Remove ap_method_list_do and ap_method_list_vdo as previously mentioned dev@httpd. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@164536 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-25 05:19:18 +00:00
Joe Orton
645809dbba Fix issue where mod_ssl does not pick up the ssl-unclean-shutdown 
setting when configured e.g. as a reverse proxy:

* modules/ssl/ssl_private.h: Remove ssl_hook_Translate.

* modules/ssl/ssl_engine_kernel.c (ssl_hook_ReadReq): Merge in
ssl_hook_Translate.  (ssl_hook_Translate): Remove.

* modules/ssl/mod_ssl.c (ssl_register_hooks): Ensure that _ReadReq
hook runs after mod_setenvif.c; don't register translate_name hook.

PR: 34452


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161958 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-19 20:02:09 +00:00
Bradley Nicholes
e0128fb67f Build mod_ssl for the NetWare platform 
Submitted by: Guenter Knauf <fuankg@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161813 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-18 23:18:10 +00:00
Bradley Nicholes
93e638300b Link to the correct socket library depending on which one is selected 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161791 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-18 19:54:33 +00:00
Paul Querna
b4cf62b67d - mod_deflate currently only does C-E, and not T-E. Fix the comment at the top saying it does T-E. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161738 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-18 06:08:56 +00:00
Paul Querna
b25736dfb0 mod_deflate should be merging the Vary header, not Setting it, and ignoring what other modules put there. 
Spotted By: Rici Lake


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161691 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-17 20:25:57 +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
Greg Ames
0aee87d2ee lookup_map_txtfile: used buffered i/o rather than reading RewriteMap txt: files 
one byte at a time. 

I was horrified to see a dump of a server with hundreds of worker threads in 
read() syscalls,  all trying to read a 149k RewriteMap file simultaneously.  
each thread finds one key, inserts it into the cache, then the rest of the 
information is discarded.  there are further improvements which could be made but 
let's try the simplest first.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161354 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-14 21:26:01 +00:00
André Malo
5071a0b5ae svn:eol-style = native 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160924 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-11 16:49:14 +00:00
Bradley Nicholes
ac399ec581 Update the NetWare dav.imp export/import file according to the DAV_DECLARE's in mod_dav.h 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160907 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-11 15:45:12 +00:00
Mladen Turk
9fac5c4376 Add failover to mod proxy. If the service is unavailable, 
check another worker in case this is balancer request.
In case the error in unrecoverable, fail with returned
status code.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160848 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-11 08:45:15 +00:00
Mladen Turk
e32503984e Set default number of maxattempts to the number of 
balancer members.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160847 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-11 08:42:33 +00:00
Bradley Nicholes
bdd9c004ff Add two more APIs to the export and import lists for NetWare 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160725 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-10 00:17:44 +00:00
Mladen Turk
363117e7a1 Move direct_connect out of attempt loop. No need to 
calculate that value on each attempt, because it's always
the same.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160705 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-09 18:33:00 +00:00
Joshua Slive
fa4e866600 Merged the simple-conf branch changes r159781:160695 into the trunk. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160696 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-09 16:59:15 +00:00
Mladen Turk
d13b2de6e2 Simplify canon_handler. There is no thing like ajps: 
protocol.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160693 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-09 16:34:33 +00:00
Mladen Turk
c4323f9615 Simplify canon_handler. Blancer can have only a single 
scheme.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160692 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-09 16:32:32 +00:00
Mladen Turk
0eab042f6a Use two optional functions from mod_ssl so that we 
can receive both is_ssl and ssl_var for ajp protocol.
This is combined work based on patch from Brad Boyer and
Joe Orton's suggestion to use ssl_var_lookup.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160690 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-09 16:16:54 +00:00
Mladen Turk
000d9acf74 Return correct status codes in case of bad request, that 
is probably too large for AJP protocol.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160677 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-09 10:39:50 +00:00