www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-18 11:41:02 +03:00
Code Activity
15,407 Commits 62 Branches 306 Tags
5fdff4c19b0e0068ff39145e86116a52f5c3db99
Commit Graph

5077 Commits

Author SHA1 Message Date
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
William A. Rowe Jr
7126d1d227 Eliminate last win32-isms, SetLastError becomes apr's set_os_error 
operation.  It unfolds the error code on win32, so we have to pre-fold it.
  On unix there is no folding.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@386821 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-18 07:43:07 +00:00
William A. Rowe Jr
f732ed1f47 Escape from casting purgatory, which the Solaris cc compiler 
will not treat as lvalues.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@386790 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-18 02:14:45 +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
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
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
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
Nick Kew
31eb7ed8c1 Log a better error message if initialisation fails on prepared statements. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@386321 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-16 12:47:53 +00:00
William A. Rowe Jr
6b45e585a0 Unsure why win32 never noticed this, but the value returned is a const char* 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@384731 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-10 08:58:56 +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
Jim Jagielski
391472a050 Make AJP flushing admin configurable. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@384580 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-09 18:39:16 +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
Ruediger Pluem
b5ca8f8f3f * Crosscheck the length of the body chunk with the length of the ajp message 
to prevent readings beyond the buffer boundaries which possibly could reveal
  sensitive memory contents to the client.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@383339 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-05 15:22:18 +00:00
Joe Orton
4f9dd0b7c8 * modules/ssl/ssl_scache_shmcb.c (shmcb_safe_clear): Mark with 
"noinline" attribute for GCC > 3.

PR: 38838


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@382799 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-03 13:11:39 +00:00
William A. Rowe Jr
613f55d849 APR_FILEPATH_NOTABOVEROOT was undefined with a left-hand NULL 
or empty path.  The SECUREROOTPATH and NOTABSOLUTE tests were
  sufficient for this application.  Adjusts for a bug in earlier
  versions of APR with this undefined value.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@382147 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-01 20:40:25 +00:00
Jeff Trawick
589b46d974 mod_charset_lite: Remove Content-Length when output filter can 
invalidate it.  Warn when input filter can invalidate it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@380232 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-23 21:40:59 +00:00
Jeff Trawick
2d93eb4aab Ensure that the proper status line is written to the client, fixing 
incorrect status lines caused by filters which modify r->status without
resetting r->status_line, such as the built-in byterange filter.

Note: For the byterange example, the handler must set r->status_line
even though this is a 200 response.  Some proxy-type modules blindly
set r->status_line as set by the origin server and thus trigger
the problem with byteranges if the origin server didn't handle the
byterange.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@379562 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-21 19:34:33 +00:00
Ruediger Pluem
70bd1f6329 * Disable persistent connections for SSL backends again as we do not 
handle them correctly, because we recreate backend->connection for each
  request and thus try to initialize an already existing SSL connection.

Noticed by: Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@379237 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-20 20:56:50 +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
Joe Orton
20cf15d539 * modules/ssl/ssl_engine_init.c (ssl_check_public_cert): Fix spurious 
hostname-mismatch warning for valid wildcard certs.

PR: 37911
Submitted by: Nick Burch <nick torchbox.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@378487 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-17 11:43:37 +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
Jim Jagielski
d05d878779 *) mod_proxy: Fix KeepAlives not being allowed and set to 
backend servers. PR38602. [Ruediger Pluem, Jim Jagielski]

Also, document previous patch:
  *) Correctly initialize mod_proxy workers, which use a
     combination of local and shared datasets. Adjust logging
     to better trace usage. PR38403. [Jim Jagielski]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@378032 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-15 16:44:42 +00:00
Jim Jagielski
4f1f25e0ba OK, handle better the initializing of worker, separating 
"shared" and "local" inits, and being aware that if the
shared aspects are initialized, this doesn't mean
the local ones are :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@377780 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-14 17:35:36 +00:00
Jim Jagielski
880a6ffe6b I wondered why I never saw the scoreboard init entry; now I know. 
The logic flow was slightly askew.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@377738 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-14 14:55:02 +00:00
Ruediger Pluem
df09bfe3f6 * Use the correct pool for apr_table_copy. Otherwise we trigger the bad pool 
ancestry abort in apr_table_copy if apr is compiled with APR_POOL_DEBUG.

Noticed by: Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@377525 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-13 22:58:03 +00:00
Garrett Rooney
cb130c3e8f Clean up some code in mod_dav. 
Submitted by: Dan Rall <dlr collab.net>

* modules/dav/main/mod_dav.c
  (dav_error_response, dav_error_response_tag): Remove redundant assignment
   of r->status_line which is handled by basic_http_header_check().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@377292 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-13 02:34:26 +00:00
Ruediger Pluem
80aafcc1fc * Do not close the backend connection, because the client sent a 
Connection: close header.

PR: 38524


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@377057 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-11 21:15:12 +00:00
Ruediger Pluem
859a572ba2 * Do not remove the connection headers from r->headers_in. They are needed 
by the http output filter to create the correct connection response headers.
  Instead work on a copy of r->headers_in.

PR: 38524


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@377053 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-11 20:57:12 +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
Joe Orton
b2e9ae5b1d * modules/proxy/mod_proxy_balancer.c: Include unistd.h to pick up 
getpid() prototype.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@375310 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-06 16:35:20 +00:00
Ruediger Pluem
f6b46944d4 * Do not overwrite the status of initialized workers and respect the configured 
status of uninitilized workers when creating a new child process.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@374929 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-04 21:25:48 +00:00
Jeff Trawick
7f6733a594 mod_speling: Stop crashing with certain non-file requests. 
(r->filename unset)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@373519 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-30 14:54:22 +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
Jim Jagielski
ec98060419 If the proxied response lacks a Server header, then 
create one.

PR: 38002 (Bugz)
Submitted: william barker at wilshire com


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@372958 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-27 19:55:45 +00:00
Ian Holsman
314aa8e9c9 add Colm's explanation of the cache_info structure from his explaination on dev@ 
Message-ID: <20060124223004.GA26461@dochas.stdlib.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@372096 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-25 04:03:31 +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
Ruediger Pluem
d66bb0a4d0 * Fix PR38340 by actual getting the word and thus advancing the message buffer 
pointer to the next data.

Submitted by: Aleksey Pesternikov <apesternikov yahoo.com>
Reviewed by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@371013 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-21 11:30:41 +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
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
Ruediger Pluem
395b632269 * Add CacheMinExpire directive to set the minimum time in seconds to cache a document 
in the case that no valid expire time was supplied with the document.

Submitted by: Brian Akins <brian.akins turner.com>
Reviewed by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@369811 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-17 15:12:23 +00:00