1996-12-02
1996-12-02 04:32:55 by Per Hedbor <ph@opera.com>
-
fd0b6f04d454ee6ee1cdc027611f7c04f441f63b
(32 lines)
(+24/-8)
[
Show
| Annotate
]
Branch: 5.2
The 'add a module' page has been redesigned, and the modules now have a _lot_ more documentation
Rev: server/base_server/config/draw_things.pike:1.1
Rev: server/base_server/mainconfig.pike:1.6
Rev: server/base_server/module.pike:1.5
Rev: server/base_server/module_support.pike:1.7
Rev: server/base_server/roxen.pike:1.12
Rev: server/base_server/roxenlib.pike:1.5
Rev: server/base_server/roxenloader.pike:1.6
Rev: server/etc/include/module.h:1.3
Rev: server/modules/directories/directories.pike:1.6
Rev: server/modules/directories/fastdir.pike:1.5
Rev: server/modules/directories/indexfiles.pike:1.4
Rev: server/modules/examples/fnord.pike:1.3
Rev: server/modules/filesystems/filesystem.pike:1.6
Rev: server/modules/filesystems/userfs.pike:1.6
Rev: server/modules/filters/htaccess.pike:1.6
Rev: server/modules/filters/redirect.pike:1.4
Rev: server/modules/filters/relay.pike:1.5
Rev: server/modules/logging/client_logger.pike:1.4
Rev: server/modules/logging/home_logger.pike:1.5
Rev: server/modules/misc/contenttypes.pike:1.5
Rev: server/modules/misc/ismap.pike:1.5
Rev: server/modules/misc/userdb.pike:1.6
Rev: server/modules/proxies/gopher.pike:1.5
Rev: server/modules/proxies/proxy.pike:1.9
Rev: server/modules/proxies/wais.pike:1.5
Rev: server/modules/scripting/cgi.pike:1.5
Rev: server/modules/scripting/fcgi.pike:1.5
Rev: server/modules/tags/header.pike:1.5
Rev: server/modules/tags/htmlparse.pike:1.8
Rev: server/modules/tags/indirect_href.pike:1.4
Rev: server/modules/tags/language.pike:1.5
Rev: server/modules/tags/lpctag.pike:1.5
Rev: server/modules/tags/tablify.pike:1.4
Rev: server/modules/tags/tablist.pike:1.5
Rev: server/modules/tags/variable.pike:1.4
Rev: server/roxen-images/modules/1stfilt.ppm:1.1
Rev: server/roxen-images/modules/dir.ppm:1.1
Rev: server/roxen-images/modules/find.ppm:1.1
Rev: server/roxen-images/modules/first.ppm:1.1
Rev: server/roxen-images/modules/last.ppm:1.1
Rev: server/roxen-images/modules/lastfilt.ppm:1.1
Rev: server/roxen-images/modules/log.ppm:1.1
Rev: server/roxen-images/modules/proxy.ppm:1.1
Rev: server/roxen-images/modules/security.ppm:1.1
Rev: server/roxen-images/modules/tag.ppm:1.1
1:
- string cvs_version = "$Id: roxen.pike,v 1.11 1996/12/01 19:18:35 per Exp $";
+ string cvs_version = "$Id: roxen.pike,v 1.12 1996/12/02 04:32:35 per Exp $";
#define IN_SPIDER
#include <module.h>
#include <variables.h>
619:
// Parse the logging format strings.
private inline string fix_logging(string s)
{
+ string pre, post, c;
+ sscanf(s, "%*[\t ]", s);
+ s = replace(s, ({"\\t", "\\n", "\\r" }), ({"\t", "\n", "\r" }));
while(s[0] == ' ') s = s[1..10000];
while(s[0] == '\t') s = s[1..10000];
-
+ while(sscanf(s, "%s$char(%d)%s", pre, c, post)==3)
+ s=sprintf("%s%c%s", pre, c, post);
+ while(sscanf(s, "%s$wchar(%d)%s", pre, c, post)==3)
+ s=sprintf("%s%2c%s", pre, c, post);
+ while(sscanf(s, "%s$int(%d)%s", pre, c, post)==3)
+ s=sprintf("%s%4c%s", pre, c, post);
return s;
}
642:
{
int s;
if(!host) host=oh;
- if(fun) fun(replace(rest, "$host", host)+"\n");
+ if(fun) fun(replace(rest, "$host", host));
}
// Logging format support functions.
726:
ip_to_host(request_id->remoteaddr, write_to_log, form,
request_id->remoteaddr, request_id->conf->log_function);
else
- request_id->conf->log_function(form + "\n");
+ request_id->conf->log_function(form);
}
// Support for unique user id's
2203:
"Log format is normal characters, or one or more of the "
"variables below:\n"
"\n"
+ "\\n \\t \\r -- As in C, newline, tab and linefeed\n"
+ "$char(int) -- Insert the (1 byte) character specified by the integer.\n"
+ "$wchar(int) -- Insert the (2 byte) word specified by the integer.\n"
+ "$int(int) -- Insert the (4 byte) word specified by the integer.\n"
+ "$^ -- Supress newline at the end of the logentry\n"
"$host -- The remote host name, or ip number.\n"
"$ip_number -- The remote ip number.\n"
"$bin-ip_number -- The remote host id as a binary integer number.\n"
2828:
foreach( get_dir( d )||({}), file)
{
- if ( !backup_extension(file) && (file[-1]!='z'))
+ if ( file[0]!='.' && !backup_extension(file) && (file[-1]!='z'))
{
if(file_size(path+file) == -2)
{
2844:
if (!(err=catch( module_info = lambda ( string file ) {
array foo;
object o;
- o = compile_file(file)();
+ o = (compile_file(file))();
#ifdef MODULE_DEBUG
perror(" load ok - ");
#endif
2852: Inside #if defined(DUMPVARS)
#ifdef DUMPVARS
dump_variables(file, o->variables, foo, o->module_creator, o->module_url);
#endif
- destruct(o);
+
#ifdef MODULE_DEBUG
perror("registered.");
#endif
- return ({ foo[1], foo[2], foo[0] });
+ return ({ foo[1], foo[2]+"<p><i>"+replace(o->file_name_and_stuff(),
+ "0<br>", file+"<br>")
+ +"</i>", foo[0] });
}(path + file))))
{