svn commit: r1820360 [17/18] - in /httpd/httpd/branches/2.4.x-mod_md: ./ docs/ docs/manual/ docs/manual/developer/ docs/manual/faq/ docs/manual/howto/ docs/manual/misc/ docs/manual/mod/ docs/manual/platform/ docs/manual/programs/ docs/manual/rewrite/ d...

[yl...@apache.org]

Modified: httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/mass.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/mass.xml.fr?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/mass.xml.fr [utf-8] (original)
+++ httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/mass.xml.fr [utf-8] Fri Jan  5 22:04:52 2018
@@ -1,7 +1,7 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1673563 -->
+<!-- English Revision: 1818061 -->
 <!-- French translation : Lucien GENTIS -->
 
 <!--
@@ -22,25 +22,25 @@
 -->
 
 <manualpage metafile="mass.xml.meta">
-<parentdocument href="./">H&eacute;bergement virtuel</parentdocument>
-   <title>H&eacute;bergement virtuel de masse configur&eacute; dynamiquement</title>
+<parentdocument href="./">Hébergement virtuel</parentdocument>
+   <title>Hébergement virtuel de masse configuré dynamiquement</title>
 
 <summary>
 
-    <p>Ce document propose une m&eacute;thode performante pour servir un nombre
-    quelconque d'h&ocirc;tes virtuels avec le serveur HTTP Apache. Un <a
-    href="../rewrite/vhosts.html">document s&eacute;par&eacute;</a> d&eacute;crit comment
-    utiliser <module>mod_rewrite</module> pour g&eacute;rer l'h&eacute;bergement
+    <p>Ce document propose une méthode performante pour servir un nombre
+    quelconque d'hôtes virtuels avec le serveur HTTP Apache. Un <a
+    href="../rewrite/vhosts.html">document séparé</a> décrit comment
+    utiliser <module>mod_rewrite</module> pour gérer l'hébergement
     virtuel de masse dynamique.
     </p>
 
 </summary>
 
-<section id="motivation"><title>A qui ce document est-il destin&eacute; ?</title>
+<section id="motivation"><title>A qui ce document est-il destiné ?</title>
 
-    <p>Les techniques d&eacute;crites ici vous concernent si votre
+    <p>Les techniques décrites ici vous concernent si votre
     <code>httpd.conf</code> contient de nombreuses sections
-    <code>&lt;VirtualHost&gt;</code> tr&egrave;s semblables,
+    <code>&lt;VirtualHost&gt;</code> très semblables,
     dans le style :</p>
 
 <highlight language="config">
@@ -64,107 +64,107 @@
 </highlight>
 
     <p>Nous voulons remplacer toutes les configurations
-    <code>&lt;VirtualHost&gt;</code> par un m&eacute;canisme qui les g&eacute;n&egrave;re
-    dynamiquement. Ceci pr&eacute;sente certains avantages :</p>
+    <code>&lt;VirtualHost&gt;</code> par un mécanisme qui les génère
+    dynamiquement. Ceci présente certains avantages :</p>
 
     <ol>
       <li>Votre fichier de configuration est plus petit, ainsi Apache
-      d&eacute;marre plus rapidement et consomme moins de m&eacute;moire. Et ce qui
-      est peut-&ecirc;tre le plus important, le fichier de configuration plus
-      petit est plus facile &agrave; maintenir, et le risque d'erreurs en est
-      diminu&eacute; d'autant.
+      démarre plus rapidement et consomme moins de mémoire. Et ce qui
+      est peut-être le plus important, le fichier de configuration plus
+      petit est plus facile à maintenir, et le risque d'erreurs en est
+      diminué d'autant.
       </li>
 
-      <li>Pour ajouter des serveurs virtuels, il suffit de cr&eacute;er les
-      r&eacute;pertoires appropri&eacute;s dans le syst&egrave;me de fichiers et les entr&eacute;es
-      dans le DNS - il n'est plus n&eacute;cessaire de reconfigurer ou de
-      red&eacute;marrer Apache.</li>
+      <li>Pour ajouter des serveurs virtuels, il suffit de créer les
+      répertoires appropriés dans le système de fichiers et les entrées
+      dans le DNS - il n'est plus nécessaire de reconfigurer ou de
+      redémarrer Apache.</li>
     </ol>
 
-    <p>Le principal d&eacute;savantage r&eacute;side dans le fait que vous ne pouvez
-    pas d&eacute;finir un fichier journal diff&eacute;rent pour chaque serveur
-    virtuel. De toute fa&ccedil;on, ce serait une mauvaise id&eacute;e si vous avez de
-    nombreux serveurs virtuels, car cela n&eacute;cessiterait un <a
+    <p>Le principal désavantage réside dans le fait que vous ne pouvez
+    pas définir un fichier journal différent pour chaque serveur
+    virtuel. De toute façon, ce serait une mauvaise idée si vous avez de
+    nombreux serveurs virtuels, car cela nécessiterait un <a
     href="fd-limits.html">nombre important de descripteurs de
-    fichier</a>. Il est pr&eacute;f&eacute;rable de rediriger <a
+    fichier</a>. Il est préférable de rediriger <a
     href="../logs.html#piped">les journaux via un pipe ou
     une file fifo</a> vers un
-    programme, et faire en sorte que ce dernier &eacute;clate les journaux
+    programme, et faire en sorte que ce dernier éclate les journaux
     en un journal par serveur virtuel. L'utilitaire <a
-    href="../programs/other.html#split-logfile">split-logfile</a>
+    href="../programs/split-logfile.html">split-logfile</a>
     constitue un exemple de ce traitement.</p>
 
 </section>
 
 <section id="overview"><title>Vue d'ensemble</title>
 
-    <p>Un serveur virtuel peut &ecirc;tre d&eacute;fini par deux informations : son
-    adresse IP, et le contenu de l'en-t&ecirc;te <code>Host:</code> de la
-    requ&ecirc;te HTTP. La technique d'h&eacute;bergement virtuel dynamique de masse
-    utilis&eacute;e ici consiste &agrave; ins&eacute;rer automatiquement ces informations
-    dans le chemin du fichier &agrave; utiliser pour r&eacute;pondre &agrave; la requ&ecirc;te. On
+    <p>Un serveur virtuel peut être défini par deux informations : son
+    adresse IP, et le contenu de l'en-tête <code>Host:</code> de la
+    requête HTTP. La technique d'hébergement virtuel dynamique de masse
+    utilisée ici consiste à insérer automatiquement ces informations
+    dans le chemin du fichier à utiliser pour répondre à la requête. On
     peut y parvenir assez facilement en utilisant
     <module>mod_vhost_alias</module> avec Apache httpd, mais on peut aussi
     <a href="../rewrite/vhosts.html">utiliser mod_rewrite</a>. </p>
