urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-28 22:33:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/next-vere' into ipc-redux

Browse Source 
* release/next-vere:
  noun: don't add identical values to song_x_cape's hashtable
  nix: fix boot-ship.nix
  release: urbit-os-v1.0.28
  vere: more readable http server status
  release: urbit-os-v1.0.27
  chat-store: don't trim on %messages, either
This commit is contained in:
Joe Bryan 2020-07-20 13:22:20 -07:00
commit 7701b17995
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/arvo/app/chat-store.hoon
View File

@ -252,7 +252,6 @@
|- ^- (quip card _state)
?~ envelopes.act
:_ state(inbox (~(put by inbox) path.act u.mailbox))
:- [%pass /trim %agent [our.bol %chat-store] %poke %noun !>([%trim ~])]
%+ send-diff path.act
[%messages path.act 0 (lent evaluated-envelopes) evaluated-envelopes]
=. letter.i.envelopes.act (evaluate-letter [author letter]:i.envelopes.act)

12
pkg/urbit/noun/retrieve.c
View File

@ -373,11 +373,13 @@ _song_x_cape(c3_ys mov, c3_ys off,
// we cons [a] and [b] as posts so that we don't
// touch their reference counts.
//
key = u3nc(u3a_to_off(a), u3a_to_off(b));
u3t_off(euq_o);
u3h_put(har_p, key, c3y);
u3t_on(euq_o);
u3z(key);
if ( a != b ) {
key = u3nc(u3a_to_off(a), u3a_to_off(b));
u3t_off(euq_o);
u3h_put(har_p, key, c3y);
u3t_on(euq_o);
u3z(key);
}
fam = _eq_pop(mov, off);
}

6
pkg/urbit/vere/io/http.c
View File

@ -1316,9 +1316,9 @@ _http_serv_start(u3_http* htp_u)
return;
}
u3l_log("http: live (%s, %s) on %d\n",
(c3y == htp_u->sec) ? "secure" : "insecure",
(c3y == htp_u->lop) ? "loopback" : "public",
u3l_log("http: %s live on %s://localhost:%d\n",
(c3y == htp_u->lop) ? "loopback" : "web interface",
(c3y == htp_u->sec) ? "https" : "http",
htp_u->por_s);
break;