Skip to content

Commit 000555d

Browse files
author
zsx
committed
add redis_geo class and sample; add https_proxy sample, add dgate sample.
1 parent b5525ad commit 000555d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+7145
-45
lines changed

‎acl_cpp_vc2003.sln

+15
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "disque_pool", "lib_acl_cpp\
536536
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
537537
EndProjectSection
538538
EndProject
539+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "redis_geo", "lib_acl_cpp\samples\redis\redis_geo\redis_geo_vc2003.vcproj", "{2DABFAD1-114B-4F96-9185-DC0C56A3662D}"
540+
ProjectSection(ProjectDependencies) = postProject
541+
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}
542+
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
543+
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
544+
EndProjectSection
545+
EndProject
539546
Global
540547
GlobalSection(SolutionConfiguration) = preSolution
541548
Debug = Debug
@@ -1226,6 +1233,14 @@ Global
12261233
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Release.Build.0 = Release|Win32
12271234
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Releasedll.ActiveCfg = Releasedll|Win32
12281235
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Releasedll.Build.0 = Releasedll|Win32
1236+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Debug.ActiveCfg = Debug|Win32
1237+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Debug.Build.0 = Debug|Win32
1238+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.DebugDll.ActiveCfg = DebugDll|Win32
1239+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.DebugDll.Build.0 = DebugDll|Win32
1240+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Release.ActiveCfg = Release|Win32
1241+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Release.Build.0 = Release|Win32
1242+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Releasedll.ActiveCfg = Releasedll|Win32
1243+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Releasedll.Build.0 = Releasedll|Win32
12291244
EndGlobalSection
12301245
GlobalSection(ExtensibilityGlobals) = postSolution
12311246
EndGlobalSection

‎acl_cpp_vc2008.sln

+16
Original file line numberDiff line numberDiff line change
@@ -612,6 +612,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "disque_cluster", "lib_acl_c
612612
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
613613
EndProjectSection
614614
EndProject
615+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "redis_geo", "lib_acl_cpp\samples\redis\redis_geo\redis_geo_vc2008.vcproj", "{2147D0CD-57C8-4C50-BBA8-71EF03B7C2AA}"
616+
ProjectSection(ProjectDependencies) = postProject
617+
{64BF4D83-53BB-4045-8522-9FF9F73B14D4} = {64BF4D83-53BB-4045-8522-9FF9F73B14D4}
618+
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
619+
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
620+
EndProjectSection
621+
EndProject
615622
Global
616623
GlobalSection(SolutionConfigurationPlatforms) = preSolution
617624
Debug|Win32 = Debug|Win32
@@ -1298,6 +1305,14 @@ Global
12981305
{1D480138-D65E-4B4E-A2B6-372927EFD61A}.Release|Win32.Build.0 = Release|Win32
12991306
{1D480138-D65E-4B4E-A2B6-372927EFD61A}.Releasedll|Win32.ActiveCfg = Releasedll|Win32
13001307
{1D480138-D65E-4B4E-A2B6-372927EFD61A}.Releasedll|Win32.Build.0 = Releasedll|Win32
1308+
{2147D0CD-57C8-4C50-BBA8-71EF03B7C2AA}.Debug|Win32.ActiveCfg = Debug|Win32
1309+
{2147D0CD-57C8-4C50-BBA8-71EF03B7C2AA}.Debug|Win32.Build.0 = Debug|Win32
1310+
{2147D0CD-57C8-4C50-BBA8-71EF03B7C2AA}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
1311+
{2147D0CD-57C8-4C50-BBA8-71EF03B7C2AA}.DebugDll|Win32.Build.0 = DebugDll|Win32
1312+
{2147D0CD-57C8-4C50-BBA8-71EF03B7C2AA}.Release|Win32.ActiveCfg = Release|Win32
1313+
{2147D0CD-57C8-4C50-BBA8-71EF03B7C2AA}.Release|Win32.Build.0 = Release|Win32
1314+
{2147D0CD-57C8-4C50-BBA8-71EF03B7C2AA}.Releasedll|Win32.ActiveCfg = Releasedll|Win32
1315+
{2147D0CD-57C8-4C50-BBA8-71EF03B7C2AA}.Releasedll|Win32.Build.0 = Releasedll|Win32
13011316
EndGlobalSection
13021317
GlobalSection(SolutionProperties) = preSolution
13031318
HideSolutionNode = FALSE
@@ -1393,6 +1408,7 @@ Global
13931408
{9A0B9C5B-484E-4C8B-9793-DDA4A33B07FA} = {4887D780-3316-4603-9A77-7AD9A4F8E1DE}
13941409
{34E75CAA-8883-4808-AC8A-FED139A49F11} = {4887D780-3316-4603-9A77-7AD9A4F8E1DE}
13951410
{0C44CD71-0A6C-4132-B59A-8BB49F0C44F8} = {4887D780-3316-4603-9A77-7AD9A4F8E1DE}
1411+
{2147D0CD-57C8-4C50-BBA8-71EF03B7C2AA} = {4887D780-3316-4603-9A77-7AD9A4F8E1DE}
13961412
{60E02ECD-9FF5-4ED0-B991-49D2548FE193} = {C4D183AB-3E2D-4664-8C63-EFB05FCF3A82}
13971413
{71A55E11-A1AD-44A2-8D7E-B717B8EDF76B} = {C4D183AB-3E2D-4664-8C63-EFB05FCF3A82}
13981414
{D4FB2F8D-F9C4-4B84-8677-0D2205F5EC16} = {C4D183AB-3E2D-4664-8C63-EFB05FCF3A82}

‎acl_cpp_vc2010.sln

+18
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "disque_cluster_vc2010", "li
324324
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
325325
EndProjectSection
326326
EndProject
327+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "redis_geo_vc2010", "lib_acl_cpp\samples\redis\redis_geo\redis_geo_vc2010.vcxproj", "{50A37701-CDC8-477E-8B7F-711FB0A90844}"
328+
ProjectSection(ProjectDependencies) = postProject
329+
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}
330+
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
331+
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
332+
EndProjectSection
333+
EndProject
327334
Global
328335
GlobalSection(SolutionConfigurationPlatforms) = preSolution
329336
Debug|Win32 = Debug|Win32
@@ -883,6 +890,16 @@ Global
883890
{65ADEA28-65B4-4930-B9BB-D338848F0841}.Releasedll|Win32.Build.0 = Releasedll|Win32
884891
{65ADEA28-65B4-4930-B9BB-D338848F0841}.Template|Win32.ActiveCfg = Release|Win32
885892
{65ADEA28-65B4-4930-B9BB-D338848F0841}.Template|Win32.Build.0 = Release|Win32
893+
{50A37701-CDC8-477E-8B7F-711FB0A90844}.Debug|Win32.ActiveCfg = Debug|Win32
894+
{50A37701-CDC8-477E-8B7F-711FB0A90844}.Debug|Win32.Build.0 = Debug|Win32
895+
{50A37701-CDC8-477E-8B7F-711FB0A90844}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
896+
{50A37701-CDC8-477E-8B7F-711FB0A90844}.DebugDll|Win32.Build.0 = DebugDll|Win32
897+
{50A37701-CDC8-477E-8B7F-711FB0A90844}.Release|Win32.ActiveCfg = Release|Win32
898+
{50A37701-CDC8-477E-8B7F-711FB0A90844}.Release|Win32.Build.0 = Release|Win32
899+
{50A37701-CDC8-477E-8B7F-711FB0A90844}.Releasedll|Win32.ActiveCfg = Releasedll|Win32
900+
{50A37701-CDC8-477E-8B7F-711FB0A90844}.Releasedll|Win32.Build.0 = Releasedll|Win32
901+
{50A37701-CDC8-477E-8B7F-711FB0A90844}.Template|Win32.ActiveCfg = Release|Win32
902+
{50A37701-CDC8-477E-8B7F-711FB0A90844}.Template|Win32.Build.0 = Release|Win32
886903
EndGlobalSection
887904
GlobalSection(SolutionProperties) = preSolution
888905
HideSolutionNode = FALSE
@@ -942,6 +959,7 @@ Global
942959
{560AD9F1-FDD5-4C89-9CCC-F4CF68FED05F} = {7B001BDA-0EFF-4EE0-89E7-C0EECE8955A9}
943960
{AD4762CE-510B-4D2C-9075-CCE7689286C4} = {7B001BDA-0EFF-4EE0-89E7-C0EECE8955A9}
944961
{3DF1326C-0D04-45D8-AD8A-1285A62EE652} = {7B001BDA-0EFF-4EE0-89E7-C0EECE8955A9}
962+
{50A37701-CDC8-477E-8B7F-711FB0A90844} = {7B001BDA-0EFF-4EE0-89E7-C0EECE8955A9}
945963
{84376B60-FF20-4FD0-967E-C568FC2FBC53} = {DC80E4B1-1DC2-49D8-9FC3-BD3E60337968}
946964
{56583E9A-B66F-4EF5-92DA-31CF24D33AB9} = {9C7533AA-D559-49ED-BE0F-7E52369A6FAD}
947965
{C80B0853-6D1C-4E5F-8C31-F4D77770C63D} = {9C7533AA-D559-49ED-BE0F-7E52369A6FAD}