-    <p>Par d&eacute;faut, ces deux modules
-    sont d&eacute;sactiv&eacute;s ; vous devez activer l'un d'eux lors de la
+    <p>Par défaut, ces deux modules
+    sont désactivés ; vous devez activer l'un d'eux lors de la
     compilation et de la configuration d'Apache httpd si vous voulez utiliser
     cette technique.</p>
 
-    <p>Certains param&egrave;tres doivent &ecirc;tre extraits de la requ&ecirc;te pour que le serveur
-    dynamique se pr&eacute;sente comme un serveur dynamique normal. Le plus
-    important est le nom du serveur, que le serveur utilise pour g&eacute;n&eacute;rer des
-    URLs d'auto-r&eacute;f&eacute;rencement, etc... Il est d&eacute;fini via la directive
-    <code>ServerName</code>, et les CGIs peuvent s'y r&eacute;f&eacute;rer via la
-    variable d'environnement <code>SERVER_NAME</code>. Sa v&eacute;ritable
-    valeur utilis&eacute;e &agrave; l'ex&eacute;cution est contr&ocirc;l&eacute;e par la d&eacute;finition de la
+    <p>Certains paramètres doivent être extraits de la requête pour que le serveur
+    dynamique se présente comme un serveur dynamique normal. Le plus
+    important est le nom du serveur, que le serveur utilise pour générer des
+    URLs d'auto-référencement, etc... Il est défini via la directive
+    <code>ServerName</code>, et les CGIs peuvent s'y référer via la
+    variable d'environnement <code>SERVER_NAME</code>. Sa véritable
+    valeur utilisée à l'exécution est contrôlée par la définition de la
     directive
     <directive module="core">UseCanonicalName</directive>. Avec
     <code>UseCanonicalName Off</code>, le nom du serveur correspond au
-    contenu de l'en-t&ecirc;te <code>Host:</code> de la requ&ecirc;te. Avec
+    contenu de l'en-tête <code>Host:</code> de la requête. Avec
     <code>UseCanonicalName DNS</code>, il est extrait d'une recherche
-    DNS inverse sur l'adresse IP du serveur virtuel. La premi&egrave;re
-    configuration est utilis&eacute;e pour l'h&eacute;bergement virtuel dynamique par
-    nom, et la deuxi&egrave;me pour l'h&eacute;bergement virtuel dynamique par IP. Si
-    httpd ne peut pas d&eacute;terminer le nom du serveur, soit parce qu'il
-    n'y a pas d'en-t&ecirc;te <code>Host:</code>, soit parce que la recherche
-    DNS a &eacute;chou&eacute;, il prend en compte la valeur d&eacute;finie par la directive
+    DNS inverse sur l'adresse IP du serveur virtuel. La première
+    configuration est utilisée pour l'hébergement virtuel dynamique par
+    nom, et la deuxième pour l'hébergement virtuel dynamique par IP. Si
+    httpd ne peut pas déterminer le nom du serveur, soit parce qu'il
+    n'y a pas d'en-tête <code>Host:</code>, soit parce que la recherche
+    DNS a échoué, il prend en compte la valeur définie par la directive
     <code>ServerName</code>.</p>
 
-    <p>L'autre param&egrave;tre &agrave; extraire est la racine des documents (d&eacute;finie
+    <p>L'autre paramètre à extraire est la racine des documents (définie
     via la directive <code>DocumentRoot</code> et disponible pour les
     scripts CGI via la variable d'environnement <code>DOCUMENT_ROOT</code>).
-    Dans une configuration classique, il est utilis&eacute; par le module core
+    Dans une configuration classique, il est utilisé par le module core
     pour faire correspondre les URIs aux noms de fichiers, mais lorsque
     la configuration du serveur comporte des serveurs virtuels, ce
