/*
 * Copyright 2012 The Netty Project
 *
 * The Netty Project licenses this file to you under the Apache License,
 * version 2.0 (the "License"); you may not use this file except in compliance
 * with the License. You may obtain a copy of the License at:
 *
 *   http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations
 * under the License.
 */
package org.jboss.netty.handler.codec.http.multipart;

import java.nio.charset.Charset;

import org.jboss.netty.handler.codec.http.HttpConstants;

/**
 * Abstract HttpData implementation
 */
public abstract class AbstractHttpData implements HttpData {

    protected final String name;
    protected long definedSize;
    protected long size;
    protected Charset charset = HttpConstants.DEFAULT_CHARSET;
    protected boolean completed;

    protected AbstractHttpData(String name, Charset charset, long size) {
        if (name == null) {
            throw new NullPointerException("name");
        }
        name = name.trim();
        if (name.length() == 0) {
            throw new IllegalArgumentException("empty name");
        }

        for (int i = 0; i < name.length(); i ++) {
            char c = name.charAt(i);
            if (c > 127) {
                throw new IllegalArgumentException(
                        "name contains non-ascii character: " + name);
            }

            // Check prohibited characters.
            switch (c) {
            case '=':
            case ',':
            case ';':
            case ' ':
            case '\t':
            case '\r':
            case '\n':
            case '\f':
            case 0x0b: // Vertical tab
                throw new IllegalArgumentException(
                        "name contains one of the following prohibited characters: " +
                        "=,; \\t\\r\\n\\v\\f: " + name);
            }
        }
        this.name = name;
        if (charset != null) {
            setCharset(charset);
        }
        definedSize = size;
    }

    public String getName() {
        return name;
    }

    public boolean isCompleted() {
        return completed;
    }

    public Charset getCharset() {
        return charset;
    }

    public void setCharset(Charset charset) {
        if (charset == null) {
            throw new NullPointerException("charset");
        }
        this.charset = charset;
    }

    public long length() {
        return size;
    }
}

@@ -687,42 +687,8 @@
 t;%0A%0A
-import java.nio.charset.Charset;%0A%0A
 impo
@@ -741,16 +741,82 @@
 tants;%0A%0A
+import java.nio.charset.Charset;%0Aimport java.util.regex.Pattern;%0A%0A
 /**%0A * A
@@ -913,16 +913,186 @@
 Data %7B%0A%0A
+    private static final Pattern STRIP_PATTERN = Pattern.compile(%22(?:%5E%5C%5Cs+%7C%5C%5Cs+$%7C%5C%5Cn)%22);%0A    private static final Pattern REPLACE_PATTERN = Pattern.compile(%22%5B%5C%5Cr%5C%5Ct%5D%22);%0A%0A
     prot
@@ -1426,32 +1426,33 @@
 me%22);%0A        %7D%0A
+%0A
         name = n
@@ -1454,862 +1454,208 @@
 e = 
-name.trim();%0A        if (name.length() == 0) %7B%0A            throw new IllegalArgumentException(%22empty name%22);%0A        %7D%0A%0A        for (int i = 0; i %3C name.length(); i ++) %7B%0A            char c = name.charAt(i);%0A            if (c %3E 127) %7B%0A                throw new IllegalArgumentException(%0A                        %22name contains non-ascii character: %22 + name);%0A            %7D%0A%0A            // Check prohibited characters.%0A            switch (c) %7B%0A            case '=':%0A            case ',':%0A            case ';':%0A            case ' ':%0A            case '%5Ct':%0A            case '%5Cr':%0A            case '%5Cn':%0A            case '%5Cf':%0A            case 0x0b: // Vertical tab%0A                throw new IllegalArgumentException(%0A                        %22name contains one of the following prohibited characters: %22 +%0A                        %22=,; %5C%5Ct%5C%5Cr%5C%5Cn%5C%5Cv%5C%5Cf: %22 +
+REPLACE_PATTERN.matcher(name).replaceAll(%22 %22);%0A        name = STRIP_PATTERN.matcher(name).replaceAll(%22%22);%0A%0A        if (name.length() == 0) %7B%0A            throw new IllegalArgumentException(%22empty
  name
+%22
 );%0A 
@@ -1665,23 +1665,10 @@
     
- 
-   %7D%0A        
 %7D
+%0A
 %0A   

Fix incorrect name validation in AbstractHttpData