aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorGeorge Claghorn <george.claghorn@gmail.com>2018-01-29 20:45:02 -0500
committerGitHub <noreply@github.com>2018-01-29 20:45:02 -0500
commit8ef0751b12878d5de757f7bec17753dee825265a (patch)
treea4605341c96bf107e99a0603bd7e17758374aa81 /actionpack/lib
parent44fc16c284533cc2f7a0f97753142aef15fb2207 (diff)
parenteea28f4103f0a55e50ce750582317110c988afcd (diff)
downloadrails-8ef0751b12878d5de757f7bec17753dee825265a.tar.gz
rails-8ef0751b12878d5de757f7bec17753dee825265a.tar.bz2
rails-8ef0751b12878d5de757f7bec17753dee825265a.zip
Merge pull request #31815 from composerinteralia/make-request-id
Allow @ in X-Request-Id header
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/middleware/request_id.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/request_id.rb b/actionpack/lib/action_dispatch/middleware/request_id.rb
index 805d3f2148..da2871b551 100644
--- a/actionpack/lib/action_dispatch/middleware/request_id.rb
+++ b/actionpack/lib/action_dispatch/middleware/request_id.rb
@@ -30,7 +30,7 @@ module ActionDispatch
private
def make_request_id(request_id)
if request_id.presence
- request_id.gsub(/[^\w\-]/, "".freeze).first(255)
+ request_id.gsub(/[^\w\-@]/, "".freeze).first(255)
else
internal_request_id
end