Support PROXY Protocol

[elyscape]

This is a rebase of #1135 onto master. It also adds some additional error checking to that code.

Closes #1135.

[vulpine]

Apologies for neglecting my branch! Thank you for picking this up. :)

[elyscape]

Okay, got some final issues ironed out. This should be good to go now.

[elyscape]

It occurred to me just now that this should probably be expanded to work on non-HTTP protocols.

[bagder]

You'll see that test 1119 and 1139 fail due to:

1. missing documentation for the new curl_easy_setopt option and
2. missing the new symbol in docs/libcurl/symbols-in-versions
3. I don't think there's a test for it (yet) but there's also missing documentation for the new command line option, isn't it?

[elyscape]

Good points. I'll look into adding those.

[maglub]

Hi, I really would like to get this feature merged into curl and would be happy to help. @elyscape, please advice if I I can help you in any way. I have compiled and tested your fork, and it works just as I personally would expect.

vagrant@ldap:~/curl/curl$ ./src/.libs/curl -v --haproxy-protocol --resolve my.vhost.com:443:192.168.1.15 -k https://my.vhost.com:443/ 2>&1 | grep -E "subject:|expire date:"
*  subject: CN=my.vhost.com
*  expire date: Apr 11 18:16:03 2018 GMT

If there is any documentation I can do for you, I will happily help.

[elyscape]

@maglub Sorry for the delay. I'll try to get the rest of the documentation done this week.

[elyscape]

Rebased onto master again with documentation added.

[bagder]

If you run test 1119 and 1139 locally you'll see that they fail:

1119 - because docs/libcurl/symbols-in-versions isn't updated with your new symbol

1139 - because docs/libcurl/curl_easy_setopt.3 doesn't mention CURLOPT_HAPROXY_PROTOCOL.3 (referring to its "local" man page)

[bagder]

For convenience to command line users, do you think it would make sense to just call it --haproxy ?

[maglub]

I would opt for --haproxy-protocol or --proxy-protocol, as the protocol could be used by other implementations too and is more descriptive.

[vulpine]

In my original PR I used --proxy-protocol and was recommended to include haproxy in the argument so as not to cause confusion with other proxy-related options.

[elyscape]

@bagder Tests fixed. I had put CURLOPT_HAPROXY_PROTOCOL in docs/libcurl/symbols-in-versions but CURLOPT_HAPROXYPROTOCOL everywhere else.

[bagder]

The red CI build is because CURLOPT_HAPROXYPROTOCOL.3 is not added to the tarball in the docs/libcurl/opts/Makfile.inc file.

[elyscape]

@bagder Fixed and rebased onto master. Apologies for the delay; I was on vacation.

[elyscape]

Ah, looks like the version I have in there is wrong. Let me know if everything else looks good and I can fix it.

[elyscape]

Well, 7.59.0 came out before this got merged, so that concern is no longer relevant. Woo!

@bagder When you get a chance, please take another look at this. Thank you!

[bagder]

Thanks for all the work on this. Please try it out in the master branch now!

[vulpine]

Thank you all for helping get this into master! <3

…

On 17 March 2018 at 10:51, Daniel Stenberg ***@***.***> wrote: Thanks for all the work on this. Please try it out in the master branch now! — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#2162 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABUhDgc18ayFAcLzKu-zFHV2Jvt2UEY6ks5tfOqhgaJpZM4Q4kUU> .

-- Sent from the Outside Broadcast Unit