markusthoemmes closed pull request #3889: make request id header name
comparison case insensitive
URL: https://github.com/apache/incubator-openwhisk/pull/3889
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/common/scala/src/main/scala/whisk/common/TransactionId.scala
b/common/scala/src/main/scala/whisk/common/TransactionId.scala
index 6441629f44..ae86321700 100644
--- a/common/scala/src/main/scala/whisk/common/TransactionId.scala
+++ b/common/scala/src/main/scala/whisk/common/TransactionId.scala
@@ -245,4 +245,6 @@ object TransactionId {
}
}
-case class TransactionGeneratorConfig(header: String)
+case class TransactionGeneratorConfig(header: String) {
+ val lowerCaseHeader = header.toLowerCase //to cache the lowercase version of
the header name
+}
diff --git a/common/scala/src/main/scala/whisk/http/BasicHttpService.scala
b/common/scala/src/main/scala/whisk/http/BasicHttpService.scala
index 586d7dce25..fa4c612200 100644
--- a/common/scala/src/main/scala/whisk/http/BasicHttpService.scala
+++ b/common/scala/src/main/scala/whisk/http/BasicHttpService.scala
@@ -108,7 +108,7 @@ trait BasicHttpService extends Directives {
extract { req =>
val tid =
req.request.headers
- .find(_.name == TransactionId.generatorConfig.header)
+ .find(_.is(TransactionId.generatorConfig.lowerCaseHeader))
.map(_.value)
.filterNot(_.startsWith(TransactionId.systemPrefix))
.getOrElse {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
