Skip to content

Commit 69a17c3

Browse files
awwitawwit
committed
Categorize source code files. Add HTTP/2 protocol support
1 parent 1a179e8 commit 69a17c3

Some content is hidden

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

60 files changed

+9786
-1434
lines changed

‎README.md‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
httpserverapp
2-
=============
1+
# httpserverapp
32

43
Sample application for [C++ http server](https://github.com/awwit/httpserver).
54

6-
Dependencies
7-
------------
5+
## Dependencies
86

97
Common:
108

@@ -14,8 +12,7 @@ Linux: `dl`, `pthread`, `gnutls`
1412

1513
Windows: `ws2_32.lib`, `libgnutls.dll.a`
1614

17-
Build
18-
-----
15+
## Build
1916

2017
Linux:
2118

@@ -37,8 +34,7 @@ cd build
3734
devenv ./../projects/msvs/httpserverapp.sln /build
3835
```
3936

40-
License
41-
=======
37+
# License
4238

4339
The source codes are licensed under the
4440
[MIT](https://opensource.org/licenses/MIT),

‎projects/qt-creator/httpserverapp.qbs‎

Lines changed: 58 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,67 @@
11
import qbs
22

33
Project {
4-
DynamicLibrary {
5-
name: "httpserverapp"
4+
DynamicLibrary {
5+
name: "httpserverapp"
66

7-
Depends { name: "cpp" }
8-
cpp.cxxLanguageVersion: "c++11"
7+
Depends { name: "cpp" }
8+
cpp.cxxLanguageVersion: "c++14"
99

10-
cpp.defines: qbs.buildVariant == "debug" ? base : base.concat(["DEBUG"])
10+
cpp.defines: qbs.buildVariant == "debug" ? ["DEBUG"] : base
1111

12-
cpp.dynamicLibraries: base.concat(["gnutls"])
12+
cpp.dynamicLibraries: ["gnutls"]
1313

14-
Properties {
15-
condition: qbs.targetOS.contains("linux")
16-
cpp.defines: outer.concat(["POSIX"])
17-
cpp.dynamicLibraries: outer.concat(["dl", "pthread"])
18-
}
14+
Properties {
15+
condition: qbs.targetOS.contains("linux")
16+
cpp.defines: outer.concat(["POSIX"])
17+
cpp.dynamicLibraries: outer.concat(["dl", "pthread"])
18+
}
19+
Properties {
20+
condition: qbs.targetOS.contains("windows")
21+
cpp.defines: outer.concat(["WIN32", "NOMINMAX"])
22+
}
1923

20-
Properties {
21-
condition: qbs.targetOS.contains("windows")
22-
cpp.defines: outer.concat(["WIN32"])
23-
}
24-
25-
files: [
26-
"../../src/FileIncoming.cpp",
27-
"../../src/FileIncoming.h",
28-
"../../src/Main.cpp",
29-
"../../src/Main.h",
30-
"../../src/RawData.h",
31-
"../../src/ServerRequest.h",
32-
"../../src/ServerResponse.h",
33-
"../../src/Socket.cpp",
34-
"../../src/Socket.h",
35-
"../../src/SocketAdapter.cpp",
36-
"../../src/SocketAdapter.h",
37-
"../../src/SocketAdapterDefault.cpp",
38-
"../../src/SocketAdapterDefault.h",
39-
"../../src/SocketAdapterTls.cpp",
40-
"../../src/SocketAdapterTls.h",
41-
"../../src/System.cpp",
42-
"../../src/System.h",
43-
"../../src/Test.cpp",
44-
"../../src/Test.h",
45-
"../../src/Utils.cpp",
46-
"../../src/Utils.h",
47-
]
48-
}
24+
files: [
25+
"../../src/Init.cpp",
26+
"../../src/Init.h",
27+
"../../src/application/Test.cpp",
28+
"../../src/application/Test.h",
29+
"../../src/client/protocol/ClientHttp1.cpp",
30+
"../../src/client/protocol/ClientHttp1.h",
31+
"../../src/client/protocol/ClientHttp2.cpp",
32+
"../../src/client/protocol/ClientHttp2.h",
33+
"../../src/client/protocol/ClientProtocol.cpp",
34+
"../../src/client/protocol/ClientProtocol.h",
35+
"../../src/utils/Event.cpp",
36+
"../../src/utils/Event.h",
37+
"../../src/transfer/FileIncoming.cpp",
38+
"../../src/transfer/FileIncoming.h",
39+
"../../src/transfer/http2/HPack.cpp",
40+
"../../src/transfer/http2/HPack.h",
41+
"../../src/transfer/http2/Http2.cpp",
42+
"../../src/transfer/http2/Http2.h",
43+
"../../src/transfer/HttpStatusCode.h",
44+
"../../src/Main.cpp",
45+
"../../src/Main.h",
46+
"../../src/client/Request.cpp",
47+
"../../src/client/Request.h",
48+
"../../src/client/Response.cpp",
49+
"../../src/client/Response.h",
50+
"../../src/transfer/ProtocolVariant.h",
51+
"../../src/transfer/AppRequest.h",
52+
"../../src/transfer/AppResponse.h",
53+
"../../src/socket/Socket.cpp",
54+
"../../src/socket/Socket.h",
55+
"../../src/socket/Adapter.cpp",
56+
"../../src/socket/Adapter.h",
57+
"../../src/socket/AdapterDefault.cpp",
58+
"../../src/socket/AdapterDefault.h",
59+
"../../src/socket/AdapterTls.cpp",
60+
"../../src/socket/AdapterTls.h",
61+
"../../src/system/System.cpp",
62+
"../../src/system/System.h",
63+
"../../src/utils/Utils.cpp",
64+
"../../src/utils/Utils.h",
65+
]
66+
}
4967
}

‎src/FileIncoming.cpp‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎src/FileIncoming.h‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)