Browse Source

Plan 9 from Bell Labs 2009-02-15

David du Colombier 15 years ago
parent
commit
27aea24571
5 changed files with 8 additions and 11 deletions
  1. 2 2
      sys/man/1/patch
  2. 1 1
      sys/man/4/fossil
  3. 2 2
      sys/man/8/nfsserver
  4. 1 5
      sys/src/cmd/webfs/cookies.c
  5. 2 1
      sys/src/cmd/webfs/http.c

+ 2 - 2
sys/man/1/patch

@@ -87,8 +87,8 @@ source files and the patched source files.
 .PP
 .I Patch/apply
 applies the patch to the current source tree.
-It is intended to be run by the Plan 9 developers  with
-.B yoshimi
+It is intended to be run by the Plan 9 developers with
+.B pie
 as their root file system.
 If the source has changed since the patch was
 created,

+ 1 - 1
sys/man/4/fossil

@@ -73,7 +73,7 @@ Unlike the Plan 9 file servers of old,
 .I fossil
 is a collection of user-space programs that run on a standard Plan 9 kernel.
 The name of the main fossil file server at Murray Hill is
-.BR yoshimi .
+.BR pie .
 The Plan 9 distribution file server,
 .BR sources ,
 is also a fossil server.

+ 2 - 2
sys/man/8/nfsserver

@@ -135,7 +135,7 @@ A typical entry in
 might be:
 .PP
 .EX
-aux/nfsserver -a tcp!edith -a tcp!yoshimi -c /lib/ndb/nfs
+aux/nfsserver -a tcp!pie -a tcp!yoshimi -c /lib/ndb/nfs
 aux/pcnfsd
 aux/portmapper
 .EE
@@ -145,7 +145,7 @@ Assuming the CPU server's name is
 the mount commands on the client would be:
 .PP
 .EX
-/etc/mount -o soft,intr eduardo:edith /n/edith
+/etc/mount -o soft,intr eduardo:pie /n/pie
 /etc/mount -o soft,intr eduardo:yoshimi /n/yoshimi
 .EE
 .PP

+ 1 - 5
sys/src/cmd/webfs/cookies.c

@@ -584,11 +584,7 @@ cookiesearch(Jar *jar, char *dom, char *path, int issecure)
 			fprint(2, "\ttry %s %s %d %s\n", jar->c[i].dom,
 				jar->c[i].path, jar->c[i].secure,
 				jar->c[i].name);
-		/*
-		 * fgb says omitting secure checks is necessary to
-		 * get some sites to work, but it seems dubious.
-		 */
-		if((0 || issecure || !jar->c[i].secure) &&
+		if((issecure || !jar->c[i].secure) &&
 		    iscookiematch(&jar->c[i], dom, path, now)){
 			if(cookiedebug)
 				fprint(2, "\tmatched\n");

+ 2 - 1
sys/src/cmd/webfs/http.c

@@ -314,7 +314,8 @@ httpopen(Client *c, Url *url)
 		ioprint(io, fd, "User-Agent: %s\r\n", c->ctl.useragent);
 	if(c->ctl.sendcookies){
 		/* should we use url->page here?  sometimes it is nil. */
-		cookies = httpcookies(url->host, url->http.page_spec, 0);
+		cookies = httpcookies(url->host, url->http.page_spec,
+			url->ischeme == UShttps);
 		if(cookies && cookies[0])
 			ioprint(io, fd, "%s", cookies);
 		if(httpdebug)