summaryrefslogtreecommitdiff
path: root/http.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-07-19 16:33:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-07-19 16:33:04 (GMT)
commiteb4f4076aa89d38221ee513a5f28f22124029c90 (patch)
tree8617f31f2dada1ec300dff9427f92ba00ea95500 /http.h
parentd37b2991b1edea76c01ec05cc383005b55c96e36 (diff)
parente01503b523e79748ac91d876f506811c597d03cb (diff)
downloadgit-eb4f4076aa89d38221ee513a5f28f22124029c90.zip
git-eb4f4076aa89d38221ee513a5f28f22124029c90.tar.gz
git-eb4f4076aa89d38221ee513a5f28f22124029c90.tar.bz2
Merge branch 'jc/zlib-wrap'
* jc/zlib-wrap: zlib: allow feeding more than 4GB in one go zlib: zlib can only process 4GB at a time zlib: wrap deflateBound() too zlib: wrap deflate side of the API zlib: wrap inflateInit2 used to accept only for gzip format zlib: wrap remaining calls to direct inflate/inflateEnd zlib wrapper: refactor error message formatter Conflicts: sha1_file.c
Diffstat (limited to 'http.h')
-rw-r--r--http.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/http.h b/http.h
index 19b7134..0bf8592 100644
--- a/http.h
+++ b/http.h
@@ -172,7 +172,7 @@ struct http_object_request {
unsigned char sha1[20];
unsigned char real_sha1[20];
git_SHA_CTX c;
- z_stream stream;
+ git_zstream stream;
int zret;
int rename;
struct active_request_slot *slot;