Commit 9713785e authored by Ben Laurie's avatar Ben Laurie
Browse files

Strip trailing stuff from mime types.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87607 13f79535-47bb-0310-9956-ffa450edef68
parent 6515b525
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -281,22 +281,22 @@ int ap_invoke_handler(request_rec *r)
    const char *handler;
    const char *p;
    size_t handler_len;
    int result = HTTP_INTERNAL_SERVER_ERROR;
    int result;
    char hbuf[MAX_STRING_LEN];

    if (r->handler) {
        handler = r->handler;
        handler_len = strlen(handler);
    }
    else {
        handler = r->content_type ? r->content_type : ap_default_type(r);
        if ((p = ap_strchr_c(handler, ';')) != NULL) {
        if (ap_strchr_c(handler, ';') != NULL) {
	    apr_cpystrn(hbuf, handler, sizeof hbuf);
	    handler = hbuf;
	    p = ap_strchr_c(handler, ';');
	    /* MIME type arguments */
            while (p > handler && p[-1] == ' ')
	        --p;		/* strip trailing spaces */
	    handler_len = p - handler;
	}
	else {
	    handler_len = strlen(handler);
	    *p='\0';
	}
    }