Merge branch 'master' of github.com:adamdruppe/arsd

cgi.d

@@ -519,45 +519,44 @@ class Cgi {
 			if(arg.startsWith("--")) {
 				nextArgIs = arg[2 .. $];
 			} else if(nextArgIs.length) {
-				switch(nextArgIs) {
+				if (nextArgIs == "cookie") {
-					case "cookie":
 					auto info = breakUp(arg);
 					if(_cookie.length)
 						_cookie ~= "; ";
 					_cookie ~= std.uri.encodeComponent(info[0]) ~ "=" ~ std.uri.encodeComponent(info[1]);
-					break;
+				}
-					case "port":
+				else if (nextArgIs == "port") {
 					port = to!int(arg);
-					break;
+				}
-					case "referrer":
+				else if (nextArgIs == "referrer") {
 					referrer = arg;
-					break;
+				}
-					case "remote-address":
+				else if (nextArgIs == "remote-address") {
 					remoteAddress = arg;
-					break;
+				}
-					case "user-agent":
+				else if (nextArgIs == "user-agent") {
 					userAgent = arg;
-					break;
+				}
-					case "authorization":
+				else if (nextArgIs == "authorization") {
 					authorization = arg;
-					break;
+				}
-					case "userpass":
+				else if (nextArgIs == "userpass") {
 					authorization = "Basic " ~ Base64.encode(cast(immutable(ubyte)[]) (arg)).idup;
-					break;
+				}
-					case "origin":
+				else if (nextArgIs == "origin") {
 					origin = arg;
-					break;
+				}
-					case "accept":
+				else if (nextArgIs == "accept") {
 					accept = arg;
-					break;
+				}
-					case "last-event-id":
+				else if (nextArgIs == "last-event-id") {
 					lastEventId = arg;
-					break;
+				}
-					case "https":
+				else if (nextArgIs == "https") {
 					if(arg == "yes")
 						https = true;
-					break;
+				}
-					case "header":
+				else if (nextArgIs == "header") {
 					string thing, other;
 					auto idx = arg.indexOf(":");
 					if(idx == -1)
@@ -565,13 +564,12 @@ class Cgi {
 					thing = arg[0 .. idx];
 					other = arg[idx + 1.. $];
 					_headers[thing.strip.toLower()] = other.strip;
-					break;
-					case "host":
-						host = arg;
-					break;
-					default:
-						// skip, we don't know it but that's ok, it might be used elsewhere so no error
 				}
+				else if (nextArgIs == "host") {
+					host = arg;
+				}
+				// else
+				// skip, we don't know it but that's ok, it might be used elsewhere so no error
 
 				nextArgIs = null;
 			} else if(lookingForMethod) {
@@ -1533,58 +1531,55 @@ class Cgi {
 
 				requestHeadersHere[name] = value;
 
-				switch(name) {
+				if (name == "accept") {
-					case "accept":
 					accept = value;
-					break;
+				}
-					case "origin":
+				else if (name == "origin") {
 					origin = value;
-					break;
+				}
-					case "connection":
+				else if (name == "connection") {
 					if(value == "close" && closeConnection)
 						*closeConnection = true;
 					if(value.toLower().indexOf("keep-alive") != -1)
 						keepAliveRequested = true;
-					break;
+				}
-					case "transfer-encoding":
+				else if (name == "transfer-encoding") {
 					if(value == "chunked")
 						isChunked = true;
-					break;
+				}
-					case "last-event-id":
+				else if (name == "last-event-id") {
 					lastEventId = value;
-					break;
+				}
-					case "authorization":
+				else if (name == "authorization") {
 					authorization = value;
-					break;
+				}
-					case "content-type":
+				else if (name == "content-type") {
 					contentType = value;
-					break;
+				}
-					case "content-length":
+				else if (name == "content-length") {
 					contentLength = to!size_t(value);
-					break;
+				}
-					case "x-forwarded-for":
+				else if (name == "x-forwarded-for") {
 					remoteAddress = value;
-					break;
+				}
-					case "x-forwarded-host":
+				else if (name == "x-forwarded-host" || name == "host") {
-					case "host":
 					host = value;
-					break;
+				}
-					case "accept-encoding":
+				else if (name == "accept-encoding") {
 					if(value.indexOf("gzip") != -1)
 						acceptsGzip = true;
-					break;
-					case "user-agent":
-						userAgent = value;
-					break;
-					case "referer":
-						referrer = value;
-					break;
-					case "cookie":
-						cookie ~= value;
-					break;
-					default:
-						// ignore it
 				}
+				else if (name == "user-agent") {
+					userAgent = value;
+				}
+				else if (name == "referer") {
+					referrer = value;
+				}
+				else if (name == "cookie") {
+					cookie ~= value;
+				}
+				// else
+				// ignore it
 
 			}
 		}

simpledisplay.d

@@ -12597,6 +12597,11 @@ extern(System) nothrow @nogc {
 	void glColor4f(float, float, float, float);
 	void glTranslatef(float, float, float);
 	void glScalef(float, float, float);
+	void glSecondaryColor3b(byte, byte, byte);
+	void glSecondaryColor3ub(ubyte, ubyte, ubyte);
+	void glSecondaryColor3i(int, int, int);
+	void glSecondaryColor3ui(uint, uint, uint);
+	void glSecondaryColor3f(float, float, float);
 
 	void glDrawElements(int, int, int, void*);