From 8732cbf2b8eb4614514213f86a0319c72b439715 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Wed, 27 Sep 2017 14:52:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=BC=E5=86=99=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/.DS_Store         | Bin 12292 -> 10244 bytes
 src/Common/config.cpp |   2 +-
 src/Common/config.h   |   2 +-
 tests/.DS_Store       | Bin 6148 -> 6148 bytes
 tests/test_server.cpp |   2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/.DS_Store b/src/.DS_Store
index f04e1d9450bda71d45db062c7fac2fa5ca0337f7..84641cf35a8752dd7f98f5b50a32ff9174db4535 100644
GIT binary patch
delta 233
zcmZokXbDhYU|?W$DortDU;r^WfEYvza5FHla4|4Qa8Fdw7nK5vFare{7)lrla*E3e
zl5+BsHeOuJJlQ~oWn#DB=6<y-rp>uZb&Nbfm5e|P1RUHOFN(8lR_A%b%*Zowg5+d-
z0nyD$0vFjgb1V2Va;6j~=OpFl=P+#cP_$v)+$xsED9H-ZsQ|Q`!4=sN8!x_Rp3E<!
ns{v8~GQR;rgRKG*Oh7Ie02v@JXiQF#nYsCi$^u59!Rd?uFF-2l

delta 212
zcmZn(Xh~3DU|?W$DortDV2}VZIe-{M3vdI8HU<U-o{0+jqLM%kGf<F$p@gBJEVw8y
zCqFNJVxjV60~MCZ+$@5VB?NdUYf8v$7UB?P+1Q}V%*hDU0R$Y}n*}+<ST?KiJY{C&
z-mD_<oPA=0h$JgSRsv*+E3#!k)$f@n^Q-8B4LAT&Hra+pngwVa$K({1nVZFA+Zi_t
cvNSMmW|0VC+*~NB!wTe<GJ&nx*zlDJ0NPn6JOBUy

diff --git a/src/Common/config.cpp b/src/Common/config.cpp
index bb30b1ec..caab23fd 100644
--- a/src/Common/config.cpp
+++ b/src/Common/config.cpp
@@ -11,7 +11,7 @@ using namespace ZL::Network;
 
 namespace Config {
 
-void loaIniConfig(){
+void loadIniConfig(){
 	auto &ini = ZL::Util::mINI::Instance();
 	try{
 		ini.parseFile(exePath() + ".ini");
diff --git a/src/Common/config.h b/src/Common/config.h
index 030b6f8b..6e6ff51e 100644
--- a/src/Common/config.h
+++ b/src/Common/config.h
@@ -14,7 +14,7 @@ using namespace ZL::Util;
 
 namespace Config {
 
-void loaIniConfig();
+void loadIniConfig();
 ////////////TCP最大连接数///////////
 #ifdef __x86_64__
 #define MAX_TCP_SESSION 100000
diff --git a/tests/.DS_Store b/tests/.DS_Store
index d7f2a65a5f94692fd046a7e8879f247bc5e3f6a9..f46f9d971922689601b61e3e49f6368111451551 100644
GIT binary patch
literal 6148
zcmeHK%Sr<=6g|-{N~N_ZsLNTpDk#N`o3Rg2v>>{2rS<_8r%ve$-Oa{-@E80_JvRxG
zX{YK+L~|iInVFn3xu=t)0ibHr?jBGEkY^Fh6<B42JeRT%EA~#2sI*28XSl-{6BZxd
z0q?+XcR=QD33aq^i+i~9x58Qch{;J5ciK_hW<OaZ4q0~Jbg(50LxZdtXMKlwjMKUP
zuV3}=jyq91jw2B(QeYnksA|y;Vst4wLIwS_tlFNFE#Lx89Ff-|W)59F&v7=GU{5br
z*J!i#z!drz(1;POsPJltVfwu~{TC<wO-G~8_Jo`|BHAH(lO-x*imS5js0_)z#golD
zV+=ZXm+g*WM5O`8aE>W6>wlsmZn!F2&KR;(T2!qr$%h|>$~&&O`Hb}#X3Iwcy75i+
zkSc@pFCuQF*d<&s_Zhzg*@)6^&VNPpAjPF6|0%d<OXSxK`r13-9q<l(I3Vjoz#<r0
zObqI!gOxr45Och(gKhbnAe_KrXfZL!Ck$n%L_<~fh@lLf_XFE6w3rw)bSQiHQ1;Er
zo=}v2JM{zI9V#^FYwv(}Anm}axh%{6-&}tFPm}zWcfdRFryNkZ#$}_%l<eNRkeuwb
u0m}`Gg!D@cY6>g69qWc{#XBrI_$-hHF|?Q%<Q<0pBcN^Ym3QDr9e4*5=+Msq

delta 93
zcmZoMXfc=|#>CJzu~2NHo}wrt0|NsP3otMwGo&(jFnFgFC+AEoRA*$IT)`s4$hcXM
qLyTo(g9r0wb`E|Hpgy3$cjn3bBD$O)tp|XZVX_U6^yV0mCCmV{a1;dq

diff --git a/tests/test_server.cpp b/tests/test_server.cpp
index 0fbafe41..880181e8 100644
--- a/tests/test_server.cpp
+++ b/tests/test_server.cpp
@@ -45,7 +45,7 @@ int main(int argc,char *argv[]){
     setExePath(argv[0]);
 	signal(SIGINT, programExit);
 	Logger::Instance().add(std::make_shared<ConsoleChannel>("stdout", LTrace));
-	Config::loaIniConfig();
+	Config::loadIniConfig();
 	DebugL << exePath();
 	//support rtmp and rtsp url
 	//just support H264+AAC