Commit 04fa52ea authored by Cliff Woolley's avatar Cliff Woolley
Browse files

Fix RewriteMap prg:'s that have command-line args. 

PR: 8464
Submitted by: James Tait <JTait@wyrddreams.demon.co.uk>


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

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Changes with Apache 2.0.37









  *) Allow RewriteMap prg:'s to take command-line arguments.  PR 8464.









     [James Tait <JTait@wyrddreams.demon.co.uk>]

















  *) Correctly return 413 when an invalid chunk size is given on









     input.  Also modify ap_discard_request_body to not do anything









     on sub-requests or when the connection will be dropped.


































modules/mappers/mod_rewrite.c



+8
−4



























Changes for modules/mappers/mod_rewrite.c: 8 added lines, 4 removed lines.



Original line number
Diff line number
Diff line







@@ -456,7 +456,7 @@ static const char *cmd_rewritemap(cmd_parms *cmd, void *dconf, const char *a1,







    else if (strncmp(a2, "prg:", 4) == 0) {









        newmap->type = MAPTYPE_PRG;









        newmap->datafile = a2+4;









        newmap->checkfile = a2+4;









        newmap->checkfile = NULL;









    }









    else if (strncmp(a2, "int:", 4) == 0) {









        newmap->type      = MAPTYPE_INT;










@@ -481,7 +481,7 @@ static const char *cmd_rewritemap(cmd_parms *cmd, void *dconf, const char *a1,







        && (apr_stat(&st, newmap->checkfile, APR_FINFO_MIN, 









                     cmd->pool) != APR_SUCCESS)) {









        return apr_pstrcat(cmd->pool,









                          "RewriteMap: map file or program not found:",









                          "RewriteMap: map file not found:",









                          newmap->checkfile, NULL);









    }




















@@ -3424,20 +3424,24 @@ static apr_status_t rewritemap_program_child(apr_pool_t *p, const char *progname







    apr_status_t rc;









    apr_procattr_t *procattr;









    apr_proc_t *procnew;









    char **argv;



















    rc = apr_tokenize_to_argv(progname, &argv, p);



















    if (((rc = apr_procattr_create(&procattr, p)) != APR_SUCCESS) ||









        ((rc = apr_procattr_io_set(procattr, APR_FULL_BLOCK,









                                  APR_FULL_NONBLOCK,









                                  APR_FULL_NONBLOCK)) != APR_SUCCESS) ||









        ((rc = apr_procattr_dir_set(procattr, 









                                   ap_make_dirstr_parent(p, progname)))









                                   ap_make_dirstr_parent(p, argv[0])))









         != APR_SUCCESS) ||









        ((rc = apr_procattr_cmdtype_set(procattr, APR_PROGRAM)) != APR_SUCCESS)) {









        /* Something bad happened, give up and go away. */









    }









    else {









        procnew = apr_pcalloc(p, sizeof(*procnew));









        rc = apr_proc_create(procnew, progname, NULL, NULL, procattr, p);









        rc = apr_proc_create(procnew, argv[0], (const char **)argv, NULL,









                             procattr, p);









    









        if (rc == APR_SUCCESS) {









            apr_pool_note_subprocess(p, procnew, APR_KILL_AFTER_TIMEOUT);