Title: [230678] trunk/Source/WebCore
- Revision
- 230678
- Author
- commit-qu...@webkit.org
- Date
- 2018-04-16 12:22:17 -0700 (Mon, 16 Apr 2018)
Log Message
[Curl] Add the Accept-Language field to curl request headers
https://bugs.webkit.org/show_bug.cgi?id=184605
Patch by Christopher Reid <chris.r...@sony.com> on 2018-04-16
Reviewed by Alex Christensen.
Add Accept-Language field to curl request headers
* platform/network/curl/CurlRequest.cpp:
* platform/network/curl/CurlRequest.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (230677 => 230678)
--- trunk/Source/WebCore/ChangeLog 2018-04-16 19:20:17 UTC (rev 230677)
+++ trunk/Source/WebCore/ChangeLog 2018-04-16 19:22:17 UTC (rev 230678)
@@ -1,3 +1,15 @@
+2018-04-16 Christopher Reid <chris.r...@sony.com>
+
+ [Curl] Add the Accept-Language field to curl request headers
+ https://bugs.webkit.org/show_bug.cgi?id=184605
+
+ Reviewed by Alex Christensen.
+
+ Add Accept-Language field to curl request headers
+
+ * platform/network/curl/CurlRequest.cpp:
+ * platform/network/curl/CurlRequest.h:
+
2018-04-16 Chris Dumez <cdu...@apple.com>
Move more WindowProxy-related logic from ScriptController to WindowProxyController
Modified: trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp (230677 => 230678)
--- trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp 2018-04-16 19:20:17 UTC (rev 230677)
+++ trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp 2018-04-16 19:22:17 UTC (rev 230678)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 Sony Interactive Entertainment Inc.
+ * Copyright (C) 2018 Sony Interactive Entertainment Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -33,6 +33,7 @@
#include "MIMETypeRegistry.h"
#include "ResourceError.h"
#include "SharedBuffer.h"
+#include <wtf/Language.h>
#include <wtf/MainThread.h>
namespace WebCore {
@@ -163,11 +164,14 @@
{
auto& sslHandle = CurlContext::singleton().sslHandle();
+ auto httpHeaderFields = m_request.httpHeaderFields();
+ appendAcceptLanguageHeader(httpHeaderFields);
+
m_curlHandle = std::make_unique<CurlHandle>();
m_curlHandle->initialize();
m_curlHandle->setUrl(m_request.url());
- m_curlHandle->appendRequestHeaders(m_request.httpHeaderFields());
+ m_curlHandle->appendRequestHeaders(httpHeaderFields);
const auto& method = m_request.httpMethod();
if (method == "GET")
@@ -453,6 +457,12 @@
m_curlHandle = nullptr;
}
+void CurlRequest::appendAcceptLanguageHeader(HTTPHeaderMap& header)
+{
+ for (const auto& language : userPreferredLanguages())
+ header.add(HTTPHeaderName::AcceptLanguage, language);
+}
+
void CurlRequest::setupPUT(ResourceRequest& request)
{
m_curlHandle->enableHttpPutRequest();
Modified: trunk/Source/WebCore/platform/network/curl/CurlRequest.h (230677 => 230678)
--- trunk/Source/WebCore/platform/network/curl/CurlRequest.h 2018-04-16 19:20:17 UTC (rev 230677)
+++ trunk/Source/WebCore/platform/network/curl/CurlRequest.h 2018-04-16 19:22:17 UTC (rev 230678)
@@ -118,7 +118,8 @@
void didCancelTransfer() override;
void finalizeTransfer();
- // For POST and PUT method
+ // For setup
+ void appendAcceptLanguageHeader(HTTPHeaderMap&);
void setupPOST(ResourceRequest&);
void setupPUT(ResourceRequest&);
void setupSendData(bool forPutMethod);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
