Commit 6e06e95c authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

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
parent 9f38d373

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ Changes with Apache 2.1.3 








  [Remove entries to the current 2.0 section below, when backported]

















  *) mod_cache: Remove unimplemented CacheForceCompletion directive.









     [Justin Erenkrantz]

















  *) support/check_forensic: Fix temp file usage









     [Javier Fernandez-Sanguino Pen~a <jfs computer.org>]










































docs/manual/mod/mod_cache.xml



+0
−33



























Changes for docs/manual/mod/mod_cache.xml: 0 added lines, 33 removed lines.



Original line number
Diff line number
Diff line







@@ -290,39 +290,6 @@ LastModified date.</description>







</usage>









</directivesynopsis>



















<directivesynopsis>









<name>CacheForceCompletion</name>









<description>Percentage of document served, after which the server









will complete caching the file even if the request is cancelled.</description>









<syntax>CacheForceCompletion <var>Percentage</var></syntax>









<default>CacheForceCompletion 60</default>









<contextlist><context>server config</context><context>virtual host</context>









</contextlist>



















<usage>









    <p>Ordinarily, if a request is cancelled while the response is being









    cached and delivered to the client the processing of the response will









    stop and the cache entry will be removed. The









    <directive>CacheForceCompletion</directive> directive specifies a









    threshold beyond which the document will continue to be cached to









    completion, even if the request is cancelled.</p>



















    <p>The threshold is a percentage specified as a value between









    <code>1</code> and <code>100</code>. A value of <code>0</code>









    specifies that the default be used. A value of <code>100</code>









    will only cache documents that are served in their entirety. A value









    between 60 and 90 is recommended.</p>



















    <example>









      CacheForceCompletion 80









    </example>



















    <note type="warning"><title>Note:</title>









      This feature is currently <em>not</em> implemented.









    </note>









</usage>









</directivesynopsis>



















<directivesynopsis>









<name>CacheIgnoreHeaders</name>









<description>Do not store the given HTTP header(s) in the cache.


































docs/manual/mod/mod_cache.xml.ja



+0
−31



























Changes for docs/manual/mod/mod_cache.xml.ja: 0 added lines, 31 removed lines.



Original line number
Diff line number
Diff line







@@ -296,37 +296,6 @@







</usage>









</directivesynopsis>



















<directivesynopsis>









<name>CacheForceCompletion</name>