-    traitement doit &ecirc;tre pris en charge par un autre module (soit
+    traitement doit être pris en charge par un autre module (soit
     <module>mod_vhost_alias</module>, soit <module>mod_rewrite</module>), qui
-    utilise un m&eacute;thode de correspondance diff&eacute;rente. Aucun de ces
-    modules ne se chargeant de d&eacute;finir la variable d'environnement
+    utilise un méthode de correspondance différente. Aucun de ces
+    modules ne se chargeant de définir la variable d'environnement
     <code>DOCUMENT_ROOT</code>, si des CGIs ou des documents SSI
-    doivent en faire usage, ils obtiendront une valeur erron&eacute;e.</p>
+    doivent en faire usage, ils obtiendront une valeur erronée.</p>
 
 </section>
 
-<section id="simple"><title>H&eacute;bergement virtuel
+<section id="simple"><title>Hébergement virtuel
 dynamique avec mod_vhost_alias</title>
 
-    <p>Cet extrait de fichier <code>httpd.conf</code> impl&eacute;mente
-    l'h&eacute;bergement virtuel d&eacute;crit dans la section <a
-    href="#motivation">&Agrave; qui ce document est-il destin&eacute; ?</a> ci-dessus
+    <p>Cet extrait de fichier <code>httpd.conf</code> implémente
+    l'hébergement virtuel décrit dans la section <a
+    href="#motivation">À qui ce document est-il destiné ?</a> ci-dessus
     en utilisant <module>mod_vhost_alias</module>.</p>
 
 <highlight language="config">
-# extrait le nom du serveur de l'en-t&ecirc;te Host:
+# extrait le nom du serveur de l'en-tête Host:
 UseCanonicalName Off
 
-# ce format de journal peut &ecirc;tre &eacute;clat&eacute; en journaux par serveur virtuel
-# &agrave; l'aide du premier champ via l'utilitaire split-logfile
+# ce format de journal peut être éclaté en journaux par serveur virtuel
+# à l'aide du premier champ via l'utilitaire split-logfile
 LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
 CustomLog "logs/access_log" vcommon
 
 # inclut le nom du serveur dans les noms de fichiers ressources
-# n&eacute;cessaires aux traitements des requ&ecirc;tes
+# nécessaires aux traitements des requêtes
 VirtualDocumentRoot "/www/hosts/%0/docs"
 VirtualScriptAlias  "/www/hosts/%0/cgi-bin"
 </highlight>
@@ -172,9 +172,9 @@ VirtualScriptAlias  "/www/hosts/%0/cgi-b
     <p>Pour changer cette configuration en solution de serveur virtuel
     par IP, il suffit de remplacer <code>UseCanonicalName
     Off</code> par <code>UseCanonicalName DNS</code>. Le nom du serveur
-    ins&eacute;r&eacute; dans le nom de fichier sera alors d&eacute;duit de l'adresse IP du
-    serveur virtuel. La variable <code>%0</code> fait r&eacute;f&eacute;rence au nom
-    de serveur de la requ&ecirc;te, tel qu'il est indiqu&eacute; dans l'en-t&ecirc;te
+    inséré dans le nom de fichier sera alors déduit de l'adresse IP du
+    serveur virtuel. La variable <code>%0</code> fait référence au nom
+    de serveur de la requête, tel qu'il est indiqué dans l'en-tête
     <code>Host:</code>.</p>
 
     <p>Voir la documentation du module <module>mod_vhost_alias</module>
@@ -182,15 +182,15 @@ VirtualScriptAlias  "/www/hosts/%0/cgi-b
 
 </section>
 
-<section id="homepages"><title>Syst&egrave;me de serveurs virtuels dynamiques
-simplifi&eacute;</title>
+<section id="homepages"><title>Système de serveurs virtuels dynamiques
+simplifié</title>
 
-    <p>Il s'agit d'une adaptation du syst&egrave;me ci-dessus, ajust&eacute; pour un
-    serveur d'h&eacute;bergement web de FAI. Gr&acirc;ce &agrave; la variable
-    <code>%2</code>, on peut extraire des sous-cha&icirc;nes de caract&egrave;res du
+    <p>Il s'agit d'une adaptation du système ci-dessus, ajusté pour un
+    serveur d'hébergement web de FAI. Grâce à la variable
+    <code>%2</code>, on peut extraire des sous-chaînes de caractères du
     nom du serveur pour les utiliser dans le nom de fichier afin, par
-    exemple, de d&eacute;finir <code>/home/user/www</code> comme emplacement des
-    documents pour <code>www.user.example.com</code>. Un seul r&eacute;pertoire
+    exemple, de définir <code>/home/user/www</code> comme emplacement des
+    documents pour <code>www.user.example.com</code>. Un seul répertoire
     <code>cgi-bin</code> suffit pour l'ensemble des
     serveurs virtuels.</p>
 
@@ -198,32 +198,32 @@ simplifi&eacute;</title>
 UseCanonicalName Off
 
 LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
-CustomLog logs/access_log vcommon
+CustomLog "logs/access_log" vcommon
 
 # insertion d'une partie du nom du serveur dans les noms de fichiers
 VirtualDocumentRoot "/home/%2/www"
 
-# r&eacute;pertoire cgi-bin unique
+# répertoire cgi-bin unique
 ScriptAlias  "/cgi-bin/"  "/www/std-cgi/"
 </highlight>
 
-    <p>Vous trouverez des exemples plus &eacute;labor&eacute;s d'utilisation de la
+    <p>Vous trouverez des exemples plus élaborés d'utilisation de la
     directive <code>VirtualDocumentRoot</code> dans la documentation du
     module <module>mod_vhost_alias</module>.</p>
 
 </section>
 
-<section id="combinations"><title>Utiliser plusieurs syst&egrave;mes
-d'h&eacute;bergement virtuel sur le m&ecirc;me serveur</title>
+<section id="combinations"><title>Utiliser plusieurs systèmes
+d'hébergement virtuel sur le même serveur</title>
 
-    <p>Moyennant une configuration un peu plus compliqu&eacute;e, vous pouvez
-    contr&ocirc;ler la port&eacute;e des diff&eacute;rentes configurations d'h&eacute;bergement
-    virtuel &agrave; l'aide des directives <code>&lt;VirtualHost&gt;</code>
+    <p>Moyennant une configuration un peu plus compliquée, vous pouvez
+    contrôler la portée des différentes configurations d'hébergement
+    virtuel à l'aide des directives <code>&lt;VirtualHost&gt;</code>
     normales de httpd. Par exemple, on peut associer une adresse IP pour
-    les pages d'accueil des clients en g&eacute;n&eacute;ral, et une autre pour les
+    les pages d'accueil des clients en général, et une autre pour les
     clients commerciaux avec la configuration suivante. Cette
-    configuration peut &ecirc;tre combin&eacute;e avec les sections
-    <code>&lt;VirtualHost&gt;</code> conventionnelles, comme indiqu&eacute;
+    configuration peut être combinée avec les sections
+    <code>&lt;VirtualHost&gt;</code> conventionnelles, comme indiqué
     plus loin.</p>
 
 <highlight language="config">
@@ -264,26 +264,26 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b"
 	<title>Note</title>
 	<p>Si le premier bloc VirtualHost ne comporte <em>pas</em> de
 	directive <directive module="core">ServerName</directive>, c'est
-	le nom issu d'une recherche DNS inverse &agrave; partir de l'adresse IP
-	du serveur virtuel qui sera utilis&eacute;. Si ce nom ne correspond pas
-	&agrave; celui que vous voulez utiliser, vous pouvez ajouter une entr&eacute;e
+	le nom issu d'une recherche DNS inverse à partir de l'adresse IP
+	du serveur virtuel qui sera utilisé. Si ce nom ne correspond pas
+	à celui que vous voulez utiliser, vous pouvez ajouter une entrée
 	de remplacement (par exemple <code>ServerName
-	none.example.com</code>) pour &eacute;viter ce comportement.</p>
+	none.example.com</code>) pour éviter ce comportement.</p>
 </note>
 
 </section>
 
-<section id="ipbased"><title>Pour un h&eacute;bergement virtuel par IP plus
+<section id="ipbased"><title>Pour un hébergement virtuel par IP plus
 efficace</title>
 
-    <p>Les changements de configuration sugg&eacute;r&eacute;s pour transformer <a
-    href="#simple">le premier exemple</a> en h&eacute;bergement virtuel par IP
-    conduisent &agrave; une configuration peu efficace. Chaque requ&ecirc;te
-    n&eacute;cessite une nouvelle recherche DNS. Pour &eacute;viter cette surcharge de
-    travail, le syst&egrave;me de fichiers peut &ecirc;tre organis&eacute; pour correspondre
-    aux adresses IP, plut&ocirc;t qu'aux noms de serveurs, supprimant par
-    la-m&ecirc;me la n&eacute;cessit&eacute; d'une recherche DNS. La journalisation doit
-    aussi &ecirc;tre adapt&eacute;e pour fonctionner sur un tel syst&egrave;me.</p>
+    <p>Les changements de configuration suggérés pour transformer <a
+    href="#simple">le premier exemple</a> en hébergement virtuel par IP
+    conduisent à une configuration peu efficace. Chaque requête
+    nécessite une nouvelle recherche DNS. Pour éviter cette surcharge de
+    travail, le système de fichiers peut être organisé pour correspondre
+    aux adresses IP, plutôt qu'aux noms de serveurs, supprimant par
+    la-même la nécessité d'une recherche DNS. La journalisation doit
+    aussi être adaptée pour fonctionner sur un tel système.</p>
 
 <highlight language="config">
 # obtention du nom du serveur par recherche DNS inverse
