#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
#ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
#endif
#include <ctype.h>
#include "SAPI.h"
#ifdef ZEND_ENGINE_2
-#include "ext/standard/php_http.h"
+# include "ext/standard/php_http.h"
#else
-#include "http_build_query.c"
+ #include "http_build_query.c"
#endif
#include "php_http.h"
#ifdef HTTP_HAVE_CURL
-#ifdef PHP_WIN32
-#include <winsock2.h>
-#include <sys/types.h>
-#endif
+# ifdef PHP_WIN32
+# include <winsock2.h>
+# include <sys/types.h>
+# endif
+
+# include <curl/curl.h>
+# include <curl/easy.h>
-#include <curl/curl.h>
-#include <curl/easy.h>
#endif
static int check_month(char *month);
static int check_tzone(char *tzone);
+static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen);
+
/* {{{ HAVE_CURL */
#ifdef HTTP_HAVE_CURL
#define http_curl_initbuf(m) _http_curl_initbuf((m) TSRMLS_CC)
/* {{{ static inline char *http_curl_getinfoname(CURLINFO) */
static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC)
{
-#define CASE(I) case CURLINFO_ ##I : return #I
+#define CASE(I) case CURLINFO_ ##I : return pretty_key(estrdup( #I ), strlen(#I), 0, 0)
switch (i)
{
/* CURLINFO_EFFECTIVE_URL = CURLINFO_STRING +1, */
}
/* }}} */
+#endif
+/* }}} HAVE_CURL */
+
/* {{{ Day/Month/TZ checks for http_parse_date()
Originally by libcurl, Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al. */
static int check_day(char *day, size_t len)
}
/* }}} */
-#endif
-/* }}} HAVE_CURL */
+/* static char *pretty_key(char *, int, int, int) */
+static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen)
+{
+ if (key && key_len) {
+ int i, wasalpha;
+ if (wasalpha = isalpha(key[0])) {
+ key[0] = uctitle ? toupper(key[0]) : tolower(key[0]);
+ }
+ for (i = 1; i < key_len; i++) {
+ if (isalpha(key[i])) {
+ key[i] = ((!wasalpha) && uctitle) ? toupper(key[i]) : tolower(key[i]);
+ wasalpha = 1;
+ } else {
+ if (xhyphen && (key[i] == '_')) {
+ key[i] = '-';
+ }
+ wasalpha = 0;
+ }
+ }
+ }
+ return key;
+}
+/* }}} */
/* }}} internals */
/* single range */
if ((c = zend_hash_num_elements(Z_ARRVAL_P(zranges))) == 1) {
char range_header[256] = {0};
-
+
zend_hash_index_find(Z_ARRVAL_P(zranges), 0, (void **) &zrange);
zend_hash_index_find(Z_ARRVAL_PP(zrange), 0, (void **) &begin);
zend_hash_index_find(Z_ARRVAL_PP(zrange), 1, (void **) &end);
/* multi range */
else {
int i;
- char bound[23] = {0}, preface[1024] = {0},
+ char bound[23] = {0}, preface[1024] = {0},
multi_header[68] = "Content-Type: multipart/byteranges; boundary=";
-
+
snprintf(bound, 22, "--%d%0.9f", time(NULL), php_combined_lcg(TSRMLS_C));
strncat(multi_header, bound + 2, 21);
http_send_header(multi_header);
SUCCESS != zend_hash_index_find(
Z_ARRVAL_PP(zrange), 1, (void **) &end)) {
break;
- }
+ }
snprintf(preface, 1023,
- HTTP_CRLF "%s"
+ HTTP_CRLF "%s"
HTTP_CRLF "Content-Type: %s"
HTTP_CRLF "Content-Range: bytes %ld-%ld/%ld"
- HTTP_CRLF
+ HTTP_CRLF
HTTP_CRLF,
-
- bound,
- HTTP_G(ctype) ? HTTP_G(ctype) : "application/x-octetstream",
- **begin,
- **end,
+
+ bound,
+ HTTP_G(ctype) ? HTTP_G(ctype) : "application/x-octetstream",
+ **begin,
+ **end,
size
);
-
+
php_body_write(preface, strlen(preface) TSRMLS_CC);
http_send_chunk(data, **begin, **end + 1, mode);
}
line = header;
- while (header_len > (line - begin)) {
+ while (header_len >= (line - begin)) {
+ int value_len = 0;
+
switch (*line++)
{
case 0:
+ --value_len; /* we don't have CR so value length is one char less */
case '\n':
- if (colon && (*line != ' ') && (*line != '\t')) {
- char *key = estrndup(header, colon - header);
- add_assoc_stringl(array, key, colon + 2, line - colon - 4, 1);
- efree(key);
-
+ if (colon && ((!(*line - 1)) || ((*line != ' ') && (*line != '\t')))) {
+
+ /* skip empty key */
+ if (header != colon) {
+ char *key = estrndup(header, colon - header);
+ value_len += line - colon - 1;
+
+ /* skip leading ws */
+ while (isspace(*(++colon))) --value_len;
+ /* skip trailing ws */
+ while (isspace(colon[value_len - 1])) --value_len;
+
+ if (value_len < 1) {
+ /* hm, empty header? */
+ add_assoc_stringl(array, key, "", 0, 0);
+ } else {
+ add_assoc_stringl(array, key, colon, value_len, 1);
+ }
+ efree(key);
+ }
+
colon = NULL;
+ value_len = 0;
header += line - header;
}
break;
}
/* }}} */
+/* {{{ void http_get_request_headers(zval *) */
+PHP_HTTP_API void _http_get_request_headers(zval *array TSRMLS_DC)
+{
+ char *key;
+
+ for ( zend_hash_internal_pointer_reset(HTTP_SERVER_VARS);
+ zend_hash_get_current_key(HTTP_SERVER_VARS, &key, NULL, 0) != HASH_KEY_NON_EXISTANT;
+ zend_hash_move_forward(HTTP_SERVER_VARS)) {
+ if (!strncmp(key, "HTTP_", 5)) {
+ zval **header;
+ zend_hash_get_current_data(HTTP_SERVER_VARS, (void **) &header);
+ add_assoc_stringl(array, pretty_key(key + 5, strlen(key) - 5, 1, 1), Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1);
+ }
+ }
+}
+/* }}} */
+
/* {{{ HAVE_CURL */
#ifdef HTTP_HAVE_CURL
#endif
/* }}} HAVE_CURL */
-/* {{{ void http_auth_header(char *, char*) */
-PHP_HTTP_API void _http_auth_header(const char *type, const char *realm TSRMLS_DC)
+/* {{{ STATUS http_auth_header(char *, char*) */
+PHP_HTTP_API STATUS _http_auth_header(const char *type, const char *realm TSRMLS_DC)
{
- char realm_header[1024];
- snprintf(realm_header, 1024, "WWW-Authenticate: %s realm=\"%s\"", type, realm);
- http_send_status_header(401, realm_header);
+ char realm_header[1024] = {0};
+ snprintf(realm_header, 1023, "WWW-Authenticate: %s realm=\"%s\"", type, realm);
+ return http_send_status_header(401, realm_header);
}
/* }}} */