Update to 2.8.0
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko
parent
55101bd793
commit
023cbff3d2
|
|
@ -6,3 +6,4 @@
|
|||
/v2.6.0.tar.gz
|
||||
/v2.7.1.tar.gz
|
||||
/http-parser-2.7.1.tar.gz
|
||||
/http-parser-2.8.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,101 +0,0 @@
|
|||
From 335850f6b868d3411968cbf5a4d59fe619dee36f Mon Sep 17 00:00:00 2001
|
||||
From: Nathaniel McCallum <npmccallum@redhat.com>
|
||||
Date: Thu, 6 Oct 2016 02:03:36 -0400
|
||||
Subject: [PATCH] parser: HTTP_STATUS_MAP(XX) and enum http_status
|
||||
|
||||
This patch provides an enum for the standardized HTTP status codes.
|
||||
Additionally, the HTTP_STATUS_MAP(XX) can be used for other purposes as
|
||||
well, such as code-to-name lookups and code-based switch statements.
|
||||
|
||||
PR-URL: https://github.com/nodejs/http-parser/pull/337
|
||||
Reviewed-By: Fedor Indutny <fedor@indutny.com>
|
||||
Reviewed-By: Brian White <mscdex@mscdex.net>
|
||||
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
|
||||
---
|
||||
http_parser.h | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 70 insertions(+)
|
||||
|
||||
diff --git a/http_parser.h b/http_parser.h
|
||||
index ea26394..45c72a0 100644
|
||||
--- a/http_parser.h
|
||||
+++ b/http_parser.h
|
||||
@@ -90,6 +90,76 @@ typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);
|
||||
typedef int (*http_cb) (http_parser*);
|
||||
|
||||
|
||||
+/* Status Codes */
|
||||
+#define HTTP_STATUS_MAP(XX) \
|
||||
+ XX(100, CONTINUE, Continue) \
|
||||
+ XX(101, SWITCHING_PROTOCOLS, Switching Protocols) \
|
||||
+ XX(102, PROCESSING, Processing) \
|
||||
+ XX(200, OK, OK) \
|
||||
+ XX(201, CREATED, Created) \
|
||||
+ XX(202, ACCEPTED, Accepted) \
|
||||
+ XX(203, NON_AUTHORITATIVE_INFORMATION, Non-Authoritative Information) \
|
||||
+ XX(204, NO_CONTENT, No Content) \
|
||||
+ XX(205, RESET_CONTENT, Reset Content) \
|
||||
+ XX(206, PARTIAL_CONTENT, Partial Content) \
|
||||
+ XX(207, MULTI_STATUS, Multi-Status) \
|
||||
+ XX(208, ALREADY_REPORTED, Already Reported) \
|
||||
+ XX(226, IM_USED, IM Used) \
|
||||
+ XX(300, MULTIPLE_CHOICES, Multiple Choices) \
|
||||
+ XX(301, MOVED_PERMANENTLY, Moved Permanently) \
|
||||
+ XX(302, FOUND, Found) \
|
||||
+ XX(303, SEE_OTHER, See Other) \
|
||||
+ XX(304, NOT_MODIFIED, Not Modified) \
|
||||
+ XX(305, USE_PROXY, Use Proxy) \
|
||||
+ XX(307, TEMPORARY_REDIRECT, Temporary Redirect) \
|
||||
+ XX(308, PERMANENT_REDIRECT, Permanent Redirect) \
|
||||
+ XX(400, BAD_REQUEST, Bad Request) \
|
||||
+ XX(401, UNAUTHORIZED, Unauthorized) \
|
||||
+ XX(402, PAYMENT_REQUIRED, Payment Required) \
|
||||
+ XX(403, FORBIDDEN, Forbidden) \
|
||||
+ XX(404, NOT_FOUND, Not Found) \
|
||||
+ XX(405, METHOD_NOT_ALLOWED, Method Not Allowed) \
|
||||
+ XX(406, NOT_ACCEPTABLE, Not Acceptable) \
|
||||
+ XX(407, PROXY_AUTHENTICATION_REQUIRED, Proxy Authentication Required) \
|
||||
+ XX(408, REQUEST_TIMEOUT, Request Timeout) \
|
||||
+ XX(409, CONFLICT, Conflict) \
|
||||
+ XX(410, GONE, Gone) \
|
||||
+ XX(411, LENGTH_REQUIRED, Length Required) \
|
||||
+ XX(412, PRECONDITION_FAILED, Precondition Failed) \
|
||||
+ XX(413, PAYLOAD_TOO_LARGE, Payload Too Large) \
|
||||
+ XX(414, URI_TOO_LONG, URI Too Long) \
|
||||
+ XX(415, UNSUPPORTED_MEDIA_TYPE, Unsupported Media Type) \
|
||||
+ XX(416, RANGE_NOT_SATISFIABLE, Range Not Satisfiable) \
|
||||
+ XX(417, EXPECTATION_FAILED, Expectation Failed) \
|
||||
+ XX(421, MISDIRECTED_REQUEST, Misdirected Request) \
|
||||
+ XX(422, UNPROCESSABLE_ENTITY, Unprocessable Entity) \
|
||||
+ XX(423, LOCKED, Locked) \
|
||||
+ XX(424, FAILED_DEPENDENCY, Failed Dependency) \
|
||||
+ XX(426, UPGRADE_REQUIRED, Upgrade Required) \
|
||||
+ XX(428, PRECONDITION_REQUIRED, Precondition Required) \
|
||||
+ XX(429, TOO_MANY_REQUESTS, Too Many Requests) \
|
||||
+ XX(431, REQUEST_HEADER_FIELDS_TOO_LARGE, Request Header Fields Too Large) \
|
||||
+ XX(451, UNAVAILABLE_FOR_LEGAL_REASONS, Unavailable For Legal Reasons) \
|
||||
+ XX(500, INTERNAL_SERVER_ERROR, Internal Server Error) \
|
||||
+ XX(501, NOT_IMPLEMENTED, Not Implemented) \
|
||||
+ XX(502, BAD_GATEWAY, Bad Gateway) \
|
||||
+ XX(503, SERVICE_UNAVAILABLE, Service Unavailable) \
|
||||
+ XX(504, GATEWAY_TIMEOUT, Gateway Timeout) \
|
||||
+ XX(505, HTTP_VERSION_NOT_SUPPORTED, HTTP Version Not Supported) \
|
||||
+ XX(506, VARIANT_ALSO_NEGOTIATES, Variant Also Negotiates) \
|
||||
+ XX(507, INSUFFICIENT_STORAGE, Insufficient Storage) \
|
||||
+ XX(508, LOOP_DETECTED, Loop Detected) \
|
||||
+ XX(510, NOT_EXTENDED, Not Extended) \
|
||||
+ XX(511, NETWORK_AUTHENTICATION_REQUIRED, Network Authentication Required) \
|
||||
+
|
||||
+enum http_status
|
||||
+ {
|
||||
+#define XX(num, name, string) HTTP_STATUS_##name = num,
|
||||
+ HTTP_STATUS_MAP(XX)
|
||||
+#undef XX
|
||||
+ };
|
||||
+
|
||||
+
|
||||
/* Request Methods */
|
||||
#define HTTP_METHOD_MAP(XX) \
|
||||
XX(0, DELETE, DELETE) \
|
||||
--
|
||||
2.10.2
|
||||
|
||||
|
|
@ -1,22 +1,14 @@
|
|||
# we use the upstream version from http_parser.h as the SONAME
|
||||
%global somajor 2
|
||||
%global sominor 7
|
||||
%global sopoint 1
|
||||
|
||||
Name: http-parser
|
||||
Version: %{somajor}.%{sominor}.%{sopoint}
|
||||
Release: 9%{?dist}
|
||||
Version: 2.8.0
|
||||
Release: 1%{?dist}
|
||||
Summary: HTTP request/response parser for C
|
||||
|
||||
License: MIT
|
||||
URL: https://github.com/nodejs/http-parser
|
||||
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
# https://github.com/nodejs/http-parser/commit/335850f6b868d3411968cbf5a4d59fe619dee36f
|
||||
Patch0001: %{name}-0001-parser-HTTP_STATUS_MAP-XX-and-enum-http_status.patch
|
||||
|
||||
BuildRequires: meson
|
||||
BuildRequires: gcc
|
||||
BuildRequires: cmake
|
||||
|
||||
%description
|
||||
This is a parser for HTTP messages written in C. It parses both requests and
|
||||
|
|
@ -36,63 +28,39 @@ Development headers and libraries for http-parser.
|
|||
%prep
|
||||
%autosetup -p1
|
||||
# TODO: try to send upstream?
|
||||
cat > CMakeLists.txt << EOF
|
||||
cmake_minimum_required (VERSION 2.8.5)
|
||||
project (http-parser C)
|
||||
include (GNUInstallDirs)
|
||||
|
||||
set (SRCS http_parser.c)
|
||||
set (HDRS http_parser.h)
|
||||
set (TEST_SRCS test.c)
|
||||
|
||||
# Non-Strict version
|
||||
add_library (http_parser \${SRCS})
|
||||
target_compile_definitions (http_parser
|
||||
PUBLIC -DHTTP_PARSER_STRICT=0)
|
||||
add_executable (test-nonstrict \${TEST_SRCS})
|
||||
target_link_libraries (test-nonstrict http_parser)
|
||||
# Strict version
|
||||
add_library (http_parser_strict \${SRCS})
|
||||
target_compile_definitions (http_parser_strict
|
||||
PUBLIC -DHTTP_PARSER_STRICT=1)
|
||||
add_executable (test-strict \${TEST_SRCS})
|
||||
target_link_libraries (test-strict http_parser_strict)
|
||||
|
||||
set_target_properties (http_parser http_parser_strict
|
||||
PROPERTIES
|
||||
SOVERSION %{somajor}
|
||||
VERSION %{version})
|
||||
|
||||
install (TARGETS http_parser http_parser_strict
|
||||
LIBRARY DESTINATION \${CMAKE_INSTALL_LIBDIR})
|
||||
install (FILES \${HDRS}
|
||||
DESTINATION \${CMAKE_INSTALL_INCLUDEDIR})
|
||||
|
||||
enable_testing ()
|
||||
add_test (NAME test-nonstrict COMMAND test-nonstrict)
|
||||
add_test (NAME test-strict COMMAND test-strict)
|
||||
cat > meson.build << EOF
|
||||
project('%{name}', 'c', version : '%{version}')
|
||||
install_headers('http_parser.h')
|
||||
foreach x : [['http_parser', ['-DHTTP_PARSER_STRICT=0']],
|
||||
['http_parser_strict', ['-DHTTP_PARSER_STRICT=1']]]
|
||||
lib = library(x.get(0), 'http_parser.c',
|
||||
c_args : x.get(1),
|
||||
version : '%{version}',
|
||||
install : true)
|
||||
test('test-@0@'.format(x.get(0)),
|
||||
executable('test-@0@'.format(x.get(0)), 'test.c',
|
||||
c_args : x.get(1),
|
||||
link_with : lib))
|
||||
endforeach
|
||||
EOF
|
||||
|
||||
%build
|
||||
mkdir %{_target_platform}
|
||||
pushd %{_target_platform}
|
||||
%cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
popd
|
||||
%make_build -C %{_target_platform}
|
||||
%meson
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%make_install -C %{_target_platform}
|
||||
%meson_install
|
||||
|
||||
%check
|
||||
make test -C %{_target_platform}
|
||||
%meson_test
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%license LICENSE-MIT
|
||||
%doc AUTHORS README.md
|
||||
%{_libdir}/libhttp_parser.so.*
|
||||
%{_libdir}/libhttp_parser_strict.so.*
|
||||
%doc AUTHORS README.md
|
||||
%license LICENSE-MIT
|
||||
|
||||
%files devel
|
||||
%{_includedir}/http_parser.h
|
||||
|
|
@ -100,6 +68,10 @@ make test -C %{_target_platform}
|
|||
%{_libdir}/libhttp_parser_strict.so
|
||||
|
||||
%changelog
|
||||
* Sat Feb 10 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.8.0-1
|
||||
- Update to 2.8.0
|
||||
- Switch to meson buildsystem
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue