Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pull: If built with --disable-http2, allow enabling via http2=1 #1798

Closed
wants to merge 2 commits into from

Conversation

cgwalters
Copy link
Member

We have a http2=[0|1] remote config option; let's have the
--disable-http2 build option define the default for that. This way
it's easy to still enable http2 for testing even if
we have it disabled by default.

We have a `http2=[0|1]` remote config option; let's have the
`--disable-http2` build option define the default for that.  This way
it's easy to still enable http2 for testing even if
we have it disabled by default.
@jlebon
Copy link
Member

jlebon commented Jan 8, 2019

How about also:

diff --git a/configure.ac b/configure.ac
index 8aeec3ab..aad3d3c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,10 +138,10 @@ AM_CONDITIONAL(USE_CURL, test x$with_curl != xno)
 if test x$with_curl = xyes; then OSTREE_FEATURES="$OSTREE_FEATURES libcurl"; fi
 AC_ARG_ENABLE(http2,
 AS_HELP_STRING([--disable-http2],
-  [Disable use of http2 (default: no)]),,
+  [Disable http2 by default (default: no)]),,
   [enable_http2=yes])
 AS_IF([test x$enable_http2 != xno ], [
-  AC_DEFINE([BUILDOPT_HTTP2], 1, [Define if we enable http2])
+  AC_DEFINE([BUILDOPT_HTTP2], 1, [Define if we enable http2 by default])
 ], [
   OSTREE_FEATURES="$OSTREE_FEATURES no-http2"
 ])

?

@cgwalters
Copy link
Member Author

So apparently I accidentally pushed the fixup to master 😢

fa35ec3

I pushed it here too though with the correct fixup! which should merge OK I think.

@jlebon
Copy link
Member

jlebon commented Jan 9, 2019

@rh-atomic-bot r+ a3e8e46

@rh-atomic-bot
Copy link

⚡ Test exempted: merge already tested.

@dustymabe
Copy link
Contributor

So apparently I accidentally pushed the fixup to master cry

:(

I try to prevent myself from doing things like this by making my git config use https for the upstreamorigin remote and ssh for my fork (the origin remote)

if I git push and it asks me for a password, I know i'm pushing to the wrong remote

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants