Merge remote-tracking branch 'urbit/master' into newbreach

Conflicts:
	urb/urbit.pill

pill created from fakezod
This commit is contained in:
~hatteb-mitlyd 2014-05-16 15:04:40 -07:00
commit 13e5b0966f

View File

@ -104,7 +104,7 @@ _cttp_heds_to_list(u2_hhed* hed_u)
static void
_cttp_heds_free(u2_hhed* hed_u)
{
if ( hed_u ) {
while ( hed_u ) {
u2_hhed* nex_u = hed_u->nex_u;
if ( hed_u->nam_c ) free(hed_u->nam_c);
@ -120,7 +120,7 @@ _cttp_heds_free(u2_hhed* hed_u)
static void
_cttp_bods_free(u2_hbod* bod_u)
{
if ( bod_u ) {
while ( bod_u ) {
u2_hbod* nex_u = bod_u->nex_u;
free(bod_u);
@ -370,19 +370,17 @@ _cttp_mcut_quay(c3_c* buf_c, c3_w len_w, u2_noun quy)
return len_w;
}
else {
u2_noun n_quy = u2h(quy);
u2_noun pn_quy = u2h(n_quy);
u2_noun qn_quy = u2t(n_quy);
u2_noun l_quy = u2h(u2t(quy));
u2_noun r_quy = u2t(u2t(quy));
u2_noun i_quy = u2h(quy);
u2_noun pi_quy = u2h(i_quy);
u2_noun qi_quy = u2t(i_quy);
u2_noun t_quy = u2t(quy);
len_w = _cttp_mcut_char(buf_c, len_w, '&');
len_w = _cttp_mcut_span(buf_c, len_w, u2k(pn_quy));
len_w = _cttp_mcut_span(buf_c, len_w, u2k(pi_quy));
len_w = _cttp_mcut_char(buf_c, len_w, '=');
len_w = _cttp_mcut_span(buf_c, len_w, u2k(qn_quy));
len_w = _cttp_mcut_span(buf_c, len_w, u2k(qi_quy));
len_w = _cttp_mcut_quay(buf_c, len_w, u2k(l_quy));
len_w = _cttp_mcut_quay(buf_c, len_w, u2k(r_quy));
len_w = _cttp_mcut_quay(buf_c, len_w, u2k(t_quy));
}
u2z(quy);
return len_w;
@ -738,7 +736,16 @@ _cttp_ccon_waste(u2_ccon* coc_u, c3_c* msg_c)
coc_u->nex_u->pre_u = coc_u->pre_u;
}
if ( coc_u->ssl.ssl_u ) {
SSL_free(coc_u->ssl.ssl_u);
SSL_free(coc_u->ssl.ssl_u);
coc_u->ssl.ssl_u = 0;
}
if ( coc_u->ssl.rio_u ) {
BIO_free(coc_u->ssl.rio_u);
coc_u->ssl.rio_u = 0;
}
if ( coc_u->ssl.wio_u ) {
BIO_free(coc_u->ssl.wio_u);
coc_u->ssl.wio_u = 0;
}
free(coc_u);
}