‎acl_cpp_vc2012.sln

+107
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wizard_demo", "wizard_demo"
528528
EndProject
529529
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "httpd_download", "app\wizard_demo\httpd_download\httpd_download_vc2012.vcxproj", "{1A38C49B-F712-4115-980B-6DBD632D25CF}"
530530
EndProject
531+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "https_proxy", "lib_acl_cpp\samples\ssl\https_proxy\https_proxy_vc2012.vcxproj", "{5F75216D-8263-4F6F-9390-76E7AC129AEE}"
532+
EndProject
533+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgate", "lib_acl\samples\dgate\dgate_vc2012.vcxproj", "{9073FA9F-26A1-482C-91D0-876434C3E4EB}"
534+
ProjectSection(ProjectDependencies) = postProject
535+
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
536+
EndProjectSection
537+
EndProject
538+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "redis_geo", "lib_acl_cpp\samples\redis\redis_geo\redis_geo_vc2012.vcxproj", "{AE10B13D-774D-49A5-9066-E90F124BA99C}"
539+
ProjectSection(ProjectDependencies) = postProject
540+
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}
541+
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
542+
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
543+
EndProjectSection
544+
EndProject
531545
Global
532546
GlobalSection(SolutionConfigurationPlatforms) = preSolution
533547
Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -2527,6 +2541,96 @@ Global
25272541
{1A38C49B-F712-4115-980B-6DBD632D25CF}.Template|Win32.Build.0 = DebugDll|Win32
25282542
{1A38C49B-F712-4115-980B-6DBD632D25CF}.Template|x64.ActiveCfg = DebugDll|x64
25292543
{1A38C49B-F712-4115-980B-6DBD632D25CF}.Template|x64.Build.0 = DebugDll|x64
2544+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
2545+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
2546+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Debug|Win32.ActiveCfg = Debug|Win32
2547+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Debug|Win32.Build.0 = Debug|Win32
2548+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Debug|x64.ActiveCfg = Debug|x64
2549+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Debug|x64.Build.0 = Debug|x64
2550+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.DebugDll|Mixed Platforms.ActiveCfg = DebugDll|Win32
2551+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.DebugDll|Mixed Platforms.Build.0 = DebugDll|Win32
2552+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
2553+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.DebugDll|Win32.Build.0 = DebugDll|Win32
2554+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.DebugDll|x64.ActiveCfg = DebugDll|x64
2555+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.DebugDll|x64.Build.0 = DebugDll|x64
2556+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
2557+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Release|Mixed Platforms.Build.0 = Release|Win32
2558+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Release|Win32.ActiveCfg = Release|Win32
2559+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Release|Win32.Build.0 = Release|Win32
2560+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Release|x64.ActiveCfg = Release|x64
2561+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Release|x64.Build.0 = Release|x64
2562+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Releasedll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32
2563+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Releasedll|Mixed Platforms.Build.0 = ReleaseDll|Win32
2564+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Releasedll|Win32.ActiveCfg = ReleaseDll|Win32
2565+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Releasedll|Win32.Build.0 = ReleaseDll|Win32
2566+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Releasedll|x64.ActiveCfg = ReleaseDll|x64
2567+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Releasedll|x64.Build.0 = ReleaseDll|x64
2568+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Template|Mixed Platforms.ActiveCfg = DebugDll|Win32
2569+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Template|Mixed Platforms.Build.0 = DebugDll|Win32
2570+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Template|Win32.ActiveCfg = DebugDll|Win32
2571+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Template|Win32.Build.0 = DebugDll|Win32
2572+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Template|x64.ActiveCfg = DebugDll|x64
2573+
{5F75216D-8263-4F6F-9390-76E7AC129AEE}.Template|x64.Build.0 = DebugDll|x64
2574+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
2575+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Debug|Mixed Platforms.Build.0 = Debug|Win32
2576+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Debug|Win32.ActiveCfg = Debug|Win32
2577+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Debug|Win32.Build.0 = Debug|Win32
2578+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Debug|x64.ActiveCfg = Debug|x64
2579+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Debug|x64.Build.0 = Debug|x64
2580+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.DebugDll|Mixed Platforms.ActiveCfg = DebugDll|Win32
2581+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.DebugDll|Mixed Platforms.Build.0 = DebugDll|Win32
2582+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
2583+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.DebugDll|Win32.Build.0 = DebugDll|Win32
2584+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.DebugDll|x64.ActiveCfg = DebugDll|x64
2585+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.DebugDll|x64.Build.0 = DebugDll|x64
2586+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Release|Mixed Platforms.ActiveCfg = Release|Win32
2587+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Release|Mixed Platforms.Build.0 = Release|Win32
2588+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Release|Win32.ActiveCfg = Release|Win32
2589+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Release|Win32.Build.0 = Release|Win32
2590+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Release|x64.ActiveCfg = Release|x64
2591+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Release|x64.Build.0 = Release|x64
2592+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Releasedll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32
2593+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Releasedll|Mixed Platforms.Build.0 = ReleaseDll|Win32
2594+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Releasedll|Win32.ActiveCfg = ReleaseDll|Win32
2595+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Releasedll|Win32.Build.0 = ReleaseDll|Win32
2596+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Releasedll|x64.ActiveCfg = ReleaseDll|x64
2597+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Releasedll|x64.Build.0 = ReleaseDll|x64
2598+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Template|Mixed Platforms.ActiveCfg = DebugDll|Win32
2599+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Template|Mixed Platforms.Build.0 = DebugDll|Win32
2600+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Template|Win32.ActiveCfg = DebugDll|Win32
2601+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Template|Win32.Build.0 = DebugDll|Win32
2602+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Template|x64.ActiveCfg = DebugDll|x64
2603+
{9073FA9F-26A1-482C-91D0-876434C3E4EB}.Template|x64.Build.0 = DebugDll|x64
2604+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
2605+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
2606+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Debug|Win32.ActiveCfg = Debug|Win32
2607+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Debug|Win32.Build.0 = Debug|Win32
2608+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Debug|x64.ActiveCfg = Debug|x64
2609+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Debug|x64.Build.0 = Debug|x64
2610+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.DebugDll|Mixed Platforms.ActiveCfg = DebugDll|Win32
2611+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.DebugDll|Mixed Platforms.Build.0 = DebugDll|Win32
2612+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
2613+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.DebugDll|Win32.Build.0 = DebugDll|Win32
2614+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.DebugDll|x64.ActiveCfg = DebugDll|x64
2615+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.DebugDll|x64.Build.0 = DebugDll|x64
2616+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
2617+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Release|Mixed Platforms.Build.0 = Release|Win32
2618+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Release|Win32.ActiveCfg = Release|Win32
2619+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Release|Win32.Build.0 = Release|Win32
2620+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Release|x64.ActiveCfg = Release|x64
2621+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Release|x64.Build.0 = Release|x64
2622+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Releasedll|Mixed Platforms.ActiveCfg = Releasedll|Win32
2623+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Releasedll|Mixed Platforms.Build.0 = Releasedll|Win32
2624+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Releasedll|Win32.ActiveCfg = Releasedll|Win32
2625+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Releasedll|Win32.Build.0 = Releasedll|Win32
2626+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Releasedll|x64.ActiveCfg = Releasedll|x64
2627+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Releasedll|x64.Build.0 = Releasedll|x64
2628+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Template|Mixed Platforms.ActiveCfg = DebugDll|Win32
2629+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Template|Mixed Platforms.Build.0 = DebugDll|Win32
2630+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Template|Win32.ActiveCfg = DebugDll|Win32
2631+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Template|Win32.Build.0 = DebugDll|Win32
2632+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Template|x64.ActiveCfg = DebugDll|x64
2633+
{AE10B13D-774D-49A5-9066-E90F124BA99C}.Template|x64.Build.0 = DebugDll|x64
25302634
EndGlobalSection
25312635
GlobalSection(SolutionProperties) = preSolution
25322636
HideSolutionNode = FALSE
@@ -2589,10 +2693,12 @@ Global
25892693
{DEDE0B8A-35C5-4674-A10A-BF6544F6A885} = {06493E1B-DA69-4471-AF4C-6890A6D0F6EE}
25902694
{B8ADBED2-0FFC-49F7-A8AE-A42CE262166D} = {3A25DC67-2832-4912-8FD5-66E499E38F11}
25912695
{B14C93A6-DABE-48F9-A78C-C94049B69984} = {3A25DC67-2832-4912-8FD5-66E499E38F11}
2696+
{5F75216D-8263-4F6F-9390-76E7AC129AEE} = {3A25DC67-2832-4912-8FD5-66E499E38F11}
25922697
{D1F030D1-36F7-4440-9801-42E31E767A52} = {FB676B5A-D82C-45CB-9E1F-F3793419DDA9}
25932698
{2495A6D4-777F-48BF-99C0-702E4A11FD23} = {FB676B5A-D82C-45CB-9E1F-F3793419DDA9}
25942699
{640ABB35-FBD3-4D34-A382-9ED8CF3FCE34} = {267F658E-44AF-4080-8577-EFCE99A5E030}
25952700
{4B58485B-D846-4485-9C5E-7F2304D71701} = {267F658E-44AF-4080-8577-EFCE99A5E030}
2701+
{9073FA9F-26A1-482C-91D0-876434C3E4EB} = {267F658E-44AF-4080-8577-EFCE99A5E030}
25962702
{D232833B-57A9-4167-B37C-A4594953F93D} = {3CC8D45A-8E3F-4F5C-A7DF-4D8027E4EA9C}
25972703
{84376B60-FF20-4FD0-967E-C568FC2FBC53} = {3CC8D45A-8E3F-4F5C-A7DF-4D8027E4EA9C}
25982704
{C8535C82-3DCB-472E-9E8F-DA769D9375B1} = {3CC8D45A-8E3F-4F5C-A7DF-4D8027E4EA9C}
@@ -2618,6 +2724,7 @@ Global
26182724
{97BC2502-5B1C-44B4-8809-83A268306FA1} = {14531A45-383C-4CCF-870B-B5C867A314F2}
26192725
{5EA23ADB-6481-4CA1-9C31-7D92036DFD47} = {14531A45-383C-4CCF-870B-B5C867A314F2}
26202726
{E3280617-6D0D-4639-9014-31BCD4ADFADC} = {14531A45-383C-4CCF-870B-B5C867A314F2}
2727+
{AE10B13D-774D-49A5-9066-E90F124BA99C} = {14531A45-383C-4CCF-870B-B5C867A314F2}
26212728
{D90DCF51-E219-4BD8-A032-076335675F58} = {C8535C82-3DCB-472E-9E8F-DA769D9375B1}
26222729
{8945DE73-78D8-4C1E-B828-2558AA33448E} = {B6BE4E77-F69D-43B0-BE8A-77A8AA61A89E}
26232730
{067E9700-A518-4747-AE70-0C6F433AE478} = {B6BE4E77-F69D-43B0-BE8A-77A8AA61A89E}

