Skip to content

Fix Glyph rendering issues #474

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.

Sign up for GitHub

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

Closed
julien-duponchelle wants to merge 1 commit into from
Closed

Fix Glyph rendering issues #474

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions patches/network-patches.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build
index b090a56d88..9fe4a5e1e8 100644
index d2330003ca..a5ea856173 100644
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -218,3 +218,6 @@ XPCOM_MANIFESTS += [
@@ -246,3 +246,6 @@ XPCOM_MANIFESTS += [
]

include("/tools/fuzzing/libfuzzer-config.mozbuild")
Expand All @@ -11,7 +11,7 @@ index b090a56d88..9fe4a5e1e8 100644
+LOCAL_INCLUDES += ["/camoucfg"]
\ No newline at end of file
diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index d0aebdf965..01472ec205 100644
index 83a9dcff01..2a1d18deea 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -14,6 +14,7 @@
Expand All @@ -22,7 +22,7 @@ index d0aebdf965..01472ec205 100644
#include "nsHttpChannel.h"
#include "nsHTTPCompressConv.h"
#include "nsHttpAuthCache.h"
@@ -747,6 +748,15 @@ uint8_t nsHttpHandler::UrgencyFromCoSFlags(uint32_t cos) {
@@ -966,6 +967,15 @@ uint8_t nsHttpHandler::UrgencyFromCoSFlags(uint32_t cos,
//-----------------------------------------------------------------------------

const nsCString& nsHttpHandler::UserAgent(bool aShouldResistFingerprinting) {
Expand All @@ -38,27 +38,25 @@ index d0aebdf965..01472ec205 100644
if (aShouldResistFingerprinting && !mSpoofedUserAgent.IsEmpty()) {
LOG(("using spoofed userAgent : %s\n", mSpoofedUserAgent.get()));
return mSpoofedUserAgent;
@@ -2077,6 +2087,10 @@ nsresult nsHttpHandler::SetAcceptLanguages() {
@@ -2082,6 +2092,10 @@ nsresult nsHttpHandler::SetAcceptLanguages() {
}

MOZ_ASSERT(NS_IsMainThread());
+ if (auto value = MaskConfig::GetString("headers.Accept-Language")) {
+ mAcceptLanguages.Assign(nsCString(value.value().c_str()));
+ return NS_OK;
+ }

mAcceptLanguagesIsDirty = false;

@@ -2098,6 +2112,10 @@ nsresult nsHttpHandler::SetAcceptLanguages() {

nsresult nsHttpHandler::SetAcceptEncodings(const char* aAcceptEncodings,
bool isSecure, bool isDictionary) {
+ if (auto value = MaskConfig::GetString("headers.Accept-Encoding")) {
+ mHttpsAcceptEncodings.Assign(nsCString(value.value().c_str()));
+ return NS_OK;
+ }

@@ -2101,6 +2115,10 @@ nsresult nsHttpHandler::SetAcceptEncodings(const char* aAcceptEncodings,
if (isDictionary) {
mDictionaryAcceptEncodings = aAcceptEncodings;
} else if (isSecure) {
mDictionaryAcceptEncodings = aAcceptEncodings;
} else if (isSecure) {
+ if (auto value = MaskConfig::GetString("headers.Accept-Encoding")) {
+ mHttpsAcceptEncodings.Assign(nsCString(value.value().c_str()));
+ return NS_OK;
+ }
mHttpsAcceptEncodings = aAcceptEncodings;
} else {
// use legacy list if a secure override is not specified