Commit f309f436 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Partial reversal of r1800306... note virtual scripts in notes 


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

modules/mappers/mod_actions.c

+5 −1
Original line number Diff line number Diff line
@@ -186,7 +186,8 @@ static int action_handler(request_rec *r) 
        ap_field_noparam(r->pool, r->content_type);



    if (action && (t = apr_table_get(conf->action_types, action))) {

        if (*t++ == '0' && r->finfo.filetype == APR_NOFILE) {

        int virtual = (*t++ == '0' ? 0 : 1);

        if (!virtual && r->finfo.filetype == APR_NOFILE) {

            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(00652)

                          "File does not exist: %s", r->filename);

            return HTTP_NOT_FOUND;
@@ -197,6 +198,9 @@ static int action_handler(request_rec *r) 
         * (will be REDIRECT_HANDLER there)

         */

        apr_table_setn(r->subprocess_env, "HANDLER", action);

        if (virtual) {

            apr_table_setn(r->notes, "virtual_script", "1");

        }

    }



    if (script == NULL)