svn commit: r1800393 - /httpd/httpd/trunk/modules/mappers/mod_actions.c

[ji...@apache.org]

Author: jim
Date: Fri Jun 30 12:34:19 2017
New Revision: 1800393

URL: http://svn.apache.org/viewvc?rev=1800393&view=rev
Log:
Partial reversal of r1800306... note virtual scripts in notes

Modified:
    httpd/httpd/trunk/modules/mappers/mod_actions.c

Modified: httpd/httpd/trunk/modules/mappers/mod_actions.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_actions.c?rev=1800393&r1=1800392&r2=1800393&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_actions.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_actions.c Fri Jun 30 12:34:19 2017
@@ -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)