Commit 8a4b2485 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Remove the last piece of the layered I/O code. I don't know why this didn't 

get removed with the rest of it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84845 13f79535-47bb-0310-9956-ffa450edef68
parent a2bc1e15

server/config.c

+4 −11
Changes for server/config.c: 4 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -308,10 +308,8 @@ int ap_invoke_handler(request_rec *r) 
    const char *handler;

    char *p;

    size_t handler_len;

    int result;

    int result = HTTP_INTERNAL_SERVER_ERROR;



    do {

        result = DECLINED;

    if (r->handler) {

        handler = r->handler;

        handler_len = strlen(handler);
@@ -336,32 +334,27 @@ int ap_invoke_handler(request_rec *r) 
            result = (*handp->hr.handler) (r);



            if (result != DECLINED)

                    break;

                return result;

        }

    }



    /* Pass two --- wildcard matches */



        if (result == DECLINED) {

    for (handp = wildhandlers; handp->hr.content_type; ++handp) {

        if (handler_len >= handp->len

            && !strncmp(handler, handp->hr.content_type, handp->len)) {

            result = (*handp->hr.handler) (r);



            if (result != DECLINED)

                        break;

                 }

                return result;

         }

    }

    } while (result == RERUN_HANDLERS);



    if (result == HTTP_INTERNAL_SERVER_ERROR && r->handler && r->filename) {

        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,

            "handler \"%s\" not found for: %s", r->handler, r->filename);

        return HTTP_INTERNAL_SERVER_ERROR;

    }

 

    return result;

    return HTTP_INTERNAL_SERVER_ERROR;

}



int g_bDebugHooks;