Fixed negotiate patch

1 files changed, 22 insertions, 12 deletions

diff --git a/mozilla-890908-async-negotiate.patch b/mozilla-890908-async-negotiate.patch
index e67faa4..4de1f23 100644
--- a/mozilla-890908-async-negotiate.patch
+++ b/mozilla-890908-async-negotiate.patch
@@ -1,6 +1,6 @@
 diff -up firefox-46.0.1/extensions/auth/nsHttpNegotiateAuth.cpp.890908-async-negotiate firefox-46.0.1/extensions/auth/nsHttpNegotiateAuth.cpp
 --- firefox-46.0.1/extensions/auth/nsHttpNegotiateAuth.cpp.890908-async-negotiate	2016-05-03 07:31:11.000000000 +0200
-+++ firefox-46.0.1/extensions/auth/nsHttpNegotiateAuth.cpp	2016-05-26 10:58:14.754420347 +0200
++++ firefox-46.0.1/extensions/auth/nsHttpNegotiateAuth.cpp	2016-05-26 15:10:23.850901737 +0200
 @@ -38,6 +38,10 @@
  #include "prnetdb.h"
  #include "mozilla/Likely.h"
@@ -122,7 +122,7 @@ diff -up firefox-46.0.1/extensions/auth/nsHttpNegotiateAuth.cpp.890908-async-neg
 +// This runnable is created by GenerateCredentialsAsync and it runs
 +// in nsHttpNegotiateAuth::mNegotiateThread and calling GenerateCredentials.
 +//
-+class GetNextTokenRunnable final : public mozilla::Runnable
++class GetNextTokenRunnable final : public nsRunnable
 +{
 +    virtual ~GetNextTokenRunnable() {}
 +    public:
@@ -261,7 +261,7 @@ diff -up firefox-46.0.1/extensions/auth/nsHttpNegotiateAuth.cpp.890908-async-neg
  //
 diff -up firefox-46.0.1/extensions/auth/nsHttpNegotiateAuth.h.890908-async-negotiate firefox-46.0.1/extensions/auth/nsHttpNegotiateAuth.h
 --- firefox-46.0.1/extensions/auth/nsHttpNegotiateAuth.h.890908-async-negotiate	2016-05-03 07:31:11.000000000 +0200
-+++ firefox-46.0.1/extensions/auth/nsHttpNegotiateAuth.h	2016-05-26 10:51:14.816550760 +0200
++++ firefox-46.0.1/extensions/auth/nsHttpNegotiateAuth.h	2016-05-26 15:04:33.971068476 +0200
 @@ -10,6 +10,7 @@
  #include "nsIURI.h"
  #include "nsSubstring.h"
@@ -287,10 +287,20 @@ diff -up firefox-46.0.1/extensions/auth/nsHttpNegotiateAuth.h.890908-async-negot
 +    RefPtr<mozilla::LazyIdleThread> mNegotiateThread;
  };
  #endif /* nsHttpNegotiateAuth_h__ */
