Index: java/org/apache/catalina/core/ApplicationHttpRequest.java
===================================================================
--- java/org/apache/catalina/core/ApplicationHttpRequest.java	(revision 1497999)
+++ java/org/apache/catalina/core/ApplicationHttpRequest.java	(working copy)
@@ -910,9 +910,10 @@
         public AttributeNamesEnumerator() {
             int last = -1;
             parentEnumeration = getRequest().getAttributeNames();
-            for (int i = 0; i < specialAttributes.length; i++) {
+            for (int i = specialAttributes.length - 1; i >= 0; i--) {
                 if (getAttribute(specials[i]) != null) {
                     last = i;
+                    break;
                 }
             }
             this.last = last;