You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Bert Huijben <be...@qqmail.nl> on 2015/10/26 16:18:06 UTC
RE: svn commit: r1710613 - /subversion/trunk/subversion/libsvn_ra_serf/update.c
> -----Original Message-----
> From: ivan@apache.org [mailto:ivan@apache.org]
> Sent: maandag 26 oktober 2015 16:08
> To: commits@subversion.apache.org
> Subject: svn commit: r1710613 -
> /subversion/trunk/subversion/libsvn_ra_serf/update.c
>
> Author: ivan
> Date: Mon Oct 26 15:08:05 2015
> New Revision: 1710613
>
> URL: http://svn.apache.org/viewvc?rev=1710613&view=rev
> Log:
> ra_serf: Do not advertise svndiff1 support if user explicitly disabled HTTP
> compression via 'http-compression=off' configuration option. The only
> difference between svndiff1 and svndiff0 that svndiff1 supports
> compression.
>
> * subversion/libsvn_ra_serf/update.c
> (headers_fetch, setup_update_report_headers): Do not add 'svndiff1' to
> Accept-Encoding request header if we're not using compression.
>
> Modified:
> subversion/trunk/subversion/libsvn_ra_serf/update.c
>
> Modified: subversion/trunk/subversion/libsvn_ra_serf/update.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/
> update.c?rev=1710613&r1=1710612&r2=1710613&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/libsvn_ra_serf/update.c (original)
> +++ subversion/trunk/subversion/libsvn_ra_serf/update.c Mon Oct 26
> 15:08:05 2015
> @@ -941,8 +941,17 @@ headers_fetch(serf_bucket_t *headers,
> {
> serf_bucket_headers_setn(headers, SVN_DAV_DELTA_BASE_HEADER,
> fetch_ctx->delta_base);
> - serf_bucket_headers_setn(headers, "Accept-Encoding",
> - "svndiff1;q=0.9,svndiff;q=0.8");
> + if (fetch_ctx->using_compression)
> + {
> + serf_bucket_headers_setn(headers, "Accept-Encoding",
> + "svndiff1;q=0.9,svndiff;q=0.8");
> + }
> + else
> + {
> + /* Do not advertise svndiff1 support if we're not interested in
> + compression. */
> + serf_bucket_headers_setn(headers, "Accept-Encoding",
> "svndiff;q=0.9");
I think you can omit the ";q=0.9" when you only specify one accepted encoding. You can't express a relative preference anyway.
(Not 100% sure, but fairly certain)
> + }
> }
> else if (fetch_ctx->using_compression)
> {
> @@ -2351,8 +2360,9 @@ setup_update_report_headers(serf_bucket_
> }
> else
> {
> - serf_bucket_headers_setn(headers, "Accept-Encoding",
> - "svndiff1;q=0.9,svndiff;q=0.8");
> + /* Do not advertise svndiff1 support if we're not interested in
> + compression. */
> + serf_bucket_headers_setn(headers, "Accept-Encoding",
> "svndiff;q=0.9");
Same here.
Bert
> }
>
> return SVN_NO_ERROR;
>
Re: svn commit: r1710613 - /subversion/trunk/subversion/libsvn_ra_serf/update.c
Posted by Ivan Zhakov <iv...@visualsvn.com>.
On 26 October 2015 at 18:18, Bert Huijben <be...@qqmail.nl> wrote:
>
>
>> -----Original Message-----
>> From: ivan@apache.org [mailto:ivan@apache.org]
>> Sent: maandag 26 oktober 2015 16:08
>> To: commits@subversion.apache.org
>> Subject: svn commit: r1710613 -
>> /subversion/trunk/subversion/libsvn_ra_serf/update.c
>>
>> Author: ivan
>> Date: Mon Oct 26 15:08:05 2015
>> New Revision: 1710613
>>
>> URL: http://svn.apache.org/viewvc?rev=1710613&view=rev
>> Log:
>> ra_serf: Do not advertise svndiff1 support if user explicitly disabled HTTP
>> compression via 'http-compression=off' configuration option. The only
>> difference between svndiff1 and svndiff0 that svndiff1 supports
>> compression.
>>
>> * subversion/libsvn_ra_serf/update.c
>> (headers_fetch, setup_update_report_headers): Do not add 'svndiff1' to
>> Accept-Encoding request header if we're not using compression.
>>
>> Modified:
>> subversion/trunk/subversion/libsvn_ra_serf/update.c
>>
>> Modified: subversion/trunk/subversion/libsvn_ra_serf/update.c
>> URL:
>> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/
>> update.c?rev=1710613&r1=1710612&r2=1710613&view=diff
>> ==========================================================
>> ====================
>> --- subversion/trunk/subversion/libsvn_ra_serf/update.c (original)
>> +++ subversion/trunk/subversion/libsvn_ra_serf/update.c Mon Oct 26
>> 15:08:05 2015
>> @@ -941,8 +941,17 @@ headers_fetch(serf_bucket_t *headers,
>> {
>> serf_bucket_headers_setn(headers, SVN_DAV_DELTA_BASE_HEADER,
>> fetch_ctx->delta_base);
>> - serf_bucket_headers_setn(headers, "Accept-Encoding",
>> - "svndiff1;q=0.9,svndiff;q=0.8");
>> + if (fetch_ctx->using_compression)
>> + {
>> + serf_bucket_headers_setn(headers, "Accept-Encoding",
>> + "svndiff1;q=0.9,svndiff;q=0.8");
>> + }
>> + else
>> + {
>> + /* Do not advertise svndiff1 support if we're not interested in
>> + compression. */
>> + serf_bucket_headers_setn(headers, "Accept-Encoding",
>> "svndiff;q=0.9");
>
> I think you can omit the ";q=0.9" when you only specify one accepted encoding. You
> can't express a relative preference anyway.
> (Not 100% sure, but fairly certain)
>
Good point. Done in r1710634. Thanks!
--
Ivan Zhakov