@@ -291,7 +291,7 @@ efficace</title>
 UseCanonicalName DNS
 
 # insertion de l'adresse IP dans les journaux afin de pouvoir les
-# &eacute;clater
+# éclater
 LogFormat "%A %h %l %u %t \"%r\" %s %b" vcommon
 CustomLog "logs/access_log" vcommon
 
@@ -302,19 +302,29 @@ VirtualScriptAliasIP  "/www/hosts/%0/cgi
 
 </section>
 
-<section id="rewrite"><title>H&eacute;bergement virtuel de masse avec
+<section id="rewrite"><title>Hébergement virtuel de masse avec
 mod_rewrite</title>
 
 <p>
-L'h&eacute;bergement virtuel de masse peut aussi &ecirc;tre effectu&eacute; en utilisant
-<module>mod_rewrite</module>, soit &agrave; l'aide de simples directives <directive
+L'hébergement virtuel de masse peut aussi être effectué en utilisant
+<module>mod_rewrite</module>, soit à l'aide de simples directives <directive
 module="mod_rewrite">RewriteRule</directive>, soit en utilisant des
-techniques plus compliqu&eacute;es comme le stockage externe des d&eacute;finitions
-des serveurs virtuels, ces derni&egrave;res &eacute;tant accessibles via des
+techniques plus compliquées comme le stockage externe des définitions
+des serveurs virtuels, ces dernières étant accessibles via des
 directives <directive module="mod_rewrite">RewriteMap</directive>. Ces
-techniques sont d&eacute;crites dans la <a
-href="../rewrite/vhosts.html">documentation sur la r&eacute;&eacute;criture</a>.</p>
+techniques sont décrites dans la <a
+href="../rewrite/vhosts.html">documentation sur la réécriture</a>.</p>
+
+</section>
+
+<section id="macro"><title>Hébergement virtuel en masse avec mod_macro</title>
 
+<p>Une autre option pour générer dynamiquement des serveurs virtuels :
+mod_macro ; ce module permet de créer un modèle de serveur virtuel que
+vous pourrez invoquer pour des noms d'hôtes multiples. La section
+<strong>Usage</strong> de la documentation du module présente un exemple qui
+illustre cette méthode.
+</p>
 </section>
 
 </manualpage>

Modified: httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/mass.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/mass.xml.ko?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/mass.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/mass.xml.ko [euc-kr] Fri Jan  5 22:04:52 2018
@@ -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: 151408:1673563 (outdated) -->
+<!-- English Revision: 151408:1818061 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/mass.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/mass.xml.meta?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/mass.xml.meta (original)
+++ httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/mass.xml.meta Fri Jan  5 22:04:52 2018
@@ -10,6 +10,6 @@
     <variant>en</variant>
     <variant>fr</variant>
     <variant outdated="yes">ko</variant>
-    <variant>tr</variant>
+    <variant outdated="yes">tr</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/mass.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/mass.xml.tr?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/mass.xml.tr [utf-8] (original)
+++ httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/mass.xml.tr [utf-8] Fri Jan  5 22:04:52 2018
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1673563 -->
+<!-- English Revision: 1673563:1818061 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
    Reviewed by: Orhan Berent <berent belgeler.gen.tr>

Modified: httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.de
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.de?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.de (original)
+++ httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.de Fri Jan  5 22:04:52 2018
@@ -290,7 +290,7 @@ var comments_identifier = 'http://httpd.
     }
 })(window, document);
 //--><!]]></script></div><div id="footer">
-<p class="apache">Copyright 2017 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 2018 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="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
 if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();

Modified: httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.en?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.en (original)
+++ httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.en Fri Jan  5 22:04:52 2018
@@ -215,7 +215,7 @@ var comments_identifier = 'http://httpd.
     }
 })(window, document);
 //--><!]]></script></div><div id="footer">
-<p class="apache">Copyright 2017 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 2018 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="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
 if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();

Modified: httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.fr?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.fr (original)
+++ httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.fr Fri Jan  5 22:04:52 2018
@@ -258,7 +258,7 @@ var comments_identifier = 'http://httpd.
     }
 })(window, document);
 //--><!]]></script></div><div id="footer">
-<p class="apache">Copyright 2017 The Apache Software Foundation.<br />Autorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2018 The Apache Software Foundation.<br />Autorisé 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="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossaire</a> | <a href="../sitemap.html">Plan du site</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
 if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();

Modified: httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.ja.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.ja.utf8?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.ja.utf8 [utf-8] (original)
+++ httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.ja.utf8 [utf-8] Fri Jan  5 22:04:52 2018
@@ -294,7 +294,7 @@ var comments_identifier = 'http://httpd.
     }
 })(window, document);
 //--><!]]></script></div><div id="footer">
-<p class="apache">Copyright 2017 The Apache Software Foundation.<br />この文書は <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> のライセンスで提供されています。.</p>
+<p class="apache">Copyright 2018 The Apache Software Foundation.<br />この文書は <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="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
 if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();

Modified: httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.ko.euc-kr?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.ko.euc-kr [euc-kr] (original)
+++ httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.ko.euc-kr [euc-kr] Fri Jan  5 22:04:52 2018
@@ -257,7 +257,7 @@ var comments_identifier = 'http://httpd.
     }
 })(window, document);
 //--><!]]></script></div><div id="footer">
-<p class="apache">Copyright 2017 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 2018 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="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">용어</a> | <a href="../sitemap.html">사이트맵</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
 if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();

Modified: httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.tr.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.tr.utf8?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.tr.utf8 [utf-8] (original)
+++ httpd/httpd/branches/2.4.x-mod_md/docs/manual/vhosts/name-based.html.tr.utf8 [utf-8] Fri Jan  5 22:04:52 2018
@@ -229,7 +229,7 @@ var comments_identifier = 'http://httpd.
     }
 })(window, document);
 //--><!]]></script></div><div id="footer">
-<p class="apache">Copyright 2017 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="apache">Copyright 2018 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
 <p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="http://wiki.apache.org/httpd/FAQ">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
 if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();

Modified: httpd/httpd/branches/2.4.x-mod_md/include/ap_release.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/include/ap_release.h?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/include/ap_release.h (original)
+++ httpd/httpd/branches/2.4.x-mod_md/include/ap_release.h Fri Jan  5 22:04:52 2018
@@ -23,7 +23,7 @@
 #define AP_RELEASE_H
 
 #define AP_SERVER_COPYRIGHT \
