Browse Source

Plan 9 from Bell Labs 2005-10-14

David du Colombier 18 years ago
parent
commit
cb8356c437
4 changed files with 13 additions and 6 deletions
  1. 3 1
      dist/replica/_plan9.db
  2. 3 3
      dist/replica/plan9.db
  3. 3 0
      dist/replica/plan9.log
  4. 4 2
      sys/src/cmd/ip/httpd/sendfd.c

+ 3 - 1
dist/replica/_plan9.db

@@ -11945,7 +11945,7 @@ sys/src/cmd/ip/httpd/netlib_find.c - 664 sys sys 1015090172 6247
 sys/src/cmd/ip/httpd/netlib_history.c - 664 sys sys 1121977160 4748
 sys/src/cmd/ip/httpd/redirect.c - 664 sys sys 1042522766 2978
 sys/src/cmd/ip/httpd/save.c - 664 sys sys 1015090172 3175
-sys/src/cmd/ip/httpd/sendfd.c - 664 sys sys 1017679317 12134
+sys/src/cmd/ip/httpd/sendfd.c - 664 sys sys 1129202621 12264
 sys/src/cmd/ip/httpd/webls.c - 664 sys sys 1120737502 7658
 sys/src/cmd/ip/httpd/webls.denied - 664 sys sys 1064887847 3
 sys/src/cmd/ip/httpd/wikipost.c - 664 sys sys 1083771074 5913
@@ -14967,3 +14967,5 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
+386/bin/ip/httpd/httpd - 775 sys sys 1129259480 292482
+386/bin/ip/httpd/save - 775 sys sys 1129259481 131212

+ 3 - 3
dist/replica/plan9.db

@@ -285,12 +285,12 @@
 386/bin/ip/gping - 775 sys sys 1116126318 182819
 386/bin/ip/hogports - 775 sys sys 1118632064 42883
 386/bin/ip/httpd - 20000000775 sys sys 1016920846 0
-386/bin/ip/httpd/httpd - 775 sys sys 1128568177 292364
+386/bin/ip/httpd/httpd - 775 sys sys 1129259480 292482
 386/bin/ip/httpd/imagemap - 775 sys sys 1127790501 114798
 386/bin/ip/httpd/man2html - 775 sys sys 1127790501 123085
 386/bin/ip/httpd/netlib_find - 775 sys sys 1127790502 115643
 386/bin/ip/httpd/netlib_history - 775 sys sys 1127790502 114439
-386/bin/ip/httpd/save - 775 sys sys 1127790502 131094
+386/bin/ip/httpd/save - 775 sys sys 1129259481 131212
 386/bin/ip/httpd/webls - 775 sys sys 1127790503 131239
 386/bin/ip/httpd/wikipost - 775 sys sys 1127790503 112677
 386/bin/ip/imap4d - 775 sys sys 1128568177 237569
@@ -11945,7 +11945,7 @@ sys/src/cmd/ip/httpd/netlib_find.c - 664 sys sys 1015090172 6247
 sys/src/cmd/ip/httpd/netlib_history.c - 664 sys sys 1121977160 4748
 sys/src/cmd/ip/httpd/redirect.c - 664 sys sys 1042522766 2978
 sys/src/cmd/ip/httpd/save.c - 664 sys sys 1015090172 3175
-sys/src/cmd/ip/httpd/sendfd.c - 664 sys sys 1017679317 12134
+sys/src/cmd/ip/httpd/sendfd.c - 664 sys sys 1129202621 12264
 sys/src/cmd/ip/httpd/webls.c - 664 sys sys 1120737502 7658
 sys/src/cmd/ip/httpd/webls.denied - 664 sys sys 1064887847 3
 sys/src/cmd/ip/httpd/wikipost.c - 664 sys sys 1083771074 5913

+ 3 - 0
dist/replica/plan9.log

@@ -21608,3 +21608,6 @@
 1128828714 0 c 386/bin/tbl - 775 sys sys 1128827256 113237
 1128979840 0 c sys/src/cmd/wikifs/tohtml.c - 664 sys sys 1128979520 14527
 1129001445 0 c 386/bin/wikifs - 775 sys sys 1129000073 202470
+1129203037 0 c sys/src/cmd/ip/httpd/sendfd.c - 664 sys sys 1129202621 12264
+1129260714 0 c 386/bin/ip/httpd/httpd - 775 sys sys 1129259480 292482
+1129260714 1 c 386/bin/ip/httpd/save - 775 sys sys 1129259481 131212

+ 4 - 2
sys/src/cmd/ip/httpd/sendfd.c

@@ -125,9 +125,10 @@ sendfd(HConnect *c, int fd, Dir *dir, HContent *type, HContent *enc)
 		r = c->head.range;
 		if(r == nil)
 			hprint(hout, "Content-Length: %lld\r\n", length);
-		else if(r->next == nil)
+		else if(r->next == nil){
 			hprint(hout, "Content-Range: bytes %ld-%ld/%lld\r\n", r->start, r->stop, length);
-		else{
+			hprint(hout, "Content-Length: %ld\r\n", r->stop - r->start);
+		}else{
 			multir = 1;
 			boundary = hmkmimeboundary(c);
 			hprint(hout, "Content-Type: multipart/byteranges; boundary=%s\r\n", boundary);
@@ -195,6 +196,7 @@ sendfd(HConnect *c, int fd, Dir *dir, HContent *type, HContent *enc)
 			hprint(hout, "\r\n--%s\r\n", boundary);
 			printtype(hout, type, enc);
 			hprint(hout, "Content-Range: bytes %ld-%ld/%lld\r\n", r->start, r->stop, length);
+			hprint(hout, "Content-Length: %ld\r\n", r->stop - r->start);
 			hprint(hout, "\r\n");
 		}
 		hflush(hout);