projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge pull request #57 from m6w6/lc-utf8
[m6w6/ext-http]
/
src
/
php_http_etag.c
diff --git
a/src/php_http_etag.c
b/src/php_http_etag.c
index 1ebddb35d4a7b283db6cc07c954133bbbde18c2e..c1e29c3f4c08b62e4842aaf861335b253ee95d6d 100644
(file)
--- a/
src/php_http_etag.c
+++ b/
src/php_http_etag.c
@@
-12,13
+12,13
@@
#include "php_http_api.h"
#include "php_http_api.h"
-#if
def
PHP_HTTP_HAVE_HASH
-# include "php_hash.h"
+#if PHP_HTTP_HAVE_HASH
+# include "
ext/hash/
php_hash.h"
#endif
#endif
-#include
<ext/standard/crc32.h>
-#include
<ext/standard/sha1.h>
-#include
<ext/standard/md5.h>
+#include
"ext/standard/crc32.h"
+#include
"ext/standard/sha1.h"
+#include
"ext/standard/md5.h"
php_http_etag_t *php_http_etag_init(const char *mode)
{
php_http_etag_t *php_http_etag_init(const char *mode)
{
@@
-33,7
+33,7
@@
php_http_etag_t *php_http_etag_init(const char *mode)
} else if (mode && !strcasecmp(mode, "md5")) {
PHP_MD5Init(ctx = emalloc(sizeof(PHP_MD5_CTX)));
} else {
} else if (mode && !strcasecmp(mode, "md5")) {
PHP_MD5Init(ctx = emalloc(sizeof(PHP_MD5_CTX)));
} else {
-#if
def
PHP_HTTP_HAVE_HASH
+#if PHP_HTTP_HAVE_HASH
const php_hash_ops *eho = NULL;
if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
const php_hash_ops *eho = NULL;
if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
@@
-60,7
+60,7
@@
char *php_http_etag_finish(php_http_etag_t *e)
unsigned char buf[4];
*((uint *) e->ctx) = ~*((uint *) e->ctx);
unsigned char buf[4];
*((uint *) e->ctx) = ~*((uint *) e->ctx);
-#if
def
WORDS_BIGENDIAN
+#if WORDS_BIGENDIAN
etag = php_http_etag_digest((unsigned char *) e->ctx, 4);
#else
buf[0] = ((unsigned char *) e->ctx)[3];
etag = php_http_etag_digest((unsigned char *) e->ctx, 4);
#else
buf[0] = ((unsigned char *) e->ctx)[3];
@@
-76,10
+76,10
@@
char *php_http_etag_finish(php_http_etag_t *e)
PHP_MD5Final(digest, e->ctx);
etag = php_http_etag_digest(digest, 16);
} else {
PHP_MD5Final(digest, e->ctx);
etag = php_http_etag_digest(digest, 16);
} else {
-#if
def
PHP_HTTP_HAVE_HASH
+#if PHP_HTTP_HAVE_HASH
const php_hash_ops *eho = NULL;
const php_hash_ops *eho = NULL;
- if (
e->mode &&
(eho = php_hash_fetch_ops(e->mode, strlen(e->mode)))) {
+ if ((eho = php_hash_fetch_ops(e->mode, strlen(e->mode)))) {
eho->hash_final(digest, e->ctx);
etag = php_http_etag_digest(digest, eho->digest_size);
}
eho->hash_final(digest, e->ctx);
etag = php_http_etag_digest(digest, eho->digest_size);
}
@@
-106,10
+106,10
@@
size_t php_http_etag_update(php_http_etag_t *e, const char *data_ptr, size_t dat
} else if ((!strcasecmp(e->mode, "md5"))) {
PHP_MD5Update(e->ctx, (const unsigned char *) data_ptr, data_len);
} else {
} else if ((!strcasecmp(e->mode, "md5"))) {
PHP_MD5Update(e->ctx, (const unsigned char *) data_ptr, data_len);
} else {
-#if
def
PHP_HTTP_HAVE_HASH
+#if PHP_HTTP_HAVE_HASH
const php_hash_ops *eho = NULL;
const php_hash_ops *eho = NULL;
- if (
e->mode &&
(eho = php_hash_fetch_ops(e->mode, strlen(e->mode)))) {
+ if ((eho = php_hash_fetch_ops(e->mode, strlen(e->mode)))) {
eho->hash_update(e->ctx, (const unsigned char *) data_ptr, data_len);
}
#endif
eho->hash_update(e->ctx, (const unsigned char *) data_ptr, data_len);
}
#endif