Index: src/OFHTTPResponse.h ================================================================== --- src/OFHTTPResponse.h +++ src/OFHTTPResponse.h @@ -22,11 +22,11 @@ @class OFArray OF_GENERIC(ObjectType); /** * @class OFHTTPResponse OFHTTPResponse.h ObjFW/OFHTTPResponse.h * - * @brief A class for representing an HTTP request reply as a stream. + * @brief A class for representing an HTTP request response as a stream. */ @interface OFHTTPResponse: OFStream { OFHTTPRequestProtocolVersion _protocolVersion; short _statusCode; @@ -33,42 +33,45 @@ OFDictionary OF_GENERIC(OFString *, OFString *) *_headers; OF_RESERVE_IVARS(OFHTTPResponse, 4) } /** - * @brief The protocol version of the HTTP request reply. + * @brief The protocol version of the HTTP request response. */ @property (nonatomic) OFHTTPRequestProtocolVersion protocolVersion; /** - * @brief The protocol version of the HTTP request reply as a string. + * @brief The protocol version of the HTTP request response as a string. */ @property (copy, nonatomic) OFString *protocolVersionString; /** - * @brief The status code of the reply to the HTTP request. + * @brief The status code of the response to the HTTP request. */ @property (nonatomic) short statusCode; /** - * @brief The headers of the reply to the HTTP request. + * @brief The headers of the response to the HTTP request. */ @property (copy, nonatomic) OFDictionary OF_GENERIC(OFString *, OFString *) *headers; /** - * @brief The reply as a string, trying to detect the encoding. + * @brief Read the response as a string, trying to detect the encoding and + * falling back to the specified encoding if not detectable. + * + * @return The response as a string */ -@property (readonly, nonatomic) OFString *string; +- (OFString *)readString; /** - * @brief Returns the reply as a string, trying to detect the encoding and + * @brief Rread the response as a string, trying to detect the encoding and * falling back to the specified encoding if not detectable. * - * @return The reply as a string + * @return The response as a string */ -- (OFString *)stringWithEncoding: (OFStringEncoding)encoding; +- (OFString *)readStringWithEncoding: (OFStringEncoding)encoding; @end #ifdef __cplusplus extern "C" { #endif Index: src/OFHTTPResponse.m ================================================================== --- src/OFHTTPResponse.m +++ src/OFHTTPResponse.m @@ -294,16 +294,16 @@ return [OFString stringWithFormat: @"%hhu.%hhu", _protocolVersion.major, _protocolVersion.minor]; } -- (OFString *)string +- (OFString *)readString { - return [self stringWithEncoding: OFStringEncodingAutodetect]; + return [self readStringWithEncoding: OFStringEncodingAutodetect]; } -- (OFString *)stringWithEncoding: (OFStringEncoding)encoding +- (OFString *)readStringWithEncoding: (OFStringEncoding)encoding { void *pool = objc_autoreleasePoolPush(); OFString *contentType, *contentLengthString, *ret; OFData *data;