-  "Copyright 2017 The Apache Software Foundation."
+  "Copyright 2018 The Apache Software Foundation."
 
 /*
  * The below defines the base string of the Server: header. Additional

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/filters/mod_proxy_html.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/filters/mod_proxy_html.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/filters/mod_proxy_html.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/filters/mod_proxy_html.c Fri Jan  5 22:04:52 2018
@@ -126,6 +126,7 @@ static const char *const fpi_xhtml =
         "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
 static const char *const fpi_xhtml_legacy =
         "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
+static const char *const fpi_html5 = "<!DOCTYPE html>\n";
 static const char *const html_etag = ">";
 static const char *const xhtml_etag = " />";
 /*#define DEFAULT_DOCTYPE fpi_html */
@@ -309,6 +310,7 @@ static void pcomment(void *ctxt, const x
         ap_fputs(ctx->f->next, ctx->bb, "<!--");
         AP_fwrite(ctx, chars, strlen(chars), 1);
         ap_fputs(ctx->f->next, ctx->bb, "-->");
+        dump_content(ctx);
     }
 }
 static void pendElement(void *ctxt, const xmlChar *uname)
@@ -323,8 +325,8 @@ static void pendElement(void *ctxt, cons
             return;
     
     }
-    else if ((ctx->cfg->doctype == fpi_html)
-             || (ctx->cfg->doctype == fpi_xhtml)) {
+    else if ((ctx->cfg->doctype == fpi_html_legacy)
+             || (ctx->cfg->doctype == fpi_xhtml_legacy)) {
         /* enforce html legacy */
         if (!desc)
             return;
@@ -371,28 +373,22 @@ static void pstartElement(void *ctxt, co
     int enforce = 0;
     if ((ctx->cfg->doctype == fpi_html) || (ctx->cfg->doctype == fpi_xhtml)) {
         /* enforce html */
-        enforce = 2;
-        if (!desc || desc->depr)
+        if (!desc || desc->depr) {
+            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->f->r, APLOGNO(01416)
+                          "Bogus HTML element %s dropped", name);
             return;
-    
+        }
+        enforce = 2;
     }
-    else if ((ctx->cfg->doctype == fpi_html)
-             || (ctx->cfg->doctype == fpi_xhtml)) {
-        enforce = 1;
+    else if ((ctx->cfg->doctype == fpi_html_legacy)
+             || (ctx->cfg->doctype == fpi_xhtml_legacy)) {
         /* enforce html legacy */
         if (!desc) {
+            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->f->r, APLOGNO(01417)
+                          "Deprecated HTML element %s dropped", name);
             return;
         }
-    }
-    if (!desc && enforce) {
-        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->f->r, APLOGNO(01416)
-                      "Bogus HTML element %s dropped", name);
-        return;
-    }
-    if (desc && desc->depr && (enforce == 2)) {
-        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->f->r, APLOGNO(01417)
-                      "Deprecated HTML element %s dropped", name);
-        return;
+        enforce = 1;
     }
 #ifdef HAVE_STACK
     descp = apr_array_push(ctx->stack);
@@ -1132,6 +1128,10 @@ static const char *set_doctype(cmd_parms
         else
             cfg->doctype = fpi_html;
     }
