ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/tcp_http.ext
(Generate patch)

Comparing deliantra/server/ext/tcp_http.ext (file contents):
Revision 1.4 by root, Tue Nov 6 23:33:15 2012 UTC vs.
Revision 1.6 by root, Wed Nov 7 01:21:27 2012 UTC

24 24
25sub respond { 25sub respond {
26 $_[0]->send ("HTTP/1.1 $_[1]\015\012" 26 $_[0]->send ("HTTP/1.1 $_[1]\015\012"
27 . "content-length: " . (0 + length $_[2]) . "\015\012" 27 . "content-length: " . (0 + length $_[2]) . "\015\012"
28 . "access-control-allow-origin: *\015\012" 28 . "access-control-allow-origin: *\015\012"
29 . $_[0]{ohdr}
29 . "$_[3]\015\012$_[2]"); 30 . "$_[3]\015\012$_[2]");
30} 31}
31 32
32my $cache_headers = "cache-control: max-age=8640000\015\012" 33my $cache_headers = "cache-control: max-age=8640000\015\012"
33 . "etag: \"0\"\015\012"; 34 . "etag: \"0\"\015\012";
47 while ($self->{rbuf} =~ s/^( (?: [^\015]+ | . )+? )\015\012\015\012//xs) { 48 while ($self->{rbuf} =~ s/^( (?: [^\015]+ | . )+? )\015\012\015\012//xs) {
48 my $req = $1; 49 my $req = $1;
49 50
50 # we ignore headers atm. 51 # we ignore headers atm.
51 52
52 $req =~ m%^GET (\S+) HTTP/[0-9.]+\015\012%i 53 $req =~ m%^GET (\S+) HTTP/([0-9.]+)\015\012%i
53 or return $self->fatal; 54 or return $self->fatal;
54 55
55 my $uri = $1; 56 my $uri = $1;
57 my $http = $2;
58
59 if ($http == 1.0) {
60 if ($req =~ /^connection\s*:\s*keep-alive/mi) {
61 $self->{ohdr} = "connection: keep-alive\015\012";
62 } else {
63 $self->{ohdr} = "connection: close\015\012";
64 delete $self->{rw};
65 }
66 }
56 67
57 $uri =~ s%^http://[^/]*%%i; # just in case 68 $uri =~ s%^http://[^/]*%%i; # just in case
58 69
59 cf::debug "HTTP GET: $self->{id} $uri"; 70 cf::debug "HTTP GET: $self->{id} $uri";
60 71
102 } 113 }
103 } 114 }
104 115
105 push @body, "</body></html>"; 116 push @body, "</body></html>";
106 117
107 $self->respond ("200 OK", (join "", @body), "Content-Type: text/html\015\012"); 118 $self->respond ("200 OK", (join "", @body), "content-type: text/html\015\012");
108 } elsif ($uri eq "/ws" && defined &ext::ws::server) { 119 } elsif ($uri eq "/ws" && defined &ext::ws::server) {
109 &ext::ws::server ($self->{id}, $self->{fh}, "$req\015\012\015\012$self->{rbuf}"); 120 &ext::ws::server ($self->{id}, $self->{fh}, "$req\015\012\015\012$self->{rbuf}");
110 121
111 %$self = (); 122 %$self = ();
123
124 } elsif ($uri eq "/") {
125 $self->respond ("302 hack", "", "location: http://cvs.schmorp.de/deliantra/html5client/client.html\015\012");
112 126
113 } else { 127 } else {
114 $self->respond ("404 not found"); 128 $self->respond ("404 not found");
115 } 129 }
116 } 130 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines