Skip to content

Commit 8f99252

Browse files
j-ulrichj-ulrich
committed
Merge branch 'release/1.6.0'
2 parents c16293c + 0a51dd8 commit 8f99252

23 files changed

+754
-721
lines changed

‎.appveyor.yml‎

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,41 @@
1-
version: "1.5.0+{build}"
1+
version: "1.6.0+{build}"
22

33
environment:
4-
CTEST_OUTPUT_ON_FAILURE: '1'
54
matrix:
6-
- CMAKE_GENERATOR: Visual Studio 15 2017 Win64
7-
QT_DIR: C:\Qt\5.12\msvc2017_64
5+
- job_name: VS 2019 x64, Qt 6.2
6+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
7+
CMAKE_GENERATOR: Visual Studio 16 2019
8+
QT_DIR: C:\Qt\6.2\msvc2019_64
9+
VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64'
10+
CMAKE_INSTALL_PATH: 'C:\Program Files\CMake'
11+
12+
- job_name: VS 2019 x64, Qt 5.15
13+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
14+
CMAKE_GENERATOR: Visual Studio 16 2019
15+
QT_DIR: C:\Qt\5.15\msvc2019_64
16+
VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64'
17+
CMAKE_INSTALL_PATH: 'C:\Program Files\CMake'
18+
19+
- job_name: VS 2017 x64, Qt 5.12
820
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
21+
CMAKE_GENERATOR: Visual Studio 15 2017 Win64
22+
QT_DIR: C:\Qt\5.12\msvc2017_64
923
VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"'
10-
- CMAKE_GENERATOR: Visual Studio 14 2015
11-
QT_DIR: C:\Qt\5.9\msvc2015
24+
CMAKE_INSTALL_PATH: 'C:\Program Files (x86)\CMake'
25+
26+
- job_name: VS 2015 x86, Qt 5.9
1227
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
28+
CMAKE_GENERATOR: Visual Studio 14 2015
29+
QT_DIR: C:\Qt\5.9\msvc2015
1330
VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86'
14-
- CMAKE_GENERATOR: Visual Studio 14 2015
15-
QT_DIR: C:\Qt\5.6\msvc2015
31+
CMAKE_INSTALL_PATH: 'C:\Program Files (x86)\CMake'
32+
33+
- job_name: VS 2015 x86, Qt 5.6
1634
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
35+
CMAKE_GENERATOR: Visual Studio 14 2015
36+
QT_DIR: C:\Qt\5.6\msvc2015
1737
VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86'
18-
- CMAKE_GENERATOR: Visual Studio 12 2013
19-
QT_DIR: C:\Qt\5.6\msvc2013
20-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
21-
VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86'
38+
CMAKE_INSTALL_PATH: 'C:\Program Files (x86)\CMake'
2239

2340
cache:
2441
- C:\.hunter -> .appveyor.yml, **\CMakeLists.txt, **\*.cmake
@@ -37,4 +54,4 @@ build:
3754

3855

3956
test_script:
40-
- msbuild "%APPVEYOR_BUILD_FOLDER%\tests\_build\RUN_TESTS.vcxproj" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
57+
- '"%CMAKE_INSTALL_PATH%\bin\ctest.exe" --output-on-failure -C Debug'