‎app/wizard_demo/httpd_download/http_servlet.cpp

+5-10
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@ bool http_servlet::reply(acl::HttpServletRequest& req,
2020
acl::string buf;
2121
buf.vformat(fmt, ap);
2222
va_end(ap);
23-
bool keep_alive = req.isKeepAlive();
2423
res.setStatus(status)
25-
.setKeepAlive(keep_alive)
24+
.setKeepAlive(req.isKeepAlive())
2625
.setContentType("text/html; charset=utf-8")
2726
.setContentLength(buf.length());
28-
return res.write(buf) && keep_alive;
27+
return res.write(buf);
2928
}
3029

3130
bool http_servlet::doError(acl::HttpServletRequest& req,
@@ -100,16 +99,14 @@ bool http_servlet::transfer_file(acl::HttpServletRequest& req,
10099
if (fsize <= 0)
101100
return reply(req, res, 500, "invalid file size: %lld", fsize);
102101

103-
bool keep_alive = req.isKeepAlive();
104-
105102
acl::string hdr_entry;
106103
acl::string filename;
107104
filename.basename(in.file_path()); // 从文件全路径中提取文件名
108105
hdr_entry.format("attachment;filename=\"%s\"", filename.c_str());
109106

110107
// 设置 HTTP 响应头中的字段
111108
res.setStatus(200)
112-
.setKeepAlive(keep_alive)
109+
.setKeepAlive(req.isKeepAlive())
113110
.setContentLength(fsize)
114111
.setContentType("application/octet-stream")
115112
// 设置 HTTP 头中的文件名
@@ -184,16 +181,14 @@ bool http_servlet::transfer_file(acl::HttpServletRequest& req,
184181
return reply(req, res, 500, "fseek(%lld) error %s",
185182
range_from, acl::last_serror());
186183

187-
bool keep_alive = req.isKeepAlive();
188-
189184
acl::string hdr_entry;
190185
acl::string filename;
191186
filename.basename(in.file_path()); // 从文件全路径中提取文件名
192187
hdr_entry.format("attachment;filename=\"%s\"", filename.c_str());
193188

194189
// 设置 HTTP 响应头中的字段
195190
res.setStatus(206) // 响应状态 206 表示部分数据
196-
.setKeepAlive(keep_alive) // 是否保持长连接
191+
.setKeepAlive(req.isKeepAlive())// 是否保持长连接
197192
.setContentLength(length) // 实际要传输的数据长度
198193
.setContentType("application/octet-stream") // 数据类型
199194
// 设置 HTTP 头中的文件名
@@ -236,5 +231,5 @@ bool http_servlet::transfer_file(acl::HttpServletRequest& req,
236231
return false;
237232
}
238233

239-
return true && keep_alive;
234+
return true;
240235
}

0 commit comments

Comments
 (0)