--- httpd-2.4.6/server/core.c	2013-06-10 15:46:37.000000000 +0100
+++ httpd-2.4.6/server/core.c	2013-08-28 13:39:32.628248703 +0100
@@ -1783,7 +1783,14 @@ 
         }
 
         if ( (cmd->override_opts & opt) != opt ) {
-            return apr_pstrcat(cmd->pool, "Option ", w, " not allowed here", NULL);
+	    if (cmd->override & NONFATAL_OVERRIDE) {
+	        ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server, "Option %s not allowed in line %d of %s.",
+	                     w, cmd->directive->line_num, cmd->directive->filename);
+		first = 0;
+	        continue;
+	    } else {
+	        return apr_pstrcat(cmd->pool, "Option ", w, " not allowed here", NULL);
+	    }
         }
         else if (action == '-') {
             /* we ensure the invariant (d->opts_add & d->opts_remove) == 0 */