Commit 7f8f166e authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Same cleanups as applied to mod_cgi, falling out of scope != destruction
  in plain ol' C.


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

modules/generators/mod_cgid.c

+4 −0
Original line number Diff line number Diff line
@@ -1052,15 +1052,18 @@ static int include_cgi(char *s, request_rec *r, ap_filter_t *next, 
    apr_bucket  *tmp_buck, *tmp2_buck;



    if (rr->status != HTTP_OK) {

        ap_destroy_sub_req(rr);

        return -1;

    }



    /* No hardwired path info or query allowed */



    if ((rr->path_info && rr->path_info[0]) || rr->args) {

        ap_destroy_sub_req(rr);

        return -1;

    }

    if (rr->finfo.filetype != APR_REG) {

        ap_destroy_sub_req(rr);

        return -1;

    }
@@ -1124,6 +1127,7 @@ static void add_ssi_vars(request_rec *r, ap_filter_t *next) 
            apr_table_setn(e, "PATH_TRANSLATED",

                           apr_pstrcat(r->pool, pa_req->filename, pa_req->path_info, NULL));

        }

        ap_destroy_sub_req(pa_req);

    }



    if (r->args) {