2001-11-12
2001-11-12 17:52:13 by Martin Stjernholm <mast@lysator.liu.se>
-
a51a90ead718dadcbe462705ac5ad21f4b0a7de0
(23 lines)
(+9/-14)
[
Show
| Annotate
]
Branch: 5.2
Some fixes and cleanups wrt throw().
Rev: server/base_server/configuration.pike:1.495
Rev: server/config_interface/actions/proc.pike:1.9
Rev: server/modules/graphics/pimage.pike:1.29
Rev: server/modules/throttling/throttlelib.pike:1.13
Rev: server/modules/throttling/throttletags.pike:1.14
Rev: server/protocols/prot_hilfe.pike:2.9
5:
// @appears Configuration
//! A site's main configuration
- constant cvs_version = "$Id: configuration.pike,v 1.494 2001/11/09 15:55:43 grubba Exp $";
+ constant cvs_version = "$Id: configuration.pike,v 1.495 2001/11/12 17:51:54 mast Exp $";
#include <module.h>
#include <module_constants.h>
#include <roxen.h>
524:
{
function f;
if(objectp(mod) && functionp(f = mod[fun])) {
- mixed error;
- if (arrayp(error = catch {
+
mixed ret;
if (ret = f(@args)) {
return ret;
}
- })) {
- error[0] = "Error in call_provider(): "+error[0];
- throw(error);
+
}
}
}
- }
+
array (function) file_extension_modules(string ext)
{
1441: Inside #if defined(URL_MODULES)
}
if(objectp( tmp ))
{
- array err;
+ mixed err;
nest ++;
err = catch {
1768: Inside #if defined(URL_MODULES)
}
if(objectp( remap ))
{
- array err;
+ mixed err;
nest ++;
TRACE_LEAVE("Recursing");
1890: Inside #if defined(URL_MODULES)
{
file = id->not_query;
- array err;
+ mixed err;
nest ++;
TRACE_LEAVE("Recursing");
err = catch {
2077: Inside #if defined(URL_MODULES)
}
if(objectp( tmp ))
{
- array err;
+ mixed err;
nest ++;
file = id->not_query;