Differences From Artifact [cc2cdac436]:
- File
src/OFHTTPRequest.h
— part of check-in
[d526d938d7]
at
2015-11-21 18:35:39
on branch trunk
— Remove OF_NULLABLE / OF_NONNULL
Now that Clang switched to use _Nullable and _Nonnull instead of
__nullable / __nonnull, there is no longer a conflict with glibc, which
means we can just define _Nullable / _Nonnull to nothing if they are not
understood by the compiler (which did not work with __nullable /
__nonnull due to this conflict).This also defines _Null_unspecified to nothing if unavailable. (user: js, size: 6675) [annotate] [blame] [check-ins using]
To Artifact [0d537b984c]:
- File
src/OFHTTPRequest.h
— part of check-in
[48980f2297]
at
2015-11-29 11:43:05
on branch trunk
— Make properties a requirement and clean up code
This increases the required GCC version from 4.0 to 4.6 (exception:
Apple GCC, which already supports this with >= 4.0 starting with OS X
10.5). Since even GCC 4.6 is really old by now, there is no point in
still supporting something even older and making the code ugly because
of that. While some hardware and OS support was dropped from GCC 4.6
compared to GCC 4.0, there is nothing in there that would be an
interesting target with the exception of BeOS maybe - but a port to BeOS
can also be achieved using the Haiku support. The other dropped OSes are
mostly old versions of OSes while newer ones are still being supported
(and those newer versions of those OSes still support the same
hardware). (user: js, size: 5116) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
76 77 78 79 80 81 82 | of_http_request_method_t _method; of_http_request_protocol_version_t _protocolVersion; OFDictionary OF_GENERIC(OFString*, OFString*) *_headers; OFDataArray *_body; OFString *_remoteAddress; } | < > > > > > > > | > > > > > > > > > > > < | 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 |
of_http_request_method_t _method;
of_http_request_protocol_version_t _protocolVersion;
OFDictionary OF_GENERIC(OFString*, OFString*) *_headers;
OFDataArray *_body;
OFString *_remoteAddress;
}
/*!
* The URL of the HTTP request.
*/
@property (copy) OFURL *URL;
/*!
* The request method of the HTTP request.
*/
@property of_http_request_method_t method;
/*!
* The headers for the HTTP request.
*/
@property OF_NULLABLE_PROPERTY (copy)
OFDictionary OF_GENERIC(OFString*, OFString*) *headers;
/*!
* The entity body of the HTTP request.
*/
@property OF_NULLABLE_PROPERTY (retain) OFDataArray *body;
/*!
* The remote address from which the request originates.
*/
@property OF_NULLABLE_PROPERTY (copy) OFString *remoteAddress;
/*!
* @brief Creates a new OFHTTPRequest.
*
* @return A new, autoreleased OFHTTPRequest
*/
+ (instancetype)request;
|
| ︙ | ︙ | |||
109 110 111 112 113 114 115 | * @brief Initializes an already allocated OFHTTPRequest with the specified URL. * * @param URL The URL for the request * @return An initialized OFHTTPRequest */ - initWithURL: (OFURL*)URL; | < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 125 126 127 128 129 130 131 132 133 134 135 136 137 138 | * @brief Initializes an already allocated OFHTTPRequest with the specified URL. * * @param URL The URL for the request * @return An initialized OFHTTPRequest */ - initWithURL: (OFURL*)URL; /*! * @brief Sets the protocol version of the HTTP request. * * @param protocolVersion The protocol version of the HTTP request */ - (void)setProtocolVersion: (of_http_request_protocol_version_t)protocolVersion; |
| ︙ | ︙ | |||
166 167 168 169 170 171 172 | /*! * @brief Returns the protocol version of the HTTP request as a string. * * @return The protocol version of the HTTP request as a string */ - (OFString*)protocolVersionString; | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 |
/*!
* @brief Returns the protocol version of the HTTP request as a string.
*
* @return The protocol version of the HTTP request as a string
*/
- (OFString*)protocolVersionString;
/*!
* @brief Sets the entity body of the HTTP request to the specified string
* encoded in UTF-8.
*
* @param string The string to use for the entity body
*/
- (void)setBodyFromString: (nullable OFString*)string;
/*!
* @brief Sets the entity body of the HTTP request to the specified string
* encoded in the specified encoding.
*
* @param string The string to use for the entity body
* @param encoding The encoding to encode the string with
*/
- (void)setBodyFromString: (nullable OFString*)string
encoding: (of_string_encoding_t)encoding;
@end
#ifdef __cplusplus
extern "C" {
#endif
/*!
* @brief Returns a C string describing the specified request method.
|
| ︙ | ︙ |