-diff -up firefox-46.0.1/netwerk/base/moz.build.rej.890908-async-negotiate firefox-46.0.1/netwerk/base/moz.build.rej
+diff -up firefox-46.0.1/netwerk/base/moz.build.890908-async-negotiate firefox-46.0.1/netwerk/base/moz.build
+--- firefox-46.0.1/netwerk/base/moz.build.890908-async-negotiate	2016-05-03 07:31:07.000000000 +0200
++++ firefox-46.0.1/netwerk/base/moz.build	2016-05-26 15:04:33.971068476 +0200
+@@ -46,6 +46,7 @@ XPIDL_SOURCES += [
+     'nsIFileStreams.idl',
+     'nsIFileURL.idl',
+     'nsIForcePendingChannel.idl',
++    'nsIHttpAuthenticatorCallback.idl',
+     'nsIHttpPushListener.idl',
+     'nsIIncrementalDownload.idl',
+     'nsIIncrementalStreamLoader.idl',
 diff -up firefox-46.0.1/netwerk/base/nsIHttpAuthenticatorCallback.idl.890908-async-negotiate firefox-46.0.1/netwerk/base/nsIHttpAuthenticatorCallback.idl
---- firefox-46.0.1/netwerk/base/nsIHttpAuthenticatorCallback.idl.890908-async-negotiate	2016-05-26 10:51:14.816550760 +0200
-+++ firefox-46.0.1/netwerk/base/nsIHttpAuthenticatorCallback.idl	2016-05-26 10:51:14.816550760 +0200
+--- firefox-46.0.1/netwerk/base/nsIHttpAuthenticatorCallback.idl.890908-async-negotiate	2016-05-26 15:04:33.971068476 +0200
++++ firefox-46.0.1/netwerk/base/nsIHttpAuthenticatorCallback.idl	2016-05-26 15:04:33.971068476 +0200
 @@ -0,0 +1,31 @@
 +/* This Source Code Form is subject to the terms of the Mozilla Public
 + * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -325,7 +335,7 @@ diff -up firefox-46.0.1/netwerk/base/nsIHttpAuthenticatorCallback.idl.890908-asy
 +
 diff -up firefox-46.0.1/netwerk/protocol/http/nsHttpBasicAuth.cpp.890908-async-negotiate firefox-46.0.1/netwerk/protocol/http/nsHttpBasicAuth.cpp
 --- firefox-46.0.1/netwerk/protocol/http/nsHttpBasicAuth.cpp.890908-async-negotiate	2016-05-03 07:31:08.000000000 +0200
-+++ firefox-46.0.1/netwerk/protocol/http/nsHttpBasicAuth.cpp	2016-05-26 10:51:14.816550760 +0200
++++ firefox-46.0.1/netwerk/protocol/http/nsHttpBasicAuth.cpp	2016-05-26 15:04:33.971068476 +0200
 @@ -49,6 +49,20 @@ nsHttpBasicAuth::ChallengeReceived(nsIHt
      *identityInvalid = true;
      return NS_OK;
@@ -349,7 +359,7 @@ diff -up firefox-46.0.1/netwerk/protocol/http/nsHttpBasicAuth.cpp.890908-async-n
  nsHttpBasicAuth::GenerateCredentials(nsIHttpAuthenticableChannel *authChannel,
 diff -up firefox-46.0.1/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp.890908-async-negotiate firefox-46.0.1/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
 --- firefox-46.0.1/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp.890908-async-negotiate	2016-05-03 07:31:08.000000000 +0200
-+++ firefox-46.0.1/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp	2016-05-26 10:51:14.817550760 +0200
++++ firefox-46.0.1/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp	2016-05-26 15:04:33.972068475 +0200
 @@ -267,6 +267,11 @@ nsHttpChannelAuthProvider::Cancel(nsresu
          mAsyncPromptAuthCancelable->Cancel(status);
          mAsyncPromptAuthCancelable = nullptr;
@@ -540,7 +550,7 @@ diff -up firefox-46.0.1/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp.8909
  } // namespace mozilla
 diff -up firefox-46.0.1/netwerk/protocol/http/nsHttpChannelAuthProvider.h.890908-async-negotiate firefox-46.0.1/netwerk/protocol/http/nsHttpChannelAuthProvider.h
 --- firefox-46.0.1/netwerk/protocol/http/nsHttpChannelAuthProvider.h.890908-async-negotiate	2016-05-03 07:31:08.000000000 +0200
-+++ firefox-46.0.1/netwerk/protocol/http/nsHttpChannelAuthProvider.h	2016-05-26 10:51:14.817550760 +0200
++++ firefox-46.0.1/netwerk/protocol/http/nsHttpChannelAuthProvider.h	2016-05-26 15:04:33.972068475 +0200
 @@ -9,11 +9,13 @@
  
  #include "nsIHttpChannelAuthProvider.h"
@@ -600,7 +610,7 @@ diff -up firefox-46.0.1/netwerk/protocol/http/nsHttpChannelAuthProvider.h.890908
  } // namespace net
 diff -up firefox-46.0.1/netwerk/protocol/http/nsHttpDigestAuth.cpp.890908-async-negotiate firefox-46.0.1/netwerk/protocol/http/nsHttpDigestAuth.cpp
 --- firefox-46.0.1/netwerk/protocol/http/nsHttpDigestAuth.cpp.890908-async-negotiate	2016-05-03 07:31:08.000000000 +0200
-+++ firefox-46.0.1/netwerk/protocol/http/nsHttpDigestAuth.cpp	2016-05-26 10:51:14.817550760 +0200
++++ firefox-46.0.1/netwerk/protocol/http/nsHttpDigestAuth.cpp	2016-05-26 15:04:33.972068475 +0200
 @@ -158,6 +158,22 @@ nsHttpDigestAuth::ChallengeReceived(nsIH
    return NS_OK;
  }
@@ -626,7 +636,7 @@ diff -up firefox-46.0.1/netwerk/protocol/http/nsHttpDigestAuth.cpp.890908-async-
                                        const char *challenge,
 diff -up firefox-46.0.1/netwerk/protocol/http/nsHttpNTLMAuth.cpp.890908-async-negotiate firefox-46.0.1/netwerk/protocol/http/nsHttpNTLMAuth.cpp
 --- firefox-46.0.1/netwerk/protocol/http/nsHttpNTLMAuth.cpp.890908-async-negotiate	2016-05-03 07:31:08.000000000 +0200
-+++ firefox-46.0.1/netwerk/protocol/http/nsHttpNTLMAuth.cpp	2016-05-26 10:51:14.817550760 +0200
++++ firefox-46.0.1/netwerk/protocol/http/nsHttpNTLMAuth.cpp	2016-05-26 15:04:33.972068475 +0200
 @@ -323,6 +323,21 @@ nsHttpNTLMAuth::ChallengeReceived(nsIHtt
  }
  
@@ -651,7 +661,7 @@ diff -up firefox-46.0.1/netwerk/protocol/http/nsHttpNTLMAuth.cpp.890908-async-ne
                                      bool             isProxyAuth,
 diff -up firefox-46.0.1/netwerk/protocol/http/nsIHttpAuthenticator.idl.890908-async-negotiate firefox-46.0.1/netwerk/protocol/http/nsIHttpAuthenticator.idl
 --- firefox-46.0.1/netwerk/protocol/http/nsIHttpAuthenticator.idl.890908-async-negotiate	2016-05-03 07:31:08.000000000 +0200
-+++ firefox-46.0.1/netwerk/protocol/http/nsIHttpAuthenticator.idl	2016-05-26 10:51:14.817550760 +0200
++++ firefox-46.0.1/netwerk/protocol/http/nsIHttpAuthenticator.idl	2016-05-26 15:04:33.973068475 +0200
 @@ -6,6 +6,8 @@
  #include "nsISupports.idl"