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

Comparing deliantra/server/ext/http.ext (file contents):
Revision 1.7 by root, Tue Oct 30 20:46:58 2012 UTC vs.
Revision 1.8 by root, Wed Oct 31 11:19:30 2012 UTC

29} 29}
30 30
31my $cache_headers = "cache-control: max-age=8640000\015\012" 31my $cache_headers = "cache-control: max-age=8640000\015\012"
32 . "etag: \"0\"\015\012"; 32 . "etag: \"0\"\015\012";
33 33
34sub content_type {
35 return "content-type: image/png\015\012" if $_[0] =~ /^\x89PNG/;
36 return "content-type: image/jpeg\015\012" if $_[0] =~ /^......JFIF/s;
37 return "content-type: audio/wav\015\012" if $_[0] =~ /^RIFF/;
38 return "content-type: audio/x-ogg\015\012" if $_[0] =~ /^OggS/;
39
40 "content-type: text/plain\015\012"
41}
42
34sub handle_req { 43sub handle_req {
35 my ($self) = @_; 44 my ($self) = @_;
36 45
37 while ($self->{rbuf} =~ s/^( ( [^\015]+ | . )+? )\015\012\015\012//xs) { 46 while ($self->{rbuf} =~ s/^( ( [^\015]+ | . )+? )\015\012\015\012//xs) {
38 my $req = $1; 47 my $req = $1;
46 55
47 $uri =~ s%^http://[^/]*%%i; # just in case 56 $uri =~ s%^http://[^/]*%%i; # just in case
48 57
49 cf::debug "HTTP GET: $self->{id} $uri"; 58 cf::debug "HTTP GET: $self->{id} $uri";
50 59
51 if ($uri =~ m%^/([0-9a-f]+)$%) { # faces 60 if ($uri =~ m%^/(M?)([0-9a-f]+)$%) { # faces
61 my $want_meta = $1;
52 my $idx = $cf::FACEHASH{pack "H*", $1}; 62 my $idx = $cf::FACEHASH{pack "H*", $2};
53 63
54 $idx 64 $idx
55 or do { $self->respond ("404 illegal face name"), next }; 65 or do { $self->respond ("404 illegal face name"), next };
56 66
57 if ($req =~ /if-none-match/i) { # dirtiest hack evar 67 if ($req =~ /if-none-match/i) { # dirtiest hack evar
58 $self->respond ("304 not modified", "", $cache_headers); 68 $self->respond ("304 not modified", "", $cache_headers);
59 next; 69 next;
60 } 70 }
61 71
62 my $type = cf::face::get_type $idx, 1; 72 my $type = cf::face::get_type $idx, 1;
73 my $data = cf::face::get_data $idx, 1;
63 74
75 (my $meta, $data) = unpack "(w/a*)*", $data
76 if $type & 1;
77
78 if ($want_meta) {
64 if ($type & 1) { 79 if ($type & 1) {
80 $self->respond ("200 OK", $meta, "content-type: text/plain\015\012" . $cache_headers);
81 } else {
65 $self->respond ("404 type $type not served yet"); 82 $self->respond ("404 type $type has no metadata");
83 }
66 } else { 84 } else {
67 if ($type == 0) { # faces 85 $self->respond ("200 OK", $data, (content_type $data) . $cache_headers);
68 $self->respond ("200 OK", (cf::face::get_data $idx, 1), "content-type: image/png\015\012$cache_headers");
69 } else {
70 $self->respond ("404 type $type not served yet");
71 }
72 } 86 }
87
73 } elsif ($uri eq "/allimgs") { # for debugging 88 } elsif ($uri eq "/debug") { # for debugging
74 my $body = "<html><body>"; 89 my $body = "<html><body>";
75 90
91 for my $type (6, 5, 4, 3, 2, 1, 0) {
92 $body .= "<h1>$type</h1>";
93
76 for (1 .. cf::face::faces_size - 1) { 94 for (1 .. cf::face::faces_size - 1) {
77 next if cf::face::get_type $_; 95 next if $type != cf::face::get_type $_;
78 my $name = cf::face::get_chksum $_, 1; 96 my $name = cf::face::get_name $_;
79 $body .= "img src='" . (unpack "H*", $name) . "'<br>"; 97 my $id = unpack "H*", cf::face::get_chksum $_, 1;
98 $body .= "<a href='$id'>$name ($id)</a>";
99 $body .= " <a href='M$id'>(meta)</a>" if $type & 1;
100 $body .= "<br>";
101 }
80 } 102 }
81 103
82 $body .= "</body></html>"; 104 $body .= "</body></html>";
83 105
84 $self->respond ("200 OK", $body, "Content-Type: text/html\015\012"); 106 $self->respond ("200 OK", $body, "Content-Type: text/html\015\012");

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines