2003-01-23
2003-01-23 16:21:02 by Martin Nilsson <mani@lysator.liu.se>
-
86903b279c385dd23c064b9f75f00e1789d7e52f
(38 lines)
(+19/-19)
[
Show
| Annotate
]
Branch: Aphoto_2.0_beta3
More cleanup
Rev: server/plugins/protocols/ftp.pike:2.87
Rev: server/plugins/protocols/http.pike:1.393
Rev: server/plugins/protocols/prot_ftp.pike:2.5
Rev: server/plugins/protocols/prot_ftps.pike:2.6
Rev: server/plugins/protocols/prot_hilfe.pike:2.17
Rev: server/plugins/protocols/prot_http.pike:2.7
Rev: server/plugins/protocols/prot_https.pike:2.8
Rev: server/plugins/protocols/prot_tetris.pike:2.6
2:
// Modified by Francesco Chemolli to add throttling capabilities.
// Copyright © 1996 - 2001, Roxen IS.
- constant cvs_version = "$Id: http.pike,v 1.392 2003/01/14 22:53:37 zino Exp $";
+ constant cvs_version = "$Id: http.pike,v 1.393 2003/01/23 16:21:02 mani Exp $";
// #define REQUEST_DEBUG
#define MAGIC_ERROR
49:
#endif
constant decode = MIME.decode_base64;
- constant find_supports_and_vars = roxen.find_supports_and_vars;
- constant version = roxen.version;
- constant _query = roxen.query;
+ constant find_supports_and_vars = core.find_supports_and_vars;
+ constant version = core.version;
+ constant _query = core.query;
private static array(string) cache;
private static int wanted_data, have_data;
123:
{
return !realauth;
}
- string _sprintf() { return "AuthEmulator"; }
+
}
AuthEmulator auth;
308:
end();
return;
}
- pipe = roxen.get_shuffler( my_fd );
+ pipe = core.get_shuffler( my_fd );
if( conf )
conf->connection_add( this_object(), pipe );
}
386: Inside #if defined(OLD_RXML_CONFIG)
void do_send_reply( string what, string url ) {
url = url_base() + url[1..];
my_fd->set_blocking();
- my_fd->write( prot + " 302 Roxen config coming up\r\n"+
+ my_fd->write( prot + " 302 ChiliMoon config coming up\r\n"+
(what?what+"\r\n":"")+"Location: "+url+"\r\n"
"Connection: close\r\nDate: "+
Roxen.http_date(predef::time(1))+
419: Inside #if ID_CACHEKEY_DEBUG
#if ID_CACHEKEY_DEBUG
constant __num = ({ 0 });
int _num;
- string _sprintf() { return "CacheKey(#" + _num + ")"; }
+ string _sprintf(int t) {
+ return t=='O' && sprintf("%O(#%d)", this_program, _num);
+ }
void create() { _num = ++__num[0]; }
void destroy() { werror("CacheKey(#" + _num + "): --DESTROY--\n"
"%s\n\n", "" || describe_backtrace(backtrace())); }
438:
if(!contents)
return cookies;
- // misc->cookies += ({contents});
+
foreach(((contents/";") - ({""})), string c)
{
string name, value;
1004:
string generate_bugreport(string msg, array(string) rxml_bt, array(string) bt,
string raw_bt_descr, string raw_url, string raw)
{
- return ("Roxen version: "+version()+
- (roxen.real_version != version()?
- " ("+roxen.real_version+")":"")+
+ return ("ChiliMoon version: "+version()+
+ (core.real_version != version()?
+ " ("+core.real_version+")":"")+
"\nPike version: " + predef::version() +
"\nRequested URL: "+raw_url+"\n"
"\nError: " + raw_bt_descr +
1357:
return file[what];
}
}
-
- string _sprintf() { return "MultiRangeWrapper"; }
+
}
1720: Inside #if defined(MAGIC_ERROR)
} else {
if(prestate->find_file)
{
- if (!roxen.configuration_authenticate (this_object(), "View Settings"))
+ if (!core.configuration_authenticate(this_object(), "View Settings"))
file = Roxen.http_auth_required("admin");
else
file = ([
1748:
if( objectp( file->try_again_later ) )
;
else
- call_out( roxen.handle, file->try_again_later, handle_request );
+ call_out( core.handle, file->try_again_later, handle_request );
return;
}
else if( file->pipe )
2049:
TIMER_END(parse_request);
#ifdef THREADS
- REQUEST_WERR("HTTP: Calling roxen.handle().");
- roxen.handle(handle_request);
+ REQUEST_WERR("HTTP: Calling core.handle().");
+ core.handle(handle_request);
#else
handle_request();
#endif
2183:
}
}
- string _sprintf( )
+ string _sprintf(int t)
{
-
+ if(t!='O') return 0;
return "RequestID(" + (raw_url||"") + ")"
#ifdef ID_OBJ_DEBUG
+ (__marker ? "[" + __marker->count + "]" : "")