Skip to content

Commit d29f8dd

Browse files
zhengshuxinzhengshuxin
committed
正式发布 acl 3.0.20 版本
该版本的主要改进为：修复了对 freebsd 不兼容的问题；比较完整地支持 polarssl 库，从而可以支持 ssl 通信
1 parent b974f8d commit d29f8dd

File tree

6 files changed

+49
-1
lines changed

6 files changed

+49
-1
lines changed

‎changes.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
�޸���ʷ�б���
22
------------------------------------------------------------------------
3+
72) 2014.8.26 --- acl 3.0.20 �汾������
34
71) 2014.6.23 --- acl 3.0.19 �汾������
45

56
70) 2014.5.27

‎lib_acl_cpp/lib_acl_cpp_vc2003.vcproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,12 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
323323
<File
324324
RelativePath=".\src\stream\ostream.cpp">
325325
</File>
326+
<File
327+
RelativePath=".\src\stream\polarssl_conf.cpp">
328+
</File>
329+
<File
330+
RelativePath=".\src\stream\polarssl_io.cpp">
331+
</File>
326332
<File
327333
RelativePath=".\src\stream\server_socket.cpp">
328334
</File>
@@ -834,6 +840,12 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
834840
<File
835841
RelativePath=".\include\acl_cpp\stream\ostream.hpp">
836842
</File>
843+
<File
844+
RelativePath=".\include\acl_cpp\stream\polarssl_conf.hpp">
845+
</File>
846+
<File
847+
RelativePath=".\include\acl_cpp\stream\polarssl_io.hpp">
848+
</File>
837849
<File
838850
RelativePath=".\include\acl_cpp\stream\server_socket.hpp">
839851
</File>

‎lib_acl_cpp/lib_acl_cpp_vc2008.vcproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -941,6 +941,14 @@
941941
RelativePath=".\src\stream\ostream.cpp"
942942
>
943943
</File>
944+
<File
945+
RelativePath=".\src\stream\polarssl_conf.cpp"
946+
>
947+
</File>
948+
<File
949+
RelativePath=".\src\stream\polarssl_io.cpp"
950+
>
951+
</File>
944952
<File
945953
RelativePath=".\src\stream\server_socket.cpp"
946954
>
@@ -1471,6 +1479,14 @@
14711479
RelativePath=".\include\acl_cpp\stream\ostream.hpp"
14721480
>
14731481
</File>
1482+
<File
1483+
RelativePath=".\include\acl_cpp\stream\polarssl_conf.hpp"
1484+
>
1485+
</File>
1486+
<File
1487+
RelativePath=".\include\acl_cpp\stream\polarssl_io.hpp"
1488+
>
1489+
</File>
14741490
<File
14751491
RelativePath=".\include\acl_cpp\stream\server_socket.hpp"
14761492
>

‎lib_acl_cpp/lib_acl_cpp_vc2010.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,8 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
319319
<ClCompile Include="src\stream\istream.cpp" />
320320
<ClCompile Include="src\stream\ofstream.cpp" />
321321
<ClCompile Include="src\stream\ostream.cpp" />
322+
<ClCompile Include="src\stream\polarssl_conf.cpp" />
323+
<ClCompile Include="src\stream\polarssl_io.cpp" />
322324
<ClCompile Include="src\stream\server_socket.cpp" />
323325
<ClCompile Include="src\stream\socket_stream.cpp" />
324326
<ClCompile Include="src\stream\ssl_aio_stream.cpp" />
@@ -436,6 +438,8 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
436438
<ClInclude Include="include\acl_cpp\stream\istream.hpp" />
437439
<ClInclude Include="include\acl_cpp\stream\ofstream.hpp" />
438440
<ClInclude Include="include\acl_cpp\stream\ostream.hpp" />
441+
<ClInclude Include="include\acl_cpp\stream\polarssl_conf.hpp" />
442+
<ClInclude Include="include\acl_cpp\stream\polarssl_io.hpp" />
439443
<ClInclude Include="include\acl_cpp\stream\server_socket.hpp" />
440444
<ClInclude Include="include\acl_cpp\stream\socket_stream.hpp" />
441445
<ClInclude Include="include\acl_cpp\stream\ssl_aio_stream.hpp" />

‎lib_acl_cpp/lib_acl_cpp_vc2010.vcxproj.filters‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,12 @@
373373
<ClCompile Include="src\stdlib\scan_dir.cpp">
374374
<Filter>src\stdlib</Filter>
375375
</ClCompile>
376+
<ClCompile Include="src\stream\polarssl_conf.cpp">
377+
<Filter>src\stream</Filter>
378+
</ClCompile>
379+
<ClCompile Include="src\stream\polarssl_io.cpp">
380+
<Filter>src\stream</Filter>
381+
</ClCompile>
376382
</ItemGroup>
377383
<ItemGroup>
378384
<ClInclude Include="src\acl_stdafx.hpp">
@@ -765,6 +771,12 @@
765771
<ClInclude Include="include\acl_cpp\stdlib\scan_dir.hpp">
766772
<Filter>include\stdlib</Filter>
767773
</ClInclude>
774+
<ClInclude Include="include\acl_cpp\stream\polarssl_conf.hpp">
775+
<Filter>include\stream</Filter>
776+
</ClInclude>
777+
<ClInclude Include="include\acl_cpp\stream\polarssl_io.hpp">
778+
<Filter>include\stream</Filter>
779+
</ClInclude>
768780
</ItemGroup>
769781
<ItemGroup>
770782
<ResourceCompile Include="lib_acl_cpp_vc2010.rc" />

‎lib_acl_cpp/samples/ssl_server/ssl_server.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ static void do_alone(const char* crt_file, const char* key_file)
382382
{
383383
master_service service(crt_file, key_file);
384384
acl::log::stdout_open(true);
385-
const char* addr = "0.0.0.0:443";
385+
const char* addr = "0.0.0.0:2443";
386386
printf("listen: %s ...\r\n", addr);
387387
service.run_alone(addr, NULL, 0); // 单独运行方式
388388
}
@@ -400,6 +400,7 @@ int main(int argc, char* argv[])
400400
#ifdef WIN32
401401
acl::acl_cpp_init();
402402
#endif
403+
acl::log::stdout_open(true);
403404

404405
// 开始运行
405406
if (argc >= 2 && strcmp(argv[1], "alone") == 0)
@@ -416,6 +417,8 @@ int main(int argc, char* argv[])
416417

417418
do_alone(crt_file, key_file);
418419
}
420+
else if (argc >= 2)
421+
printf("usage: %s alone cert_file key_file\r\n", argv[0]);
419422
else
420423
do_cgi();
421424

0 commit comments

Comments
 (0)