<description>$B%j%/%(%9%H$,%-%c%s%;%k$5$l$F$b%-%c%C%7%e$r40N;$9$k$+$I$&$+$r(B









$B7h$a$kAw$i$l$?%I%-%e%a%s%H$N3d9g$r;XDj$9$k!#(B</description>









<syntax>CacheForceCompletion <var>Percentage</var></syntax>









<default>CacheForceCompletion 60</default>









<contextlist><context>server config</context><context>virtual host</context>









</contextlist>



















<usage>









    <p>$BDL>o!"1~Ez$,%-%c%C%7%e$5$l$F%/%i%$%"%s%H$KAw$i$l$F$$$k:GCf$K(B









    $B%j%/%(%9%H$,%-%c%s%;%k$5$l$k$H!"1~Ez$N=hM}$OCf;_$5$l$F!"%-%c%C%7%e$N(B









    $B%(%s%H%j$b:o=|$5$l$^$9!#(B<directive>CacheForceCompletion</directive>









    $B%G%#%l%/%F%#%V$O!"%j%/%(%9%H$,%-%c%s%;%k$5$l$F$b!"%-%c%C%7%e=hM}$r(B









    $B40N;$^$GB3$1$k$+$I$&$+$N$7$-$$CM$r;XDj$7$^$9!#(B</p>



















    <p>$B$7$-$$CM$O(B <code>1</code> $B$H(B <code>100</code> $B$N4V$G;XDj$9$k(B









    $B3d9g$G$9!#(B<code>0</code> $B$G$O%G%U%)%k%H$,;H$o$l$^$9!#(B









    <code>100</code> $B$G$O!"40A4$KAw?.$,40N;$7$?%I%-%e%a%s%H$N$_$r(B









    $B%-%c%C%7%e$7$^$9!#(B60 $B$+$i(B 90 $B$N4V$NCM$,?d>)CM$G$9!#(B</p>



















    <example>









      CacheForceCompletion 80









    </example>



















    <note type="warning"><title>$BCm(B:</title>









      $B$3$N5!G=$O8=;~E@$G$O<BAu$5$l$F(B<em>$B$$$^$;$s(B</em>$B!#(B









    </note>









</usage>









</directivesynopsis>



















<directivesynopsis>









<name>CacheIgnoreHeaders</name>









<description>$B;XDj$5$l$?(B HTTP $B%X%C%@$r%-%c%C%7%e$KJ]B8$7$J$$!#(B


































docs/manual/mod/mod_cache.xml.ko



+0
−30



























Changes for docs/manual/mod/mod_cache.xml.ko: 0 added lines, 30 removed lines.



Original line number
Diff line number
Diff line







@@ -291,36 +291,6 @@







</usage>









</directivesynopsis>



















<directivesynopsis>









<name>CacheForceCompletion</name>









<description>요청이 취소되더라도 서버가 파일을 계속 캐쉬하기위해









필요한 문서의 서비스률.</description>









<syntax>CacheForceCompletion <var>Percentage</var></syntax>









<default>CacheForceCompletion 60</default>









<contextlist><context>server config</context><context>virtual host</context>









</contextlist>



















<usage>









    <p>보통 응답을 캐쉬하고 클라이언트로 보내는 도중에 요청이









    취소되면 응답 처리를 중단되고 캐쉬 항목을 지운다.









    <directive>CacheForceCompletion</directive> 지시어는 요청이









    취소되더라도 문서를 계속 캐쉬할 정도를 지정한다.</p>



















    <p>정도는 백분율로 나타내며 <code>1</code>과 <code>100</code>









    사이의 값이다. <code>0</code> 값을 지정하면 기본값을 사용한다.









    <code>100</code>은 내용을 모두 서비스한 문서만을 캐쉬한다.









    60과 90 사이의 값을 추천한다.</p>



















    <example>









      CacheForceCompletion 80









    </example>



















    <note type="warning"><title>주의:</title>









      이 기능은 현재 구현되지 <em>않았다</em>.









    </note>









</usage>









</directivesynopsis>



















<directivesynopsis>









<name>CacheIgnoreHeaders</name>









<description>캐쉬에 지정한 HTTP 헤더(들)를 저장하지 않는다


































modules/cache/mod_cache.c



+0
−26



























Changes for modules/cache/mod_cache.c: 0 added lines, 26 removed lines.



Original line number
Diff line number
Diff line







@@ -702,9 +702,6 @@ static void * create_cache_config(apr_pool_t *p, server_rec *s)







    /* factor used to estimate Expires date from LastModified date */









    ps->factor = DEFAULT_CACHE_LMFACTOR;









    ps->factor_set = 0;









    /* default percentage to force cache completion */









    ps->complete = DEFAULT_CACHE_COMPLETION;









    ps->complete_set = 0;









    ps->no_last_mod_ignore_set = 0;









    ps->no_last_mod_ignore = 0;









    ps->ignorecachecontrol = 0;










@@ -736,9 +733,6 @@ static void * merge_cache_config(apr_pool_t *p, void *basev, void *overridesv)







    /* factor used to estimate Expires date from LastModified date */









    ps->factor =









        (overrides->factor_set == 0) ? base->factor : overrides->factor;









    /* default percentage to force cache completion */









    ps->complete =









        (overrides->complete_set == 0) ? base->complete : overrides->complete;



















    ps->no_last_mod_ignore =









        (overrides->no_last_mod_ignore_set == 0)










@@ -884,23 +878,6 @@ static const char *set_cache_factor(cmd_parms *parms, void *dummy,







    return NULL;









}



















static const char *set_cache_complete(cmd_parms *parms, void *dummy,









                                      const char *arg)









{









    cache_server_conf *conf;









    int val;



















    conf =









        (cache_server_conf *)ap_get_module_config(parms->server->module_config,









                                                  &cache_module);









    if (sscanf(arg, "%u", &val) != 1) {









        return "CacheForceCompletion value must be a percentage";









    }









    conf->complete = val;









    conf->complete_set = 1;









    return NULL;









}



















static int cache_post_config(apr_pool_t *p, apr_pool_t *plog,









                             apr_pool_t *ptemp, server_rec *s)









{










@@ -947,9 +924,6 @@ static const command_rec cache_cmds[] =







    AP_INIT_TAKE1("CacheLastModifiedFactor", set_cache_factor, NULL, RSRC_CONF,









                  "The factor used to estimate Expires date from "









                  "LastModified date"),









    AP_INIT_TAKE1("CacheForceCompletion", set_cache_complete, NULL, RSRC_CONF,









                  "Percentage of download to arrive for the cache to force "









                  "complete transfer"),









    {NULL}









};