* HTTPi_Request prototype
[m6w6/ext-http] / http_api.c
index 0c5c44512926a84cf898ebcc66b16a2fe1a4bc61..160c123a691f232c73ae145f61822cc1c1ac43c7 100644 (file)
@@ -178,58 +178,6 @@ static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC);
 #endif
 /* }}} HAVE_CURL */
 
-/* {{{ inline char *http_etag(void *, size_t, http_send_mode) */
-inline char *_http_etag(const void *data_ptr, const size_t data_len, 
-       const http_send_mode data_mode TSRMLS_DC)
-{
-       char ssb_buf[128] = {0};
-       unsigned char digest[16];
-       PHP_MD5_CTX ctx;
-       char *new_etag = ecalloc(33, 1);
-
-       PHP_MD5Init(&ctx);
-
-       switch (data_mode)
-       {
-               case SEND_DATA:
-                       PHP_MD5Update(&ctx, data_ptr, data_len);
-               break;
-
-               case SEND_RSRC:
-                       if (!HTTP_G(ssb).sb.st_ino) {
-                               if (php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb))) {
-                                       return NULL;
-                               }
-                       }
-                       snprintf(ssb_buf, 127, "%l=%l=%l",
-                               HTTP_G(ssb).sb.st_mtime,
-                               HTTP_G(ssb).sb.st_ino,
-                               HTTP_G(ssb).sb.st_size
-                       );
-                       PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf));
-               break;
-
-               default:
-                       efree(new_etag);
-                       return NULL;
-               break;
-       }
-
-       PHP_MD5Final(digest, &ctx);
-       make_digest(new_etag, digest);
-
-       return new_etag;
-}
-/* }}} */
-
-/* {{{inline int http_is_range_request(void) */
-inline int _http_is_range_request(TSRMLS_D)
-{
-       return zend_hash_exists(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]),
-               "HTTP_RANGE", strlen("HTTP_RANGE") + 1);
-}
-/* }}} */
-
 /* {{{ static int http_sort_q(const void *, const void *) */
 static int http_sort_q(const void *a, const void *b TSRMLS_DC)
 {
@@ -1046,6 +994,88 @@ PHP_HTTP_API time_t _http_parse_date(const char *date)
 }
 /* }}} */
 
+/* {{{ inline char *http_etag(void *, size_t, http_send_mode) */
+PHP_HTTP_API inline char *_http_etag(const void *data_ptr, const size_t data_len,
+       const http_send_mode data_mode TSRMLS_DC)
+{
+       char ssb_buf[128] = {0};
+       unsigned char digest[16];
+       PHP_MD5_CTX ctx;
+       char *new_etag = ecalloc(33, 1);
+
+       PHP_MD5Init(&ctx);
+
+       switch (data_mode)
+       {
+               case SEND_DATA:
+                       PHP_MD5Update(&ctx, data_ptr, data_len);
+               break;
+
+               case SEND_RSRC:
+                       if (!HTTP_G(ssb).sb.st_ino) {
+                               if (php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb))) {
+                                       return NULL;
+                               }
+                       }
+                       snprintf(ssb_buf, 127, "%ld=%ld=%ld",
+                               HTTP_G(ssb).sb.st_mtime,
+                               HTTP_G(ssb).sb.st_ino,
+                               HTTP_G(ssb).sb.st_size
+                       );
+                       PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf));
+               break;
+
+               default:
+                       efree(new_etag);
+                       return NULL;
+               break;
+       }
+
+       PHP_MD5Final(digest, &ctx);
+       make_digest(new_etag, digest);
+
+       return new_etag;
+}
+/* }}} */
+
+/* {{{ inline http_lmod(void *, http_send_mode) */
+PHP_HTTP_API inline time_t _http_lmod(const void *data_ptr, const http_send_mode data_mode TSRMLS_DC)
+{
+       switch (data_mode)
+       {
+               case SEND_DATA:
+               {
+                       return time(NULL);
+               }
+
+               case SEND_RSRC:
+               {
+                       if (!HTTP_G(ssb).sb.st_mtime) {
+                               if (php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb))) {
+                                       return 0;
+                               }
+                       }
+                       return HTTP_G(ssb).sb.st_mtime;
+               }
+
+               default:
+               {
+                       zval mtime;
+                       php_stat(Z_STRVAL_P((zval *) data_ptr), Z_STRLEN_P((zval *) data_ptr), FS_MTIME, &mtime TSRMLS_CC);
+                       return Z_LVAL(mtime);
+               }
+       }
+}
+/* }}} */
+
+/* {{{inline int http_is_range_request(void) */
+PHP_HTTP_API inline int _http_is_range_request(TSRMLS_D)
+{
+       return zend_hash_exists(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]),
+               "HTTP_RANGE", strlen("HTTP_RANGE") + 1);
+}
+/* }}} */
+
 /* {{{ inline STATUS http_send_status(int) */
 PHP_HTTP_API inline STATUS _http_send_status(const int status TSRMLS_DC)
 {
@@ -1123,7 +1153,7 @@ PHP_HTTP_API STATUS _http_start_ob_handler(php_output_handler_func_t handler_fun
        int count, i;
 
        if (count = OG(ob_nesting_level)) {
-               stack = ecalloc(sizeof(php_ob_buffer), count);
+               stack = ecalloc(sizeof(php_ob_buffer *), count);
 
                if (count > 1) {
                        zend_stack_apply_with_argument(&OG(ob_buffers), ZEND_STACK_APPLY_BOTTOMUP,
@@ -1147,6 +1177,12 @@ PHP_HTTP_API STATUS _http_start_ob_handler(php_output_handler_func_t handler_fun
                        php_start_ob_buffer_named(s->handler_name, s->chunk_size, s->erase TSRMLS_CC);
                }
                php_body_write(s->buffer, s->text_length TSRMLS_CC);
+               efree(s->handler_name);
+               efree(s->buffer);
+               efree(s);
+       }
+       if (count) {
+               efree(stack);
        }
 
        return SUCCESS;
@@ -1217,28 +1253,154 @@ PHP_HTTP_API STATUS _http_send_last_modified(const time_t t TSRMLS_DC)
 PHP_HTTP_API STATUS _http_send_etag(const char *etag,
        const int etag_len TSRMLS_DC)
 {
-       STATUS ret;
-       int header_len;
+       STATUS status;
        char *etag_header;
 
-       header_len = sizeof("ETag: \"\"") + etag_len + 1;
-       etag_header = ecalloc(header_len, 1);
-       sprintf(etag_header, "ETag: \"%s\"", etag);
-       ret = http_send_header(etag_header);
-       efree(etag_header);
-
        if (!etag_len){
                php_error_docref(NULL TSRMLS_CC,E_ERROR,
-                       "Sending empty Etag (previous: %s)\n", HTTP_G(etag));
+                       "Attempt to send empty ETag (previous: %s)\n", HTTP_G(etag));
                return FAILURE;
        }
+
        /* remember */
        if (HTTP_G(etag)) {
                efree(HTTP_G(etag));
        }
        HTTP_G(etag) = estrdup(etag);
 
-       return ret;
+       etag_header = ecalloc(sizeof("ETag: \"\"") + etag_len, 1);
+       sprintf(etag_header, "ETag: \"%s\"", etag);
+       if (SUCCESS != (status = http_send_header(etag_header))) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't send '%s' header", etag_header);
+       }
+       efree(etag_header);
+       return status;
+}
+/* }}} */
+
+/* {{{ STATUS http_send_cache_control(char *, size_t) */
+PHP_HTTP_API STATUS _http_send_cache_control(const char *cache_control,
+       const size_t cc_len TSRMLS_DC)
+{
+       STATUS status;
+       char *cc_header = ecalloc(sizeof("Cache-Control: ") + cc_len, 1);
+
+       sprintf(cc_header, "Cache-Control: %s", cache_control);
+       if (SUCCESS != (status = http_send_header(cc_header))) {
+               php_error_docref(NULL TSRMLS_CC, E_NOTICE,
+                       "Could not send '%s' header", cc_header);
+       }
+       efree(cc_header);
+       return status;
+}
+/* }}} */
+
+/* {{{ STATUS http_send_content_type(char *, size_t) */
+PHP_HTTP_API STATUS _http_send_content_type(const char *content_type,
+       const size_t ct_len TSRMLS_DC)
+{
+       STATUS status;
+       char *ct_header;
+
+       if (!strchr(content_type, '/')) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                       "Content-Type '%s' doesn't seem to consist of a primary and a secondary part",
+                       content_type);
+               return FAILURE;
+       }
+
+       /* remember for multiple ranges */
+       if (HTTP_G(ctype)) {
+               efree(HTTP_G(ctype));
+       }
+       HTTP_G(ctype) = estrndup(content_type, ct_len);
+
+       ct_header = ecalloc(sizeof("Content-Type: ") + ct_len, 1);
+       sprintf(ct_header, "Content-Type: %s", content_type);
+
+       if (SUCCESS != (status = http_send_header(ct_header))) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                       "Couldn't send '%s' header", ct_header);
+       }
+       efree(ct_header);
+       return status;
+}
+/* }}} */
+
+/* {{{ STATUS http_send_content_disposition(char *, size_t, zend_bool) */
+PHP_HTTP_API STATUS _http_send_content_disposition(const char *filename,
+       const size_t f_len, const int send_inline TSRMLS_DC)
+{
+       STATUS status;
+       char *cd_header;
+
+       if (send_inline) {
+               cd_header = ecalloc(sizeof("Content-Disposition: inline; filename=\"\"") + f_len, 1);
+               sprintf(cd_header, "Content-Disposition: inline; filename=\"%s\"", filename);
+       } else {
+               cd_header = ecalloc(sizeof("Content-Disposition: attachment; filename=\"\"") + f_len, 1);
+               sprintf(cd_header, "Content-Disposition: attachment; filename=\"%s\"", filename);
+       }
+
+       if (SUCCESS != (status = http_send_header(cd_header))) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't send '%s' header", cd_header);
+       }
+       efree(cd_header);
+       return status;
+}
+/* }}} */
+
+/* {{{ STATUS http_cache_last_modified(time_t, time_t, char *, size_t) */
+PHP_HTTP_API STATUS _http_cache_last_modified(const time_t last_modified,
+       const time_t send_modified, const char *cache_control, const size_t cc_len TSRMLS_DC)
+{
+       if (cc_len) {
+               http_send_cache_control(cache_control, cc_len);
+       }
+
+       if (http_modified_match("HTTP_IF_MODIFIED_SINCE", last_modified)) {
+               if (SUCCESS == http_send_status(304)) {
+                       zend_bailout();
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified");
+                       return FAILURE;
+               }
+       }
+       return http_send_last_modified(send_modified);
+}
+/* }}} */
+
+/* {{{ STATUS http_cache_etag(char *, size_t, char *, size_t) */
+PHP_HTTP_API STATUS _http_cache_etag(const char *etag, const size_t etag_len,
+       const char *cache_control, const size_t cc_len TSRMLS_DC)
+{
+       if (cc_len) {
+               http_send_cache_control(cache_control, cc_len);
+       }
+
+       if (etag_len) {
+               http_send_etag(etag, etag_len);
+               if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
+                       if (SUCCESS == http_send_status(304)) {
+                               zend_bailout();
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified");
+                               return FAILURE;
+                       }
+               }
+       }
+
+       /* if no etag is given and we didn't already start ob_etaghandler -- start it */
+       if (!HTTP_G(etag_started)) {
+               if (SUCCESS == http_start_ob_handler(_http_ob_etaghandler, "ob_etaghandler", 4096, 1)) {
+                       HTTP_G(etag_started) = 1;
+                       return SUCCESS;
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not start ob_etaghandler");
+                       return FAILURE;
+               }
+       }
+       return SUCCESS;
 }
 /* }}} */
 
