Commit Graph

4367 Commits

Author SHA1 Message Date
Alexey Sokolov 85700bdee3 Add a comment for #820 and #1012 2015-12-05 18:04:32 +00:00
Alexey Sokolov 52a4548d51 Fix style a bit. 2015-12-05 17:54:23 +00:00
Adam 47f887ce43 Add SNI client support
Close #1200
2015-12-05 17:48:13 +00:00
Alexey Sokolov b2ed9d7615 Fix bad merge of Csocket submodule 2015-11-30 08:19:04 +00:00
Alexey Sokolov 7f6fc6643e Merge branch 'master' into notify
Conflicts:
    test/Integration.cpp
2015-11-30 08:02:47 +00:00
Alexey Sokolov d736397194 Small change for test of notify_connect for better variety 2015-11-30 08:00:51 +00:00
Alexey Sokolov bee266a08e Fix test after fixing #1190 2015-11-29 12:26:17 +00:00
Alexey Sokolov 569f057561 Call CTCP callback for actions too, as it was before switch to CMessage.
Partyline had both of callbacks, one of which is redundant.

Fix #1134
Fix #1190
2015-11-29 00:59:50 +00:00
Alexey Sokolov 391f89d6e2 Travis: notify #znc-dev through ZNC-Linker 2015-11-28 19:21:43 +00:00
Oleh Prypin 50edbd5f0d Test notify_connect module 2015-11-27 12:20:33 +02:00
Alexey Sokolov 45f661e496 Merge pull request #1192 from nospampleasemam/support-separate-sslkeyfile
support for separate SSLKeyFile configuration
2015-11-27 01:38:45 +00:00
Oleh Prypin facec8d4a3 Show client identification in notify_connect module 2015-11-26 17:00:30 +02:00
Alexey Sokolov b7aff7f7ea Don't bump compiler requirements from GCC 4.7 to GCC 4.8 yet.
Fix #1189
2015-11-26 14:02:15 +00:00
Dylan Lloyd dcd259778a support separate SSLKeyFile & SSLDHParamFile configuration 2015-11-25 17:00:23 -08:00
Alexey Sokolov 1ab7fbf3b9 Revert "znc.service.in: start after network-online.target"
This reverts commit 43f2253f2d.

See https://github.com/znc/znc/issues/1165#issuecomment-159006828 and above.
2015-11-25 00:04:51 +00:00
Alexey Sokolov 0b9c7f7436 modperl: provide operator "" for ZNC::String 2015-11-23 09:57:48 +00:00
Alexey Sokolov cbf5c38d0a Teach modperl and modpython about CMessage and new hooks which accept it.
Fix #1084
Fix #1085
2015-11-22 23:39:30 +00:00
Alexey Sokolov 11b19a63f1 Fix behavior of HALTCORE and HALTMODS for On*BufferPlayLine after introduction of CMessage. 2015-11-22 23:36:03 +00:00
Alexey Sokolov 103ed00861 Move Message assertions to special cast operators.
Don't use static_cast directly anymore, but use these operators.
2015-11-21 12:13:54 +00:00
Alexey Sokolov f33809585f Move Message sizes asserts to their definitions, and add missing ones. 2015-11-21 10:50:52 +00:00
Alexey Sokolov c283d7a07b Fix include guard of Message.h 2015-11-21 10:35:03 +00:00
Alexey Sokolov f3bc06c47d Revert "znc.service.in: add datadir & instructions"
This reverts commit 28f7f57666.

Close #1165
2015-11-21 00:40:24 +00:00
Alexey Sokolov 2cb6599c87 Merge pull request #1184 from TingPing/tingping/servicefile
Fix bindir in service file
2015-11-15 23:34:38 +00:00
Patrick Griffis be60ebb4b7 Fix bindir in service file 2015-11-15 18:26:15 -05:00
Alexey Sokolov 622b48427c Merge pull request #1166 from Mikaela/systemd
znc.service.in: add datadir & instructions
2015-11-15 22:28:51 +00:00
Alexey Sokolov 6ec64ebfba Merge branch '1.6.x'
Conflicts:
	ChangeLog.md
	configure.ac
	third_party/Csocket
