rugged 1.7.2 → 1.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/AUTHORS +1 -0
- data/vendor/libgit2/CMakeLists.txt +23 -10
- data/vendor/libgit2/COPYING +195 -1
- data/vendor/libgit2/cmake/{FindIconv.cmake → FindIntlIconv.cmake} +6 -0
- data/vendor/libgit2/cmake/FindLLHTTP.cmake +39 -0
- data/vendor/libgit2/cmake/SelectGSSAPI.cmake +1 -1
- data/vendor/libgit2/cmake/SelectHTTPParser.cmake +23 -8
- data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +17 -8
- data/vendor/libgit2/cmake/SelectHashes.cmake +28 -11
- data/vendor/libgit2/cmake/SelectRegex.cmake +6 -1
- data/vendor/libgit2/cmake/SelectSSH.cmake +22 -17
- data/vendor/libgit2/cmake/SelectZlib.cmake +4 -0
- data/vendor/libgit2/deps/llhttp/CMakeLists.txt +8 -0
- data/vendor/libgit2/deps/llhttp/LICENSE-MIT +22 -0
- data/vendor/libgit2/deps/llhttp/api.c +510 -0
- data/vendor/libgit2/deps/llhttp/http.c +170 -0
- data/vendor/libgit2/deps/llhttp/llhttp.c +10168 -0
- data/vendor/libgit2/deps/llhttp/llhttp.h +897 -0
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +1 -1
- data/vendor/libgit2/deps/ntlmclient/crypt_builtin_md4.c +311 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +2 -1
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +0 -20
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +4 -4
- data/vendor/libgit2/deps/ntlmclient/ntlm.c +21 -21
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +5 -4
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +2 -1
- data/vendor/libgit2/deps/ntlmclient/utf8.h +1176 -721
- data/vendor/libgit2/deps/ntlmclient/util.h +11 -0
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +1 -0
- data/vendor/libgit2/deps/xdiff/xmerge.c +2 -2
- data/vendor/libgit2/deps/zlib/CMakeLists.txt +6 -1
- data/vendor/libgit2/deps/zlib/LICENSE +22 -0
- data/vendor/libgit2/deps/zlib/adler32.c +5 -27
- data/vendor/libgit2/deps/zlib/crc32.c +94 -167
- data/vendor/libgit2/deps/zlib/deflate.c +358 -435
- data/vendor/libgit2/deps/zlib/deflate.h +41 -10
- data/vendor/libgit2/deps/zlib/gzguts.h +13 -18
- data/vendor/libgit2/deps/zlib/infback.c +17 -30
- data/vendor/libgit2/deps/zlib/inffast.c +1 -4
- data/vendor/libgit2/deps/zlib/inffast.h +1 -1
- data/vendor/libgit2/deps/zlib/inflate.c +36 -102
- data/vendor/libgit2/deps/zlib/inftrees.c +6 -11
- data/vendor/libgit2/deps/zlib/inftrees.h +6 -6
- data/vendor/libgit2/deps/zlib/trees.c +287 -352
- data/vendor/libgit2/deps/zlib/zconf.h +23 -14
- data/vendor/libgit2/deps/zlib/zlib.h +202 -202
- data/vendor/libgit2/deps/zlib/zutil.c +18 -44
- data/vendor/libgit2/deps/zlib/zutil.h +13 -33
- data/vendor/libgit2/include/git2/annotated_commit.h +12 -5
- data/vendor/libgit2/include/git2/apply.h +27 -6
- data/vendor/libgit2/include/git2/attr.h +17 -4
- data/vendor/libgit2/include/git2/blame.h +133 -28
- data/vendor/libgit2/include/git2/blob.h +71 -28
- data/vendor/libgit2/include/git2/branch.h +22 -15
- data/vendor/libgit2/include/git2/buffer.h +6 -4
- data/vendor/libgit2/include/git2/cert.h +2 -1
- data/vendor/libgit2/include/git2/checkout.h +83 -32
- data/vendor/libgit2/include/git2/cherrypick.h +10 -3
- data/vendor/libgit2/include/git2/clone.h +25 -9
- data/vendor/libgit2/include/git2/commit.h +132 -3
- data/vendor/libgit2/include/git2/common.h +120 -63
- data/vendor/libgit2/include/git2/config.h +93 -23
- data/vendor/libgit2/include/git2/credential.h +30 -2
- data/vendor/libgit2/include/git2/credential_helpers.h +1 -0
- data/vendor/libgit2/include/git2/deprecated.h +133 -3
- data/vendor/libgit2/include/git2/describe.h +13 -1
- data/vendor/libgit2/include/git2/diff.h +38 -8
- data/vendor/libgit2/include/git2/email.h +9 -29
- data/vendor/libgit2/include/git2/errors.h +46 -73
- data/vendor/libgit2/include/git2/filter.h +14 -7
- data/vendor/libgit2/include/git2/global.h +8 -1
- data/vendor/libgit2/include/git2/graph.h +3 -2
- data/vendor/libgit2/include/git2/ignore.h +10 -0
- data/vendor/libgit2/include/git2/index.h +99 -14
- data/vendor/libgit2/include/git2/indexer.h +21 -4
- data/vendor/libgit2/include/git2/mailmap.h +7 -1
- data/vendor/libgit2/include/git2/merge.h +46 -1
- data/vendor/libgit2/include/git2/message.h +2 -2
- data/vendor/libgit2/include/git2/net.h +3 -1
- data/vendor/libgit2/include/git2/notes.h +9 -6
- data/vendor/libgit2/include/git2/object.h +9 -8
- data/vendor/libgit2/include/git2/odb.h +91 -49
- data/vendor/libgit2/include/git2/odb_backend.h +80 -52
- data/vendor/libgit2/include/git2/oid.h +23 -24
- data/vendor/libgit2/include/git2/oidarray.h +7 -1
- data/vendor/libgit2/include/git2/pack.h +13 -1
- data/vendor/libgit2/include/git2/patch.h +2 -3
- data/vendor/libgit2/include/git2/pathspec.h +9 -0
- data/vendor/libgit2/include/git2/proxy.h +10 -0
- data/vendor/libgit2/include/git2/rebase.h +9 -6
- data/vendor/libgit2/include/git2/refdb.h +2 -2
- data/vendor/libgit2/include/git2/reflog.h +3 -2
- data/vendor/libgit2/include/git2/refs.h +9 -6
- data/vendor/libgit2/include/git2/refspec.h +14 -4
- data/vendor/libgit2/include/git2/remote.h +94 -18
- data/vendor/libgit2/include/git2/repository.h +57 -21
- data/vendor/libgit2/include/git2/reset.h +16 -3
- data/vendor/libgit2/include/git2/revert.h +9 -4
- data/vendor/libgit2/include/git2/revparse.h +3 -3
- data/vendor/libgit2/include/git2/revwalk.h +3 -2
- data/vendor/libgit2/include/git2/signature.h +46 -1
- data/vendor/libgit2/include/git2/stash.h +17 -3
- data/vendor/libgit2/include/git2/status.h +10 -6
- data/vendor/libgit2/include/git2/stdint.h +87 -85
- data/vendor/libgit2/include/git2/strarray.h +2 -3
- data/vendor/libgit2/include/git2/submodule.h +20 -9
- data/vendor/libgit2/include/git2/sys/alloc.h +12 -0
- data/vendor/libgit2/include/git2/sys/commit.h +77 -3
- data/vendor/libgit2/include/git2/sys/commit_graph.h +103 -62
- data/vendor/libgit2/include/git2/sys/config.h +80 -4
- data/vendor/libgit2/include/git2/sys/credential.h +4 -3
- data/vendor/libgit2/include/git2/sys/diff.h +21 -1
- data/vendor/libgit2/include/git2/sys/email.h +7 -0
- data/vendor/libgit2/include/git2/sys/errors.h +76 -0
- data/vendor/libgit2/include/git2/sys/filter.h +66 -3
- data/vendor/libgit2/include/git2/sys/hashsig.h +11 -0
- data/vendor/libgit2/include/git2/sys/index.h +3 -2
- data/vendor/libgit2/include/git2/sys/mempack.h +32 -2
- data/vendor/libgit2/include/git2/sys/merge.h +55 -7
- data/vendor/libgit2/include/git2/sys/midx.h +43 -4
- data/vendor/libgit2/include/git2/sys/odb_backend.h +7 -3
- data/vendor/libgit2/include/git2/sys/openssl.h +8 -1
- data/vendor/libgit2/include/git2/sys/path.h +12 -1
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +40 -36
- data/vendor/libgit2/include/git2/sys/refs.h +3 -2
- data/vendor/libgit2/include/git2/sys/remote.h +8 -1
- data/vendor/libgit2/include/git2/sys/repository.h +63 -3
- data/vendor/libgit2/include/git2/sys/stream.h +11 -2
- data/vendor/libgit2/include/git2/sys/transport.h +24 -3
- data/vendor/libgit2/include/git2/tag.h +3 -1
- data/vendor/libgit2/include/git2/trace.h +9 -3
- data/vendor/libgit2/include/git2/transaction.h +3 -2
- data/vendor/libgit2/include/git2/transport.h +11 -3
- data/vendor/libgit2/include/git2/tree.h +16 -5
- data/vendor/libgit2/include/git2/types.h +19 -3
- data/vendor/libgit2/include/git2/version.h +44 -8
- data/vendor/libgit2/include/git2/worktree.h +16 -6
- data/vendor/libgit2/src/CMakeLists.txt +6 -4
- data/vendor/libgit2/src/cli/CMakeLists.txt +2 -2
- data/vendor/libgit2/src/cli/cmd.c +1 -1
- data/vendor/libgit2/src/cli/cmd.h +4 -0
- data/vendor/libgit2/src/cli/cmd_blame.c +287 -0
- data/vendor/libgit2/src/cli/cmd_cat_file.c +6 -8
- data/vendor/libgit2/src/cli/cmd_clone.c +5 -7
- data/vendor/libgit2/src/cli/cmd_config.c +241 -0
- data/vendor/libgit2/src/cli/cmd_hash_object.c +6 -8
- data/vendor/libgit2/src/cli/cmd_help.c +6 -7
- data/vendor/libgit2/src/cli/cmd_index_pack.c +114 -0
- data/vendor/libgit2/src/cli/cmd_init.c +102 -0
- data/vendor/libgit2/src/cli/common.c +168 -0
- data/vendor/libgit2/src/cli/common.h +63 -0
- data/vendor/libgit2/src/cli/error.h +1 -1
- data/vendor/libgit2/src/cli/main.c +52 -24
- data/vendor/libgit2/src/cli/opt.c +29 -3
- data/vendor/libgit2/src/cli/opt.h +21 -3
- data/vendor/libgit2/src/cli/opt_usage.c +102 -33
- data/vendor/libgit2/src/cli/opt_usage.h +6 -1
- data/vendor/libgit2/src/cli/progress.c +51 -2
- data/vendor/libgit2/src/cli/progress.h +12 -0
- data/vendor/libgit2/src/cli/unix/sighandler.c +2 -1
- data/vendor/libgit2/src/cli/win32/precompiled.h +1 -1
- data/vendor/libgit2/src/cli/win32/sighandler.c +1 -1
- data/vendor/libgit2/src/libgit2/CMakeLists.txt +26 -8
- data/vendor/libgit2/src/libgit2/apply.c +10 -13
- data/vendor/libgit2/src/libgit2/attr.c +30 -13
- data/vendor/libgit2/src/libgit2/attr_file.c +7 -2
- data/vendor/libgit2/src/libgit2/attr_file.h +2 -0
- data/vendor/libgit2/src/libgit2/attrcache.c +69 -33
- data/vendor/libgit2/src/libgit2/attrcache.h +5 -9
- data/vendor/libgit2/src/libgit2/blame.c +130 -44
- data/vendor/libgit2/src/libgit2/blame.h +1 -0
- data/vendor/libgit2/src/libgit2/cache.c +22 -17
- data/vendor/libgit2/src/libgit2/cache.h +7 -9
- data/vendor/libgit2/src/libgit2/checkout.c +34 -24
- data/vendor/libgit2/src/libgit2/checkout.h +0 -2
- data/vendor/libgit2/src/libgit2/cherrypick.c +1 -2
- data/vendor/libgit2/src/libgit2/clone.c +186 -166
- data/vendor/libgit2/src/libgit2/clone.h +4 -1
- data/vendor/libgit2/src/libgit2/commit.c +92 -0
- data/vendor/libgit2/src/libgit2/commit_graph.c +67 -56
- data/vendor/libgit2/src/libgit2/commit_graph.h +1 -2
- data/vendor/libgit2/src/libgit2/config.c +389 -298
- data/vendor/libgit2/src/libgit2/config.cmake.in +3 -0
- data/vendor/libgit2/src/libgit2/config.h +9 -4
- data/vendor/libgit2/src/libgit2/config_backend.h +8 -10
- data/vendor/libgit2/src/libgit2/config_cache.c +4 -5
- data/vendor/libgit2/src/libgit2/config_file.c +99 -88
- data/vendor/libgit2/src/libgit2/config_list.c +285 -0
- data/vendor/libgit2/src/libgit2/config_list.h +32 -0
- data/vendor/libgit2/src/libgit2/config_mem.c +194 -40
- data/vendor/libgit2/src/libgit2/config_parse.c +10 -9
- data/vendor/libgit2/src/libgit2/config_snapshot.c +24 -31
- data/vendor/libgit2/src/libgit2/describe.c +24 -24
- data/vendor/libgit2/src/libgit2/diff.c +1 -1
- data/vendor/libgit2/src/libgit2/diff_driver.c +12 -19
- data/vendor/libgit2/src/libgit2/diff_driver.h +2 -2
- data/vendor/libgit2/src/libgit2/diff_generate.c +3 -3
- data/vendor/libgit2/src/libgit2/diff_parse.c +2 -2
- data/vendor/libgit2/src/libgit2/diff_print.c +65 -9
- data/vendor/libgit2/src/libgit2/diff_tform.c +36 -8
- data/vendor/libgit2/src/libgit2/email.c +1 -0
- data/vendor/libgit2/src/libgit2/fetch.c +5 -3
- data/vendor/libgit2/src/libgit2/filter.c +5 -5
- data/vendor/libgit2/src/libgit2/git2.rc +3 -3
- data/vendor/libgit2/src/libgit2/grafts.c +18 -20
- data/vendor/libgit2/src/libgit2/grafts.h +0 -1
- data/vendor/libgit2/src/libgit2/graph.c +1 -1
- data/vendor/libgit2/src/libgit2/hashmap_oid.h +30 -0
- data/vendor/libgit2/src/libgit2/ignore.c +9 -5
- data/vendor/libgit2/src/libgit2/index.c +68 -90
- data/vendor/libgit2/src/libgit2/index.h +2 -2
- data/vendor/libgit2/src/libgit2/index_map.c +95 -0
- data/vendor/libgit2/src/libgit2/index_map.h +28 -0
- data/vendor/libgit2/src/libgit2/indexer.c +34 -38
- data/vendor/libgit2/src/libgit2/iterator.c +14 -8
- data/vendor/libgit2/src/libgit2/libgit2.c +153 -368
- data/vendor/libgit2/src/libgit2/mailmap.c +1 -1
- data/vendor/libgit2/src/libgit2/merge.c +42 -37
- data/vendor/libgit2/src/libgit2/merge_driver.c +2 -2
- data/vendor/libgit2/src/libgit2/midx.c +28 -15
- data/vendor/libgit2/src/libgit2/mwindow.c +38 -45
- data/vendor/libgit2/src/libgit2/mwindow.h +4 -0
- data/vendor/libgit2/src/libgit2/object.c +6 -5
- data/vendor/libgit2/src/libgit2/odb.c +5 -4
- data/vendor/libgit2/src/libgit2/odb_mempack.c +49 -17
- data/vendor/libgit2/src/libgit2/odb_pack.c +13 -5
- data/vendor/libgit2/src/libgit2/oid.c +32 -5
- data/vendor/libgit2/src/libgit2/oid.h +11 -0
- data/vendor/libgit2/src/libgit2/pack-objects.c +58 -31
- data/vendor/libgit2/src/libgit2/pack-objects.h +12 -4
- data/vendor/libgit2/src/libgit2/pack.c +30 -24
- data/vendor/libgit2/src/libgit2/pack.h +15 -10
- data/vendor/libgit2/src/libgit2/patch_parse.c +2 -2
- data/vendor/libgit2/src/libgit2/path.c +1 -1
- data/vendor/libgit2/src/libgit2/pathspec.c +1 -1
- data/vendor/libgit2/src/libgit2/push.c +79 -28
- data/vendor/libgit2/src/libgit2/push.h +1 -0
- data/vendor/libgit2/src/libgit2/refdb_fs.c +128 -61
- data/vendor/libgit2/src/libgit2/reflog.c +1 -2
- data/vendor/libgit2/src/libgit2/reflog.h +2 -0
- data/vendor/libgit2/src/libgit2/refs.c +26 -7
- data/vendor/libgit2/src/libgit2/refs.h +6 -1
- data/vendor/libgit2/src/libgit2/refspec.c +28 -1
- data/vendor/libgit2/src/libgit2/refspec.h +8 -0
- data/vendor/libgit2/src/libgit2/remote.c +121 -61
- data/vendor/libgit2/src/libgit2/repository.c +231 -51
- data/vendor/libgit2/src/libgit2/repository.h +10 -6
- data/vendor/libgit2/src/libgit2/revert.c +1 -2
- data/vendor/libgit2/src/libgit2/revparse.c +2 -2
- data/vendor/libgit2/src/libgit2/revwalk.c +13 -10
- data/vendor/libgit2/src/libgit2/revwalk.h +3 -3
- data/vendor/libgit2/src/libgit2/settings.c +468 -0
- data/vendor/libgit2/src/libgit2/settings.h +6 -2
- data/vendor/libgit2/src/libgit2/signature.c +132 -15
- data/vendor/libgit2/src/libgit2/signature.h +0 -1
- data/vendor/libgit2/src/libgit2/status.c +1 -1
- data/vendor/libgit2/src/libgit2/streams/mbedtls.c +54 -60
- data/vendor/libgit2/src/libgit2/streams/openssl.c +32 -7
- data/vendor/libgit2/src/libgit2/streams/openssl.h +2 -0
- data/vendor/libgit2/src/libgit2/streams/openssl_dynamic.c +4 -0
- data/vendor/libgit2/src/libgit2/streams/openssl_dynamic.h +3 -0
- data/vendor/libgit2/src/libgit2/streams/stransport.c +39 -7
- data/vendor/libgit2/src/libgit2/submodule.c +106 -63
- data/vendor/libgit2/src/libgit2/submodule.h +6 -7
- data/vendor/libgit2/src/libgit2/tag.c +1 -1
- data/vendor/libgit2/src/libgit2/trailer.c +6 -6
- data/vendor/libgit2/src/libgit2/transaction.c +26 -20
- data/vendor/libgit2/src/libgit2/transaction.h +4 -1
- data/vendor/libgit2/src/libgit2/transport.c +4 -1
- data/vendor/libgit2/src/libgit2/transports/credential.c +1 -1
- data/vendor/libgit2/src/libgit2/transports/http.c +1 -2
- data/vendor/libgit2/src/libgit2/transports/http.h +0 -10
- data/vendor/libgit2/src/libgit2/transports/httpclient.c +112 -72
- data/vendor/libgit2/src/libgit2/transports/httpparser.c +128 -0
- data/vendor/libgit2/src/libgit2/transports/httpparser.h +99 -0
- data/vendor/libgit2/src/libgit2/transports/local.c +8 -7
- data/vendor/libgit2/src/libgit2/transports/smart.c +20 -8
- data/vendor/libgit2/src/libgit2/transports/smart.h +4 -2
- data/vendor/libgit2/src/libgit2/transports/smart_pkt.c +2 -2
- data/vendor/libgit2/src/libgit2/transports/smart_protocol.c +55 -10
- data/vendor/libgit2/src/libgit2/transports/ssh.c +41 -1103
- data/vendor/libgit2/src/libgit2/transports/ssh_exec.c +347 -0
- data/vendor/libgit2/src/libgit2/transports/ssh_exec.h +26 -0
- data/vendor/libgit2/src/libgit2/transports/ssh_libssh2.c +1126 -0
- data/vendor/libgit2/src/libgit2/transports/ssh_libssh2.h +28 -0
- data/vendor/libgit2/src/libgit2/transports/winhttp.c +35 -7
- data/vendor/libgit2/src/libgit2/tree.c +34 -26
- data/vendor/libgit2/src/libgit2/tree.h +3 -2
- data/vendor/libgit2/src/libgit2/worktree.c +14 -17
- data/vendor/libgit2/src/util/CMakeLists.txt +4 -6
- data/vendor/libgit2/src/util/alloc.c +4 -1
- data/vendor/libgit2/src/util/allocators/debugalloc.c +73 -0
- data/vendor/libgit2/src/{cli/cli.h → util/allocators/debugalloc.h} +6 -9
- data/vendor/libgit2/src/util/allocators/stdalloc.c +0 -10
- data/vendor/libgit2/src/util/array.h +18 -17
- data/vendor/libgit2/src/util/cc-compat.h +2 -0
- data/vendor/libgit2/src/util/ctype_compat.h +70 -0
- data/vendor/libgit2/src/util/date.c +22 -14
- data/vendor/libgit2/src/util/date.h +12 -0
- data/vendor/libgit2/src/util/errors.c +401 -0
- data/vendor/libgit2/src/{libgit2 → util}/errors.h +21 -17
- data/vendor/libgit2/src/util/fs_path.c +15 -4
- data/vendor/libgit2/src/util/fs_path.h +23 -0
- data/vendor/libgit2/src/util/futils.c +6 -5
- data/vendor/libgit2/src/util/futils.h +13 -4
- data/vendor/libgit2/src/util/git2_features.h.in +12 -1
- data/vendor/libgit2/src/util/git2_util.h +6 -0
- data/vendor/libgit2/src/util/hash/openssl.c +152 -0
- data/vendor/libgit2/src/util/hash/openssl.h +17 -1
- data/vendor/libgit2/src/util/hash/sha.h +4 -1
- data/vendor/libgit2/src/util/hashmap.h +424 -0
- data/vendor/libgit2/src/util/hashmap_str.h +43 -0
- data/vendor/libgit2/src/util/integer.h +3 -1
- data/vendor/libgit2/src/util/net.c +13 -7
- data/vendor/libgit2/src/util/net.h +2 -0
- data/vendor/libgit2/src/util/pool.c +1 -1
- data/vendor/libgit2/src/util/pool.h +5 -0
- data/vendor/libgit2/src/util/pqueue.h +1 -1
- data/vendor/libgit2/src/util/process.h +222 -0
- data/vendor/libgit2/src/util/rand.c +1 -7
- data/vendor/libgit2/src/util/regexp.c +1 -1
- data/vendor/libgit2/src/util/sortedcache.c +14 -13
- data/vendor/libgit2/src/util/sortedcache.h +3 -3
- data/vendor/libgit2/src/util/str.c +2 -2
- data/vendor/libgit2/src/util/strlist.c +108 -0
- data/vendor/libgit2/src/util/strlist.h +36 -0
- data/vendor/libgit2/src/util/unix/posix.h +0 -2
- data/vendor/libgit2/src/util/unix/process.c +629 -0
- data/vendor/libgit2/src/util/unix/realpath.c +23 -5
- data/vendor/libgit2/src/util/util.c +2 -2
- data/vendor/libgit2/src/util/util.h +4 -38
- data/vendor/libgit2/src/util/vector.c +3 -3
- data/vendor/libgit2/src/util/vector.h +2 -2
- data/vendor/libgit2/src/util/win32/posix_w32.c +29 -6
- data/vendor/libgit2/src/util/win32/process.c +506 -0
- metadata +45 -28
- data/vendor/libgit2/deps/http-parser/CMakeLists.txt +0 -6
- data/vendor/libgit2/deps/http-parser/COPYING +0 -23
- data/vendor/libgit2/deps/http-parser/http_parser.c +0 -2182
- data/vendor/libgit2/deps/http-parser/http_parser.h +0 -305
- data/vendor/libgit2/deps/zlib/COPYING +0 -27
- data/vendor/libgit2/include/git2/sys/reflog.h +0 -21
- data/vendor/libgit2/src/libgit2/config_entries.c +0 -237
- data/vendor/libgit2/src/libgit2/config_entries.h +0 -24
- data/vendor/libgit2/src/libgit2/errors.c +0 -293
- data/vendor/libgit2/src/libgit2/idxmap.c +0 -157
- data/vendor/libgit2/src/libgit2/idxmap.h +0 -177
- data/vendor/libgit2/src/libgit2/libgit2.h +0 -15
- data/vendor/libgit2/src/libgit2/offmap.c +0 -101
- data/vendor/libgit2/src/libgit2/offmap.h +0 -133
- data/vendor/libgit2/src/libgit2/oidmap.c +0 -107
- data/vendor/libgit2/src/libgit2/oidmap.h +0 -128
- data/vendor/libgit2/src/libgit2/threadstate.c +0 -97
- data/vendor/libgit2/src/libgit2/threadstate.h +0 -22
- data/vendor/libgit2/src/libgit2/transports/ssh.h +0 -14
- data/vendor/libgit2/src/util/khash.h +0 -615
- data/vendor/libgit2/src/util/strmap.c +0 -100
- data/vendor/libgit2/src/util/strmap.h +0 -131
- /data/vendor/libgit2/cmake/{FindHTTPParser.cmake → FindHTTP_Parser.cmake} +0 -0
|
@@ -22,6 +22,7 @@ typedef struct transport_definition {
|
|
|
22
22
|
|
|
23
23
|
static git_smart_subtransport_definition http_subtransport_definition = { git_smart_subtransport_http, 1, NULL };
|
|
24
24
|
static git_smart_subtransport_definition git_subtransport_definition = { git_smart_subtransport_git, 0, NULL };
|
|
25
|
+
|
|
25
26
|
#ifdef GIT_SSH
|
|
26
27
|
static git_smart_subtransport_definition ssh_subtransport_definition = { git_smart_subtransport_ssh, 0, NULL };
|
|
27
28
|
#endif
|
|
@@ -33,11 +34,13 @@ static transport_definition transports[] = {
|
|
|
33
34
|
{ "http://", git_transport_smart, &http_subtransport_definition },
|
|
34
35
|
{ "https://", git_transport_smart, &http_subtransport_definition },
|
|
35
36
|
{ "file://", git_transport_local, NULL },
|
|
37
|
+
|
|
36
38
|
#ifdef GIT_SSH
|
|
37
39
|
{ "ssh://", git_transport_smart, &ssh_subtransport_definition },
|
|
38
40
|
{ "ssh+git://", git_transport_smart, &ssh_subtransport_definition },
|
|
39
41
|
{ "git+ssh://", git_transport_smart, &ssh_subtransport_definition },
|
|
40
42
|
#endif
|
|
43
|
+
|
|
41
44
|
{ NULL, 0, 0 }
|
|
42
45
|
};
|
|
43
46
|
|
|
@@ -200,7 +203,7 @@ int git_transport_unregister(const char *scheme)
|
|
|
200
203
|
git__free(d);
|
|
201
204
|
|
|
202
205
|
if (!custom_transports.length)
|
|
203
|
-
|
|
206
|
+
git_vector_dispose(&custom_transports);
|
|
204
207
|
|
|
205
208
|
error = 0;
|
|
206
209
|
goto done;
|
|
@@ -204,7 +204,7 @@ int git_credential_ssh_key_memory_new(
|
|
|
204
204
|
const char *privatekey,
|
|
205
205
|
const char *passphrase)
|
|
206
206
|
{
|
|
207
|
-
#ifdef
|
|
207
|
+
#ifdef GIT_SSH_LIBSSH2_MEMORY_CREDENTIALS
|
|
208
208
|
return git_credential_ssh_key_type_new(
|
|
209
209
|
cred,
|
|
210
210
|
username,
|
|
@@ -9,7 +9,6 @@
|
|
|
9
9
|
|
|
10
10
|
#ifndef GIT_WINHTTP
|
|
11
11
|
|
|
12
|
-
#include "http_parser.h"
|
|
13
12
|
#include "net.h"
|
|
14
13
|
#include "remote.h"
|
|
15
14
|
#include "smart.h"
|
|
@@ -334,7 +333,7 @@ static int lookup_proxy(
|
|
|
334
333
|
return 0;
|
|
335
334
|
}
|
|
336
335
|
|
|
337
|
-
if (!proxy ||
|
|
336
|
+
if (!proxy || !*proxy ||
|
|
338
337
|
(error = git_net_url_parse_http(&transport->proxy.url, proxy)) < 0)
|
|
339
338
|
goto done;
|
|
340
339
|
|
|
@@ -15,14 +15,4 @@
|
|
|
15
15
|
|
|
16
16
|
extern bool git_http__expect_continue;
|
|
17
17
|
|
|
18
|
-
GIT_INLINE(int) git_http__user_agent(git_str *buf)
|
|
19
|
-
{
|
|
20
|
-
const char *ua = git_libgit2__user_agent();
|
|
21
|
-
|
|
22
|
-
if (!ua)
|
|
23
|
-
ua = "libgit2 " LIBGIT2_VERSION;
|
|
24
|
-
|
|
25
|
-
return git_str_printf(buf, "git/2.0 (%s)", ua);
|
|
26
|
-
}
|
|
27
|
-
|
|
28
18
|
#endif
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
|
|
8
8
|
#include "common.h"
|
|
9
9
|
#include "git2.h"
|
|
10
|
-
|
|
10
|
+
|
|
11
11
|
#include "vector.h"
|
|
12
12
|
#include "trace.h"
|
|
13
13
|
#include "httpclient.h"
|
|
@@ -21,6 +21,7 @@
|
|
|
21
21
|
#include "streams/socket.h"
|
|
22
22
|
#include "streams/tls.h"
|
|
23
23
|
#include "auth.h"
|
|
24
|
+
#include "httpparser.h"
|
|
24
25
|
|
|
25
26
|
static git_http_auth_scheme auth_schemes[] = {
|
|
26
27
|
{ GIT_HTTP_AUTH_NEGOTIATE, "Negotiate", GIT_CREDENTIAL_DEFAULT, git_http_auth_negotiate },
|
|
@@ -108,7 +109,7 @@ struct git_http_client {
|
|
|
108
109
|
git_http_server_t current_server;
|
|
109
110
|
http_client_state state;
|
|
110
111
|
|
|
111
|
-
|
|
112
|
+
git_http_parser parser;
|
|
112
113
|
|
|
113
114
|
git_http_server server;
|
|
114
115
|
git_http_server proxy;
|
|
@@ -154,7 +155,7 @@ void git_http_response_dispose(git_http_response *response)
|
|
|
154
155
|
memset(response, 0, sizeof(git_http_response));
|
|
155
156
|
}
|
|
156
157
|
|
|
157
|
-
static int on_header_complete(
|
|
158
|
+
static int on_header_complete(git_http_parser *parser)
|
|
158
159
|
{
|
|
159
160
|
http_parser_context *ctx = (http_parser_context *) parser->data;
|
|
160
161
|
git_http_client *client = ctx->client;
|
|
@@ -219,7 +220,7 @@ static int on_header_complete(http_parser *parser)
|
|
|
219
220
|
return 0;
|
|
220
221
|
}
|
|
221
222
|
|
|
222
|
-
static int on_header_field(
|
|
223
|
+
static int on_header_field(git_http_parser *parser, const char *str, size_t len)
|
|
223
224
|
{
|
|
224
225
|
http_parser_context *ctx = (http_parser_context *) parser->data;
|
|
225
226
|
|
|
@@ -254,7 +255,7 @@ static int on_header_field(http_parser *parser, const char *str, size_t len)
|
|
|
254
255
|
return 0;
|
|
255
256
|
}
|
|
256
257
|
|
|
257
|
-
static int on_header_value(
|
|
258
|
+
static int on_header_value(git_http_parser *parser, const char *str, size_t len)
|
|
258
259
|
{
|
|
259
260
|
http_parser_context *ctx = (http_parser_context *) parser->data;
|
|
260
261
|
|
|
@@ -342,7 +343,7 @@ static int resend_needed(git_http_client *client, git_http_response *response)
|
|
|
342
343
|
return 0;
|
|
343
344
|
}
|
|
344
345
|
|
|
345
|
-
static int on_headers_complete(
|
|
346
|
+
static int on_headers_complete(git_http_parser *parser)
|
|
346
347
|
{
|
|
347
348
|
http_parser_context *ctx = (http_parser_context *) parser->data;
|
|
348
349
|
|
|
@@ -364,8 +365,8 @@ static int on_headers_complete(http_parser *parser)
|
|
|
364
365
|
return ctx->parse_status = PARSE_STATUS_ERROR;
|
|
365
366
|
}
|
|
366
367
|
|
|
367
|
-
ctx->response->status = parser
|
|
368
|
-
ctx->client->keepalive =
|
|
368
|
+
ctx->response->status = git_http_parser_status_code(parser);
|
|
369
|
+
ctx->client->keepalive = git_http_parser_keep_alive(parser);
|
|
369
370
|
|
|
370
371
|
/* Prepare for authentication */
|
|
371
372
|
collect_authinfo(&ctx->response->server_auth_schemetypes,
|
|
@@ -378,18 +379,15 @@ static int on_headers_complete(http_parser *parser)
|
|
|
378
379
|
ctx->response->resend_credentials = resend_needed(ctx->client,
|
|
379
380
|
ctx->response);
|
|
380
381
|
|
|
381
|
-
/* Stop parsing. */
|
|
382
|
-
http_parser_pause(parser, 1);
|
|
383
|
-
|
|
384
382
|
if (ctx->response->content_type || ctx->response->chunked)
|
|
385
383
|
ctx->client->state = READING_BODY;
|
|
386
384
|
else
|
|
387
385
|
ctx->client->state = DONE;
|
|
388
386
|
|
|
389
|
-
return
|
|
387
|
+
return git_http_parser_pause(parser);
|
|
390
388
|
}
|
|
391
389
|
|
|
392
|
-
static int on_body(
|
|
390
|
+
static int on_body(git_http_parser *parser, const char *buf, size_t len)
|
|
393
391
|
{
|
|
394
392
|
http_parser_context *ctx = (http_parser_context *) parser->data;
|
|
395
393
|
size_t max_len;
|
|
@@ -411,7 +409,7 @@ static int on_body(http_parser *parser, const char *buf, size_t len)
|
|
|
411
409
|
return 0;
|
|
412
410
|
}
|
|
413
411
|
|
|
414
|
-
static int on_message_complete(
|
|
412
|
+
static int on_message_complete(git_http_parser *parser)
|
|
415
413
|
{
|
|
416
414
|
http_parser_context *ctx = (http_parser_context *) parser->data;
|
|
417
415
|
|
|
@@ -651,6 +649,30 @@ static int puts_host_and_port(git_str *buf, git_net_url *url, bool force_port)
|
|
|
651
649
|
return git_str_oom(buf) ? -1 : 0;
|
|
652
650
|
}
|
|
653
651
|
|
|
652
|
+
static int append_user_agent(git_str *buf)
|
|
653
|
+
{
|
|
654
|
+
const char *product = git_settings__user_agent_product();
|
|
655
|
+
const char *comment = git_settings__user_agent();
|
|
656
|
+
|
|
657
|
+
GIT_ASSERT(product && comment);
|
|
658
|
+
|
|
659
|
+
if (!*product)
|
|
660
|
+
return 0;
|
|
661
|
+
|
|
662
|
+
git_str_puts(buf, "User-Agent: ");
|
|
663
|
+
git_str_puts(buf, product);
|
|
664
|
+
|
|
665
|
+
if (*comment) {
|
|
666
|
+
git_str_puts(buf, " (");
|
|
667
|
+
git_str_puts(buf, comment);
|
|
668
|
+
git_str_puts(buf, ")");
|
|
669
|
+
}
|
|
670
|
+
|
|
671
|
+
git_str_puts(buf, "\r\n");
|
|
672
|
+
|
|
673
|
+
return git_str_oom(buf) ? -1 : 0;
|
|
674
|
+
}
|
|
675
|
+
|
|
654
676
|
static int generate_connect_request(
|
|
655
677
|
git_http_client *client,
|
|
656
678
|
git_http_request *request)
|
|
@@ -665,9 +687,7 @@ static int generate_connect_request(
|
|
|
665
687
|
puts_host_and_port(buf, &client->server.url, true);
|
|
666
688
|
git_str_puts(buf, " HTTP/1.1\r\n");
|
|
667
689
|
|
|
668
|
-
|
|
669
|
-
git_http__user_agent(buf);
|
|
670
|
-
git_str_puts(buf, "\r\n");
|
|
690
|
+
append_user_agent(buf);
|
|
671
691
|
|
|
672
692
|
git_str_puts(buf, "Host: ");
|
|
673
693
|
puts_host_and_port(buf, &client->server.url, true);
|
|
@@ -711,9 +731,7 @@ static int generate_request(
|
|
|
711
731
|
|
|
712
732
|
git_str_puts(buf, " HTTP/1.1\r\n");
|
|
713
733
|
|
|
714
|
-
|
|
715
|
-
git_http__user_agent(buf);
|
|
716
|
-
git_str_puts(buf, "\r\n");
|
|
734
|
+
append_user_agent(buf);
|
|
717
735
|
|
|
718
736
|
git_str_puts(buf, "Host: ");
|
|
719
737
|
puts_host_and_port(buf, request->url, false);
|
|
@@ -768,25 +786,37 @@ static int check_certificate(
|
|
|
768
786
|
void *cert_cb_payload)
|
|
769
787
|
{
|
|
770
788
|
git_cert *cert;
|
|
771
|
-
|
|
789
|
+
git_error *last_error;
|
|
772
790
|
int error;
|
|
773
791
|
|
|
774
792
|
if ((error = git_stream_certificate(&cert, stream)) < 0)
|
|
775
793
|
return error;
|
|
776
794
|
|
|
777
|
-
|
|
795
|
+
/*
|
|
796
|
+
* Allow callers to set an error - but save ours and clear
|
|
797
|
+
* it, so that we can detect if they set one and restore it
|
|
798
|
+
* if we need to.
|
|
799
|
+
*/
|
|
800
|
+
git_error_save(&last_error);
|
|
801
|
+
git_error_clear();
|
|
778
802
|
|
|
779
803
|
error = cert_cb(cert, is_valid, url->host, cert_cb_payload);
|
|
780
804
|
|
|
781
|
-
if (error == GIT_PASSTHROUGH
|
|
782
|
-
|
|
783
|
-
else if (error == GIT_PASSTHROUGH)
|
|
784
|
-
error = 0;
|
|
785
|
-
else if (error && !git_error_last())
|
|
786
|
-
git_error_set(GIT_ERROR_HTTP,
|
|
787
|
-
"user rejected certificate for %s", url->host);
|
|
805
|
+
if (error == GIT_PASSTHROUGH) {
|
|
806
|
+
error = is_valid ? 0 : -1;
|
|
788
807
|
|
|
789
|
-
|
|
808
|
+
if (error) {
|
|
809
|
+
git_error_restore(last_error);
|
|
810
|
+
last_error = NULL;
|
|
811
|
+
}
|
|
812
|
+
} else if (error) {
|
|
813
|
+
if (!git_error_exists())
|
|
814
|
+
git_error_set(GIT_ERROR_HTTP,
|
|
815
|
+
"user rejected certificate for %s",
|
|
816
|
+
url->host);
|
|
817
|
+
}
|
|
818
|
+
|
|
819
|
+
git_error_free(last_error);
|
|
790
820
|
return error;
|
|
791
821
|
}
|
|
792
822
|
|
|
@@ -864,9 +894,29 @@ GIT_INLINE(int) server_setup_from_url(
|
|
|
864
894
|
return 0;
|
|
865
895
|
}
|
|
866
896
|
|
|
897
|
+
static bool parser_settings_initialized;
|
|
898
|
+
static git_http_parser_settings parser_settings;
|
|
899
|
+
|
|
900
|
+
GIT_INLINE(git_http_parser_settings *) http_client_parser_settings(void)
|
|
901
|
+
{
|
|
902
|
+
if (!parser_settings_initialized) {
|
|
903
|
+
parser_settings.on_header_field = on_header_field;
|
|
904
|
+
parser_settings.on_header_value = on_header_value;
|
|
905
|
+
parser_settings.on_headers_complete = on_headers_complete;
|
|
906
|
+
parser_settings.on_body = on_body;
|
|
907
|
+
parser_settings.on_message_complete = on_message_complete;
|
|
908
|
+
|
|
909
|
+
parser_settings_initialized = true;
|
|
910
|
+
}
|
|
911
|
+
|
|
912
|
+
return &parser_settings;
|
|
913
|
+
}
|
|
914
|
+
|
|
867
915
|
static void reset_parser(git_http_client *client)
|
|
868
916
|
{
|
|
869
|
-
|
|
917
|
+
git_http_parser_init(&client->parser,
|
|
918
|
+
GIT_HTTP_PARSER_RESPONSE,
|
|
919
|
+
http_client_parser_settings());
|
|
870
920
|
}
|
|
871
921
|
|
|
872
922
|
static int setup_hosts(
|
|
@@ -1109,27 +1159,9 @@ GIT_INLINE(int) client_read(git_http_client *client)
|
|
|
1109
1159
|
return (int)read_len;
|
|
1110
1160
|
}
|
|
1111
1161
|
|
|
1112
|
-
static bool parser_settings_initialized;
|
|
1113
|
-
static http_parser_settings parser_settings;
|
|
1114
|
-
|
|
1115
|
-
GIT_INLINE(http_parser_settings *) http_client_parser_settings(void)
|
|
1116
|
-
{
|
|
1117
|
-
if (!parser_settings_initialized) {
|
|
1118
|
-
parser_settings.on_header_field = on_header_field;
|
|
1119
|
-
parser_settings.on_header_value = on_header_value;
|
|
1120
|
-
parser_settings.on_headers_complete = on_headers_complete;
|
|
1121
|
-
parser_settings.on_body = on_body;
|
|
1122
|
-
parser_settings.on_message_complete = on_message_complete;
|
|
1123
|
-
|
|
1124
|
-
parser_settings_initialized = true;
|
|
1125
|
-
}
|
|
1126
|
-
|
|
1127
|
-
return &parser_settings;
|
|
1128
|
-
}
|
|
1129
|
-
|
|
1130
1162
|
GIT_INLINE(int) client_read_and_parse(git_http_client *client)
|
|
1131
1163
|
{
|
|
1132
|
-
|
|
1164
|
+
git_http_parser *parser = &client->parser;
|
|
1133
1165
|
http_parser_context *ctx = (http_parser_context *) parser->data;
|
|
1134
1166
|
unsigned char http_errno;
|
|
1135
1167
|
int read_len;
|
|
@@ -1143,11 +1175,10 @@ GIT_INLINE(int) client_read_and_parse(git_http_client *client)
|
|
|
1143
1175
|
if (!client->read_buf.size && (read_len = client_read(client)) < 0)
|
|
1144
1176
|
return read_len;
|
|
1145
1177
|
|
|
1146
|
-
parsed_len =
|
|
1147
|
-
http_client_parser_settings(),
|
|
1178
|
+
parsed_len = git_http_parser_execute(parser,
|
|
1148
1179
|
client->read_buf.ptr,
|
|
1149
1180
|
client->read_buf.size);
|
|
1150
|
-
http_errno =
|
|
1181
|
+
http_errno = git_http_parser_errno(parser);
|
|
1151
1182
|
|
|
1152
1183
|
if (parsed_len > INT_MAX) {
|
|
1153
1184
|
git_error_set(GIT_ERROR_HTTP, "unexpectedly large parse");
|
|
@@ -1166,26 +1197,29 @@ GIT_INLINE(int) client_read_and_parse(git_http_client *client)
|
|
|
1166
1197
|
* (This can happen in response to an expect/continue request,
|
|
1167
1198
|
* where the server gives you a 100 and 200 simultaneously.)
|
|
1168
1199
|
*/
|
|
1169
|
-
if (http_errno ==
|
|
1200
|
+
if (http_errno == GIT_HTTP_PARSER_PAUSED) {
|
|
1201
|
+
size_t additional_size;
|
|
1202
|
+
|
|
1203
|
+
git_http_parser_resume(parser);
|
|
1204
|
+
|
|
1170
1205
|
/*
|
|
1171
|
-
* http-parser has a "feature" where it will not deliver
|
|
1172
|
-
* final byte when paused in a callback. Consume
|
|
1173
|
-
*
|
|
1206
|
+
* http-parser has a "feature" where it will not deliver
|
|
1207
|
+
* the final byte when paused in a callback. Consume
|
|
1208
|
+
* that byte.
|
|
1174
1209
|
*/
|
|
1175
|
-
|
|
1210
|
+
if ((additional_size = git_http_parser_remain_after_pause(parser)) > 0) {
|
|
1211
|
+
GIT_ASSERT((client->read_buf.size - parsed_len) >= additional_size);
|
|
1176
1212
|
|
|
1177
|
-
|
|
1178
|
-
|
|
1179
|
-
|
|
1180
|
-
|
|
1181
|
-
client->read_buf.ptr + parsed_len,
|
|
1182
|
-
1);
|
|
1213
|
+
parsed_len += git_http_parser_execute(parser,
|
|
1214
|
+
client->read_buf.ptr + parsed_len,
|
|
1215
|
+
additional_size);
|
|
1216
|
+
}
|
|
1183
1217
|
}
|
|
1184
1218
|
|
|
1185
1219
|
/* Most failures will be reported in http_errno */
|
|
1186
|
-
else if (parser
|
|
1220
|
+
else if (git_http_parser_errno(parser) != GIT_HTTP_PARSER_OK) {
|
|
1187
1221
|
git_error_set(GIT_ERROR_HTTP, "http parser error: %s",
|
|
1188
|
-
|
|
1222
|
+
git_http_parser_errmsg(parser, http_errno));
|
|
1189
1223
|
return -1;
|
|
1190
1224
|
}
|
|
1191
1225
|
|
|
@@ -1193,7 +1227,7 @@ GIT_INLINE(int) client_read_and_parse(git_http_client *client)
|
|
|
1193
1227
|
else if (parsed_len != client->read_buf.size) {
|
|
1194
1228
|
git_error_set(GIT_ERROR_HTTP,
|
|
1195
1229
|
"http parser did not consume entire buffer: %s",
|
|
1196
|
-
|
|
1230
|
+
git_http_parser_errmsg(parser, http_errno));
|
|
1197
1231
|
return -1;
|
|
1198
1232
|
}
|
|
1199
1233
|
|
|
@@ -1232,7 +1266,7 @@ static void complete_response_body(git_http_client *client)
|
|
|
1232
1266
|
|
|
1233
1267
|
/* If there was an error, just close the connection. */
|
|
1234
1268
|
if (client_read_and_parse(client) < 0 ||
|
|
1235
|
-
parser_context.error !=
|
|
1269
|
+
parser_context.error != GIT_HTTP_PARSER_OK ||
|
|
1236
1270
|
(parser_context.parse_status != PARSE_STATUS_OK &&
|
|
1237
1271
|
parser_context.parse_status != PARSE_STATUS_NO_OUTPUT)) {
|
|
1238
1272
|
git_error_clear();
|
|
@@ -1240,6 +1274,7 @@ static void complete_response_body(git_http_client *client)
|
|
|
1240
1274
|
}
|
|
1241
1275
|
|
|
1242
1276
|
done:
|
|
1277
|
+
client->parser.data = NULL;
|
|
1243
1278
|
git_str_clear(&client->read_buf);
|
|
1244
1279
|
}
|
|
1245
1280
|
|
|
@@ -1407,9 +1442,9 @@ int git_http_client_read_response(
|
|
|
1407
1442
|
git_http_response_dispose(response);
|
|
1408
1443
|
|
|
1409
1444
|
if (client->current_server == PROXY) {
|
|
1410
|
-
|
|
1445
|
+
git_vector_dispose_deep(&client->proxy.auth_challenges);
|
|
1411
1446
|
} else if(client->current_server == SERVER) {
|
|
1412
|
-
|
|
1447
|
+
git_vector_dispose_deep(&client->server.auth_challenges);
|
|
1413
1448
|
}
|
|
1414
1449
|
|
|
1415
1450
|
client->state = READING_RESPONSE;
|
|
@@ -1429,6 +1464,7 @@ int git_http_client_read_response(
|
|
|
1429
1464
|
done:
|
|
1430
1465
|
git_str_dispose(&parser_context.parse_header_name);
|
|
1431
1466
|
git_str_dispose(&parser_context.parse_header_value);
|
|
1467
|
+
client->parser.data = NULL;
|
|
1432
1468
|
|
|
1433
1469
|
return error;
|
|
1434
1470
|
}
|
|
@@ -1484,6 +1520,8 @@ done:
|
|
|
1484
1520
|
if (error < 0)
|
|
1485
1521
|
client->connected = 0;
|
|
1486
1522
|
|
|
1523
|
+
client->parser.data = NULL;
|
|
1524
|
+
|
|
1487
1525
|
return error;
|
|
1488
1526
|
}
|
|
1489
1527
|
|
|
@@ -1506,7 +1544,7 @@ int git_http_client_skip_body(git_http_client *client)
|
|
|
1506
1544
|
do {
|
|
1507
1545
|
error = client_read_and_parse(client);
|
|
1508
1546
|
|
|
1509
|
-
if (parser_context.error !=
|
|
1547
|
+
if (parser_context.error != GIT_HTTP_PARSER_OK ||
|
|
1510
1548
|
(parser_context.parse_status != PARSE_STATUS_OK &&
|
|
1511
1549
|
parser_context.parse_status != PARSE_STATUS_NO_OUTPUT)) {
|
|
1512
1550
|
git_error_set(GIT_ERROR_HTTP,
|
|
@@ -1518,6 +1556,8 @@ int git_http_client_skip_body(git_http_client *client)
|
|
|
1518
1556
|
if (error < 0)
|
|
1519
1557
|
client->connected = 0;
|
|
1520
1558
|
|
|
1559
|
+
client->parser.data = NULL;
|
|
1560
|
+
|
|
1521
1561
|
return error;
|
|
1522
1562
|
}
|
|
1523
1563
|
|
|
@@ -1565,7 +1605,7 @@ GIT_INLINE(void) http_server_close(git_http_server *server)
|
|
|
1565
1605
|
|
|
1566
1606
|
git_net_url_dispose(&server->url);
|
|
1567
1607
|
|
|
1568
|
-
|
|
1608
|
+
git_vector_dispose_deep(&server->auth_challenges);
|
|
1569
1609
|
free_auth_context(server);
|
|
1570
1610
|
}
|
|
1571
1611
|
|
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (C) the libgit2 contributors. All rights reserved.
|
|
3
|
+
*
|
|
4
|
+
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
|
5
|
+
* a Linking Exception. For full terms see the included COPYING file.
|
|
6
|
+
*/
|
|
7
|
+
|
|
8
|
+
#include "httpparser.h"
|
|
9
|
+
|
|
10
|
+
#include <string.h>
|
|
11
|
+
|
|
12
|
+
#if defined(GIT_HTTPPARSER_HTTPPARSER)
|
|
13
|
+
|
|
14
|
+
#include "http_parser.h"
|
|
15
|
+
|
|
16
|
+
static int on_message_begin(http_parser *p)
|
|
17
|
+
{
|
|
18
|
+
git_http_parser *parser = (git_http_parser *)p;
|
|
19
|
+
return parser->settings.on_message_begin(parser);
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
static int on_url(http_parser *p, const char *str, size_t len)
|
|
23
|
+
{
|
|
24
|
+
git_http_parser *parser = (git_http_parser *)p;
|
|
25
|
+
return parser->settings.on_url(parser, str, len);
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
static int on_header_field(http_parser *p, const char *str, size_t len)
|
|
29
|
+
{
|
|
30
|
+
git_http_parser *parser = (git_http_parser *)p;
|
|
31
|
+
return parser->settings.on_header_field(parser, str, len);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
static int on_header_value(http_parser *p, const char *str, size_t len)
|
|
35
|
+
{
|
|
36
|
+
git_http_parser *parser = (git_http_parser *)p;
|
|
37
|
+
return parser->settings.on_header_value(parser, str, len);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
static int on_headers_complete(http_parser *p)
|
|
41
|
+
{
|
|
42
|
+
git_http_parser *parser = (git_http_parser *)p;
|
|
43
|
+
return parser->settings.on_headers_complete(parser);
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
static int on_body(http_parser *p, const char *buf, size_t len)
|
|
47
|
+
{
|
|
48
|
+
git_http_parser *parser = (git_http_parser *)p;
|
|
49
|
+
return parser->settings.on_body(parser, buf, len);
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
static int on_message_complete(http_parser *p)
|
|
53
|
+
{
|
|
54
|
+
git_http_parser *parser = (git_http_parser *)p;
|
|
55
|
+
return parser->settings.on_message_complete(parser);
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
void git_http_parser_init(
|
|
59
|
+
git_http_parser *parser,
|
|
60
|
+
git_http_parser_t type,
|
|
61
|
+
git_http_parser_settings *settings)
|
|
62
|
+
{
|
|
63
|
+
http_parser_init(&parser->parser, (enum http_parser_type)type);
|
|
64
|
+
memcpy(&parser->settings, settings, sizeof(git_http_parser_settings));
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
size_t git_http_parser_execute(
|
|
68
|
+
git_http_parser *parser,
|
|
69
|
+
const char *data,
|
|
70
|
+
size_t len)
|
|
71
|
+
{
|
|
72
|
+
struct http_parser_settings settings_proxy;
|
|
73
|
+
|
|
74
|
+
memset(&settings_proxy, 0, sizeof(struct http_parser_settings));
|
|
75
|
+
|
|
76
|
+
settings_proxy.on_message_begin = parser->settings.on_message_begin ? on_message_begin : NULL;
|
|
77
|
+
settings_proxy.on_url = parser->settings.on_url ? on_url : NULL;
|
|
78
|
+
settings_proxy.on_header_field = parser->settings.on_header_field ? on_header_field : NULL;
|
|
79
|
+
settings_proxy.on_header_value = parser->settings.on_header_value ? on_header_value : NULL;
|
|
80
|
+
settings_proxy.on_headers_complete = parser->settings.on_headers_complete ? on_headers_complete : NULL;
|
|
81
|
+
settings_proxy.on_body = parser->settings.on_body ? on_body : NULL;
|
|
82
|
+
settings_proxy.on_message_complete = parser->settings.on_message_complete ? on_message_complete : NULL;
|
|
83
|
+
|
|
84
|
+
return http_parser_execute(&parser->parser, &settings_proxy, data, len);
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
#elif defined(GIT_HTTPPARSER_LLHTTP) || defined(GIT_HTTPPARSER_BUILTIN)
|
|
88
|
+
|
|
89
|
+
# include <llhttp.h>
|
|
90
|
+
|
|
91
|
+
size_t git_http_parser_execute(
|
|
92
|
+
git_http_parser *parser,
|
|
93
|
+
const char* data,
|
|
94
|
+
size_t len)
|
|
95
|
+
{
|
|
96
|
+
llhttp_errno_t error;
|
|
97
|
+
size_t parsed_len;
|
|
98
|
+
|
|
99
|
+
/*
|
|
100
|
+
* Unlike http_parser, which returns the number of parsed
|
|
101
|
+
* bytes in the _execute() call, llhttp returns an error
|
|
102
|
+
* code.
|
|
103
|
+
*/
|
|
104
|
+
|
|
105
|
+
if (data == NULL || len == 0)
|
|
106
|
+
error = llhttp_finish(parser);
|
|
107
|
+
else
|
|
108
|
+
error = llhttp_execute(parser, data, len);
|
|
109
|
+
|
|
110
|
+
parsed_len = len;
|
|
111
|
+
|
|
112
|
+
/*
|
|
113
|
+
* Adjust number of parsed bytes in case of error.
|
|
114
|
+
*/
|
|
115
|
+
if (error != HPE_OK) {
|
|
116
|
+
parsed_len = llhttp_get_error_pos(parser) - data;
|
|
117
|
+
|
|
118
|
+
/* This isn't a real pause, just a way to stop parsing early. */
|
|
119
|
+
if (error == HPE_PAUSED_UPGRADE)
|
|
120
|
+
llhttp_resume_after_upgrade(parser);
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
return parsed_len;
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
#else
|
|
127
|
+
# error unknown http-parser
|
|
128
|
+
#endif
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (C) the libgit2 contributors. All rights reserved.
|
|
3
|
+
*
|
|
4
|
+
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
|
5
|
+
* a Linking Exception. For full terms see the included COPYING file.
|
|
6
|
+
*/
|
|
7
|
+
|
|
8
|
+
#ifndef INCLUDE_transports_httpparser_h__
|
|
9
|
+
#define INCLUDE_transports_httpparser_h__
|
|
10
|
+
|
|
11
|
+
#include "git2_util.h"
|
|
12
|
+
|
|
13
|
+
#if defined(GIT_HTTPPARSER_HTTPPARSER)
|
|
14
|
+
|
|
15
|
+
# include <http_parser.h>
|
|
16
|
+
|
|
17
|
+
typedef enum {
|
|
18
|
+
GIT_HTTP_PARSER_OK = HPE_OK,
|
|
19
|
+
GIT_HTTP_PARSER_PAUSED = HPE_PAUSED,
|
|
20
|
+
} git_http_parser_error_t;
|
|
21
|
+
|
|
22
|
+
typedef enum {
|
|
23
|
+
GIT_HTTP_PARSER_REQUEST = HTTP_REQUEST,
|
|
24
|
+
GIT_HTTP_PARSER_RESPONSE = HTTP_RESPONSE,
|
|
25
|
+
} git_http_parser_t;
|
|
26
|
+
|
|
27
|
+
typedef struct git_http_parser git_http_parser;
|
|
28
|
+
|
|
29
|
+
typedef struct {
|
|
30
|
+
int (*on_message_begin)(git_http_parser *);
|
|
31
|
+
int (*on_url)(git_http_parser *, const char *, size_t);
|
|
32
|
+
int (*on_header_field)(git_http_parser *, const char *, size_t);
|
|
33
|
+
int (*on_header_value)(git_http_parser *, const char *, size_t);
|
|
34
|
+
int (*on_headers_complete)(git_http_parser *);
|
|
35
|
+
int (*on_body)(git_http_parser *, const char *, size_t);
|
|
36
|
+
int (*on_message_complete)(git_http_parser *);
|
|
37
|
+
} git_http_parser_settings;
|
|
38
|
+
|
|
39
|
+
struct git_http_parser {
|
|
40
|
+
http_parser parser;
|
|
41
|
+
git_http_parser_settings settings;
|
|
42
|
+
void *data;
|
|
43
|
+
};
|
|
44
|
+
|
|
45
|
+
void git_http_parser_init(
|
|
46
|
+
git_http_parser *parser,
|
|
47
|
+
git_http_parser_t type,
|
|
48
|
+
git_http_parser_settings *settings);
|
|
49
|
+
|
|
50
|
+
size_t git_http_parser_execute(
|
|
51
|
+
git_http_parser *parser,
|
|
52
|
+
const char *data,
|
|
53
|
+
size_t len);
|
|
54
|
+
|
|
55
|
+
# define git_http_parser_status_code(parser) parser->parser.status_code
|
|
56
|
+
# define git_http_parser_keep_alive(parser) http_should_keep_alive(&parser->parser)
|
|
57
|
+
# define git_http_parser_pause(parser) (http_parser_pause(&parser->parser, 1), 0)
|
|
58
|
+
# define git_http_parser_resume(parser) http_parser_pause(&parser->parser, 0)
|
|
59
|
+
# define git_http_parser_remain_after_pause(parser) 1
|
|
60
|
+
# define git_http_parser_errno(parser) parser->parser.http_errno
|
|
61
|
+
# define git_http_parser_errmsg(parser, errno) http_errno_description(errno)
|
|
62
|
+
|
|
63
|
+
#elif defined(GIT_HTTPPARSER_LLHTTP) || defined(GIT_HTTPPARSER_BUILTIN)
|
|
64
|
+
|
|
65
|
+
# include <llhttp.h>
|
|
66
|
+
|
|
67
|
+
typedef enum {
|
|
68
|
+
GIT_HTTP_PARSER_OK = HPE_OK,
|
|
69
|
+
GIT_HTTP_PARSER_PAUSED = HPE_PAUSED,
|
|
70
|
+
} git_http_parser_error_t;
|
|
71
|
+
|
|
72
|
+
typedef enum {
|
|
73
|
+
GIT_HTTP_PARSER_REQUEST = HTTP_REQUEST,
|
|
74
|
+
GIT_HTTP_PARSER_RESPONSE = HTTP_RESPONSE,
|
|
75
|
+
} git_http_parser_t;
|
|
76
|
+
|
|
77
|
+
typedef llhttp_t git_http_parser;
|
|
78
|
+
typedef llhttp_settings_t git_http_parser_settings;
|
|
79
|
+
|
|
80
|
+
# define git_http_parser_init(parser, direction, settings) llhttp_init(parser, (llhttp_type_t)direction, settings)
|
|
81
|
+
|
|
82
|
+
size_t git_http_parser_execute(
|
|
83
|
+
git_http_parser *parser,
|
|
84
|
+
const char *data,
|
|
85
|
+
size_t len);
|
|
86
|
+
|
|
87
|
+
# define git_http_parser_status_code(parser) parser->status_code
|
|
88
|
+
# define git_http_parser_keep_alive(parser) llhttp_should_keep_alive(parser)
|
|
89
|
+
# define git_http_parser_pause(parser) (llhttp_pause(parser), GIT_HTTP_PARSER_PAUSED)
|
|
90
|
+
# define git_http_parser_resume(parser) llhttp_resume(parser)
|
|
91
|
+
# define git_http_parser_remain_after_pause(parser) 0
|
|
92
|
+
# define git_http_parser_errno(parser) parser->error
|
|
93
|
+
# define git_http_parser_errmsg(parser, errno) llhttp_get_error_reason(parser)
|
|
94
|
+
|
|
95
|
+
#else
|
|
96
|
+
# error unknown http-parser
|
|
97
|
+
#endif
|
|
98
|
+
|
|
99
|
+
#endif
|