View | Details | Raw Unified | Return to bug 25360
Collapse All | Expand All

(-)CoyoteRequest.java (-7 / +5 lines)
Lines 2324-2335 Link Here
2324
        Parameters parameters = coyoteRequest.getParameters();
2324
        Parameters parameters = coyoteRequest.getParameters();
2325
2325
2326
        String enc = coyoteRequest.getCharacterEncoding();
2326
        String enc = coyoteRequest.getCharacterEncoding();
2327
        if (enc != null) {
2327
        if (enc == null)
2328
            parameters.setEncoding(enc);
2328
            enc = org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING;
2329
        } else {
2329
2330
            parameters.setEncoding
2330
        parameters.setQueryStringEncoding(enc);
2331
                (org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING);
2332
        }
2333
2331
2334
        parameters.handleQueryParameters();
2332
        parameters.handleQueryParameters();
2335
2333
Lines 2370-2376 Link Here
2370
                }
2368
                }
2371
                int actualLen = readPostBody(formData, len);
2369
                int actualLen = readPostBody(formData, len);
2372
                if (actualLen == len) {
2370
                if (actualLen == len) {
2373
                    parameters.processParameters(formData, 0, len);
2371
                    parameters.processParameters(formData, 0, len, enc);
2374
                }
2372
                }
2375
            } catch (Throwable t) {
2373
            } catch (Throwable t) {
2376
                ; // Ignore
2374
                ; // Ignore

Return to bug 25360