Leith Bade
|
8f1754cf0a
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
include/mbgl/storage/base_request.hpp
include/mbgl/storage/file_request_baton.hpp
include/mbgl/storage/http_request.hpp
include/mbgl/storage/http_request_baton.hpp
include/mbgl/util/uv_detail.hpp
platform/darwin/http_request_baton_cocoa.mm
platform/default/caching_http_file_source.cpp
platform/default/http_request_baton_curl.cpp
src/map/map.cpp
src/storage/base_request.cpp
src/storage/file_request.cpp
src/storage/file_request_baton.cpp
src/storage/http_request.cpp
src/storage/http_request_baton.cpp
|
2014-12-04 22:19:46 +11:00 |
|
John Firebaugh
|
57249ca32c
|
Prefer stdlib to libuv (fixes #688)
|
2014-12-03 17:38:10 -08:00 |
|
Leith Bade
|
f090d6b264
|
Use uv::async and various other fixes
|
2014-12-03 21:57:55 +11:00 |
|
Konstantin Käfer
|
992d9ff051
|
add back CURL requesting
|
2014-09-24 16:19:47 +02:00 |
|
Konstantin Käfer
|
0fc1f66868
|
whitespace fixes
|
2014-09-24 16:16:30 +02:00 |
|
Konstantin Käfer
|
3f38c7650e
|
add retry timers
|
2014-09-24 16:16:29 +02:00 |
|
Konstantin Käfer
|
d9fc7708a2
|
do 304 requests and cache them in sqlite
|
2014-09-24 16:14:09 +02:00 |
|