← Back to branch summary

~ubuntu-branches/ubuntu/vivid/tomcat6/vivid-proposed

« back to all changes in this revision

Viewing changes to java/org/apache/jk/server/JkMain.java

  • Committer: Package Import Robot
  • Author(s): tony mancill
  • Date: 2013-08-03 21:50:20 UTC
  • mfrom: (1.2.9)
  • Revision ID: package-import@ubuntu.com-20130803215020-glb1brkoau0zxr5x
Tags: 6.0.37-1
* New upstream release.
  - Drop patches for CVE-2012-4534, CVE-2012-4431, CVE-2012-3546,
    CVE-2012-2733, CVE-2012-3439
  - Drop 0011-CVE-02012-0022-regression-fix.patch
  - Drop 0017-eclipse-compiler-update.patch
* Freshened remaining patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/jk/server/JkMain.java
151
151
        }
152
152
        props.put( n, v );
153
153
        if( started ) {
 
154
            // Replacements need special processing only when started==true,
 
155
            // because preProcessProperties() handles them during startup.
 
156
            String alias = (String) replacements.get(n);
 
157
            if (alias != null) {
 
158
                props.put( alias, v );
 
159
                if (log.isDebugEnabled()) {
 
160
                    log.debug("Substituting " + n + " " + alias + " " + v);
 
161
                }
 
162
            }
154
163
            processProperty( n, v );
 
164
            if (alias != null) {
 
165
                processProperty( alias, v );
 
166
            }
155
167
            saveProperties();
156
168
        }
157
169
    }
533
545
        replacements.put("bufferSize", "channelSocket.bufferSize");
534
546
        replacements.put("tomcatAuthentication", "request.tomcatAuthentication");
535
547
        replacements.put("packetSize", "channelSocket.packetSize");
 
548
        replacements.put("maxHeaderCount", "request.maxHeaderCount");
536
549
    }
537
550
 
538
551
    private void preProcessProperties() {