httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Eissing <stefan.eiss...@greenbytes.de>
Subject Re: svn commit: r1695727 - in /httpd/httpd/trunk: docs/manual/mod/core.xml include/http_core.h server/core.c server/protocol.c
Date Tue, 15 Sep 2015 08:00:22 GMT
Uhm, did I mess something up (again)? My core.xml says:
...
<directivesynopsis>
    <name>Protocols</name>
    <description>Protocols available for a server/virtual host</description>
    <syntax>Protocols <var>protocol</var> ...</syntax>
    <default>Protocols http/1.1</default>
    <contextlist><context>server config</context><context>virtual
host</context></contextlist>
    <compatibility>Only available from Apache 2.4.17 and later.</compatibility>
    
    <usage>
        <p>This directive specifies the list of protocols supported for a
            server/virtual host. The list determines the allowed protocols
            a client may negotiate for this server/host.</p>
        
        <p>You need to set protocols if you want to extend the available
            protocols for a server/host. By default, only the http/1.1 protocol
            (which includes the compatibility with 1.0 and 0.9 clients) is
            allowed.</p>
        
        <p>For example, if you want to support HTTP/2 for a server with TLS, 
            specify:</p>
        
        <highlight language="config">
            Protocols h2 http/1.1
        </highlight>

        <p>Valid protocols are <code>http/1.1</code> for http and https
connections,
            <code>h2</code> on https connections and <code>h2c</code>
for http
            connections. Modules may enable more protocols.</p>
        
        <p>It is safe to specify protocols that are unavailable/disabled. Such
        protocol names will simply be ignored.</p>
        
        <p>Protocols specified in base servers are inherited for virtual hosts 
            only if the virtual host has no own Protocols directive. Or, the other
            way around, Protocols directives in virtual hosts replace any
            such directive in the base server.
        </p>

    </usage>
    <seealso><directive module="core">ProtocolsHonorOrder</directive></seealso>
</directivesynopsis>


<directivesynopsis>
    <name>ProtocolsHonorOrder</name>
    <description>Protocols available for a server/virtual host</description>
    <syntax>ProtocolsHonorOrder On|Off</syntax>
    <default>ProtocolsHonorOrder On</default>
    <contextlist><context>server config</context><context>virtual
host</context></contextlist>
    <compatibility>Only available from Apache 2.4.17 and later.</compatibility>
    
    <usage>
        <p>This directive specifies if the server should honor the order in which
        the <directive>Protocols</directive> directive lists protocols.</p>
        
        <p>If configured Off, the client supplied list order of protocols has 
            precedence over the order in the server configuration.</p>
        
        <p>With <directive>ProtocolsHonorOrder</directive> set to <code>on</code>

            (default), the client ordering does not matter and only the ordering 
            in the server settings influences the outcome of the protocol 
            negotiation.</p>
        
    </usage>
    <seealso><directive module="core">Protocols</directive></seealso>
</directivesynopsis>

> Am 15.09.2015 um 02:47 schrieb Christophe JAILLET <christophe.jaillet@wanadoo.fr>:
> 
> Hi,
> 
> Protocols and ProtocolsHonorOrder have the same description.
> Is it done on purpose or is it a cut'n paste error?
> 
> CJ
> 
> Le 13/08/2015 17:33, icing@apache.org a écrit :
>> Author: icing
>> Date: Thu Aug 13 15:33:07 2015
>> New Revision: 1695727
>> 
>> URL: http://svn.apache.org/r1695727
>> Log:
>> new directive ProtocolsHonorOrder, added documentation for Protocols feature, changed
preference selection and config merging
>> 
>> Modified:
>>     httpd/httpd/trunk/docs/manual/mod/core.xml
>>     httpd/httpd/trunk/include/http_core.h
>>     httpd/httpd/trunk/server/core.c
>>     httpd/httpd/trunk/server/protocol.c
>> 
>> Modified: httpd/httpd/trunk/docs/manual/mod/core.xml
>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml?rev=1695727&r1=1695726&r2=1695727&view=diff
>> ==============================================================================
>> --- httpd/httpd/trunk/docs/manual/mod/core.xml (original)
>> +++ httpd/httpd/trunk/docs/manual/mod/core.xml Thu Aug 13 15:33:07 2015
>> @@ -3711,6 +3711,71 @@ Protocol https
>>      <directivesynopsis>
>> +    <name>Protocols</name>
>> +    <description>Protocols available for a server/virtual host</description>
>> +    <syntax>Protocols <var>protocol</var> ...</syntax>
>> +    <contextlist><context>server config</context><context>virtual
host</context></contextlist>
> [...]
>> +<directivesynopsis>
>> +    <name>ProtocolsHonorOrder</name>
>> +    <description>Protocols available for a server/virtual host</description>
>> +    <syntax>ProtocolsHonorOrder On|Off</syntax>
>> +    <default>ProtocolsHonorOrder Off</default>
>> +    <contextlist><context>server config</context><context>virtual
host</context></contextlist>
>> 
> 

<green/>bytes GmbH
Hafenweg 16, 48155 Münster, Germany
Phone: +49 251 2807760. Amtsgericht Münster: HRB5782




Mime
View raw message