View | Details | Raw Unified | Return to bug 55192
Collapse All | Expand All

(-)httpd-2.4.4.orig/include/http_config.h (+2 lines)
Lines 326-331 Link Here
326
    /** directive with syntax error */
326
    /** directive with syntax error */
327
    const ap_directive_t *err_directive;
327
    const ap_directive_t *err_directive;
328
328
329
   /** Request associated with this command */
330
   request_rec *request;
329
};
331
};
330
332
331
/**
333
/**
(-)httpd-2.4.4.orig/server/config.c (-9 / +24 lines)
Lines 853-862 Link Here
853
853
854
    if ((parms->override & cmd->req_override) == 0 && !override_list_ok) {
854
    if ((parms->override & cmd->req_override) == 0 && !override_list_ok) {
855
        if (parms->override & NONFATAL_OVERRIDE) {
855
        if (parms->override & NONFATAL_OVERRIDE) {
856
            ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, parms->temp_pool,
856
	    if (parms->request) {
857
                          APLOGNO(02295)
857
                ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, parms->request,
858
                          "%s in .htaccess forbidden by AllowOverride",
858
                              APLOGNO(02295)
859
                          cmd->name);
859
                              "%s in .htaccess forbidden by AllowOverride",
860
                              cmd->name);
861
            } else {
862
                ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, parms->temp_pool,
863
                              APLOGNO(02295)
864
                              "%s in .htaccess forbidden by AllowOverride",
865
                              cmd->name);
866
            }
860
            return NULL;
867
            return NULL;
861
        }
868
        }
862
        else {
869
        else {
Lines 1274-1283 Link Here
1274
    if (ml == NULL) {
1281
    if (ml == NULL) {
1275
        parms->err_directive = current;
1282
        parms->err_directive = current;
1276
        if (parms->override & NONFATAL_UNKNOWN) {
1283
        if (parms->override & NONFATAL_UNKNOWN) {
1277
            ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, parms->temp_pool,
1284
            if (parms->request) {
1278
                          APLOGNO(02296) "Unknown directive %s "
1285
                ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, parms->request,
1279
                          "perhaps misspelled or defined by a module "
1286
                              APLOGNO(02296) "Unknown directive %s "
1280
                          "not included in the server configuration", dir);
1287
                              "perhaps misspelled or defined by a module "
1288
                              "not included in the server configuration", dir);
1289
            } else {
1290
                ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, parms->temp_pool,
1291
                              APLOGNO(02296) "Unknown directive %s "
1292
                              "perhaps misspelled or defined by a module "
1293
                              "not included in the server configuration", dir);
1294
            }
1281
            return NULL;
1295
            return NULL;
1282
        }
1296
        }
1283
        else {
1297
        else {
Lines 1553-1559 Link Here
1553
 */
1567
 */
1554
1568
1555
static cmd_parms default_parms =
1569
static cmd_parms default_parms =
1556
{NULL, 0, 0, NULL, -1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
1570
{NULL, 0, 0, NULL, -1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
1557
1571
1558
AP_DECLARE(char *) ap_server_root_relative(apr_pool_t *p, const char *file)
1572
AP_DECLARE(char *) ap_server_root_relative(apr_pool_t *p, const char *file)
1559
{
1573
{
Lines 2103-2108 Link Here
2103
    parms.temp_pool = r->pool;
2117
    parms.temp_pool = r->pool;
2104
    parms.server = r->server;
2118
    parms.server = r->server;
2105
    parms.path = apr_pstrdup(r->pool, d);
2119
    parms.path = apr_pstrdup(r->pool, d);
2120
    parms.request = r;
2106
2121
2107
    /* loop through the access names and find the first one */
2122
    /* loop through the access names and find the first one */
2108
    while (access_name[0]) {
2123
    while (access_name[0]) {

Return to bug 55192