2015-11-15 18:21:11 +00:00
Alexey Sokolov 840acbfb5d Merge branch '1.6.x' of github.com:znc/znc into 1.6.x 2015-11-15 18:00:48 +00:00
Alexey Sokolov e2d313d3ba Revert version changes after releasing 1.6.2 to 1.6.x 2015-11-15 17:59:43 +00:00
Alexey Sokolov 55b5c24255 Increase the version number to 1.6.2 znc-1.6.2 2015-11-15 17:36:31 +00:00
Mikaela Suomalainen 28f7f57666 znc.service.in: add datadir & instructions
Closes #1165
2015-11-10 09:28:24 +02:00
Alexey Sokolov 1e46ea821a Merge pull request #1176 from KindOne-/master
Add test for controlpanel module
2015-11-08 16:47:34 +00:00
KindOne 6ac59ee4df Add test for controlpanel 2015-11-06 20:45:38 -05:00
Alexey Sokolov f909cf1ce0 Merge pull request #1178 from Mikaela/travis
.travis.yml: encrypt IRC notification settings
2015-11-06 11:27:07 +00:00
Mikaela Suomalainen 429e0451e4 .travis.yml: encrypt IRC notification settings
Thanks @petemoore at #795
2015-11-06 13:16:59 +02:00
Alexey Sokolov 622c07b864 Merge pull request #1171 from walliski/logNameFix
Make $USER and $NETWORK case sensitive in logs
2015-11-04 22:52:43 +00:00
Alexey Sokolov 92ce58d25f ZNC 1.6.2-rc1 znc-1.6.2-rc1 2015-11-02 21:10:51 +00:00
Alexey Sokolov 4048483da0 Update Csocket: fix build without sslv3 (#1146) 2015-11-02 00:36:08 +00:00
Alexey Sokolov 2d0e2ebbde Don't package appveyor config in tarball
[skip ci]
2015-11-01 23:03:50 +00:00
Alexey Sokolov 29847146cf Make channel test more reliable 2015-11-01 23:01:05 +00:00
Alexey Sokolov 900a11a1a9 Fix test which I've just broken 2015-11-01 22:44:50 +00:00
Alexey Sokolov 585b380189 How did I manage to write invalid JOIN test? 2015-11-01 22:26:24 +00:00
Alexey Sokolov 2eb1164f94 AppVeyor: fix fork() on 32 bit cygwin in shell module.
[2015-10-31 22:44:22.609963] (user/test) CLI -> ZNC [PRIVMSG *shell :echo blahblah]
      0 [main] znc 2624 child_info_fork::abort: address space needed by 'simple_away.so' (0x380000) is already occupied
[2015-10-31 22:44:22.618538] (user/test) ZNC -> CLI [:*shell!shell@/home/appveyor PRIVMSG nick :Failed to execute: Resource temporarily unavailable]
2015-11-01 19:15:27 +00:00
Alexey Sokolov 34026d39dc Add test for shell module 2015-10-31 20:36:58 +00:00
Alexey Sokolov 81fd078157 Merge branch '1.6.x' 2015-10-31 11:58:30 +00:00
Alexey Sokolov fa4c01e49d Add missing return statement to dcc module.
It was harmless, but it makes Coverity happier.
2015-10-31 02:30:04 +00:00
Alexey Sokolov 0d8bb7e597 Merge branch '1.6.x'
Conflicts:
	modules/cyrusauth.cpp
	modules/keepnick.cpp
	modules/notes.cpp
2015-10-30 14:56:28 +00:00
Alexey Sokolov 096dc5b320 Fix some unitialized fields in modules.
They are not used before OnLoad anyway, but Coverity will be happier.
2015-10-30 14:52:51 +00:00
Alexey Sokolov c8edabb035 Fix memory leak when reading invalid znc.conf
Found by https://scan.coverity.com/
2015-10-30 14:36:01 +00:00
Alexey Sokolov 5e337647b1 Add test for invalid channel config. 2015-10-30 14:33:46 +00:00
Alexey Sokolov 3f9bc71bb2 Travis: don't build twice for coverity (again) 2015-10-30 01:52:44 +00:00