From 582a87f2028773e3886a7abcceb36245bcd36506 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Thu, 26 Sep 2013 09:16:23 -0700
Subject: [PATCH] [FIXED JENKINS-19613] 49c731f made PROXY_HEADER static under
 the assumption that XStream would treat that like a missing field.
 Unfortunately it threw an error instead, breaking startup; fixed by renaming
 the constant.

(cherry picked from commit d82ba3b7524096fe571a37894c5b85091f4f45ad)
---
 changelog.html                                                | 4 +++-
 .../main/java/hudson/security/csrf/DefaultCrumbIssuer.java    | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/changelog.html b/changelog.html
index fab0190e83ce..792140d92790 100644
--- a/changelog.html
+++ b/changelog.html
@@ -55,7 +55,9 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
-  <li class=>
+  <li class='major bug'>
+    Default crumb issuer configurations saved in older releases did not load as of Jenkins 1.531.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-19613">issue 19613</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 
diff --git a/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java b/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java
index c69d9aac676b..f23699b7581d 100644
--- a/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java
+++ b/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java
@@ -100,11 +100,11 @@ public boolean validateCrumb(ServletRequest request, String salt, String crumb)
         return false;
     }
 
-    private static final String PROXY_HEADER = "X-Forwarded-For";
+    private static final String X_FORWARDED_FOR = "X-Forwarded-For";
 
     private String getClientIP(HttpServletRequest req) {
         String defaultAddress = req.getRemoteAddr();
-        String forwarded = req.getHeader(PROXY_HEADER);
+        String forwarded = req.getHeader(X_FORWARDED_FOR);
         if (forwarded != null) {
 	        String[] hopList = forwarded.split(",");
             if (hopList.length >= 1) {