← Back to branch summary

~mozillateam/firefox/firefox.utopic

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu-ua-string-changes.patch

  • Committer: Chris Coulson
  • Date: 2015-06-29 11:18:00 UTC
  • mfrom: (1077.1.49 firefox-beta.utopic)
  • Revision ID: chris.coulson@canonical.com-20150629111800-l07896unh7fqmhnv
Tags: 39.0+build5-0ubuntu0.14.10.1
releasing package firefox version 39.0+build5-0ubuntu0.14.10.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu-ua-string-changes.patch
2
2
Author: Chris Coulson <chris.coulson@canonical.com>
3
3
Forwarded: not-needed
4
4
 
5
 
Index: firefox-trunk-36.0~a1~hg20141031r213433/netwerk/protocol/http/nsHttpHandler.cpp
 
5
Index: firefox-trunk-39.0~a1~hg20150319r234403/netwerk/protocol/http/nsHttpHandler.cpp
6
6
===================================================================
7
 
--- firefox-trunk-36.0~a1~hg20141031r213433.orig/netwerk/protocol/http/nsHttpHandler.cpp        2014-10-31 23:44:28.578615299 +0000
8
 
+++ firefox-trunk-36.0~a1~hg20141031r213433/netwerk/protocol/http/nsHttpHandler.cpp     2014-10-31 23:47:41.670859152 +0000
9
 
@@ -167,6 +167,9 @@
 
7
--- firefox-trunk-39.0~a1~hg20150319r234403.orig/netwerk/protocol/http/nsHttpHandler.cpp        2015-03-19 22:06:15.726198019 +0000
 
8
+++ firefox-trunk-39.0~a1~hg20150319r234403/netwerk/protocol/http/nsHttpHandler.cpp     2015-03-19 22:12:18.075823254 +0000
 
9
@@ -170,6 +170,9 @@
10
10
     , mLegacyAppName("Mozilla")
11
11
     , mLegacyAppVersion("5.0")
12
12
     , mProduct("Gecko")
13
13
+#ifdef MOZ_UA_VENDOR
14
14
+    , mVendor(MOZ_UA_VENDOR)
15
15
+#endif
 
16
     , mCompatFirefoxEnabled(false)
16
17
     , mUserAgentIsDirty(true)
17
18
     , mUseCache(true)
18
 
     , mPromptTempRedirect(true)
19
 
@@ -326,6 +329,9 @@
 
19
@@ -333,6 +336,9 @@
20
20
     LOG(("> misc = %s\n", mMisc.get()));
21
21
     LOG(("> product = %s\n", mProduct.get()));
22
22
     LOG(("> product-sub = %s\n", mProductSub.get()));
26
26
     LOG(("> app-name = %s\n", mAppName.get()));
27
27
     LOG(("> app-version = %s\n", mAppVersion.get()));
28
28
     LOG(("> compat-firefox = %s\n", mCompatFirefox.get()));
29
 
@@ -613,8 +619,10 @@
 
29
@@ -620,8 +626,10 @@
30
30
                            mCompatFirefox.Length() +
31
31
                            mCompatDevice.Length() +
32
32
                            mDeviceModelId.Length() +
39
39
     // Application portion
40
40
     mUserAgent.Assign(mLegacyAppName);
41
41
     mUserAgent += '/';
42
 
@@ -629,6 +637,10 @@
 
42
@@ -636,6 +644,10 @@
43
43
       mUserAgent.AppendLiteral("; ");
44
44
     }
45
45
 #endif
50
50
     if (!mCompatDevice.IsEmpty()) {
51
51
         mUserAgent += mCompatDevice;
52
52
         mUserAgent.AppendLiteral("; ");
53
 
Index: firefox-trunk-36.0~a1~hg20141031r213433/netwerk/protocol/http/nsHttpHandler.h
 
53
Index: firefox-trunk-39.0~a1~hg20150319r234403/netwerk/protocol/http/nsHttpHandler.h
54
54
===================================================================
55
 
--- firefox-trunk-36.0~a1~hg20141031r213433.orig/netwerk/protocol/http/nsHttpHandler.h  2014-10-31 23:44:28.578615299 +0000
56
 
+++ firefox-trunk-36.0~a1~hg20141031r213433/netwerk/protocol/http/nsHttpHandler.h       2014-10-31 23:44:28.578615299 +0000
57
 
@@ -425,6 +425,7 @@
 
55
--- firefox-trunk-39.0~a1~hg20150319r234403.orig/netwerk/protocol/http/nsHttpHandler.h  2015-03-19 22:06:15.726198019 +0000
 
56
+++ firefox-trunk-39.0~a1~hg20150319r234403/netwerk/protocol/http/nsHttpHandler.h       2015-03-19 22:06:15.722198001 +0000
 
57
@@ -435,6 +435,7 @@
58
58
     // useragent components
59
59
     nsCString      mLegacyAppName;
60
60
     nsCString      mLegacyAppVersion;
62
62
     nsCString      mPlatform;
63
63
     nsCString      mOscpu;
64
64
     nsCString      mMisc;
65
 
Index: firefox-trunk-36.0~a1~hg20141031r213433/netwerk/protocol/http/Makefile.in
 
65
Index: firefox-trunk-39.0~a1~hg20150319r234403/netwerk/protocol/http/Makefile.in
66
66
===================================================================
67
67
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
68
 
+++ firefox-trunk-36.0~a1~hg20141031r213433/netwerk/protocol/http/Makefile.in   2014-10-31 23:44:28.578615299 +0000
 
68
+++ firefox-trunk-39.0~a1~hg20150319r234403/netwerk/protocol/http/Makefile.in   2015-03-19 22:06:15.722198001 +0000
69
69
@@ -0,0 +1,9 @@
70
70
+# This Source Code Form is subject to the terms of the Mozilla Public
71
71
+# License, v. 2.0. If a copy of the MPL was not distributed with this