Backport ffedad8d to release/3.5

This commit is contained in:
Aaron Jones 2016-08-31 14:13:45 +00:00
parent 865e70f529
commit 6008896554
No known key found for this signature in database
GPG key ID: EC6F86EE9CD840B5

View file

@ -800,7 +800,7 @@ server_estab(struct Client *client_p)
EmptyString(server_p->spasswd) ? "*" : server_p->spasswd, TS_CURRENT, me.id);
/* pass info to new server */
send_capabilities(client_p, default_server_capabs
send_capabilities(client_p, default_server_capabs | CAP_MASK
| (ServerConfCompressed(server_p) ? CAP_ZIP_SUPPORTED : 0)
| (ServerConfTb(server_p) ? CAP_TB : 0));
@ -1357,7 +1357,7 @@ serv_connect_callback(rb_fde_t *F, int status, void *data)
EmptyString(server_p->spasswd) ? "*" : server_p->spasswd, TS_CURRENT, me.id);
/* pass my info to the new server */
send_capabilities(client_p, default_server_capabs
send_capabilities(client_p, default_server_capabs | CAP_MASK
| (ServerConfCompressed(server_p) ? CAP_ZIP_SUPPORTED : 0)
| (ServerConfTb(server_p) ? CAP_TB : 0));