- fix phpinfo()
[m6w6/ext-http] / http_response_object.c
index a0b8817cc218563e95fc758e23af0a826da952eb..544b60337198fd4841852d8b24e75caa9463d497 100644 (file)
@@ -248,6 +248,14 @@ static inline void _http_response_object_declare_default_properties(TSRMLS_D)
        DCL_CONST(long, "ETAG_SHA1", HTTP_ETAG_SHA1);
        DCL_CONST(long, "ETAG_CRC32", HTTP_ETAG_CRC32);
        
+#      ifdef HTTP_HAVE_HASH_EXT
+       DCL_CONST(long, "ETAG_SHA256", HTTP_ETAG_SHA256);
+       DCL_CONST(long, "ETAG_SHA384", HTTP_ETAG_SHA384);
+       DCL_CONST(long, "ETAG_SHA512", HTTP_ETAG_SHA512);
+       DCL_CONST(long, "ETAG_RIPEMD128", HTTP_ETAG_RIPEMD128);
+       DCL_CONST(long, "ETAG_RIPEMD160", HTTP_ETAG_RIPEMD160);
+#      endif
+
 #      ifdef HTTP_HAVE_MHASH
        {
                int l, i, c = mhash_count();
@@ -900,7 +908,7 @@ PHP_METHOD(HttpResponse, setData)
        }
        
        UPD_STATIC_PROP(long, lastModified, http_last_modified(the_data, SEND_DATA));
-       if (etag = http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA)) {
+       if ((etag = http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA))) {
                UPD_STATIC_PROP(string, eTag, etag);
                efree(etag);
        }
@@ -959,7 +967,7 @@ PHP_METHOD(HttpResponse, setStream)
        zend_list_addref(Z_LVAL_P(the_stream));
        
        UPD_STATIC_PROP(long, lastModified, http_last_modified(the_real_stream, SEND_RSRC));
-       if (etag = http_etag(the_real_stream, 0, SEND_RSRC)) {
+       if ((etag = http_etag(the_real_stream, 0, SEND_RSRC))) {
                UPD_STATIC_PROP(string, eTag, etag);
                efree(etag);
        }
@@ -1018,7 +1026,7 @@ PHP_METHOD(HttpResponse, setFile)
        }
 
        UPD_STATIC_PROP(long, lastModified, http_last_modified(the_file, -1));
-       if (etag = http_etag(the_file, 0, -1)) {
+       if ((etag = http_etag(the_file, 0, -1))) {
                UPD_STATIC_PROP(string, eTag, etag);
                efree(etag);
        }