|
|
@ -25,7 +25,7 @@ diff -up chromium-83.0.4103.97/chrome/service/cloud_print/print_system_cups.cc.e
|
|
|
|
|
|
|
|
|
|
|
|
diff -up chromium-83.0.4103.97/printing/backend/cups_helper.cc.el7cups chromium-83.0.4103.97/printing/backend/cups_helper.cc
|
|
|
|
diff -up chromium-83.0.4103.97/printing/backend/cups_helper.cc.el7cups chromium-83.0.4103.97/printing/backend/cups_helper.cc
|
|
|
|
--- chromium-83.0.4103.97/printing/backend/cups_helper.cc.el7cups 2020-06-15 10:41:01.848722898 -0400
|
|
|
|
--- chromium-83.0.4103.97/printing/backend/cups_helper.cc.el7cups 2020-06-15 10:41:01.848722898 -0400
|
|
|
|
+++ chromium-83.0.4103.97/printing/backend/cups_helper.cc 2020-06-15 10:43:57.780900879 -0400
|
|
|
|
+++ chromium-83.0.4103.97/printing/backend/cups_helper.cc 2020-06-16 09:17:08.791872797 -0400
|
|
|
|
@@ -32,18 +32,6 @@ namespace printing {
|
|
|
|
@@ -32,18 +32,6 @@ namespace printing {
|
|
|
|
// This section contains helper code for PPD parsing for semantic capabilities.
|
|
|
|
// This section contains helper code for PPD parsing for semantic capabilities.
|
|
|
|
namespace {
|
|
|
|
namespace {
|
|
|
@ -55,7 +55,7 @@ diff -up chromium-83.0.4103.97/printing/backend/cups_helper.cc.el7cups chromium-
|
|
|
|
: http_(nullptr) {
|
|
|
|
: http_(nullptr) {
|
|
|
|
// If we have an empty url, use default print server.
|
|
|
|
// If we have an empty url, use default print server.
|
|
|
|
if (print_server_url.is_empty())
|
|
|
|
if (print_server_url.is_empty())
|
|
|
|
@@ -552,12 +539,6 @@ HttpConnectionCUPS::HttpConnectionCUPS(c
|
|
|
|
@@ -552,17 +539,10 @@ HttpConnectionCUPS::HttpConnectionCUPS(c
|
|
|
|
if (port == url::PORT_UNSPECIFIED)
|
|
|
|
if (port == url::PORT_UNSPECIFIED)
|
|
|
|
port = kDefaultIPPServerPort;
|
|
|
|
port = kDefaultIPPServerPort;
|
|
|
|
|
|
|
|
|
|
|
@ -65,10 +65,19 @@ diff -up chromium-83.0.4103.97/printing/backend/cups_helper.cc.el7cups chromium-
|
|
|
|
- blocking ? 1 : 0, kCupsTimeout.InMilliseconds(),
|
|
|
|
- blocking ? 1 : 0, kCupsTimeout.InMilliseconds(),
|
|
|
|
- /*cancel=*/nullptr);
|
|
|
|
- /*cancel=*/nullptr);
|
|
|
|
- } else {
|
|
|
|
- } else {
|
|
|
|
// Continue to use deprecated CUPS calls because because older Linux
|
|
|
|
- // Continue to use deprecated CUPS calls because because older Linux
|
|
|
|
// distribution such as RHEL/CentOS 7 are shipped with CUPS 1.6.
|
|
|
|
- // distribution such as RHEL/CentOS 7 are shipped with CUPS 1.6.
|
|
|
|
http_ =
|
|
|
|
- http_ =
|
|
|
|
@@ -570,8 +551,6 @@ HttpConnectionCUPS::HttpConnectionCUPS(c
|
|
|
|
- httpConnectEncrypt(print_server_url.host().c_str(), port, encryption);
|
|
|
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
+ // Continue to use deprecated CUPS calls because because older Linux
|
|
|
|
|
|
|
|
+ // distribution such as RHEL/CentOS 7 are shipped with CUPS 1.6.
|
|
|
|
|
|
|
|
+ http_ =
|
|
|
|
|
|
|
|
+ httpConnectEncrypt(print_server_url.host().c_str(), port, encryption);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!http_) {
|
|
|
|
|
|
|
|
LOG(ERROR) << "CP_CUPS: Failed connecting to print server: "
|
|
|
|
|
|
|
|
@@ -570,8 +550,6 @@ HttpConnectionCUPS::HttpConnectionCUPS(c
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -77,7 +86,7 @@ diff -up chromium-83.0.4103.97/printing/backend/cups_helper.cc.el7cups chromium-
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
HttpConnectionCUPS::~HttpConnectionCUPS() {
|
|
|
|
HttpConnectionCUPS::~HttpConnectionCUPS() {
|
|
|
|
@@ -579,6 +558,10 @@ HttpConnectionCUPS::~HttpConnectionCUPS(
|
|
|
|
@@ -579,6 +557,10 @@ HttpConnectionCUPS::~HttpConnectionCUPS(
|
|
|
|
httpClose(http_);
|
|
|
|
httpClose(http_);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|