cvs: php4 /ext/midgard midgard.c

davidg Sun Feb 18 10:45:25 2001 EDT Modified files: /php4/ext/midgard midgard.c Log: allow execution of 'normal' php scripts Index: php4/ext/midgard/midgard.c diff -u php4/ext/midgard/midgard.c:1.4 php4/ext/midgard/midgard.c:1.5 --- php4/ext/midgard/midgard.c:1.4 Sat Feb 17 15:21:50 2001 +++ php4/ext/midgard/midgard.c Sun Feb 18 10:45:24 2001 @@ -1,4 +1,4 @@ -/* $Id: midgard.c,v 1.4 2001/02/17 23:21:50 emile Exp $ +/* $Id: midgard.c,v 1.5 2001/02/18 18:45:24 davidg Exp $ Copyright (C) 1999 Jukka Zitting <jukka.zitting@iki.fi> Copyright (C) 2000 The Midgard Project ry Copyright (C) 2000 Emile Heyns, Aurora SA <emile@iris-advies.com> @@ -357,38 +357,49 @@ /* Remove if there's nothing to do at request start */ PHP_RINIT_FUNCTION(midgard) { -request_rec *r; -module *midgard_module; + request_rec *r; + module *midgard_module; - SLS_FETCH(); - MGDLS_FETCH(); + SLS_FETCH(); + MGDLS_FETCH(); midgard_module = ap_find_linked_module("mod_midgard.c"); if (!midgard_module) { - MGDG(rcfg) = NULL; - MGDG(dcfg) = NULL; - return FAILURE; + MGDG(rcfg) = NULL; + MGDG(dcfg) = NULL; + php_error(E_ERROR, "Cannot get midgard module descriptor"); + return SUCCESS; } /* Failure on Apache 1.3.18-dev (Marius) ??? */ r = ((request_rec *) SG(server_context)); MGDG(rcfg) = (midgard_request_config *) - ap_get_module_config(r->request_config, midgard_module); + ap_get_module_config(r->request_config, midgard_module); if(MGDG(rcfg) == NULL) { - php_error(E_ERROR, "Cannot get midgard module config"); - return FAILURE; + MGD_LOG_START("Cannot get midgard module config") + MGD_LOG_END() + php_error(E_NOTICE, "Cannot get midgard module config"); + MGDG(rcfg) = NULL; + MGDG(dcfg) = NULL; + return SUCCESS; } + MGDG(dcfg) = (midgard_directory_config *) ap_get_module_config(r->per_dir_config, midgard_module); - if(MGDG(rcfg) == NULL) { - php_error(E_ERROR, "Cannot get midgard module directory config"); - return FAILURE; + if(MGDG(dcfg) == NULL) { + MGD_LOG_START("Cannot get midgard module directory config") + MGD_LOG_END() + php_error(E_NOTICE, "Cannot get midgard module directory config"); + MGDG(rcfg) = NULL; + MGDG(dcfg) = NULL; + return SUCCESS; } MGDG(mgd) = MGDG(rcfg)->mgd; ALLOC_INIT_ZVAL(MGDG(udf)); if(MGDG(udf)) array_init(MGDG(udf)); + return SUCCESS; }