‎.github/githubIssues.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
const searchForExistingGithubIssue = async ( { keywords, github, context } ) => {
33
const query = keywords.concat( [ 'in:title', `repo:${context.repo.owner}/${context.repo.repo}`, 'type:issue' ] ).join( '+' );
4-
const searchResponse = await github.search.issuesAndPullRequests( {
4+
const searchResponse = await github.rest.search.issuesAndPullRequests( {
55
q: query,
66
} );
77
return searchResponse.data;
@@ -16,7 +16,7 @@ const createNewGithubIssue = async ( { title, body, github, context } ) => {
1616
body
1717
};
1818

19-
const issueResponse = await github.issues.create( newIssue );
19+
const issueResponse = await github.rest.issues.create( newIssue );
2020
return issueResponse.data;
2121
};
2222

‎.github/http-status-codes.txt‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Hypertext Transfer Protocol (HTTP) Status Code Registry
44

55
Last Updated
6-
2021-12-22
6+
2022-06-08
77

88
Available Formats
99
[IMG]
@@ -22,7 +22,7 @@ HTTP Status Codes
2222
IETF Review
2323

2424
Reference
25-
[RFC-ietf-httpbis-semantics, Section 16.2.1]
25+
[RFC9110, Section 16.2.1]
2626

2727
Note
2828

@@ -38,59 +38,59 @@ HTTP Status Codes
3838
CSV
3939

4040
Value Description Reference
41-
100 Continue [RFC-ietf-httpbis-semantics, Section 15.2.1]
42-
101 Switching Protocols [RFC-ietf-httpbis-semantics, Section 15.2.2]
41+
100 Continue [RFC9110, Section 15.2.1]
42+
101 Switching Protocols [RFC9110, Section 15.2.2]
4343
102 Processing [RFC2518]
4444
103 Early Hints [RFC8297]
4545
104-199 Unassigned
46-
200 OK [RFC-ietf-httpbis-semantics, Section 15.3.1]
47-
201 Created [RFC-ietf-httpbis-semantics, Section 15.3.2]
48-
202 Accepted [RFC-ietf-httpbis-semantics, Section 15.3.3]
49-
203 Non-Authoritative Information [RFC-ietf-httpbis-semantics, Section 15.3.4]
50-
204 No Content [RFC-ietf-httpbis-semantics, Section 15.3.5]
51-
205 Reset Content [RFC-ietf-httpbis-semantics, Section 15.3.6]
52-
206 Partial Content [RFC-ietf-httpbis-semantics, Section 15.3.7]
46+
200 OK [RFC9110, Section 15.3.1]
47+
201 Created [RFC9110, Section 15.3.2]
48+
202 Accepted [RFC9110, Section 15.3.3]
49+
203 Non-Authoritative Information [RFC9110, Section 15.3.4]
50+
204 No Content [RFC9110, Section 15.3.5]
51+
205 Reset Content [RFC9110, Section 15.3.6]
52+
206 Partial Content [RFC9110, Section 15.3.7]
5353
207 Multi-Status [RFC4918]
5454
208 Already Reported [RFC5842]
5555
209-225 Unassigned
5656
226 IM Used [RFC3229]
5757
227-299 Unassigned
58-
300 Multiple Choices [RFC-ietf-httpbis-semantics, Section 15.4.1]
59-
301 Moved Permanently [RFC-ietf-httpbis-semantics, Section 15.4.2]
60-
302 Found [RFC-ietf-httpbis-semantics, Section 15.4.3]
61-
303 See Other [RFC-ietf-httpbis-semantics, Section 15.4.4]
62-
304 Not Modified [RFC-ietf-httpbis-semantics, Section 15.4.5]
63-
305 Use Proxy [RFC-ietf-httpbis-semantics, Section 15.4.6]
64-
306 (Unused) [RFC-ietf-httpbis-semantics, Section 15.4.7]
65-
307 Temporary Redirect [RFC-ietf-httpbis-semantics, Section 15.4.8]
66-
308 Permanent Redirect [RFC-ietf-httpbis-semantics, Section 15.4.9]
58+
300 Multiple Choices [RFC9110, Section 15.4.1]
59+
301 Moved Permanently [RFC9110, Section 15.4.2]
60+
302 Found [RFC9110, Section 15.4.3]
61+
303 See Other [RFC9110, Section 15.4.4]
62+
304 Not Modified [RFC9110, Section 15.4.5]
63+
305 Use Proxy [RFC9110, Section 15.4.6]
64+
306 (Unused) [RFC9110, Section 15.4.7]
65+
307 Temporary Redirect [RFC9110, Section 15.4.8]
66+
308 Permanent Redirect [RFC9110, Section 15.4.9]
6767
309-399 Unassigned
68-
400 Bad Request [RFC-ietf-httpbis-semantics, Section 15.5.1]
69-
401 Unauthorized [RFC-ietf-httpbis-semantics, Section 15.5.2]
70-
402 Payment Required [RFC-ietf-httpbis-semantics, Section 15.5.3]
71-
403 Forbidden [RFC-ietf-httpbis-semantics, Section 15.5.4]
72-
404 Not Found [RFC-ietf-httpbis-semantics, Section 15.5.5]
73-
405 Method Not Allowed [RFC-ietf-httpbis-semantics, Section 15.5.6]
74-
406 Not Acceptable [RFC-ietf-httpbis-semantics, Section 15.5.7]
75-
407 Proxy Authentication Required [RFC-ietf-httpbis-semantics, Section 15.5.8]
76-
408 Request Timeout [RFC-ietf-httpbis-semantics, Section 15.5.9]
77-
409 Conflict [RFC-ietf-httpbis-semantics, Section 15.5.10]
78-
410 Gone [RFC-ietf-httpbis-semantics, Section 15.5.11]
79-
411 Length Required [RFC-ietf-httpbis-semantics, Section 15.5.12]
80-
412 Precondition Failed [RFC-ietf-httpbis-semantics, Section 15.5.13]
81-
413 Content Too Large [RFC-ietf-httpbis-semantics, Section 15.5.14]
82-
414 URI Too Long [RFC-ietf-httpbis-semantics, Section 15.5.15]
83-
415 Unsupported Media Type [RFC-ietf-httpbis-semantics, Section 15.5.16]
84-
416 Range Not Satisfiable [RFC-ietf-httpbis-semantics, Section 15.5.17]
85-
417 Expectation Failed [RFC-ietf-httpbis-semantics, Section 15.5.18]
86-
418 (Unused) [RFC-ietf-httpbis-semantics, Section 15.5.19]
68+
400 Bad Request [RFC9110, Section 15.5.1]
69+
401 Unauthorized [RFC9110, Section 15.5.2]
70+
402 Payment Required [RFC9110, Section 15.5.3]
71+
403 Forbidden [RFC9110, Section 15.5.4]
72+
404 Not Found [RFC9110, Section 15.5.5]
73+
405 Method Not Allowed [RFC9110, Section 15.5.6]
74+
406 Not Acceptable [RFC9110, Section 15.5.7]
75+
407 Proxy Authentication Required [RFC9110, Section 15.5.8]
76+
408 Request Timeout [RFC9110, Section 15.5.9]
77+
409 Conflict [RFC9110, Section 15.5.10]
78+
410 Gone [RFC9110, Section 15.5.11]
79+
411 Length Required [RFC9110, Section 15.5.12]
80+
412 Precondition Failed [RFC9110, Section 15.5.13]
81+
413 Content Too Large [RFC9110, Section 15.5.14]
82+
414 URI Too Long [RFC9110, Section 15.5.15]
83+
415 Unsupported Media Type [RFC9110, Section 15.5.16]
84+
416 Range Not Satisfiable [RFC9110, Section 15.5.17]
85+
417 Expectation Failed [RFC9110, Section 15.5.18]
86+
418 (Unused) [RFC9110, Section 15.5.19]
8787
419-420 Unassigned
88-
421 Misdirected Request [RFC-ietf-httpbis-semantics, Section 15.5.20]
89-
422 Unprocessable Content [RFC-ietf-httpbis-semantics, Section 15.5.21]
88+
421 Misdirected Request [RFC9110, Section 15.5.20]
89+
422 Unprocessable Content [RFC9110, Section 15.5.21]
9090
423 Locked [RFC4918]
9191
424 Failed Dependency [RFC4918]
9292
425 Too Early [RFC8470]
93-
426 Upgrade Required [RFC-ietf-httpbis-semantics, Section 15.5.22]
93+
426 Upgrade Required [RFC9110, Section 15.5.22]
9494
427 Unassigned
9595
428 Precondition Required [RFC6585]
9696
429 Too Many Requests [RFC6585]
@@ -99,12 +99,12 @@ HTTP Status Codes
9999
432-450 Unassigned
100100
451 Unavailable For Legal Reasons [RFC7725]
101101
452-499 Unassigned
102-
500 Internal Server Error [RFC-ietf-httpbis-semantics, Section 15.6.1]
103-
501 Not Implemented [RFC-ietf-httpbis-semantics, Section 15.6.2]
104-
502 Bad Gateway [RFC-ietf-httpbis-semantics, Section 15.6.3]
105-
503 Service Unavailable [RFC-ietf-httpbis-semantics, Section 15.6.4]
106-
504 Gateway Timeout [RFC-ietf-httpbis-semantics, Section 15.6.5]
107-
505 HTTP Version Not Supported [RFC-ietf-httpbis-semantics, Section 15.6.6]
102+
500 Internal Server Error [RFC9110, Section 15.6.1]
103+
501 Not Implemented [RFC9110, Section 15.6.2]
104+
502 Bad Gateway [RFC9110, Section 15.6.3]
105+
503 Service Unavailable [RFC9110, Section 15.6.4]
106+
504 Gateway Timeout [RFC9110, Section 15.6.5]
107+
505 HTTP Version Not Supported [RFC9110, Section 15.6.6]
108108
506 Variant Also Negotiates [RFC2295]
109109
507 Insufficient Storage [RFC4918]
110110
508 Loop Detected [RFC5842]

‎.github/qNetworkReplyErrorCodes.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const qNetworkReplyErrorCodesFileName = 'QNetworkReplyErrorCodes.txt';
66
const qNetworkReplyErrorCodesFilePath = path.join( __dirname, qNetworkReplyErrorCodesFileName );
77

88
const fetchQNetworkReplyErrorCodeListFromGitHub = async ( github ) => {
9-
const getContent = github.repos.getContent || github.repos.getContents;
9+
const getContent = github.rest.repos.getContent || github.rest.repos.getContents;
1010
const response = await getContent( {
1111
owner: 'qt',
1212
repo: 'qtbase',

‎.github/workflows/checkForCodeUpdates.yml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@ jobs:
1010
name: Check for HTTP Status Codes Update
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
14-
- uses: actions/setup-node@v1
13+
- uses: actions/checkout@v3
14+
with:
15+
ref: develop
16+
- uses: actions/setup-node@v3
17+
with:
18+
node-version: 16
1519
- run: npm install
16-
- uses: actions/github-script@v4
20+
- uses: actions/github-script@v6
1721
with:
1822
script: |
1923
const path = require( 'path' );
@@ -23,10 +27,14 @@ jobs:
2327
name: Check for QNetworkReply Error Codes Update
2428
runs-on: ubuntu-latest
2529
steps:
26-
- uses: actions/checkout@v2
27-
- uses: actions/setup-node@v1
30+
- uses: actions/checkout@v3
31+
with:
32+
ref: develop
33+
- uses: actions/setup-node@v3
34+
with:
35+
node-version: 16
2836
- run: npm install
29-
- uses: actions/github-script@v4
37+
- uses: actions/github-script@v6
3038
with:
3139
script: |
3240
const path = require( 'path' );

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
name: Build & Test
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@v3
1111
- name: Build and run tests
1212
run: >
1313
docker run --rm
@@ -16,7 +16,7 @@ jobs:
1616
/bin/bash -c "
1717
cd /workspace
1818
&& g++ --version
19-
&& qmake --version
19+
&& qmake6 --version
2020
&& cd tests
2121
&& mkdir _build
2222
&& cd _build

‎.release-it.json‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,18 @@
2525
"HttpStatusCodes_C++.h",
2626
"HttpStatusCodes_C++11.h",
2727
"HttpStatusCodes_Qt.h",
28+
"HttpStatusCodes_Qt_C++11.h",
2829
{
2930
"file": ".appveyor.yml",
3031
"search": "version: \".*\\+{build}\"",
3132
"replace": "version: \"{{version}}+{build}\""
32-
},
33-
{
34-
"file": "CHANGELOG.md",
35-
"search": "Unreleased",
36-
"replace": "[{{version}}] - {{now:yyyy-MM-dd}}"
37-
},
38-
{
39-
"file": "CHANGELOG.md",
40-
"search": "(\\[\\d+\\.\\d+\\.\\d+\\]: http)",
41-
"replace": "[{{version}}]: https://github.com/j-ulrich/http-status-codes-cpp/releases/tag/{{version}}\n$1"
4233
}
4334
]
35+
},
36+
"@release-it/keep-a-changelog": {
37+
"head": "develop",
38+
"addVersionUrl": true,
39+
"versionUrl": "{repositoryUrl}/releases/tag/{tagName}"
4440
}
4541
}
4642
}

‎CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,21 @@ This project adheres to [Semantic Versioning](http://semver.org/).
77
This changelog follows the [Keep a Changelog](http://keepachangelog.com) format.
88

99

10+
---
11+
12+
## [1.6.0] - 2025-02-09
13+
14+
### Added ###
15+
- [#28] Added code `Invalid` (-1).
16+
- [#28]{Qt C++11} Qt C++11 variant which uses `enum class` for the codes.
17+
18+
### Changed ###
19+
- {Qt} `networkErrorToStatusCode()` now returns a `Code` instead of `int`.
20+
21+
### Removed ###
22+
- Testing with Visual Studio 2013 because of outdated CMake.
23+
24+
1025
---
1126

1227

@@ -91,9 +106,12 @@ Initial (actually unversioned) release.
91106
---
92107

93108

109+
[1.6.0]: https://github.com/j-ulrich/http-status-codes-cpp/compare/1.5.0...1.6.0
94110
[1.5.0]: https://github.com/j-ulrich/http-status-codes-cpp/releases/tag/1.5.0
95111
[1.4.0]: https://github.com/j-ulrich/http-status-codes-cpp/releases/tag/1.4.0
96112
[1.3.0]: https://github.com/j-ulrich/http-status-codes-cpp/releases/tag/1.3.0
97113
[1.2.0]: https://github.com/j-ulrich/http-status-codes-cpp/releases/tag/1.2.0
98114
[1.1.1]: https://github.com/j-ulrich/http-status-codes-cpp/releases/tag/1.1.1
99115
[1.1.0]: https://github.com/j-ulrich/http-status-codes-cpp/releases/tag/1.1.0
116+
117+
[unreleased]: https://github.com/j-ulrich/http-status-codes-cpp/compare/1.6.0...develop

‎HttpStatusCodes_C++.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* https://github.com/j-ulrich/http-status-codes-cpp
66
*
7-
* \version 1.5.0
7+
* \version 1.6.0
88
* \author Jochen Ulrich <[email protected]>
99
* \copyright Licensed under Creative Commons CC0 (http://creativecommons.org/publicdomain/zero/1.0/)
1010
*/
@@ -24,6 +24,8 @@ namespace HttpStatus
2424
*/
2525
enum Code
2626
{
27+
Invalid = -1, //!< An invalid status code.
28+
2729
/*####### 1xx - Informational #######*/
2830
/* Indicates an interim response for communicating connection status
2931
* or request progress prior to completing the requested action and

‎HttpStatusCodes_C++11.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* https://github.com/j-ulrich/http-status-codes-cpp
66
*
7-
* \version 1.5.0
7+
* \version 1.6.0
88
* \author Jochen Ulrich <[email protected]>
99
* \copyright Licensed under Creative Commons CC0 (http://creativecommons.org/publicdomain/zero/1.0/)
1010
*/
@@ -24,6 +24,8 @@ namespace HttpStatus
2424
*/
2525
enum class Code
2626
{
27+
Invalid = -1, //!< An invalid status code.
28+
2729
/*####### 1xx - Informational #######*/
2830
/* Indicates an interim response for communicating connection status
2931
* or request progress prior to completing the requested action and

0 commit comments

Comments
 (0)