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
17,629 Commits 62 Branches 313 Tags
httpd-2.2-proxy
Commit Graph

41 Commits

Author SHA1 Message Date
Jim Jagielski
0d6dfd0bb1 Approved backedports: 
-     http://svn.apache.org/viewvc?view=rev&revision=649162
-     http://svn.apache.org/viewvc?view=rev&revision=649176
-     http://svn.apache.org/viewvc?view=rev&revision=649460



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@765997 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-17 13:36:50 +00:00
Lars Eilebrecht
e0790fb1e7 mod_disk_cache now turns off sendfile support if 'EnableSendfile off' 
is defined globally.

Reviewed by: Ruediger Pluem, Issac Goldstand, Niklas Edmundsson



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@746552 13f79535-47bb-0310-9956-ffa450edef68
 2009-02-21 17:38:33 +00:00
Paul J. Reder
36601869bd Commit promoted backport of PR46401 
*) mod_cache: Correctly save Content-Encoding of cachable entity. PR 46401
    [Dan Poirier <poirier pobox.com>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@727767 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-18 17:14:53 +00:00
Ruediger Pluem
d22ba22853 Merge r409942, r607245, r607440 from trunk: 
* Remove temporary files if renaming fails, otherwise they may accumulate.


* Make loglevel consistent for similar situations. As this really should not
  happen set it to error.


* Change loglevel from ERROR to WARNING if the renaming of the vary, headers
  or data file fails.

Submitted by: Davi Arnaut <davi haxent.com.br>
Reviewed by: rpluem, niq, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@607443 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-29 16:28:57 +00:00
Justin Erenkrantz
111f019f09 mod_disk_cache: Allow Vary'd content to be refreshed properly. 
(Backport of r538992, r538997, r539054)

Reviewed by: jerenkrantz, fielding, rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539279 13f79535-47bb-0310-9956-ffa450edef68
 2007-05-18 06:09:53 +00:00
Graham Leggett
6d9ff9a341 mod_disk_cache: Make sure that only positive integers are accepted 
for the CacheMaxFileSize and CacheMinFileSize parameters in the
config file. PR39380

+1: minfrin, jim, trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@463506 13f79535-47bb-0310-9956-ffa450edef68
 2006-10-12 23:17:43 +00:00
Roy T. Fielding
ae1748a99f update license header text 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@421103 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-12 03:38:44 +00:00
Paul Querna
786089eef9 Revert r395231 from the 2.2.x branch. This gets us back to the old place with regard to the copyright statements. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396056 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-22 01:53:06 +00:00
Colm MacCarthaigh
8ffd8c554b Update the last year of copyright for the 2.2.x branch 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@395231 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-19 12:33:16 +00:00
Paul Querna
d6c31184e0 Merge r389697 and r390499 from trunk, making mod_disk_cache return better error codes, instead of a silly APR_EGENERAL. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@390598 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-01 06:26:56 +00:00
Jim Jagielski
b2a530354a Merge accepted backport... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@390190 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-30 17:46:44 +00:00
Jim Jagielski
0f7b6563e8 Merge r345053 from trunk: 
No functional change: remove "internal" tab spacing/formatting.



Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@345239 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-17 13:39:15 +00:00
Jim Jagielski
b3181bddae No functional change: remove trailing whitespace. This also means 
that "blank" lines, which had consisted of just spaces
and/or tabs are now truly blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@332309 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-10 15:20:05 +00:00
Colm MacCarthaigh
d6334c5579 Merge r239406 with the 2.2.x branch. Again, no functional changes; this rev 
moves some structures and define's shared by mod_disk_cache and htcacheclean
into a single mod_disk_cache.h.  

Original Author: asteinmetz
Review by: colm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292557 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-29 21:30:30 +00:00
Colm MacCarthaigh
bf61af9527 Backport r239420 and r239421 to the 2.2.x branch; Enhance 
CacheEnable/CacheDisable to be of use to proxy servers.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290133 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-19 12:10:34 +00:00
Justin Erenkrantz
8998c32fb6 mod_disk_cache: Remove the directory path of the cached file as far as possible 
(up to the cache root) to get rid of unused empty directories.

* cache/mod_disk_cache.c
  (remove_url): Try to delete directories; also change two APR_ENOENT to
  APR_STATUS_IS_ENOENT.

(Justin tweaked some comments.)

Submitted by: Rudiger Plum <ruediger.pluem vodafone.com>
Reviewed by: Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232334 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-12 16:52:28 +00:00
Justin Erenkrantz
a992d08b42 Implement mod_disk_cache's remove_url. 
(Minor tweaks and comment fixes by Justin.)

Suggested by: Paul Querna, Justin Erenkrantz
Submitted by: Rudiger Plum <ruediger.pluem vodafone.com>
Reviewed by: Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231486 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-11 17:31:10 +00:00
Justin Erenkrantz
d971ca4ef8 mod_disk_cache: Retry file rename up to three times to ameliorate race 
condition with htcacheclean removing the directories underneath us.

(Includes tweaks by Justin.)

Suggested by: Graham Leggett
Submitted by: Andreas Steinmetz <ast@domdv.de>
Reviewed by: Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231349 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-10 23:03:38 +00:00
Paul Querna
01d65f9f59 Quick hack to store varied contents under the same path, making it 
easier for admins to manage the cache.

Still requires modifications to htcacheclean to work.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@219945 13f79535-47bb-0310-9956-ffa450edef68
 2005-07-20 16:56:23 +00:00
William A. Rowe Jr
2e3f62d979 caddr_t is quite non-portable, but a (void*) will do the trick. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@191174 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-17 16:27:58 +00:00
Bradley Nicholes
a5930f73ee Fix up some type mismatches that are causing compiler errors in Metrowerks on NetWare 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190819 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-15 21:37:10 +00:00
Paul Querna
13424c5f6e - Remove unneeded cast. 
Reported by: Garrett Rooney


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190547 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-14 01:50:27 +00:00
Paul Querna
d4293052e2 - Partial revert of revision 190535. Remove const from tempfile, since apr_file_mktemp() requires it. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190536 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-14 00:23:13 +00:00
Paul Querna
e54924f2ac * cache/mod_disk_cache.c: Make most members of disk_cache_object into const char*. This removes the need to cast the const out in several places. 
* cache/mod_cache.h: Make cache_object.key a const.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190535 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-14 00:16:48 +00:00
Paul Querna
605cba8fa8 - Remove unused dirlevels and dirlength from the cache info structure. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190534 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-14 00:08:09 +00:00
Paul Querna
e4ef99743c Based on feedback from dev@httpd, store Vary headers inside the '.header' file. 
These Vary headers are used to build a new hash for a URL, based on the 
client's headers.  This allows mod_disk_cache to store many variations of one 
URI, where previously it would only store a single variant.

htcacheclean needs to be updated to understand the new file format.  I plan on 
updating htcacheclean in the next couple days.

PR: 35211


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190530 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-13 23:17:52 +00:00
Paul Querna
4ae5658935 - link/unlink are not called directly, so we do not need this extra header. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190047 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-11 00:33:48 +00:00
Paul Querna
0d46d695a2 - Use apr_file_mktemp() and rename the header data file to its final location, instead of opening it and then writing it out as we go. Should prevent race conditions on busy servers. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190043 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-11 00:26:19 +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
Sander Striker
438c65986e Tracked down by Justin Erenkrantz. 
* modules/cache/mod_disk_cache.c

  (store_headers): Stop second guessing mod_cache and just store the
   headers in a new file (overwriting the old).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156306 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-06 12:52:46 +00:00
Joe Orton
519b48fce1 * modules/cache/mod_disk_cache.c (store_body): Fix format string 
warnings; print integers using _FMT strings.

* modules/cache/cache_util.c (ap_cache_check_freshness): Remove unused
variable.

* modules/cache/cache_storage.c (cache_select_url): Remove unused
variable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153385 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-11 12:16:06 +00:00
Justin Erenkrantz
441086ecfd More work to properly handle revalidated responses correctly. 
* modules/cache/mod_cache.c: If we add a new Expires value, tell our client;
  merge in headers properly (or better than before) so that we can update the
  header fields on a revalidated but with updated header fields.
* modules/cache/mod_cache.h, modules/cache/cache_storage.c:
  Add preserve_orig flag to ap_cache_accept_headers to allow updating of fields.
* modules/cache/mod_disk_cache.c: Load status value from disk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@152973 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-09 01:38:59 +00:00
Bradley Nicholes
f193418fa8 Make the function declaration match the prototype 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@152927 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-08 19:41:15 +00:00
Justin Erenkrantz
1d4c6d1c6d Cleanup structures in mod_cache and friends to remove unused or unnecessary 
fields.  Also resolves a number of latent bugs due to the wrong fields being
accessed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@152679 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-08 17:39:56 +00:00
Justin Erenkrantz
3846ec8b48 * modules/cache/mod_disk_cache.c: Properly load cached ETag from on-disk 
structures.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151815 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-08 02:01:46 +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
Justin Erenkrantz
e597158021 * modules/cache/mod_disk_cache.c: Cache r->err_headers_out headers. This 
allows CGI scripts to be properly cached.

This issue was pointed out by Sander Striker.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@126042 13f79535-47bb-0310-9956-ffa450edef68
 2005-01-22 17:59:48 +00:00
Justin Erenkrantz
45fdd72155 mod_cache: Remove unimplemented CacheForceCompletion directive. 
* modules/cache/mod_cache.h: Remove DEFAULT_CACHE_COMPLETION #define and
  complete-related vars.
* modules/cache/mod_cache.c: Ditto.
* modules/cache/mod_disk_cache.c: Clarify error message; remove unused
  complete var (unrelated to CacheForceCompletion removal).
* docs/manual/mod/mod_cache.xml.ja, docs/manual/mod/mod_cache.xml.ko,
  docs/manual/mod/mod_cache.xml: Remove references to CacheForceCompletion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@125573 13f79535-47bb-0310-9956-ffa450edef68
 2005-01-19 00:19:58 +00:00
Jean-Frederic Clere
d850e22dcb util_charset.h has already the needed #if APR_CHARSET_EBCDIC. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124224 13f79535-47bb-0310-9956-ffa450edef68
 2005-01-05 16:16:07 +00:00
Jean-Frederic Clere
af7e1482aa Add including of util_charset.h otherwise ap_hdrs_from_ascii is not defined. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124080 13f79535-47bb-0310-9956-ffa450edef68
 2005-01-04 09:58:01 +00:00
Justin Erenkrantz
63dd4623e1 At long last, promote mod_cache and friends out of experimental/. 
Also, take quick pass through docs files to remove experimental label for them.

Reviewed by: Paul Querna, Bill Stoddard, Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106737 13f79535-47bb-0310-9956-ffa450edef68
 2004-11-27 19:06:48 +00:00