pound icon indicating copy to clipboard operation
pound copied to clipboard

Stage for upstream/v2.9a

Open nyov opened this issue 6 years ago • 0 comments

I have continued and rebased your patch-queue against your v2.8a import, as well as the v2.8 (final) import as I recently had need for that. https://github.com/nyov/pound/tree/stage_for_upstream/v2.8b https://github.com/nyov/pound/tree/stage_for_upstream/v2.9a

I'll open only the one PR though, and mostly FYI - not necessarily to trust and merge it. Feel free to close.

I don't think there are any conflicts with the upstream changes in 2.8a's http.c, but I don't guarantee it. Code built ok and runs though ;)

Except for resolving the conflicts, here are the slight changes I did to the queue:

  • Retag release as 2.8+github; updated the configure lines obviously
  • Make HTTP/HTTPS mismatch errors more friendly: upstream added *h400 = "Bad Request"; but missed the error code *h400 = "400 Bad Request"; your patch has.
  • OrURLs block, with valid URLs: changed static char * parse_orurls() to static char * parse_orurls(void) to kill a 'function declaration is not a prototype' warning.
  • On the "stage_for_upstream/v2.9a" branch, I added 3 commits to remove unneeded dependencies to libresolv, libm and libdl which were apparently introduced with the -now removed- DynScale code. (Could be squashed) I'm not a 100% on libdl, though. Perhaps there is some code somewhere in private branches that makes use of dlopen and it's been around longer than the others.

I've tagged the v2.8 import in my repo; but perhaps you'll want to import (and gpg verify) it yourself instead. I did not update pristine-tar, because I forgot the tool and workflow to do that.

nyov avatar Jul 04 '18 14:07 nyov