Author: mturk
Date: Mon Dec 21 12:39:29 2009
New Revision: 892800

URL: http://svn.apache.org/viewvc?rev=892800&view=rev
Log:
Fix #48305. Skip if property ends with .secret

Modified:
    tomcat/jk/trunk/native/common/jk_status.c
    tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_status.c?rev=892800&r1=892799&r2=892800&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_status.c (original)
+++ tomcat/jk/trunk/native/common/jk_status.c Mon Dec 21 12:39:29 2009
@@ -4403,7 +4403,13 @@
         for (i=0;i<l;i++) {
             const char *name = jk_map_name_at(init_data, i);
             if (name) {
-                const char *value = jk_map_value_at(init_data, i);
+                const char *value;
+                size_t nl = strlen(name);
+                if (nl > sizeof(".secret") &&
+                    strcmp(name + nl - 7, ".secret") == 0) {
+                    continue;
+                }
+                value = jk_map_value_at(init_data, i);
                 if (!value)
                     value = "(null)";
                 if (mime == JK_STATUS_MIME_HTML ||

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=892800&r1=892799&r2=892800&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Dec 21 12:39:29 2009
@@ -44,6 +44,10 @@
   <subsection name="Native">
     <changelog>
       <fix>
+        <bug>48305</bug>: Status: Do not show secret property when
+        doing dump. (mturk)
+      </fix>
+      <fix>
         <bug>47224</bug>: Status: When address gets changed invalidate
         all opened sockets in the endpoint cache. This will cause new
         backend connections to get opened using new address. (mturk)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to