Skip to content

Commit

Permalink
正式发布 acl 3.0.20 版本
Browse files Browse the repository at this point in the history
该版本的主要改进为:修复了对 freebsd 不兼容的问题;比较完整地支持 polarssl 库,从而可以支持 ssl 通信
  • Loading branch information
zhengshuxin committed Aug 26, 2014
1 parent b974f8d commit d29f8dd
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 1 deletion.
1 change: 1 addition & 0 deletions changes.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
�޸���ʷ�б���
------------------------------------------------------------------------
72) 2014.8.26 --- acl 3.0.20 �汾������
71) 2014.6.23 --- acl 3.0.19 �汾������

70) 2014.5.27
Expand Down
12 changes: 12 additions & 0 deletions lib_acl_cpp/lib_acl_cpp_vc2003.vcproj
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,12 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
<File
RelativePath=".\src\stream\ostream.cpp">
</File>
<File
RelativePath=".\src\stream\polarssl_conf.cpp">
</File>
<File
RelativePath=".\src\stream\polarssl_io.cpp">
</File>
<File
RelativePath=".\src\stream\server_socket.cpp">
</File>
Expand Down Expand Up @@ -834,6 +840,12 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
<File
RelativePath=".\include\acl_cpp\stream\ostream.hpp">
</File>
<File
RelativePath=".\include\acl_cpp\stream\polarssl_conf.hpp">
</File>
<File
RelativePath=".\include\acl_cpp\stream\polarssl_io.hpp">
</File>
<File
RelativePath=".\include\acl_cpp\stream\server_socket.hpp">
</File>
Expand Down
16 changes: 16 additions & 0 deletions lib_acl_cpp/lib_acl_cpp_vc2008.vcproj
Original file line number Diff line number Diff line change
Expand Up @@ -941,6 +941,14 @@
RelativePath=".\src\stream\ostream.cpp"
>
</File>
<File
RelativePath=".\src\stream\polarssl_conf.cpp"
>
</File>
<File
RelativePath=".\src\stream\polarssl_io.cpp"
>
</File>
<File
RelativePath=".\src\stream\server_socket.cpp"
>
Expand Down Expand Up @@ -1471,6 +1479,14 @@
RelativePath=".\include\acl_cpp\stream\ostream.hpp"
>
</File>
<File
RelativePath=".\include\acl_cpp\stream\polarssl_conf.hpp"
>
</File>
<File
RelativePath=".\include\acl_cpp\stream\polarssl_io.hpp"
>
</File>
<File
RelativePath=".\include\acl_cpp\stream\server_socket.hpp"
>
Expand Down
4 changes: 4 additions & 0 deletions lib_acl_cpp/lib_acl_cpp_vc2010.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,8 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
<ClCompile Include="src\stream\istream.cpp" />
<ClCompile Include="src\stream\ofstream.cpp" />
<ClCompile Include="src\stream\ostream.cpp" />
<ClCompile Include="src\stream\polarssl_conf.cpp" />
<ClCompile Include="src\stream\polarssl_io.cpp" />
<ClCompile Include="src\stream\server_socket.cpp" />
<ClCompile Include="src\stream\socket_stream.cpp" />
<ClCompile Include="src\stream\ssl_aio_stream.cpp" />
Expand Down Expand Up @@ -436,6 +438,8 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
<ClInclude Include="include\acl_cpp\stream\istream.hpp" />
<ClInclude Include="include\acl_cpp\stream\ofstream.hpp" />
<ClInclude Include="include\acl_cpp\stream\ostream.hpp" />
<ClInclude Include="include\acl_cpp\stream\polarssl_conf.hpp" />
<ClInclude Include="include\acl_cpp\stream\polarssl_io.hpp" />
<ClInclude Include="include\acl_cpp\stream\server_socket.hpp" />
<ClInclude Include="include\acl_cpp\stream\socket_stream.hpp" />
<ClInclude Include="include\acl_cpp\stream\ssl_aio_stream.hpp" />
Expand Down
12 changes: 12 additions & 0 deletions lib_acl_cpp/lib_acl_cpp_vc2010.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,12 @@
<ClCompile Include="src\stdlib\scan_dir.cpp">
<Filter>src\stdlib</Filter>
</ClCompile>
<ClCompile Include="src\stream\polarssl_conf.cpp">
<Filter>src\stream</Filter>
</ClCompile>
<ClCompile Include="src\stream\polarssl_io.cpp">
<Filter>src\stream</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\acl_stdafx.hpp">
Expand Down Expand Up @@ -765,6 +771,12 @@
<ClInclude Include="include\acl_cpp\stdlib\scan_dir.hpp">
<Filter>include\stdlib</Filter>
</ClInclude>
<ClInclude Include="include\acl_cpp\stream\polarssl_conf.hpp">
<Filter>include\stream</Filter>
</ClInclude>
<ClInclude Include="include\acl_cpp\stream\polarssl_io.hpp">
<Filter>include\stream</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="lib_acl_cpp_vc2010.rc" />
Expand Down
5 changes: 4 additions & 1 deletion lib_acl_cpp/samples/ssl_server/ssl_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ static void do_alone(const char* crt_file, const char* key_file)
{
master_service service(crt_file, key_file);
acl::log::stdout_open(true);
const char* addr = "0.0.0.0:443";
const char* addr = "0.0.0.0:2443";
printf("listen: %s ...\r\n", addr);
service.run_alone(addr, NULL, 0); // 单独运行方式
}
Expand All @@ -400,6 +400,7 @@ int main(int argc, char* argv[])
#ifdef WIN32
acl::acl_cpp_init();
#endif
acl::log::stdout_open(true);

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

do_alone(crt_file, key_file);
}
else if (argc >= 2)
printf("usage: %s alone cert_file key_file\r\n", argv[0]);
else
do_cgi();

Expand Down

0 comments on commit d29f8dd

Please sign in to comment.