Subject: Re: bug#35969: 26.2, Excorporate

From: Thomas Fitzsimmons <[email-masked]>
Date: Mon, 17 Jun 2019 18:08:08 -0400

Hi,

Good to hear that the patch I posted worked!

Yes, that's the patch that Andreas's commit
84613dae5c34ea742dd9a3e56f5acb55f604b483 applied.  From what I can tell,
you will not have that in Emacs 26.2.

Can you try reverting my patch and applying Andreas's patch, and see if
Excorporate still works through the proxy?

Thanks,
Thomas

"tenspd137 ." <[email-masked]> writes:

> The patch Thomas seems to work from behind the proxy.  My current
> emacs version is 26.2, so I would think it would include the commit
> Andreas is talking about....  I went and looked it up - is this the
> correct commit?
>
> diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
> index 53798f7..817c5ce 100644
> --- a/lisp/url/url-http.el
> +++ b/lisp/url/url-http.el
> @@ -1412,7 +1412,9 @@ The return value of this function is the
> retrieval buffer."
> 'url-http-wait-for-headers-change-function)
> (set-process-filter tls-connection 'url-http-generic-filter)
> (process-send-string tls-connection
> - (url-http-create-request)))
> + ;; Use the non-proxy form of the request
> + (let (url-http-proxy)
> + (url-http-create-request))))
> (gnutls-error
> (url-http-activate-callback)
> (error "gnutls-error: %s" e))
>
> Thanks!
>
> -C
>
>
> On Sat, Jun 15, 2019 at 1:41 AM Andreas Schwab <[email-masked]> wrote:
>>
>> On Jun 14 2019, Thomas Fitzsimmons <[email-masked]> wrote:
>>
>> > diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
>> > index 00803a103a..723d111d58 100644
>> > --- a/lisp/url/url-http.el
>> > +++ b/lisp/url/url-http.el
>> > @@ -329,7 +329,10 @@ url-http-create-request
>> >               ;; The request
>> >               (or url-http-method "GET") " "
>> >               (url-http--encode-string
>> > -              (if using-proxy (url-recreate-url url-http-target-url) real-fname))
>> > +              (if (and using-proxy
>> > +                       (not (equal "https" (url-type url-http-target-url))))
>> > +                  (url-recreate-url url-http-target-url)
>> > +                real-fname))
>>
>> That should already be handled by commit 84613dae5c.
>>
>> Andreas.
>>
>> --
>> Andreas Schwab, [email-masked]
>> GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
>> "And now for something completely different."