Commit 65ca4c3e authored by Jeff Trawick's avatar Jeff Trawick
Browse files

Report unbounded containers in the config file. Previously, a typo 

in the </container> directive could result in the rest of the config
file being silently ignored, with undesired defaults used.


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

CHANGES

+5 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.14-dev



  *) Report unbounded containers in the config file.  Previously, a typo

     in the </container> directive could result in the rest of the config

     file being silently ignored, with undesired defaults used.

     [Jeff Trawick]



  *) Make the old_write filter use the ap_f* functions for the buffering.

     [Ryan Bloom]

server/config.c

+9 −3
Original line number Diff line number Diff line
@@ -1137,14 +1137,20 @@ AP_DECLARE(const char *) ap_soak_end_container(cmd_parms *cmd, char *directive) 
                                      directive + 1, "> but saw ",

                                      cmd_name, ">", NULL);

                }

                break;

                return NULL; /* found end of container */

            }

            else {

                ap_soak_end_container(cmd, cmd_name);

                const char *msg;



                if ((msg = ap_soak_end_container(cmd, cmd_name)) != NULL) {

                    return msg;

                }

            }

        }

    return NULL;

    }

    return apr_pstrcat(cmd->pool, "Expected </",

                       directive + 1, "> before end of configuration",

                       NULL);

}



static const char *execute_now(char *cmd_line, const char *args, cmd_parms *parms,