- typos

diff --git a/php_http_cache_api.h b/php_http_cache_api.h
index 03ea1134be656f6412583633e544c9eaaa9069c5..c9344837178bc26266925c7570fe349155aff0e0 100644 (file)
--- a/php_http_cache_api.h
+++ b/php_http_cache_api.h
@@ -79,11 +79,10 @@ static inline void *_http_etag_init(TSRMLS_D)
 static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
 {
        unsigned char digest[128] = {0};
 static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
 {
        unsigned char digest[128] = {0};

-       char *etag = NULL;
+       char *etag = NULL, *mode = HTTP_G(etag).mode;

        
 #ifdef HTTP_HAVE_EXT_HASH
        php_hash_ops *eho = NULL;
        
 #ifdef HTTP_HAVE_EXT_HASH
        php_hash_ops *eho = NULL;

-       char *mode = HTTP_G(etag).mode;

        
        if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
                eho->hash_final(digest, ctx);
        
        if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
                eho->hash_final(digest, ctx);


@@ -108,9 +107,9 @@ static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
 #define http_etag_update(c, d, l) _http_etag_update((c), (d), (l) TSRMLS_CC)
 static inline void _http_etag_update(void *ctx, const char *data_ptr, size_t data_len TSRMLS_DC)
 {
 #define http_etag_update(c, d, l) _http_etag_update((c), (d), (l) TSRMLS_CC)
 static inline void _http_etag_update(void *ctx, const char *data_ptr, size_t data_len TSRMLS_DC)
 {

+       char *mode = HTTP_G(etag).mode;

 #ifdef HTTP_HAVE_EXT_HASH
        php_hash_ops *eho = NULL;
 #ifdef HTTP_HAVE_EXT_HASH
        php_hash_ops *eho = NULL;

-       char *mode = HTTP_G(etag).mode;

        
        if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
                eho->hash_update(ctx, (const unsigned char *) data_ptr, data_len);
        
        if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
                eho->hash_update(ctx, (const unsigned char *) data_ptr, data_len);

diff --git a/tests/etag_mode_044.phpt b/tests/etag_mode_044.phpt
index 5f69d4bd921248d8fed86cc003e9880f9f0bf1f4..055395a71d86eae264f301fc8438ef5727df09bc 100644 (file)
--- a/tests/etag_mode_044.phpt
+++ b/tests/etag_mode_044.phpt
@@ -5,7 +5,7 @@ ob ext/hash etag
 include 'skip.inc';
 checkcgi();
 checkmin(5.1);
 include 'skip.inc';
 checkcgi();
 checkmin(5.1);

-skipif(!extendion_loaded('hash'), 'need mhash support');
+skipif(!extension_loaded('hash'), 'need ext/hash support');

 ?>
 --FILE--
 <?php
 ?>
 --FILE--
 <?php