+    else if (!strcasecmp(t, "html5")) {
+        cfg->etag = html_etag;
+        cfg->doctype = fpi_html5;
+    }
     else {
         cfg->doctype = apr_pstrdup(cmd->pool, t);
         if (l && ((l[0] == 'x') || (l[0] == 'X')))

Propchange: httpd/httpd/branches/2.4.x-mod_md/modules/http2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  5 22:04:52 2018
@@ -1,6 +1,6 @@
 /httpd/httpd/branches/2.4.17-protocols-changes/modules/http2:1712542-1715252
 /httpd/httpd/branches/2.4.17-protocols-http2/modules/http2:1701609-1701654
-/httpd/httpd/branches/2.4.x/modules/http2:1816418-1816972
+/httpd/httpd/branches/2.4.x/modules/http2:1816418-1820355
 /httpd/httpd/branches/revert-ap-ldap/modules/http2:1150158-1150173
 /httpd/httpd/branches/wombat-integration/modules/http2:723609-723841
 /httpd/httpd/trunk/modules/http2:1200475,1200478,1200482,1200491,1200496,1200513,1200550,1200556,1200580,1200605,1200612,1200614,1200639,1200646,1200656,1200667,1200679,1200699,1200702,1200955,1200957,1200961,1200963,1200968,1200975,1200977,1201032,1201042,1201111,1201194,1201198,1201202,1201443,1201450,1201460,1201956,1202236,1202453,1202456,1202886,1203400,1203491,1203632,1203714,1203859,1203980,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206472,1206587,1206850,1206940,1206978,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210067,1210080,1210120,1210124,1210130,1210148,1210219,1210221,1210252,1210284,1210336,1210378,1210725,1210892,1210951,1210954,1211351-1211352,1211364,1211490,1211495,1211528,1211663,1211680,1212872,1212883,1213338,1213380-1213381,1213391,1213399,1213567,1214003,1214
 005,1214015,1215514,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221205,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1222930,1223048,1225060,1225197-1225199,1225223,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,1227910,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1229930,1230286,1231255,1231257,1231442,1231446,1231508,1231510,1231518,1232575,1232594,1232630,1232838,1234180,1234297,1234479,1234511,1234565,1234574,1234642-1234643,1234876,1234899,1235019,1236122,1236701,1237407,1238545,1238768,1239029-1239030,1239071,1239565,1240315,1240470,1240778,1241069,1241071,1242089,1242798,1242967,1243176,1243246,1243797,1243799,1244211,1245717,1290823,1290835,1291819-1291820,1291834,1291840,1292043,1293405,1293534-1293535,1293658,1293678,1293708,1294306,1294349,1294356,1294358,1294372,1294471,1297560,1299718,1299786,1300766,1301111,1301725,1302444,1302483,1302653,1302665,1302674,1303201,1303435,1303827,1304087,1304874-1
 304875,1305167,1305586,1306350,1306409,1306426,1306841,1307790,1308327,1308459,1309536,1309567,1311468,1324760,1325218,1325227,1325250,1325265,1325275,1325632,1325724,1326980,1326984,1326991,1327689,1328325-1328326,1328339,1328345,1328950,1330189,1330964,1331110,1331115,1331942,1331977,1332378,1333969,1334343,1335882,1337344,1341906,1341913,1343085,1343087,1343094,1343099,1343109,1343935,1345319,1345329,1346905,1347980,1348036,1348653,1348656,1348660,1349905,1351012-1351020,1351071-1351072,1351074,1351737,1352047,1352534,1352909-1352912,1357685,1358061,1359057,1359881,1359884,1361153,1361298,1361766,1361773,1361778,1361784,1361791-1361792,1361801,1361803,1362020,1362538,1362707,1363035,1363183,1363186,1363312,1363440,1363557,1363589,1363829,1363832,1363836-1363837,1363853,1364133,1364138,1364229,1364601,1364695,1365001,1365020,1365029,1365479,1366319,1366344,1366621,1367778,1367819,1368053,1368058,1368094,1368121,1368131,1368393,1368396,1369419,1369568,1369604,1369618,1369904,136999
 5,1369999,1370001,1370466,1370592,1370615-1370616,1370763,1371387,1371791,1371801,1371878,1371903,1373270,1373447,1373898,1373955,1374157,1374199,1374247,1374874,1374877,1374880,1375006,1375009,1375011,1375013,1375584,1376695,1376700,1378178,1383490,1384408,1384913,1386576,1386578,1386726,1386822,1386880,1386913,1387085,1387088,1387110,1387389,1387444,1387603,1387607,1387633,1387693,1387979,1388029,1388445,1388447,1388648,1388660,1388825,1388899,1389316,1389339,1389481,1389506,1389564,1389566-1389569,1390562,1390564,1391396,1391398,1391771,1392120,1392122,1392150,1392214,1392345-1392347,1392850,1393033,1393058,1393152,1393338,1393564,1394079,1395225,1395253-1395256,1395792,1396440,1397172,1397320,1397636,1397687,1397710,1397716,1398025,1398040,1398066,1398478,1398480-1398481,1398970,1399413,1399687,1399708,1400700,1401448,1402924,1403476,1403483,1403492,1404653,1405407,1405856,1405973,1406068,1406493,1406495,1406616,1406646,1406760,1407004,1407006,1407085,1407088,1407248,1407381,140
 7459-1407460,1407528,1407853,1407965,1408093,1408402,1408958,1408961,1409170,1409437,1409726,1409800,1410681,1410954,1411862,1412278,1413732,1414094,1415008,1415023,1415075,1416121,1416150,1416278,1417197,1417440,1417529,1418524,1418556,1418648,1418655,1418703,1418721,1418752,1418769,1419084,1419719,1419726,1419755,1419781,1419796,1420120,1420124,1420149,1420184,1420644,1420685-1420686,1420975,1421288,1421323,1421851,1421912,1421953,1422135,1422549,1422594,1422712,1422855,1422937,1422943,1422980,1423353,1423933,1425360,1425771-1425772,1425775,1425777,1425874,1426850,1426975,1427546,1428184,1428280,1428916,1429228,1429559,1429561,1429564,1429582,1430575,1430814,1430869,1433001,1433613,1433682,1433861,1433988,1435178,1435811,1436058,1436401,1439083,1439106,1439114,1439404,1439623,1442309,1442320,1442326,1442412,1442759,1442865,1447993,1448171,1448453,1451478,1451484,1451633,1451849,1451905,1451921,1452128,1452195,1452259,1452281,1452551,1452911,1452949,1452954,1453022,1453574,1453604,
 1453875-1453876,1453963,1453981,1454386,1454414-1454415,1454888,1457437,1457450,1457471,1457504,1457520-1457521,1457610,1457995,1458003-1458004,1458020,1458285,1458447,1458456,1462266,1462269,1462643,1463044-1463047,1463052,1463056,1463455,1463736,1463750,1463754,1464675,1464721,1464762,1465115-1465116,1465190,1467765,1468581,1470183,1470679,1470940,1471449,1475878,1476604,1476621,1476642,1476644-1476645,1476652,1476680,1477094,1477530,1478382,1478748,1479117,1479216,1479222,1479411,1479528,1479905,1479966,1480046,1480627,1481197,1481302,1481306,1481396-1481397,1481891,1482041,1482075,1482170,1482555,1482859,1482996,1483005,1483027,1483190,1484343,1484398,1484832,1484910,1484914,1485409,1485668,1486490,1487528,1487530,1488158,1488164,1488296,1488471,1488492,1488644,1490493,1490507,1490550,1490761,1490994,1491155,1491221,1491234,1491458,1491479,1491538,1491564,1491724,1492663,1492710,1492782,1493330,1493921,1493925,1494536,1495501,1496194,1496338,1496429,1496709,1497371,1497588,14988
 80,1499679,1500323,1500345,1500362,1500423,1500437,1500483,1500519,1501294,1501369,1501399,1501913,1502665,1502772,1503680,1503866,1503990-1503991,1504276,1506474,1506714,1509872,1509983,1510084-1510085,1510098,1510588,1510707,1511093,1513492,1513508,1514039,1514064,1514214-1514215,1514255,1514267,1514617,1515050,1515162,1515403,1515411,1515420,1517025,1517045,1517175,1517366,1517386,1517388,1518265,1518269,1519475,1520368,1520445,1520760,1520908,1521909,1523235,1523239,1523281,1523387,1524101,1524158,1524192,1524368,1524388,1524770,1525276,1525280-1525281,1525931,1526168,1526189,1526647,1526666,1527008,1527220,1527291,1527294-1527295,1527509,1527925-1527926,1528143,1528718,1529014,1529277,1529449,1529559,1529988,1529991,1530793,1531340,1531370,1531505,1531672,1531961-1531962,1532746,1532816,1533065,1533224,1534321,1534754,1534890,1534892,1536310,1537535,1538490,1540051-1540052,1541181,1541270,1541368,1542338,1542379,1542533,1542562,1542615,1543020,1543147,1543149,1543174,1544381,15
 44774,1544784,1544812,1544820,1545286,1545292,1545325,1545364,1545408,1545411,1546692-1546693,1546730,1546759-1546760,1546801,1546804-1546805,1546835-1546836,1547845,1550061,1550302,1550307,1551685,1551714,1551802,1552130,1552227,1553204,1553824,1554161,1554168,1554170,1554175-1554176,1554179,1554181,1554184,1554188,1554192,1554195,1554276,1554281,1554300-1554301,1554994-1554995,1555240,1555259,1555266,1555423-1555424,1555463-1555464,1555467,1555555,1555569,1556206,1556428,1556911-1556912,1556914,1556937,1557317,1557617,1558483,1559351,1559828,1560367,1560546,1560679,1560689,1560729,1560977,1560979,1561137,1561262,1561385,1561660,1561923,1562472,1563193,1563379,1563381,1563417-1563418,1563420,1564052,1564437,1564475,1564756,1564760,1565081,1565711,1568404,1569615,1570288,1570598,1571369,1572092,1572198,1572543,1572561,1572611,1572630,1572655,1572663,1572668-1572671,1572896,1572905,1572911,1572967,1573224,1573229,1573626,1574151,1575400,1576233,1576741,1578760,1578762,1580568,1583005
 ,1583007-1583008,1583027,1583175,1583191,1584098,1584417,1584430,1584434,1584572,1584653,1584658,1584665,1584703,1584878,1584884,1584896,1585054,1585072,1585090,1585157,1585435,1585609,1585824,1585918-1585919,1586745,1586827,1587036,1587040,1587053,1587255,1587594,1587607,1587639,1587654,1588054,1588065,1588213,1588330,1588427,1588519,1588527,1588704,1588851,1588853,1588868,1589413,1590437,1590509,1591143,1591320,1591322,1591328,1591390,1591394,1591401,1591472,1591508,1592032,1592037,1592500,1592511,1592514,1592529,1592615,1592632,1593745,1594625,1594643,1594648,1595305,1595321,1595426,1597182,1597349,1597352,1597533,1597639,1597642,1598107,1598946,1599535,1601076,1601184-1601185,1601274,1601291,1601624,1601630,1601919,1601995,1602338,1602978,1602989,1603027,1603029,1603122,1603156,1603915,1604382,1604461,1604631,1605207,1605827,1605829,1607960,1608284,1608785,1608999,1609914,1609936,1609938,1610207,1610311,1610353,1610366,1610491,1610652,1610674,1611165,1611169,1611244,1611600,1611
 871,1611978,1612068,1615026,1615289,1617018,1618401,1618541,1619297,1619383,1619444,1619483,1619835,1620324,1620461,1620932,1621367,1621372,1621417,1621453,1621806,1622450,1624234,1624349,1625196,1625952,1626050,1626978,1628104,1628918-1628919,1628924,1628950,1629235,1629239,1629244,1629250,1629372,1629440-1629441,1629485,1629507-1629508,1629519,1629577,1629652,1629916,1631885,1632454,1632740,1632742,1633730-1633731,1633793,1634120,1634237,1634425,1634736,1634836,1635510,1635558,1635644-1635645,1635762,1637112,1638072-1638073,1638879,1639614,1640031,1640036,1640040,1640042,1640331,1641077,1641095,1641376,1642099,1642484,1642499,1642847,1642868,1643034,1643284,1643537,1643825,1644245,1646282,1646724,1647035,1648201,1648394,1648433,1648719,1648840,1649001,1649043,1649491,1649632,1649966,1650047,1650061,1650309-1650310,1650320,1651088,1652829,1652929,1652931,1652955,1652982,1652985,1652989,1653941,1653978,1653997,1656225,1656669,1657256,1657261,1657636,1657638,1657685,1657881,1657897,1
 658760,1658765,1661067,1661258,1661448,1661464,1661486,1662245-1662246,1663017,1663647,1664071,1664133,1664205,1664299,1664709,1665215-1665216,1665218,1665625,1665643,1665721,1666297,1666361,1666363,1666468,1666618,1666998,1667385-1667386,1668532,1668535,1668553,1669130,1669289,1669292,1670434,1671364,1671396-1671397,1671918,1672289,1672453,1672466,1672480,1672483,1672564,1672757,1672985,1672989,1673113,1673155,1673368,1673455,1673769,1674056,1674538,1674542,1674606,1674632,1674697,1675103,1675410,1675533,1676085,1676654,1676709,1676842,1677096,1677143-1677146,1677149,1677151,1677153-1677156,1677159,1677339,1677462,1677702,1677830,1677832,1677834-1677835,1678763,1679032,1679181-1679182,1679192,1679428,1679432,1679470,1679620,1679712,1680276,1680895,1680900,1680942,1681037,1681424,1681440,1681685,1681694,1681795,1682482,1682816,1682819,1682907,1682923,1682937,1682979,1682988,1683044,1683047,1683123,1683881,1683884,1684057,1684171,1684900,1685069,1685339,1685345,1685347,1685349-168535
 0,1685650,1685659,1685779,1686085,1686853,1686856,1687539,1687680,1687980,1688274,1688331,1688339-1688341,1688343,1688399,1688475,1688536,1688538,1688660,1689325,1689605,1689694,1689698,1690120,1690137,1690248,1691374,1691582,1691592,1691819,1691908,1692285,1692432,1692486,1692516,1693792,1693918-1693919,1693963,1694903,1694936,1694950-1694951,1695170,1695727,1695874,1695885,1695920,1696105,1696264,1696266,1696279,1696428,1696442,1696565,1696592,1696607,1696755,1696881,1697013,1697015,1697051,1697323,1697339,1697370,1697389,1697446,1697543,1697634,1697855,1698023,1698103,1698107,1698116,1698133,1698330,1698334,1700271,1700275,1700317-1700322,1700326,1700328,1700330-1700332,1700334,1700336,1700338,1700418,1700514,1700777,1700851,1700917,1700925,1700968,1701005,1701145,1701178,1701204,1701347,1701436,1701545,1701717,1702643,1702919,1702948,1703152,1703417,1703642,1703807,1703813,1703822,1703871,1703902,1703952,1704099,1704241,1704262,1704797,1704799,1704826,1705099,1705134,1705194,170
 5217,1705257,1705749,1705776,1705823,1705826,1705828,1705833,1705922,1705983,1706275,1706523,1706595,1706627,1706635,1706637,1706640,1706918,1706942,1706989,1707002,1707230-1707231,1707497,1707519,1707591,1707626-1707627,1707640,1707831,1707883,1707889,1708107,1709008,1709587,1709596,1709602,1709995,1710095,1710105,1710231,1710380,1710391,1710419,1710572,1710583,1710723,1711479,1711553,1711648,1711728,1711902,1712382,1713040,1713043,1713209,1713937,1715023,1715255,1715273,1715567-1715568,1715570-1715572,1715576,1715581-1715585,1715886,1716211,1716388,1716460,1716487,1716660,1716940,1717063,1717086,1717639,1717816,1717934,1717958,1717975,1717985,1718314,1718338,1718400,1718476,1718496,1718514,1718556,1718569,1718598,1719016,1719018,1719189-1719190,1719252,1719254-1719255,1719257,1719967,1720129,1720996,1721313,1721685,1721899,1722137,1722154,1722177,1722195,1722229,1722320,1722328,1722334,1722350-1722351,1722358,1722377,1722572,1722701,1723122,1723143,1723284,1723295,1723567,1723953,
 1724847,1724857,1724879,1724992-1724993,1724995,1725018,1725031,1725090,1725120,1725149,1725325,1725328,1725387,1725392,1725394-1725395,1725445,1725468,1725485,1725489,1725498-1725499,1725516,1725523,1725545,1725567,1725581,1725602,1725822,1725940,1725967,1726009,1726026,1726038,1726049,1726051-1726052,1726055,1726086,1726167,1726233,1726675,1726798,1726881,1726888,1727071,1727111,1727317,1727544,1727573,1727603,1727842,1728326,1728804,1729208,1729374,1729376,1729826,1729847,1729929-1729931,1729960,1730297,1730640,1730723,1730865,1731929,1732228,1732252,1732353,1732369,1732716,1732954,1732986,1733056,1733064,1733068,1733088-1733089,1733275,1733523,1733537-1733538,1733691,1734006,1734125,1734239,1734294,1734412,1734561,1734807,1734817,1734947,1734955,1734989,1735088,1735159,1735337,1735608-1735609,1735611,1735668,1735786,1735931,1735935,1735942,1735952,1736156,1736243,1736250,1736463,1736681,1736686,1737006,1737014,1737020-1737021,1737102,1737114,1737125,1737254,1737256,1737265,17374
 47,1737449,1737451,1737476,1738217,1738331,1738333,1738464,1738466,1738486,1738563,1738628,1738631,1738633,1738635,1739008,1739146,1739151,1739193,1739201,1739303,1739312,1739738,1739932,1740075,1740084,1740108,1740110,1740155,1740735,1741045,1741065,1741112,1741115,1741268,1741310,1741392,1741414,1741446,1741461,1741557,1741564,1741570,1741596,1741621,1741648,1741934,1742005,1742135,1742260,1742359,1742444-1742447,1742460,1742791-1742792,1743335,1743517,1743699,1743788,1743816,1744203-1744204,1744206,1744283,1744415,1744421,1744458-1744459,1744712,1744751,1744767,1744778,1744980,1745034,1745175,1745767,1745835,1746207,1746647,1746988,1747170,1747469,1747531,1747550,1747735,1747808,1747810,1747946,1748047,1748155,1748368,1748448,1748531,1748653,1748888,1749151,1749401,1749404,1749505,1749658-1749659,1749676,1749678,1749695,1749924-1749925,1750043,1750218,1750335,1750392,1750407,1750412,1750416,1750420,1750474,1750494,1750507-1750508,1750553,1750567,1750750,1750779,1750854-1750855,17
 50947,1750955,1750960,1751970,1752087,1752096,1752145,1752331-1752333,1752347,1752415,1753167,1753224,1753228-1753229,1753257,1753315-1753316,1753498,1753541,1753592,1753594,1753777,1754129,1754164,1754391,1754399,1754414,1754534,1755323,1756038,1756542,1756553,1756611,1756631,1756844,1756846,1756848,1756852-1756853,1757009-1757011,1757029-1757031,1757061,1757524,1757534,1757540,1757662-1757663,1757985,1758003,1758083,1758307-1758311,1758446,1758558,1759415,1759984,1760018,1761434,1761477,1761479,1761548,1761714,1762512,1762515,1762517,1762580,1762701-1762703,1762718,1762723,1762742-1762743,1763158,1763246,1763613,1764005,1764040,1764046,1764236,1764243,1764255,1765318,1765328,1765357,1765420,1766097,1766129,1766160,1766308,1766424,1766691,1766851,1766857,1767128,1767180-1767181,1767553,1767564,1767803,1767936,1768160,1768245,1769192,1769332,1769550,1769593,1769596,1769600,1770395,1770750,1770752,1770768,1770771,1770828,1770951,1770998,1771001,1771015,1771791,1772339,1772489,1772504
 ,1772576,1772812-1772813,1772919,1773159,1773162,1773293,1773346,1773397,1773761,1773779,1773812,1773861-1773862,1773865,1774008,1774018,1774023,1774068-1774069,1774286,1774288,1774538,1774602,1774609,1775173,1775195,1775199,1775487,1775664,1775770,1775775,1775813,1775833,1775944,1775946,1776735,1776738,1776956,1777160,1777324,1777354,1777460,1777672,1777907,1778067,1778350,1778630,1779077,1779091,1779354,1779459,1779525,1779528,1779699,1779738,1779743,1779896,1779972,1779979,1780159,1780328-1780329,1780576,1780596,1780598,1781304,1781324,1781328-1781329,1781575,1781577,1781580,1781687,1782164,1782166,1782193-1782194,1782323,1782418-1782419,1782482,1782532,1782875,1782944,1782958,1782975,1783305,1783683,1783693,1783756,1783759-1783760,1783762,1783912,1783996,1784002,1784366,1784372,1784571,1785672,1785683,1786512,1786575-1786576,1786715,1787051,1787141,1787604,1788040,1788430,1788672,1788981,1789221,1789224,1789276,1789279,1789395,1789520,1789535,1789692,1789740,1790102,1790113,1790
 284,1790754,1790826-1790827,1790842,1790850,1790852-1790853,1790855,1790860,1791377,1791388,1791669,1791773,1791790,1792195,1792212,1793525,1793533,1794049,1796348,1797745,1799341,1800689,1800978,1801594,1801994-1801995,1802305,1802309,1804096,1805188,1805190,1805206,1807238,1808723,1810089,1816619

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_alt_svc.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_alt_svc.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_alt_svc.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_alt_svc.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_bucket_beam.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_bucket_beam.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_bucket_beam.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_bucket_beam.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_bucket_eos.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_bucket_eos.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_bucket_eos.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_bucket_eos.c Fri Jan  5 22:04:52 2018
@@ -13,6 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+ 
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #include <assert.h>
 #include <stddef.h>

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_config.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_config.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_config.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_conn.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_conn.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_conn.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_conn.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_conn_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_conn_io.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_conn_io.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_conn_io.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_ctx.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_ctx.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_ctx.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_ctx.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_filter.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_filter.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_filter.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_from_h1.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_from_h1.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_from_h1.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_from_h1.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_h2.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_h2.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_h2.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_h2.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_headers.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_headers.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_headers.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_headers.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_mplx.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_mplx.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_mplx.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_mplx.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_ngn_shed.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_ngn_shed.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_ngn_shed.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_ngn_shed.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_proxy_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_proxy_session.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_proxy_session.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_proxy_session.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_proxy_util.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_proxy_util.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_proxy_util.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_push.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_push.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_push.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_push.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_request.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_request.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_request.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_session.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_session.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_session.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_stream.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_stream.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_stream.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_stream.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_switch.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_switch.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_switch.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_switch.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_task.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_task.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_task.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_task.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_util.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_util.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_util.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_workers.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_workers.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_workers.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/h2_workers.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -160,7 +176,7 @@ static apr_status_t slot_pull_task(h2_sl
          * If we still have idle workers, we let the worker be sticky, 
          * e.g. making it poll the task's h2_mplx instance for more work 
          * before asking back here. */
-        slot->sticks = 1;/*slot->workers->max_workers;*/
+        slot->sticks = slot->workers->max_workers;
         return rv;            
     }
     slot->sticks = 0;

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/mod_http2.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/mod_http2.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/mod_http2.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/mod_http2.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: httpd/httpd/branches/2.4.x-mod_md/modules/http2/mod_proxy_http2.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/http2/mod_proxy_http2.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/http2/mod_proxy_http2.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/http2/mod_proxy_http2.c Fri Jan  5 22:04:52 2018
@@ -1,3 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 /* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");