zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-23 02:22:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Jari Matilainen 2014-10-12 00:00:05 +02:00
commit 11194a8bc2
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
NEWS
View file

@ -1,4 +1,6 @@
v0.8.17-head 2014-XX-XX The Irssi team <staff@irssi.org> v0.8.18-head 2014-XX-YY The Irssi team <staff@irssi.org>
v0.8.17 2014-10-11 The Irssi team <staff@irssi.org>
+ Document that SSL connections aren't properly handled during /UPGRADE. See Github PR #39. + Document that SSL connections aren't properly handled during /UPGRADE. See Github PR #39.
+ Synchronize scripts with scripts.irssi.org. + Synchronize scripts with scripts.irssi.org.
+ Performance enhancement of the nicklist as well as the window_item_find function. See Github PR #24. + Performance enhancement of the nicklist as well as the window_item_find function. See Github PR #24.
@ -19,6 +21,7 @@ v0.8.17-head 2014-XX-XX The Irssi team <staff@irssi.org>
- Fixed gui_printtext_after and term_refresh_*() visibility. See Github PR #22. - Fixed gui_printtext_after and term_refresh_*() visibility. See Github PR #22.
- Fixed issue where UTF-8 characters was corrupted once for every 32k text. See Github PR #12. - Fixed issue where UTF-8 characters was corrupted once for every 32k text. See Github PR #12.
- Fixed redrawing issue with right-aligned statusbar. - Fixed redrawing issue with right-aligned statusbar.
- Fixed use-after-free bug with cached settings values. See Github PR #147.
v0.8.16 2014-05-28 The Irssi team <staff@irssi.org> v0.8.16 2014-05-28 The Irssi team <staff@irssi.org>
+ Add -noautosendcmd to /SERVER and /CONNECT. Passing this option will + Add -noautosendcmd to /SERVER and /CONNECT. Passing this option will

2
configure.ac
View file

@ -1,4 +1,4 @@
AC_INIT(irssi, 0.8.17-head) AC_INIT(irssi, 0.8.18-head)
AC_CONFIG_SRCDIR([src]) AC_CONFIG_SRCDIR([src])
AC_CONFIG_AUX_DIR(build-aux) AC_CONFIG_AUX_DIR(build-aux)
AC_PREREQ(2.50) AC_PREREQ(2.50)

4
src/core/servers.c
View file

@ -218,9 +218,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
return; return;
if (ip != NULL) { if (ip != NULL) {
own_ip = ip == NULL ? NULL : own_ip = IPADDR_IS_V6(ip) ? server->connrec->own_ip6 : server->connrec->own_ip4;
(IPADDR_IS_V6(ip) ? server->connrec->own_ip6 :
server->connrec->own_ip4);
port = server->connrec->proxy != NULL ? port = server->connrec->proxy != NULL ?
server->connrec->proxy_port : server->connrec->port; server->connrec->proxy_port : server->connrec->port;
handle = server->connrec->use_ssl ? handle = server->connrec->use_ssl ?