@@ -1774,15 +1936,14 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded,
 }
 /* }}} */
 
-/* {{{ proto STATUS http_split_response(zval *, zval *, zval *) */
-PHP_HTTP_API STATUS _http_split_response(const zval *zresponse, zval *zheaders,
-       zval *zbody TSRMLS_DC)
+/* {{{ proto STATUS http_split_response_ex(char *, size_t, zval *, zval *) */
+PHP_HTTP_API STATUS _http_split_response_ex( char *response, 
+       size_t response_len, zval *zheaders, zval *zbody TSRMLS_DC)
 {
-       char *header, *response, *body = NULL;
-       long response_len = Z_STRLEN_P(zresponse);
-       header = response = Z_STRVAL_P(zresponse);
+       char *body = NULL;
+       char *header = response;
 
-       while ((response - Z_STRVAL_P(zresponse) + 3) < response_len) {
+       while ((response - header + 4) < response_len) {
                if (    (*response++ == '\r') &&
                                (*response++ == '\n') &&
                                (*response++ == '\r') &&
@@ -1798,7 +1959,7 @@ PHP_HTTP_API STATUS _http_split_response(const zval *zresponse, zval *zheaders,
                Z_TYPE_P(zbody) = IS_NULL;
        }
 
-       return http_parse_headers(header, body - Z_STRVAL_P(zresponse), zheaders);
+       return http_parse_headers(header, body ? body - header : response_len, zheaders);
 }
 /* }}} */