}
/* }}} */
-/* {{{ STATUS http_exit(int, char*, char*, zend_bool) */
-STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header TSRMLS_DC)
+/* {{{ void http_log(char *, char *, char *) */
+void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC)
{
+ time_t now;
+ struct tm nowtm;
char datetime[128];
- if (SUCCESS != http_send_status_header(status, send_header ? header : NULL)) {
- http_error_ex(HE_WARNING, HTTP_E_HEADER, "Failed to exit with status/header: %d - %s", status, header ? header : "");
- STR_FREE(header);
- STR_FREE(body);
- return FAILURE;
- }
- if (body) {
- PHPWRITE(body, strlen(body));
- }
- {
- time_t now;
- struct tm nowtm;
-
- time(&now);
- strftime(datetime, sizeof(datetime), "%Y-%m-%d %H:%M:%S", php_localtime_r(&now, &nowtm));
- }
-
-#define HTTP_LOG_WRITE(for, type, header) \
- HTTP_LOG_WRITE_EX(for, type, header); \
- HTTP_LOG_WRITE_EX(composite, type, header);
+ time(&now);
+ strftime(datetime, sizeof(datetime), "%Y-%m-%d %H:%M:%S", php_localtime_r(&now, &nowtm));
-#define HTTP_LOG_WRITE_EX(for, type, header) \
- if (HTTP_G(log).##for && strlen(HTTP_G(log).##for)) { \
- php_stream *log = php_stream_open_wrapper(HTTP_G(log).##for, "ab", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); \
+#define HTTP_LOG_WRITE(file, type, msg) \
+ if (file && strlen(file)) { \
+ php_stream *log = php_stream_open_wrapper(file, "ab", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); \
\
if (log) { \
- php_stream_printf(log TSRMLS_CC, "%s [%12s] %32s <%s>%s", datetime, type, header, SG(request_info).request_uri, PHP_EOL); \
+ php_stream_printf(log TSRMLS_CC, "%s [%12s] %32s <%s>%s", datetime, type, msg, SG(request_info).request_uri, PHP_EOL); \
php_stream_close(log); \
} \
\
}
+
+ HTTP_LOG_WRITE(file, ident, message);
+ HTTP_LOG_WRITE(HTTP_G(log).composite, ident, message);
+}
+/* }}} */
+
+/* {{{ STATUS http_exit(int, char*, char*) */
+STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header TSRMLS_DC)
+{
+ if (status || send_header) {
+ if (SUCCESS != http_send_status_header(status, send_header ? header : NULL)) {
+ http_error_ex(HE_WARNING, HTTP_E_HEADER, "Failed to exit with status/header: %d - %s", status, header ? header : "");
+ STR_FREE(header);
+ STR_FREE(body);
+ return FAILURE;
+ }
+ }
+
+ if (body) {
+ PHPWRITE(body, strlen(body));
+ }
+
switch (status)
{
- case 301: HTTP_LOG_WRITE(redirect, "301-REDIRECT", header); break;
- case 302: HTTP_LOG_WRITE(redirect, "302-REDIRECT", header); break;
- case 304: HTTP_LOG_WRITE(cache, "304-CACHE", header); break;
- case 401: HTTP_LOG_WRITE(auth, "401-AUTH", header); break;
- case 403: HTTP_LOG_WRITE(auth, "403-AUTH", header); break;
- case 405: HTTP_LOG_WRITE(allowed_methods, "405-ALLOWED", header); break;
+ case 301: http_log(HTTP_G(log).redirect, "301-REDIRECT", header); break;
+ case 302: http_log(HTTP_G(log).redirect, "302-REDIRECT", header); break;
+ case 304: http_log(HTTP_G(log).cache, "304-CACHE", header); break;
+ case 405: http_log(HTTP_G(log).allowed_methods, "405-ALLOWED", header); break;
+ default: http_log(NULL, header, body); break;
}
+
STR_FREE(header);
STR_FREE(body);
+
zend_bailout();
/* fake */
return SUCCESS;
/* }}} */
/* {{{ char *http_chunked_decode(char *, size_t, char **, size_t *) */
-PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encoded_len,
- char **decoded, size_t *decoded_len TSRMLS_DC)
+PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC)
{
const char *e_ptr;
char *d_ptr;
-
+
*decoded_len = 0;
*decoded = ecalloc(1, encoded_len);
d_ptr = *decoded;
e_ptr = encoded;
while (((e_ptr - encoded) - encoded_len) > 0) {
- int no_crlf = 0;
+ size_t chunk_len = 0, EOL_len = 0;
+ int eol_mismatch = 0;
char *n_ptr;
- size_t chunk_len = 0;
chunk_len = strtol(e_ptr, &n_ptr, 16);
/* check if:
* - we could not read in chunk size
- * - chunk size is not followed by HTTP_CRLF|NUL
+ * - chunk size is not followed by (CR)LF|NUL
*/
- if ((n_ptr == e_ptr) || (*n_ptr && (no_crlf = strncmp(n_ptr, HTTP_CRLF, lenof(HTTP_CRLF))))) {
+ if ((n_ptr == e_ptr) || (*n_ptr && (eol_mismatch = n_ptr != http_locate_eol(e_ptr, &EOL_len)))) {
/* don't fail on apperently not encoded data */
if (e_ptr == encoded) {
memcpy(*decoded, encoded, encoded_len);
return encoded + encoded_len;
} else {
efree(*decoded);
- if (no_crlf) {
- http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0D 0x0A; got: 0x%x 0x%x)", *n_ptr, *(n_ptr + 1));
+ if (eol_mismatch) {
+ if (EOL_len == 2) {
+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0D 0x0A; got: 0x%X 0x%X)", *n_ptr, *(n_ptr + 1));
+ } else {
+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0A; got: 0x%X)", *n_ptr);
+ }
} else {
- char *error = estrndup(n_ptr, strcspn(n_ptr, "\r\n \0"));
+ char *error = estrndup(n_ptr, strcspn(n_ptr, "\r\n "));
http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded);
efree(error);
}
break;
}
- memcpy(d_ptr, e_ptr += 2, chunk_len);
+ memcpy(d_ptr, e_ptr += EOL_len, chunk_len);
d_ptr += chunk_len;
- e_ptr += chunk_len + 2;
+ e_ptr += chunk_len + EOL_len;
*decoded_len += chunk_len;
}
}
/* }}} */
-/* {{{ STATUS http_locate_body(char *, size_t) */
-PHP_HTTP_API
-/* }}} */
-
/*
* Local variables:
* tab-width: 4