You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by pq...@apache.org on 2008/04/07 18:31:24 UTC
svn commit: r645594 [21/28] - in /httpd/sandbox/amsterdam/d: ./ build/
docs/conf/ docs/conf/extra/ docs/man/ docs/manual/ docs/manual/developer/
docs/manual/faq/ docs/manual/howto/ docs/manual/misc/ docs/manual/mod/
docs/manual/platform/ docs/manual/pr...
Modified: httpd/sandbox/amsterdam/d/docs/manual/upgrading.html.ru.koi8-r
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/upgrading.html.ru.koi8-r?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/upgrading.html.ru.koi8-r [koi8-r] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/upgrading.html.ru.koi8-r [koi8-r] Mon Apr 7 09:28:58 2008
@@ -196,6 +196,6 @@
<a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)"> pt-br </a> |
<a href="./ru/upgrading.html" title="Russian"> ru </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="./mod/">Модули</a> | <a href="./mod/directives.html">Директивы</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Глоссарий</a> | <a href="./sitemap.html">Карта сайта</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/urlmapping.html
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/urlmapping.html?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/urlmapping.html (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/urlmapping.html Mon Apr 7 09:28:58 2008
@@ -2,9 +2,9 @@
Content-Language: en
Content-type: text/html; charset=ISO-8859-1
-URI: urlmapping.html.ja.euc-jp
+URI: urlmapping.html.ja.utf8
Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
URI: urlmapping.html.ko.euc-kr
Content-Language: ko
Modified: httpd/sandbox/amsterdam/d/docs/manual/urlmapping.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/urlmapping.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/urlmapping.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/urlmapping.html.en Mon Apr 7 09:28:58 2008
@@ -291,6 +291,6 @@
<a href="./ja/urlmapping.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="./ko/urlmapping.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/urlmapping.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/urlmapping.html.ko.euc-kr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/urlmapping.html.ko.euc-kr [euc-kr] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/urlmapping.html.ko.euc-kr [euc-kr] Mon Apr 7 09:28:58 2008
@@ -242,6 +242,6 @@
<a href="./ja/urlmapping.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="./ko/urlmapping.html" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="./mod/">모듈</a> | <a href="./mod/directives.html">지시어들</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">용어</a> | <a href="./sitemap.html">사이트맵</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/details.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/details.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/details.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/details.html.en Mon Apr 7 09:28:58 2008
@@ -437,6 +437,6 @@
<a href="../fr/vhosts/details.html" hreflang="fr" rel="alternate" title="Français"> fr </a> |
<a href="../ko/vhosts/details.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/details.html.fr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/details.html.fr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/details.html.fr (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/details.html.fr Mon Apr 7 09:28:58 2008
@@ -454,6 +454,6 @@
<a href="../fr/vhosts/details.html" title="Français"> fr </a> |
<a href="../ko/vhosts/details.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossaire</a> | <a href="../sitemap.html">Plan du site</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/details.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/details.html.ko.euc-kr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/details.html.ko.euc-kr [euc-kr] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/details.html.ko.euc-kr [euc-kr] Mon Apr 7 09:28:58 2008
@@ -379,6 +379,6 @@
<a href="../fr/vhosts/details.html" hreflang="fr" rel="alternate" title="Français"> fr </a> |
<a href="../ko/vhosts/details.html" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">모듈</a> | <a href="../mod/directives.html">지시어들</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">용어</a> | <a href="../sitemap.html">사이트맵</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.html
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.html?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.html (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.html Mon Apr 7 09:28:58 2008
@@ -6,9 +6,9 @@
Content-Language: fr
Content-type: text/html; charset=ISO-8859-1
-URI: examples.html.ja.euc-jp
+URI: examples.html.ja.utf8
Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
URI: examples.html.ko.euc-kr
Content-Language: ko
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.html.en Mon Apr 7 09:28:58 2008
@@ -439,7 +439,7 @@
<div class="example"><p><code>
<VirtualHost *:*><br />
ProxyPreserveHost On<br />
- ProxyPass / http://192.168.111.2<br />
+ ProxyPass / http://192.168.111.2/<br />
ProxyPassReverse / http://192.168.111.2/<br />
ServerName hostname.example.com<br />
</VirtualHost>
@@ -655,6 +655,6 @@
<a href="../ja/vhosts/examples.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/vhosts/examples.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.html.fr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.html.fr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.html.fr (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.html.fr Mon Apr 7 09:28:58 2008
@@ -23,6 +23,8 @@
<a href="../ja/vhosts/examples.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/vhosts/examples.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Verifiez la version
+ Anglaise pour les changements récents.</div>
<p>Le but de ce document est d'essayer de répondre aux questions
@@ -674,6 +676,6 @@
<a href="../ja/vhosts/examples.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/vhosts/examples.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossaire</a> | <a href="../sitemap.html">Plan du site</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.html.ko.euc-kr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.html.ko.euc-kr [euc-kr] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.html.ko.euc-kr [euc-kr] Mon Apr 7 09:28:58 2008
@@ -624,6 +624,6 @@
<a href="../ja/vhosts/examples.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/vhosts/examples.html" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">모듈</a> | <a href="../mod/directives.html">지시어들</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">용어</a> | <a href="../sitemap.html">사이트맵</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml Mon Apr 7 09:28:58 2008
@@ -419,7 +419,7 @@
<example>
<VirtualHost *:*><br />
ProxyPreserveHost On<br />
- ProxyPass / http://192.168.111.2<br />
+ ProxyPass / http://192.168.111.2/<br />
ProxyPassReverse / http://192.168.111.2/<br />
ServerName hostname.example.com<br />
</VirtualHost>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml.fr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml.fr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml.fr (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml.fr Mon Apr 7 09:28:58 2008
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='ISO-8859-1' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 420990 -->
+<!-- English Revision: 420990:618551 (outdated) -->
<!-- French translation by Vincent Deffontaines, Alain B., review by -->
<!--
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml.ja
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml.ja?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml.ja [iso-2022-jp] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml.ja [iso-2022-jp] Mon Apr 7 09:28:58 2008
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='iso-2022-jp' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 420990 -->
+<!-- English Revision: 420990:618551 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml.ko
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml.ko?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml.ko [euc-kr] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml.ko [euc-kr] Mon Apr 7 09:28:58 2008
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='EUC-KR' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:420990 (outdated) -->
+<!-- English Revision: 105989:618551 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml.meta
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml.meta?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml.meta (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/examples.xml.meta Mon Apr 7 09:28:58 2008
@@ -7,8 +7,8 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
- <variant>ja</variant>
+ <variant outdated="yes">fr</variant>
+ <variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
</variants>
</metafile>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/fd-limits.html
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/fd-limits.html?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/fd-limits.html (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/fd-limits.html Mon Apr 7 09:28:58 2008
@@ -6,9 +6,9 @@
Content-Language: fr
Content-type: text/html; charset=ISO-8859-1
-URI: fd-limits.html.ja.euc-jp
+URI: fd-limits.html.ja.utf8
Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
URI: fd-limits.html.ko.euc-kr
Content-Language: ko
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/fd-limits.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/fd-limits.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/fd-limits.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/fd-limits.html.en Mon Apr 7 09:28:58 2008
@@ -123,6 +123,6 @@
<a href="../ja/vhosts/fd-limits.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/vhosts/fd-limits.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/fd-limits.html.fr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/fd-limits.html.fr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/fd-limits.html.fr (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/fd-limits.html.fr Mon Apr 7 09:28:58 2008
@@ -136,6 +136,6 @@
<a href="../ja/vhosts/fd-limits.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/vhosts/fd-limits.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossaire</a> | <a href="../sitemap.html">Plan du site</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/fd-limits.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/fd-limits.html.ko.euc-kr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/fd-limits.html.ko.euc-kr [euc-kr] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/fd-limits.html.ko.euc-kr [euc-kr] Mon Apr 7 09:28:58 2008
@@ -117,6 +117,6 @@
<a href="../ja/vhosts/fd-limits.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/vhosts/fd-limits.html" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">모듈</a> | <a href="../mod/directives.html">지시어들</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">용어</a> | <a href="../sitemap.html">사이트맵</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html Mon Apr 7 09:28:58 2008
@@ -10,9 +10,9 @@
Content-Language: fr
Content-type: text/html; charset=ISO-8859-1
-URI: index.html.ja.euc-jp
+URI: index.html.ja.utf8
Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
URI: index.html.ko.euc-kr
Content-Language: ko
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html.de
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html.de?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html.de (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html.de Mon Apr 7 09:28:58 2008
@@ -103,6 +103,6 @@
<a href="../ja/vhosts/" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html.en Mon Apr 7 09:28:58 2008
@@ -103,6 +103,6 @@
<a href="../ja/vhosts/" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html.fr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html.fr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html.fr (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html.fr Mon Apr 7 09:28:58 2008
@@ -104,6 +104,6 @@
<a href="../ja/vhosts/" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossaire</a> | <a href="../sitemap.html">Plan du site</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html.ko.euc-kr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html.ko.euc-kr [euc-kr] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/index.html.ko.euc-kr [euc-kr] Mon Apr 7 09:28:58 2008
@@ -101,6 +101,6 @@
<a href="../ja/vhosts/" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/vhosts/" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">모듈</a> | <a href="../mod/directives.html">지시어들</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">용어</a> | <a href="../sitemap.html">사이트맵</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/ip-based.html
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/ip-based.html?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/ip-based.html (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/ip-based.html Mon Apr 7 09:28:58 2008
@@ -6,9 +6,9 @@
Content-Language: fr
Content-type: text/html; charset=ISO-8859-1
-URI: ip-based.html.ja.euc-jp
+URI: ip-based.html.ja.utf8
Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
URI: ip-based.html.ko.euc-kr
Content-Language: ko
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/ip-based.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/ip-based.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/ip-based.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/ip-based.html.en Mon Apr 7 09:28:58 2008
@@ -157,6 +157,6 @@
<a href="../ja/vhosts/ip-based.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/ip-based.html.fr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/ip-based.html.fr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/ip-based.html.fr (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/ip-based.html.fr Mon Apr 7 09:28:58 2008
@@ -177,6 +177,6 @@
<a href="../ja/vhosts/ip-based.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossaire</a> | <a href="../sitemap.html">Plan du site</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/ip-based.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/ip-based.html.ko.euc-kr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/ip-based.html.ko.euc-kr [euc-kr] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/ip-based.html.ko.euc-kr [euc-kr] Mon Apr 7 09:28:58 2008
@@ -147,6 +147,6 @@
<a href="../ja/vhosts/ip-based.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/vhosts/ip-based.html" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">모듈</a> | <a href="../mod/directives.html">지시어들</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">용어</a> | <a href="../sitemap.html">사이트맵</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/mass.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/mass.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/mass.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/mass.html.en Mon Apr 7 09:28:58 2008
@@ -423,6 +423,6 @@
<p><span>Available Languages: </span><a href="../en/vhosts/mass.html" title="English"> en </a> |
<a href="../ko/vhosts/mass.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/mass.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/mass.html.ko.euc-kr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/mass.html.ko.euc-kr [euc-kr] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/mass.html.ko.euc-kr [euc-kr] Mon Apr 7 09:28:58 2008
@@ -418,6 +418,6 @@
<p><span>가능한 언어: </span><a href="../en/vhosts/mass.html" hreflang="en" rel="alternate" title="English"> en </a> |
<a href="../ko/vhosts/mass.html" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">모듈</a> | <a href="../mod/directives.html">지시어들</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">용어</a> | <a href="../sitemap.html">사이트맵</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html Mon Apr 7 09:28:58 2008
@@ -10,9 +10,9 @@
Content-Language: fr
Content-type: text/html; charset=ISO-8859-1
-URI: name-based.html.ja.euc-jp
+URI: name-based.html.ja.utf8
Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
URI: name-based.html.ko.euc-kr
Content-Language: ko
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html.de
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html.de?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html.de (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html.de Mon Apr 7 09:28:58 2008
@@ -266,6 +266,6 @@
<a href="../ja/vhosts/name-based.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html.en Mon Apr 7 09:28:58 2008
@@ -241,6 +241,6 @@
<a href="../ja/vhosts/name-based.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html.fr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html.fr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html.fr (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html.fr Mon Apr 7 09:28:58 2008
@@ -295,6 +295,6 @@
<a href="../ja/vhosts/name-based.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossaire</a> | <a href="../sitemap.html">Plan du site</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html.ko.euc-kr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html.ko.euc-kr [euc-kr] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/vhosts/name-based.html.ko.euc-kr [euc-kr] Mon Apr 7 09:28:58 2008
@@ -233,6 +233,6 @@
<a href="../ja/vhosts/name-based.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> |
<a href="../ko/vhosts/name-based.html" title="Korean"> ko </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">모듈</a> | <a href="../mod/directives.html">지시어들</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">용어</a> | <a href="../sitemap.html">사이트맵</a></p></div>
</body></html>
Modified: httpd/sandbox/amsterdam/d/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/include/ap_mmn.h?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/include/ap_mmn.h (original)
+++ httpd/sandbox/amsterdam/d/include/ap_mmn.h Mon Apr 7 09:28:58 2008
@@ -140,14 +140,29 @@
* 20071023.3 (2.3.0-dev) Declare ap_time_process_request() as part of the
* public scoreboard API.
* 20071108.1 (2.3.0-dev) Add the optional kept_body brigade to request_rec
+ * 20071108.2 (2.3.0-dev) Add st and keep fields to struct util_ldap_connection_t
+ * 20071108.3 (2.3.0-dev) Add API guarantee for adding connection filters
+ * with non-NULL request_rec pointer (ap_add_*_filter*)
+ * 20071108.4 (2.3.0-dev) Add ap_proxy_ssl_connection_cleanup
+ * 20071108.5 (2.3.0-dev) Add *scpool to proxy_conn_rec structure
+ * 20071108.6 (2.3.0-dev) Add *r and need_flush to proxy_conn_rec structure
+ * 20071108.7 (2.3.0-dev) Add *ftp_directory_charset to proxy_dir_conf
+ * 20071108.8 (2.3.0-dev) Add optional function ap_logio_add_bytes_in() to mog_logio
+ * 20071108.9 (2.3.0-dev) Add chroot support to unixd_config
+ * 20071108.10(2.3.0-dev) Introduce new ap_expr API
+ * 20071108.11(2.3.0-dev) Revise/Expand new ap_expr API
+ * 20071108.12(2.3.0-dev) Remove ap_expr_clone from the API (same day it was added)
+ * 20080403.0 (2.3.0-dev) Add condition field to core dir config
+ * 20080403.1 (2.3.0-dev) Add authn/z hook and provider registration wrappers.
+ * 20080403.2 (2.3.0-dev) Add ap_escape_path_segment_buffer() and ap_unescape_all().
*/
#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
#ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20071108
+#define MODULE_MAGIC_NUMBER_MAJOR 20080403
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 2 /* 0...n */
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
Modified: httpd/sandbox/amsterdam/d/include/ap_mpm.h
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/include/ap_mpm.h?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/include/ap_mpm.h (original)
+++ httpd/sandbox/amsterdam/d/include/ap_mpm.h Mon Apr 7 09:28:58 2008
@@ -91,14 +91,6 @@
AP_DECLARE(int) ap_mpm_run(apr_pool_t *pconf, apr_pool_t *plog, server_rec *server_conf);
/**
- * predicate indicating if a graceful stop has been requested ...
- * used by the connection loop
- * @return 1 if a graceful stop has been requested, 0 otherwise
- * @fn int ap_graceful_stop_signalled(*void)
- */
-AP_DECLARE(int) ap_graceful_stop_signalled(void);
-
-/**
* Spawn a process with privileges that another module has requested
* @param r The request_rec of the current request
* @param newproc The resulting process handle.
Modified: httpd/sandbox/amsterdam/d/include/ap_release.h
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/include/ap_release.h?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/include/ap_release.h (original)
+++ httpd/sandbox/amsterdam/d/include/ap_release.h Mon Apr 7 09:28:58 2008
@@ -25,7 +25,7 @@
#include "apr_general.h" /* stringify */
#define AP_SERVER_COPYRIGHT \
- "Copyright 2007 The Apache Software Foundation."
+ "Copyright 2008 The Apache Software Foundation."
/*
* The below defines the base string of the Server: header. Additional
Modified: httpd/sandbox/amsterdam/d/include/http_config.h
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/include/http_config.h?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/include/http_config.h (original)
+++ httpd/sandbox/amsterdam/d/include/http_config.h Mon Apr 7 09:28:58 2008
@@ -113,43 +113,43 @@
/** This configuration directive takes a flag (on/off) as a argument*/
# define AP_FLAG func.flag
-/** method of declaring a directive with no arguments */
+/** mechanism for declaring a directive with no arguments */
# define AP_INIT_NO_ARGS(directive, func, mconfig, where, help) \
{ directive, { .no_args=func }, mconfig, where, RAW_ARGS, help }
-/** method of declaring a directive with raw argument parsing */
+/** mechanism for declaring a directive with raw argument parsing */
# define AP_INIT_RAW_ARGS(directive, func, mconfig, where, help) \
{ directive, { .raw_args=func }, mconfig, where, RAW_ARGS, help }
-/** method of declaring a directive with raw argument parsing */
+/** mechanism for declaring a directive with raw argument parsing */
# define AP_INIT_TAKE_ARGV(directive, func, mconfig, where, help) \
{ directive, { .take_argv=func }, mconfig, where, TAKE_ARGV, help }
-/** method of declaring a directive which takes 1 argument */
+/** mechanism for declaring a directive which takes 1 argument */
# define AP_INIT_TAKE1(directive, func, mconfig, where, help) \
{ directive, { .take1=func }, mconfig, where, TAKE1, help }
-/** method of declaring a directive which takes multiple arguments */
+/** mechanism for declaring a directive which takes multiple arguments */
# define AP_INIT_ITERATE(directive, func, mconfig, where, help) \
{ directive, { .take1=func }, mconfig, where, ITERATE, help }
-/** method of declaring a directive which takes 2 arguments */
+/** mechanism for declaring a directive which takes 2 arguments */
# define AP_INIT_TAKE2(directive, func, mconfig, where, help) \
{ directive, { .take2=func }, mconfig, where, TAKE2, help }
-/** method of declaring a directive which takes 1 or 2 arguments */
+/** mechanism for declaring a directive which takes 1 or 2 arguments */
# define AP_INIT_TAKE12(directive, func, mconfig, where, help) \
{ directive, { .take2=func }, mconfig, where, TAKE12, help }
-/** method of declaring a directive which takes multiple 2 arguments */
+/** mechanism for declaring a directive which takes multiple 2 arguments */
# define AP_INIT_ITERATE2(directive, func, mconfig, where, help) \
{ directive, { .take2=func }, mconfig, where, ITERATE2, help }
-/** method of declaring a directive which takes 1 or 3 arguments */
+/** mechanism for declaring a directive which takes 1 or 3 arguments */
# define AP_INIT_TAKE13(directive, func, mconfig, where, help) \
{ directive, { .take3=func }, mconfig, where, TAKE13, help }
-/** method of declaring a directive which takes 2 or 3 arguments */
+/** mechanism for declaring a directive which takes 2 or 3 arguments */
# define AP_INIT_TAKE23(directive, func, mconfig, where, help) \
{ directive, { .take3=func }, mconfig, where, TAKE23, help }
-/** method of declaring a directive which takes 1 to 3 arguments */
+/** mechanism for declaring a directive which takes 1 to 3 arguments */
# define AP_INIT_TAKE123(directive, func, mconfig, where, help) \
{ directive, { .take3=func }, mconfig, where, TAKE123, help }
-/** method of declaring a directive which takes 3 arguments */
+/** mechanism for declaring a directive which takes 3 arguments */
# define AP_INIT_TAKE3(directive, func, mconfig, where, help) \
{ directive, { .take3=func }, mconfig, where, TAKE3, help }
-/** method of declaring a directive which takes a flag (on/off) as a argument*/
+/** mechanism for declaring a directive which takes a flag (on/off) argument */
# define AP_INIT_FLAG(directive, func, mconfig, where, help) \
{ directive, { .flag=func }, mconfig, where, FLAG, help }
@@ -721,8 +721,6 @@
/** @} */
-#ifdef CORE_PRIVATE
-
/**
* @brief This structure is used to assign symbol names to module pointers
*/
@@ -961,8 +959,6 @@
ap_conf_vector_t *section_vector,
const char *section,
module *mod, apr_pool_t *pconf);
-
-#endif
/* Hooks */
Modified: httpd/sandbox/amsterdam/d/include/http_connection.h
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/include/http_connection.h?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/include/http_connection.h (original)
+++ httpd/sandbox/amsterdam/d/include/http_connection.h Mon Apr 7 09:28:58 2008
@@ -38,7 +38,6 @@
* @brief Apache connection library
*/
-#ifdef CORE_PRIVATE
/**
* This is the protocol module driver. This calls all of the
* pre-connection and connection hooks for all protocol modules.
@@ -71,7 +70,6 @@
* @param c The connection we are closing
*/
AP_DECLARE(void) ap_lingering_close(conn_rec *c);
-#endif
/* Hooks */
/**
Modified: httpd/sandbox/amsterdam/d/include/http_core.h
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/include/http_core.h?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/include/http_core.h (original)
+++ httpd/sandbox/amsterdam/d/include/http_core.h Mon Apr 7 09:28:58 2008
@@ -30,6 +30,9 @@
#include "apr_hash.h"
#include "apr_optional.h"
#include "util_filter.h"
+#include "ap_expr.h"
+
+#include "http_config.h"
#if APR_HAVE_STRUCT_RLIMIT
#include <sys/time.h>
@@ -306,8 +309,6 @@
*/
AP_DECLARE(int) ap_satisfies(request_rec *r);
-#ifdef CORE_PRIVATE
-
/**
* Core is also unlike other modules in being implemented in more than
* one file... so, data structures are declared here, even though most of
@@ -541,6 +542,7 @@
#define USE_CANONICAL_PHYS_PORT_UNSET (2)
unsigned use_canonical_phys_port : 2;
+ ap_parse_node_t *condition; /* Conditionally merge <If> sections */
} core_dir_config;
/* Per-server core configuration */
@@ -597,7 +599,6 @@
apr_off_t readbytes);
apr_status_t ap_core_output_filter(ap_filter_t *f, apr_bucket_brigade *b);
-#endif /* CORE_PRIVATE */
AP_DECLARE(const char*) ap_get_server_protocol(server_rec* s);
AP_DECLARE(void) ap_set_server_protocol(server_rec* s, const char* proto);
@@ -656,6 +657,9 @@
*/
APR_DECLARE_OPTIONAL_FN(void, ap_logio_add_bytes_out,
+ (conn_rec *c, apr_off_t bytes));
+
+APR_DECLARE_OPTIONAL_FN(void, ap_logio_add_bytes_in,
(conn_rec *c, apr_off_t bytes));
/* ----------------------------------------------------------------------
Modified: httpd/sandbox/amsterdam/d/include/http_log.h
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/include/http_log.h?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/include/http_log.h (original)
+++ httpd/sandbox/amsterdam/d/include/http_log.h Mon Apr 7 09:28:58 2008
@@ -121,8 +121,6 @@
int ap_open_logs(apr_pool_t *pconf, apr_pool_t *plog,
apr_pool_t *ptemp, server_rec *s_main);
-#ifdef CORE_PRIVATE
-
/**
* Perform special processing for piped loggers in MPM child
* processes.
@@ -132,8 +130,6 @@
* internal core function
*/
void ap_logs_child_init(apr_pool_t *p, server_rec *s);
-
-#endif /* CORE_PRIVATE */
/*
* The primary logging functions, ap_log_error, ap_log_rerror, ap_log_cerror,
Modified: httpd/sandbox/amsterdam/d/include/http_protocol.h
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/include/http_protocol.h?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/include/http_protocol.h (original)
+++ httpd/sandbox/amsterdam/d/include/http_protocol.h Mon Apr 7 09:28:58 2008
@@ -140,13 +140,11 @@
AP_DECLARE(const char *) ap_make_content_type(request_rec *r,
const char *type);
-#ifdef CORE_PRIVATE
/**
* Precompile metadata structures used by ap_make_content_type()
* @param pool The pool to use for allocations
*/
AP_DECLARE(void) ap_setup_make_content_type(apr_pool_t *pool);
-#endif /* CORE_PRIVATE */
/**
* Construct an entity tag from the resource information. If it's a real
@@ -267,7 +265,7 @@
* return true if found.
*
* @param method String containing the name of the method to check.
- * @param l Pointer to a method list, such as cmd->methods_limited.
+ * @param l Pointer to a method list, such as r->allowed_methods.
* @return 1 if method is in the list, otherwise 0
*/
AP_DECLARE(int) ap_method_in_list(ap_method_list_t *l, const char *method);
@@ -277,7 +275,7 @@
* already listed.
*
* @param method String containing the name of the method to check.
- * @param l Pointer to a method list, such as cmd->methods_limited.
+ * @param l Pointer to a method list, such as r->allowed_methods.
* @return None.
*/
AP_DECLARE(void) ap_method_list_add(ap_method_list_t *l, const char *method);
@@ -285,7 +283,7 @@
/**
* Remove an HTTP method name from an ap_method_list_t structure.
*
- * @param l Pointer to a method list, such as cmd->methods_limited.
+ * @param l Pointer to a method list, such as r->allowed_methods.
* @param method String containing the name of the method to remove.
* @return None.
*/
@@ -295,7 +293,7 @@
/**
* Reset a method list to be completely empty.
*
- * @param l Pointer to a method list, such as cmd->methods_limited.
+ * @param l Pointer to a method list, such as r->allowed_methods.
* @return None.
*/
AP_DECLARE(void) ap_clear_method_list(ap_method_list_t *l);
Modified: httpd/sandbox/amsterdam/d/include/http_request.h
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/include/http_request.h?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/include/http_request.h (original)
+++ httpd/sandbox/amsterdam/d/include/http_request.h Mon Apr 7 09:28:58 2008
@@ -18,6 +18,12 @@
* @file http_request.h
* @brief Apache Request library
*
+ * @defgroup APACHE_CORE_REQ Apache Request Processing
+ * @ingroup APACHE_CORE
+ * @{
+ */
+
+/*
* request.c is the code which handles the main line of request
* processing, once a request has been read in (finding the right per-
* directory configuration, building it if necessary, and calling all
@@ -42,6 +48,7 @@
#define APACHE_HTTP_REQUEST_H
#include "apr_hooks.h"
+#include "apr_optional.h"
#include "util_filter.h"
#ifdef __cplusplus
@@ -181,7 +188,73 @@
* @return 1 if authentication is required, 0 otherwise
*/
AP_DECLARE(int) ap_some_auth_required(request_rec *r);
-
+
+/**
+ * @defgroup APACHE_CORE_REQ_AUTH Access Control for Sub-Requests and
+ * Internal Redirects
+ * @ingroup APACHE_CORE_REQ
+ * @{
+ */
+
+#define AP_AUTH_INTERNAL_PER_URI 0 /**< Run access control hooks on all
+ internal requests with URIs
+ distinct from that of initial
+ request */
+#define AP_AUTH_INTERNAL_PER_CONF 1 /**< Run access control hooks only on
+ internal requests with
+ configurations distinct from
+ that of initial request */
+#define AP_AUTH_INTERNAL_MASK 0x000F /**< mask to extract internal request
+ processing mode */
+
+/**
+ * Clear flag which determines when access control hooks will be run for
+ * internal requests.
+ */
+AP_DECLARE(void) ap_clear_auth_internal(void);
+
+/**
+ * Determine whether access control hooks will be run for all internal
+ * requests with URIs distinct from that of the initial request, or only
+ * those for which different configurations apply than those which applied
+ * to the initial request. To accomodate legacy external modules which
+ * may expect access control hooks to be run for all internal requests
+ * with distinct URIs, this is the default behaviour unless all access
+ * control hooks and authentication and authorization providers are
+ * registered with AP_AUTH_INTERNAL_PER_CONF.
+ * @param ptemp Pool used for temporary allocations
+ */
+AP_DECLARE(void) ap_setup_auth_internal(apr_pool_t *ptemp);
+
+/**
+ * Register an authentication or authorization provider with the global
+ * provider pool.
+ * @param pool The pool to create any storage from
+ * @param provider_group The group to store the provider in
+ * @param provider_name The name for this provider
+ * @param provider_version The version for this provider
+ * @param provider Opaque structure for this provider
+ * @param type Internal request processing mode, either
+ * AP_AUTH_INTERNAL_PER_URI or AP_AUTH_INTERNAL_PER_CONF
+ * @return APR_SUCCESS if all went well
+ */
+AP_DECLARE(apr_status_t) ap_register_auth_provider(apr_pool_t *pool,
+ const char *provider_group,
+ const char *provider_name,
+ const char *provider_version,
+ const void *provider,
+ int type);
+
+/** @} */
+
+/* Optional functions coming from mod_authn_core and mod_authz_core
+ * that list all registered authn/z providers.
+ */
+APR_DECLARE_OPTIONAL_FN(apr_array_header_t *, authn_ap_list_provider_names,
+ (apr_pool_t *ptemp));
+APR_DECLARE_OPTIONAL_FN(apr_array_header_t *, authz_ap_list_provider_names,
+ (apr_pool_t *ptemp));
+
/**
* Determine if the current request is the main request or a subrequest
* @param r The current request
@@ -235,7 +308,6 @@
#define MERGE_ALLOW 0
#define REPLACE_ALLOW 1
-#ifdef CORE_PRIVATE
/**
* Process a top-level request from a client, and synchronously write
* the response to the client
@@ -257,7 +329,6 @@
* @param r The current request
*/
AP_DECLARE(void) ap_die(int type, request_rec *r);
-#endif
/* Hooks */
@@ -300,11 +371,13 @@
* r->ap_auth_type). This hook is only run when Apache determines that
* authentication/authorization is required for this resource (as determined
* by the 'Require' directive). It runs after the access_checker hook, and
- * before the auth_checker hook.
+ * before the auth_checker hook. This hook should be registered with
+ * ap_hook_check_authn().
*
* @param r The current request
* @return OK, DECLINED, or HTTP_...
* @ingroup hooks
+ * @see ap_hook_check_authn
*/
AP_DECLARE_HOOK(int,check_user_id,(request_rec *r))
@@ -331,11 +404,13 @@
* This hook is used to apply additional access control to this resource.
* It runs *before* a user is authenticated, so this hook is really to
* apply additional restrictions independent of a user. It also runs
- * independent of 'Require' directive usage.
+ * independent of 'Require' directive usage. This hook should be registered
+ * with ap_hook_check_access().
*
* @param r the current request
* @return OK, DECLINED, or HTTP_...
* @ingroup hooks
+ * @see ap_hook_check_access
*/
AP_DECLARE_HOOK(int,access_checker,(request_rec *r))
@@ -344,15 +419,71 @@
* is available for the authenticated user (r->user and r->ap_auth_type).
* It runs after the access_checker and check_user_id hooks. Note that
* it will *only* be called if Apache determines that access control has
- * been applied to this resource (through a 'Require' directive).
+ * been applied to this resource (through a 'Require' directive). This
+ * hook should be registered with ap_hook_check_authz().
*
* @param r the current request
* @return OK, DECLINED, or HTTP_...
* @ingroup hooks
+ * @see ap_hook_check_authz
*/
AP_DECLARE_HOOK(int,auth_checker,(request_rec *r))
/**
+ * Register a hook function that will apply additional access control to
+ * the current request.
+ * @param pf An access_checker hook function
+ * @param aszPre A NULL-terminated array of strings that name modules whose
+ * hooks should precede this one
+ * @param aszSucc A NULL-terminated array of strings that name modules whose
+ * hooks should succeed this one
+ * @param nOrder An integer determining order before honouring aszPre and
+ * aszSucc (for example, HOOK_MIDDLE)
+ * @param type Internal request processing mode, either
+ * AP_AUTH_INTERNAL_PER_URI or AP_AUTH_INTERNAL_PER_CONF
+ */
+AP_DECLARE(void) ap_hook_check_access(ap_HOOK_access_checker_t *pf,
+ const char * const *aszPre,
+ const char * const *aszSucc,
+ int nOrder, int type);
+
+/**
+ * Register a hook function that will analyze the request headers,
+ * authenticate the user, and set the user information in the request record.
+ * @param pf A check_user_id hook function
+ * @param aszPre A NULL-terminated array of strings that name modules whose
+ * hooks should precede this one
+ * @param aszSucc A NULL-terminated array of strings that name modules whose
+ * hooks should succeed this one
+ * @param nOrder An integer determining order before honouring aszPre and
+ * aszSucc (for example, HOOK_MIDDLE)
+ * @param type Internal request processing mode, either
+ * AP_AUTH_INTERNAL_PER_URI or AP_AUTH_INTERNAL_PER_CONF
+ */
+AP_DECLARE(void) ap_hook_check_authn(ap_HOOK_check_user_id_t *pf,
+ const char * const *aszPre,
+ const char * const *aszSucc,
+ int nOrder, int type);
+
+/**
+ * Register a hook function that determine if the resource being requested
+ * is available for the currently authenticated user.
+ * @param pf An auth_checker hook function
+ * @param aszPre A NULL-terminated array of strings that name modules whose
+ * hooks should precede this one
+ * @param aszSucc A NULL-terminated array of strings that name modules whose
+ * hooks should succeed this one
+ * @param nOrder An integer determining order before honouring aszPre and
+ * aszSucc (for example, HOOK_MIDDLE)
+ * @param type Internal request processing mode, either
+ * AP_AUTH_INTERNAL_PER_URI or AP_AUTH_INTERNAL_PER_CONF
+ */
+AP_DECLARE(void) ap_hook_check_authz(ap_HOOK_auth_checker_t *pf,
+ const char * const *aszPre,
+ const char * const *aszSucc,
+ int nOrder, int type);
+
+/**
* This hook allows modules to insert filters for the current request
* @param r the current request
* @ingroup hooks
@@ -398,3 +529,4 @@
#endif
#endif /* !APACHE_HTTP_REQUEST_H */
+/** @} */
Modified: httpd/sandbox/amsterdam/d/include/httpd.h
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/include/httpd.h?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/include/httpd.h (original)
+++ httpd/sandbox/amsterdam/d/include/httpd.h Mon Apr 7 09:28:58 2008
@@ -68,8 +68,6 @@
extern "C" {
#endif
-#ifdef CORE_PRIVATE
-
/* ----------------------------- config dir ------------------------------ */
/** Define this to be the default server home dir. Most things later in this
@@ -210,8 +208,6 @@
*/
#define DEFAULT_ADD_DEFAULT_CHARSET_NAME "iso-8859-1"
-#endif /* CORE_PRIVATE */
-
/** default HTTP Server protocol */
#define AP_SERVER_PROTOCOL "HTTP/1.1"
@@ -1435,6 +1431,13 @@
AP_DECLARE(int) ap_is_url(const char *u);
/**
+ * Unescape a string
+ * @param url The string to unescape
+ * @return 0 on success, non-zero otherwise
+ */
+AP_DECLARE(int) ap_unescape_all(char *url);
+
+/**
* Unescape a URL
* @param url The url to unescape
* @return 0 on success, non-zero otherwise
@@ -1468,6 +1471,14 @@
* @return The converted URL
*/
AP_DECLARE(char *) ap_escape_path_segment(apr_pool_t *p, const char *s);
+
+/**
+ * Escape a path segment, as defined in RFC 1808, to a preallocated buffer.
+ * @param c The preallocated buffer to write to
+ * @param s The path to convert
+ * @return The converted URL (c)
+ */
+AP_DECLARE(char *) ap_escape_path_segment_buffer(char *c, const char *s);
/**
* convert an OS path to a URL in an OS dependant way.
Modified: httpd/sandbox/amsterdam/d/include/util_filter.h
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/include/util_filter.h?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/include/util_filter.h (original)
+++ httpd/sandbox/amsterdam/d/include/util_filter.h Mon Apr 7 09:28:58 2008
@@ -411,6 +411,10 @@
* @param ctx Context data to set in the filter
* @param r The request to add this filter for (or NULL if it isn't associated with a request)
* @param c The connection to add this filter for
+ * @note If adding a connection-level output filter (i.e. where the type
+ * is >= AP_FTYPE_CONNECTION) during processing of a request, the request
+ * object r must be passed in to ensure the filter chains are modified
+ * correctly. f->r will still be initialized as NULL in the new filter.
*/
AP_DECLARE(ap_filter_t *) ap_add_output_filter(const char *name, void *ctx,
request_rec *r, conn_rec *c);
@@ -421,7 +425,11 @@
*
* @param f The filter handle to add
* @param r The request to add this filter for (or NULL if it isn't associated with a request)
- * @param c The connection to add the fillter for
+ * @param c The connection to add the filter for
+ * @note If adding a connection-level output filter (i.e. where the type
+ * is >= AP_FTYPE_CONNECTION) during processing of a request, the request
+ * object r must be passed in to ensure the filter chains are modified
+ * correctly. f->r will still be initialized as NULL in the new filter.
*/
AP_DECLARE(ap_filter_t *) ap_add_output_filter_handle(ap_filter_rec_t *f,
void *ctx,
Modified: httpd/sandbox/amsterdam/d/include/util_ldap.h
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/include/util_ldap.h?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/include/util_ldap.h (original)
+++ httpd/sandbox/amsterdam/d/include/util_ldap.h Mon Apr 7 09:28:58 2008
@@ -29,6 +29,14 @@
#include "apr_tables.h"
#include "apr_time.h"
#include "apr_ldap.h"
+#include "apr_ldap_rebind.h"
+
+#if APR_HAS_MICROSOFT_LDAPSDK
+#define AP_LDAP_IS_SERVER_DOWN(s) ((s) == LDAP_SERVER_DOWN \
+ ||(s) == LDAP_UNAVAILABLE)
+#else
+#define AP_LDAP_IS_SERVER_DOWN(s) ((s) == LDAP_SERVER_DOWN)
+#endif
#if APR_HAS_SHARED_MEMORY
#include "apr_rmm.h"
@@ -85,6 +93,11 @@
always=LDAP_DEREF_ALWAYS
} deref_options;
+#define AP_LDAP_DEFAULT_HOPLIMIT 5 /* make sure these two stay */
+#define AP_LDAP_DEFAULT_HOPLIMIT_STR "5" /* in synch with each other! */
+#define AP_LDAP_CHASEREFERRALS_OFF 0
+#define AP_LDAP_CHASEREFERRALS_ON 1
+
/* Structure representing an LDAP connection */
typedef struct util_ldap_connection_t {
LDAP *ldap;
@@ -107,7 +120,17 @@
const char *reason; /* Reason for an error failure */
struct util_ldap_connection_t *next;
+ struct util_ldap_state_t *st; /* The LDAP vhost config this connection belongs to */
+ int keep; /* Will this connection be kept when it's unlocked */
+
+ int ChaseReferrals; /* [on|off] (default = AP_LDAP_CHASEREFERRALS_ON)*/
+ int ReferralHopLimit; /* # of referral hops to follow (default = AP_LDAP_DEFAULT_HOPLIMIT) */
} util_ldap_connection_t;
+
+typedef struct util_ldap_config_t {
+ int ChaseReferrals;
+ int ReferralHopLimit;
+} util_ldap_config_t;
/* LDAP cache state information */
typedef struct util_ldap_state_t {
Modified: httpd/sandbox/amsterdam/d/libhttpd.dsp
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/libhttpd.dsp?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/libhttpd.dsp (original)
+++ httpd/sandbox/amsterdam/d/libhttpd.dsp Mon Apr 7 09:28:58 2008
@@ -116,6 +116,10 @@
# End Source File
# Begin Source File
+SOURCE=.\include\ap_expr.h
+# End Source File
+# Begin Source File
+
SOURCE=.\include\ap_mmn.h
# End Source File
# Begin Source File
@@ -489,6 +493,10 @@
# Begin Source File
SOURCE=.\include\util_ebcdic.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\util_expr.c
# End Source File
# Begin Source File
Modified: httpd/sandbox/amsterdam/d/modules/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/modules/NWGNUmakefile?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/modules/NWGNUmakefile (original)
+++ httpd/sandbox/amsterdam/d/modules/NWGNUmakefile Mon Apr 7 09:28:58 2008
@@ -1,8 +1,15 @@
#
# Declare the sub-directories to be built here
#
-# To build with exerimental modules set the environment
+# To build with exerimental modules set the environment
# variable EXPERIMENTAL=1
+# To build with the mod_ssl module set the environment
+# variable WITH_MOD_SSL=1
+
+# If USE_STDSOCKETS is defined we allways build mod_ssl
+ifdef USE_STDSOCKETS
+WITH_MOD_SSL=1
+endif
SUBDIRS = \
aaa \
@@ -11,6 +18,7 @@
dav\fs \
dav\lock \
echo \
+ examples \
generators \
loggers \
mappers \
@@ -18,7 +26,7 @@
proxy \
filters \
database \
- $(EOLIST)
+ $(EOLIST)
# If LDAPSDK has been defined then build the util_ldap module
ifneq "$(LDAPSDK)" ""
@@ -26,7 +34,7 @@
$(EOLIST)
endif
-# If OSSLSDK has been defined then build the mod_ssl module
+# If WITH_MOD_SSL and OSSLSDK have been defined then build the mod_ssl module
ifdef WITH_MOD_SSL
ifneq "$(OSSLSDK)" ""
SUBDIRS += ssl \
@@ -37,19 +45,19 @@
#If the mod_edir directory exists then build the mod_edir module
ifeq "$(wildcard $(AP_WORK)\modules\mod_edir)" "$(AP_WORK)\modules\mod_edir"
SUBDIRS += mod_edir \
- $(EOLIST)
+ $(EOLIST)
endif
# Allow the experimental modules to be built if EXPERIMENTAL is defined
ifdef EXPERIMENTAL
SUBDIRS += experimental \
- $(EOLIST)
+ $(EOLIST)
endif
-# Allow the experimental modules to be built if EXPERIMENTAL is defined
+# Allow the debugging modules to be built if DEBUG is defined
ifdef DEBUG
SUBDIRS += debugging \
- $(EOLIST)
+ $(EOLIST)
endif
@@ -63,7 +71,7 @@
#
# build this level's files
-ifeq "$(wildcard NWGNUmakefile.mak)" "NWGNUmakefile.mak"
+ifeq "$(wildcard NWGNUmakefile.mak)" "NWGNUmakefile.mak"
include NWGNUmakefile.mak
endif
@@ -72,4 +80,4 @@
# installation area
#
install :: nlms FORCE
-
+
Modified: httpd/sandbox/amsterdam/d/modules/README
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/modules/README?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/modules/README (original)
+++ httpd/sandbox/amsterdam/d/modules/README Mon Apr 7 09:28:58 2008
@@ -18,6 +18,10 @@
echo/
+examples/
+ This directory contains some sample code that should help you on your
+ way to develop your own Apache modules.
+
experimental/
In this directory we've placed some modules which we think
provide some pretty interesting functionality, but which
Modified: httpd/sandbox/amsterdam/d/modules/aaa/mod_access_compat.c
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/modules/aaa/mod_access_compat.c?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/modules/aaa/mod_access_compat.c (original)
+++ httpd/sandbox/amsterdam/d/modules/aaa/mod_access_compat.c Mon Apr 7 09:28:58 2008
@@ -364,7 +364,8 @@
APR_REGISTER_OPTIONAL_FN(access_compat_ap_satisfies);
/* This can be access checker since we don't require r->user to be set. */
- ap_hook_access_checker(check_dir_access,NULL,NULL,APR_HOOK_MIDDLE);
+ ap_hook_check_access(check_dir_access, NULL, NULL, APR_HOOK_MIDDLE,
+ AP_AUTH_INTERNAL_PER_CONF);
}
module AP_MODULE_DECLARE_DATA access_compat_module =
Modified: httpd/sandbox/amsterdam/d/modules/aaa/mod_auth_basic.c
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/modules/aaa/mod_auth_basic.c?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/modules/aaa/mod_auth_basic.c (original)
+++ httpd/sandbox/amsterdam/d/modules/aaa/mod_auth_basic.c Mon Apr 7 09:28:58 2008
@@ -286,7 +286,8 @@
static void register_hooks(apr_pool_t *p)
{
- ap_hook_check_user_id(authenticate_basic_user,NULL,NULL,APR_HOOK_MIDDLE);
+ ap_hook_check_authn(authenticate_basic_user, NULL, NULL, APR_HOOK_MIDDLE,
+ AP_AUTH_INTERNAL_PER_CONF);
}
module AP_MODULE_DECLARE_DATA auth_basic_module =
Modified: httpd/sandbox/amsterdam/d/modules/aaa/mod_auth_digest.c
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/modules/aaa/mod_auth_digest.c?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/modules/aaa/mod_auth_digest.c (original)
+++ httpd/sandbox/amsterdam/d/modules/aaa/mod_auth_digest.c Mon Apr 7 09:28:58 2008
@@ -1970,7 +1970,8 @@
ap_hook_post_config(initialize_module, NULL, cfgPost, APR_HOOK_MIDDLE);
ap_hook_child_init(initialize_child, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_post_read_request(parse_hdr_and_update_nc, parsePre, NULL, APR_HOOK_MIDDLE);
- ap_hook_check_user_id(authenticate_digest_user, NULL, NULL, APR_HOOK_MIDDLE);
+ ap_hook_check_authn(authenticate_digest_user, NULL, NULL, APR_HOOK_MIDDLE,
+ AP_AUTH_INTERNAL_PER_CONF);
ap_hook_fixups(add_auth_info, NULL, NULL, APR_HOOK_MIDDLE);
}
Modified: httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_anon.c
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_anon.c?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_anon.c (original)
+++ httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_anon.c Mon Apr 7 09:28:58 2008
@@ -198,8 +198,8 @@
static void register_hooks(apr_pool_t *p)
{
- ap_register_provider(p, AUTHN_PROVIDER_GROUP, "anon", "0",
- &authn_anon_provider);
+ ap_register_auth_provider(p, AUTHN_PROVIDER_GROUP, "anon", "0",
+ &authn_anon_provider, AP_AUTH_INTERNAL_PER_CONF);
}
module AP_MODULE_DECLARE_DATA authn_anon_module =
Modified: httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_core.c
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_core.c?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_core.c (original)
+++ httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_core.c Mon Apr 7 09:28:58 2008
@@ -27,7 +27,6 @@
#define APR_WANT_BYTEFUNC
#include "apr_want.h"
-#define CORE_PRIVATE
#include "ap_config.h"
#include "httpd.h"
#include "http_config.h"
@@ -253,8 +252,9 @@
apr_hash_set(authcfg->alias_rec, provider_alias, APR_HASH_KEY_STRING, prvdraliasrec);
/* Register the fake provider so that we get called first */
- ap_register_provider(cmd->pool, AUTHN_PROVIDER_GROUP, provider_alias, "0",
- &authn_alias_provider);
+ ap_register_auth_provider(cmd->pool, AUTHN_PROVIDER_GROUP,
+ provider_alias, "0", &authn_alias_provider,
+ AP_AUTH_INTERNAL_PER_CONF);
}
cmd->override = old_overrides;
@@ -296,6 +296,11 @@
return apr_pstrdup(r->pool, conf->ap_auth_name);
}
+static apr_array_header_t *authn_ap_list_provider_names(apr_pool_t *ptemp)
+{
+ return ap_list_provider_names(ptemp, AUTHN_PROVIDER_GROUP, "0");
+}
+
static const command_rec authn_cmds[] =
{
AP_INIT_TAKE1("AuthType", ap_set_string_slot,
@@ -313,6 +318,7 @@
{
APR_REGISTER_OPTIONAL_FN(authn_ap_auth_type);
APR_REGISTER_OPTIONAL_FN(authn_ap_auth_name);
+ APR_REGISTER_OPTIONAL_FN(authn_ap_list_provider_names);
}
module AP_MODULE_DECLARE_DATA authn_core_module =
Modified: httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_dbd.c
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_dbd.c?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_dbd.c (original)
+++ httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_dbd.c Mon Apr 7 09:28:58 2008
@@ -18,6 +18,7 @@
#include "httpd.h"
#include "http_config.h"
#include "http_log.h"
+#include "http_request.h"
#include "apr_lib.h"
#include "apr_dbd.h"
#include "mod_dbd.h"
@@ -98,24 +99,29 @@
ap_dbd_t *dbd = authn_dbd_acquire_fn(r);
if (dbd == NULL) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "Error looking up %s in database", user);
+ "Failed to acquire database connection to look up "
+ "user '%s'", user);
return AUTH_GENERAL_ERROR;
}
if (conf->user == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "No AuthDBDUserPWQuery has been specified.");
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "No AuthDBDUserPWQuery has been specified");
return AUTH_GENERAL_ERROR;
}
statement = apr_hash_get(dbd->prepared, conf->user, APR_HASH_KEY_STRING);
if (statement == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "A prepared statement could not be found for AuthDBDUserPWQuery, key '%s'.", conf->user);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "A prepared statement could not be found for "
+ "AuthDBDUserPWQuery with the key '%s'", conf->user);
return AUTH_GENERAL_ERROR;
}
if (apr_dbd_pvselect(dbd->driver, r->pool, dbd->handle, &res, statement,
0, user, NULL) != 0) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "Error looking up %s in database", user);
+ "Query execution error looking up '%s' "
+ "in database", user);
return AUTH_GENERAL_ERROR;
}
for (rv = apr_dbd_get_row(dbd->driver, r->pool, res, &row, -1);
@@ -123,7 +129,8 @@
rv = apr_dbd_get_row(dbd->driver, r->pool, res, &row, -1)) {
if (rv != 0) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
- "Error looking up %s in database", user);
+ "Error retrieving results while looking up '%s' "
+ "in database", user);
return AUTH_GENERAL_ERROR;
}
if (dbd_password == NULL) {
@@ -184,22 +191,27 @@
ap_dbd_t *dbd = authn_dbd_acquire_fn(r);
if (dbd == NULL) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "Error looking up %s in database", user);
+ "Failed to acquire database connection to look up "
+ "user '%s:%s'", user, realm);
return AUTH_GENERAL_ERROR;
}
if (conf->realm == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "No AuthDBDUserRealmQuery has been specified.");
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "No AuthDBDUserRealmQuery has been specified");
return AUTH_GENERAL_ERROR;
}
statement = apr_hash_get(dbd->prepared, conf->realm, APR_HASH_KEY_STRING);
if (statement == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "A prepared statement could not be found for AuthDBDUserRealmQuery, key '%s'.", conf->realm);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "A prepared statement could not be found for "
+ "AuthDBDUserRealmQuery with the key '%s'", conf->realm);
return AUTH_GENERAL_ERROR;
}
if (apr_dbd_pvselect(dbd->driver, r->pool, dbd->handle, &res, statement,
0, user, realm, NULL) != 0) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "Error looking up %s:%s in database", user, realm);
+ "Query execution error looking up '%s:%s' "
+ "in database", user, realm);
return AUTH_GENERAL_ERROR;
}
for (rv = apr_dbd_get_row(dbd->driver, r->pool, res, &row, -1);
@@ -207,7 +219,8 @@
rv = apr_dbd_get_row(dbd->driver, r->pool, res, &row, -1)) {
if (rv != 0) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
- "Error looking up %s in database", user);
+ "Error retrieving results while looking up '%s:%s' "
+ "in database", user, realm);
return AUTH_GENERAL_ERROR;
}
if (dbd_hash == NULL) {
@@ -256,7 +269,8 @@
&authn_dbd_realm
};
- ap_register_provider(p, AUTHN_PROVIDER_GROUP, "dbd", "0", &authn_dbd_provider);
+ ap_register_auth_provider(p, AUTHN_PROVIDER_GROUP, "dbd", "0",
+ &authn_dbd_provider, AP_AUTH_INTERNAL_PER_CONF);
}
module AP_MODULE_DECLARE_DATA authn_dbd_module =
{
Modified: httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_dbm.c
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_dbm.c?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_dbm.c (original)
+++ httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_dbm.c Mon Apr 7 09:28:58 2008
@@ -189,8 +189,8 @@
static void register_hooks(apr_pool_t *p)
{
- ap_register_provider(p, AUTHN_PROVIDER_GROUP, "dbm", "0",
- &authn_dbm_provider);
+ ap_register_auth_provider(p, AUTHN_PROVIDER_GROUP, "dbm", "0",
+ &authn_dbm_provider, AP_AUTH_INTERNAL_PER_CONF);
}
module AP_MODULE_DECLARE_DATA authn_dbm_module =
Modified: httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_default.c
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_default.c?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_default.c (original)
+++ httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_default.c Mon Apr 7 09:28:58 2008
@@ -90,7 +90,8 @@
static void register_hooks(apr_pool_t *p)
{
- ap_hook_check_user_id(authenticate_no_user,NULL,NULL,APR_HOOK_LAST);
+ ap_hook_check_authn(authenticate_no_user, NULL, NULL, APR_HOOK_LAST,
+ AP_AUTH_INTERNAL_PER_CONF);
}
module AP_MODULE_DECLARE_DATA authn_default_module =
Modified: httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_file.c
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_file.c?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_file.c (original)
+++ httpd/sandbox/amsterdam/d/modules/aaa/mod_authn_file.c Mon Apr 7 09:28:58 2008
@@ -163,8 +163,8 @@
static void register_hooks(apr_pool_t *p)
{
- ap_register_provider(p, AUTHN_PROVIDER_GROUP, "file", "0",
- &authn_file_provider);
+ ap_register_auth_provider(p, AUTHN_PROVIDER_GROUP, "file", "0",
+ &authn_file_provider, AP_AUTH_INTERNAL_PER_CONF);
}
module AP_MODULE_DECLARE_DATA authn_file_module =