| ") +
@@ -192,15 +193,15 @@ case "":
case "/static": // really don't like to do this, but the IE stores directories
// (history) without trailing slash, even if the url originaly
// has one, at least IIRC.
- htredirect(version, "/static/", "use the trailing slash", 1);
+ htredirect(prot, "/static/", "use the trailing slash", 1);
quit();
return 1;
case "/static/":
- file = "/static/index.html";
+ item = "/static/index.html";
break;
case "/oauth":
object oauth;
- http_ok(version);
+ http_ok(prot);
//PT((">>> looking up token %O in shm: %O\n", query["oauth_token"], shared_memory("oauth_request_tokens")))
if (oauth = shared_memory("oauth_request_tokens")[query["oauth_token"]]) {
//PT((">>> oauth: %O\n", oauth))
@@ -214,34 +215,34 @@ case "/oauth":
return 1;
}
string name;
- switch (file[1]) {
+ switch (item[1]) {
case '~':
- string channel, nick = file[2..];
- if (sscanf(file, "/~%s/%s", nick, channel)) {
+ string channel, nick = item[2..];
+ if (sscanf(item, "/~%s/%s", nick, channel)) {
name = "~" + nick + "#" + channel;
} else if (o = summon_person(nick, NET_PATH "user")) {
- o->htinfo(version, query, headers, qs, channel);
+ o->htinfo(prot, query, headers, qs, channel);
quit();
return 1;
}
//fall thru
case '@':
- unless(name) name = file[2..];
+ unless(name) name = item[2..];
o = find_place(name);
break;
default:
- if (abbrev("/static/", file)) {
- if (file_size(file) > 0) {
- if (sscanf(file, "%!s.%s", ext)) {
+ if (abbrev("/static/", item)) {
+ if (file_size(item) > 0) {
+ if (sscanf(item, "%!s.%s", ext)) {
while (sscanf(ext, "%!s.%s", ext)) ;
}
- http_ok(version, content_type(ext), 0);
- binary_message(read_file(file));
+ http_ok(prot, content_type(ext), 0);
+ binary_message(read_file(item));
quit();
return 1;
}
- } else if (sscanf(file, "/%s/%s.page", ext, t) == 2) {
- http_ok(version);
+ } else if (sscanf(item, "/%s/%s.page", ext, t) == 2) {
+ http_ok(prot);
sTextPath(0, query["lang"] || ext, "html");
t = replace(t, "/", "_");
write(T("_HTML_head", "" CHATNAME "\n"
@@ -253,16 +254,16 @@ case "/oauth":
}
}
- if (index(file, ':') != -1) {
- http_error(version, 501, "Not Implemented. Whatever you are trying "
+ if (index(item, ':') != -1) {
+ http_error(prot, 501, "Not Implemented. Whatever you are trying "
"there, this server won't help you.");
quit();
return;
}
- unless (o) o = file -> load();
- if (objectp(o) || o = find_object(file))
- done = o->htget(version, query, headers, qs) != HTMORE;
+ unless (o) o = item -> load();
+ if (objectp(o) || o = find_object(item))
+ done = o->htget(prot, query, headers, qs) != HTMORE;
if (done)
quit();
diff --git a/world/net/include/net.h b/world/net/include/net.h
index c47bf56..b85c0fb 100644
--- a/world/net/include/net.h
+++ b/world/net/include/net.h
@@ -166,12 +166,12 @@
# define htmlhead this_interactive()->http_head
# define htmlpage this_interactive()->http_page
# define htmltail this_interactive()->http_tail
-
-# define HTERROR 1 // return mc if necessary?
-# define HTDONE 0
-# define HTMORE -1
#endif
+#define HTERROR 1 // return mc if necessary?
+#define HTDONE 0
+#define HTMORE -1
+
// even more specific to the way we parse commands
// combine the rest of the arguments back into one string
#define ARGS(x) implode(args[x..], " ")
|