| serf.h | serf.h | |||
|---|---|---|---|---|
| skipping to change at line 85 | skipping to change at line 85 | |||
| #define SERF_ERROR_WAIT_CONN (APR_OS_START_USERERR + SERF_ERROR_RANGE + 3) | #define SERF_ERROR_WAIT_CONN (APR_OS_START_USERERR + SERF_ERROR_RANGE + 3) | |||
| /* This code is for when something went wrong during deflating compressed | /* This code is for when something went wrong during deflating compressed | |||
| * data e.g. a CRC error. */ | * data e.g. a CRC error. */ | |||
| #define SERF_ERROR_DECOMPRESSION_FAILED (APR_OS_START_USERERR + \ | #define SERF_ERROR_DECOMPRESSION_FAILED (APR_OS_START_USERERR + \ | |||
| SERF_ERROR_RANGE + 4) | SERF_ERROR_RANGE + 4) | |||
| /* This code is for when a response received from a http server is not in | /* This code is for when a response received from a http server is not in | |||
| * http-compliant syntax. */ | * http-compliant syntax. */ | |||
| #define SERF_ERROR_BAD_HTTP_RESPONSE (APR_OS_START_USERERR + \ | #define SERF_ERROR_BAD_HTTP_RESPONSE (APR_OS_START_USERERR + \ | |||
| SERF_ERROR_RANGE + 5) | SERF_ERROR_RANGE + 5) | |||
| /* SSL certificates related errors */ | ||||
| #define SERF_ERROR_SSL_CERT_FAILED (APR_OS_START_USERERR + SERF_ERROR_RANGE | ||||
| + 70) | ||||
| /* SSL communications related errors */ | ||||
| #define SERF_ERROR_SSL_COMM_FAILED (APR_OS_START_USERERR + SERF_ERROR_RANGE | ||||
| + 71) | ||||
| /* General authentication related errors */ | /* General authentication related errors */ | |||
| #define SERF_ERROR_AUTHN_FAILED (APR_OS_START_USERERR + SERF_ERROR_RANGE + 90) | #define SERF_ERROR_AUTHN_FAILED (APR_OS_START_USERERR + SERF_ERROR_RANGE + 90) | |||
| /* None of the available authn mechanisms for the request are supported */ | /* None of the available authn mechanisms for the request are supported */ | |||
| #define SERF_ERROR_AUTHN_NOT_SUPPORTED (APR_OS_START_USERERR + SERF_ERROR_R ANGE + 91) | #define SERF_ERROR_AUTHN_NOT_SUPPORTED (APR_OS_START_USERERR + SERF_ERROR_R ANGE + 91) | |||
| /* Authn was requested by the server but the header lacked some attribute */ | /* Authn was requested by the server but the header lacked some attribute */ | |||
| #define SERF_ERROR_AUTHN_MISSING_ATTRIBUTE (APR_OS_START_USERERR + SERF_ERR OR_RANGE + 92) | #define SERF_ERROR_AUTHN_MISSING_ATTRIBUTE (APR_OS_START_USERERR + SERF_ERR OR_RANGE + 92) | |||
| /* Authentication handler initialization related errors */ | /* Authentication handler initialization related errors */ | |||
| skipping to change at line 1019 | skipping to change at line 1025 | |||
| void serf_debug__closed_conn( | void serf_debug__closed_conn( | |||
| serf_bucket_alloc_t *allocator); | serf_bucket_alloc_t *allocator); | |||
| void serf_debug__bucket_destroy( | void serf_debug__bucket_destroy( | |||
| const serf_bucket_t *bucket); | const serf_bucket_t *bucket); | |||
| void serf_debug__bucket_alloc_check( | void serf_debug__bucket_alloc_check( | |||
| serf_bucket_alloc_t *allocator); | serf_bucket_alloc_t *allocator); | |||
| /* Version info */ | /* Version info */ | |||
| #define SERF_MAJOR_VERSION 1 | #define SERF_MAJOR_VERSION 1 | |||
| #define SERF_MINOR_VERSION 1 | #define SERF_MINOR_VERSION 1 | |||
| #define SERF_PATCH_VERSION 0 | #define SERF_PATCH_VERSION 1 | |||
| /* Version number string */ | /* Version number string */ | |||
| #define SERF_VERSION_STRING APR_STRINGIFY(SERF_MAJOR_VERSION) "." \ | #define SERF_VERSION_STRING APR_STRINGIFY(SERF_MAJOR_VERSION) "." \ | |||
| APR_STRINGIFY(SERF_MINOR_VERSION) "." \ | APR_STRINGIFY(SERF_MINOR_VERSION) "." \ | |||
| APR_STRINGIFY(SERF_PATCH_VERSION) | APR_STRINGIFY(SERF_PATCH_VERSION) | |||
| /** | /** | |||
| * Check at compile time if the Serf version is at least a certain | * Check at compile time if the Serf version is at least a certain | |||
| * level. | * level. | |||
| * @param major The major version component of the version checked | * @param major The major version component of the version checked | |||
| End of changes. 2 change blocks. | ||||
| 1 lines changed or deleted | 9 lines changed or added | |||
| serf_private.h | serf_private.h | |||
|---|---|---|---|---|
| skipping to change at line 206 | skipping to change at line 206 | |||
| serf_bucket_t *ostream_head; | serf_bucket_t *ostream_head; | |||
| serf_bucket_t *ostream_tail; | serf_bucket_t *ostream_tail; | |||
| /* Aggregate bucket used to send the CONNECT request. */ | /* Aggregate bucket used to send the CONNECT request. */ | |||
| serf_bucket_t *ssltunnel_ostream; | serf_bucket_t *ssltunnel_ostream; | |||
| /* The list of active requests. */ | /* The list of active requests. */ | |||
| serf_request_t *requests; | serf_request_t *requests; | |||
| serf_request_t *requests_tail; | serf_request_t *requests_tail; | |||
| /* The list of requests we're holding on to because we're going to | ||||
| * reset the connection soon. | ||||
| */ | ||||
| serf_request_t *hold_requests; | ||||
| serf_request_t *hold_requests_tail; | ||||
| struct iovec vec[IOV_MAX]; | struct iovec vec[IOV_MAX]; | |||
| int vec_len; | int vec_len; | |||
| serf_connection_setup_t setup; | serf_connection_setup_t setup; | |||
| void *setup_baton; | void *setup_baton; | |||
| serf_connection_closed_t closed; | serf_connection_closed_t closed; | |||
| void *closed_baton; | void *closed_baton; | |||
| /* Max. number of outstanding requests. */ | /* Max. number of outstanding requests. */ | |||
| unsigned int max_outstanding_requests; | unsigned int max_outstanding_requests; | |||
| End of changes. 1 change blocks. | ||||
| 6 lines changed or deleted | 0 lines changed or added | |||