David Cermak
faef936581
mdns: Fix include query ID in reponses
...
Closes https://github.com/espressif/esp-idf/issues/5574
2020-12-15 19:01:33 +00:00
David Čermák
26bca96029
Merge branch 'bugfix/fix_transport_ssl_blocking_v4.2' into 'release/v4.2'
...
transport: fix transport ssl blocking (v4.2)
See merge request espressif/esp-idf!10691
2020-12-16 02:59:03 +08:00
David Čermák
a1e1470447
Merge branch 'bugfix/fix_esp_modem_mode_switch_timeout_v4.2' into 'release/v4.2'
...
fix esp_modem switch mode timeout (v4.2)
See merge request espressif/esp-idf!11395
2020-12-16 02:57:44 +08:00
Anton Maklakov
9fb05897db
Merge branch 'bugfix/ci_py2_warnings_fix_v4.2' into 'release/v4.2'
...
ci: Python 2 warnings fix (v4.2)
See merge request espressif/esp-idf!11617
2020-12-15 19:06:33 +08:00
Ivan Grokhotkov
c8d1b18a3c
Merge branch 'bugfix/py2_socketio_v4.2' into 'release/v4.2'
...
tools: Fix requirements incompatible with Python 2 (v4.2)
See merge request espressif/esp-idf!11604
2020-12-15 18:38:43 +08:00
David Čermák
99cb0f25eb
Merge branch 'bugfix/pppos_ignored_modem_start_return_v4.2' into 'release/v4.2'
...
pppos client: modem netif fix ignoring potential modem-start error (v4.2)
See merge request espressif/esp-idf!11394
2020-12-15 16:15:27 +08:00
David Čermák
99be1aca73
Merge branch 'bugfix/fix_netsuite_tx_wrap_v4.2' into 'release/v4.2'
...
CI: esp_netif tests: Fix netsuite driver layer per wifi optimization changes (v4.2)
See merge request espressif/esp-idf!11388
2020-12-15 16:14:45 +08:00
David Čermák
7fcb8ffe0a
Merge branch 'feature/mqtt_submodule_update_23c8e1ec_v4.2' into 'release/v4.2'
...
MQTT: Update submodule reference to da850b (config, error flags, minor fixes) (v4.2)
See merge request espressif/esp-idf!11312
2020-12-15 16:13:03 +08:00
David Čermák
cbd0af7217
Merge branch 'bugfix/mdns_src_addr_cpy_v4.2' into 'release/v4.2'
...
mdns: Fix wrong mdns source address if lwIP IPv6 zoning disabled (v4.2)
See merge request espressif/esp-idf!11310
2020-12-15 16:10:55 +08:00
David Čermák
3b63476e31
Merge branch 'bugfix/backport_v4.2_fix_websocket_issue' into 'release/v4.2'
...
websocket_client: fix some issues for websocket client (backport v4.2)
See merge request espressif/esp-idf!11276
2020-12-15 16:10:12 +08:00
xutao
c0e3aa1ef8
transport: fix transport ssl blocking
...
In SSL mode, if `esp_transport_poll_read` function is used, the cache data in mebdtls will be blocked
2020-12-15 08:07:18 +00:00
Anton Maklakov
e1d62cda5f
Merge branch 'feature/ci_fix_docker_build_v4.2' into 'release/v4.2'
...
ci: Use git mirror for docker image (v4.2)
See merge request espressif/esp-idf!10445
2020-12-15 14:55:07 +08:00
Anton Maklakov
8c3526d91f
Merge branch 'bugfix/build_docs_pdf_job_v4.2' into 'release/v4.2'
...
docs: seperate build_docs html and pdf CI jobs (Backport v4.2)
See merge request espressif/esp-idf!10549
2020-12-15 14:54:00 +08:00
Anton Maklakov
f5f91a4d05
tools: Redirect some warnings to stderr
2020-12-15 13:16:50 +07:00
Anton Maklakov
3a5de540f1
ci: Ignore Python 2 deprecation warning
2020-12-15 13:16:03 +07:00
Mahavir Jain
48cd4d65e6
Merge branch 'bugfix/redirection_v4.2' into 'release/v4.2'
...
esp_http_client: Skip check for redirection counter if status code is success, fix issue with digest auth, configurable user agent string. (v4.2)
See merge request espressif/esp-idf!11597
2020-12-14 20:03:03 +08:00
Roland Dobai
9ff5f94233
tools: Fix requirements incompatible with Python 2
2020-12-14 10:48:00 +01:00
Scott Shell
fad8a27cf7
Make the UserAgent string in esp-http-client configurable
...
Signed-off-by: Shubham Kulkarni <shubham.kulkarni@espressif.com>
Merges https://github.com/espressif/esp-idf/pull/6044
2020-12-14 14:02:50 +05:30
Shubham Kulkarni
465d911052
http_auth.c: Fix crash when opaque field is not present in challenge string
...
Closes: https://github.com/espressif/esp-idf/issues/5888
2020-12-14 13:58:29 +05:30
Shubham Kulkarni
b951b5adec
esp_http_client: Skip check for redirection counter if status code is success.
...
Set disable_auto_redirect in esp_http_client example to validate this condition in CI
2020-12-14 13:58:28 +05:30
Jiang Jiang Jian
18a1bc9e7f
Merge branch 'bugfix/decouple_wifi_bt_with_coex_v4.2' into 'release/v4.2'
...
esp_wifi: decouple Wi-Fi and bluetooth with coexist to reduce binary file size(backport v4.2)
See merge request espressif/esp-idf!11542
2020-12-14 12:17:23 +08:00
Island
a23449ee23
Merge branch 'optimize/ble_mesh_provision_dev_uuid_check_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Need uuid when adding device for provisioning (v4.2)
See merge request espressif/esp-idf!11577
2020-12-14 10:15:44 +08:00
Ivan Grokhotkov
a46d8b2831
Merge branch 'bugfix/verify-directory-exists_v4.2' into 'release/v4.2'
...
Bugfix: add check for existence build directory (v4.2)
See merge request espressif/esp-idf!11581
2020-12-12 01:43:15 +08:00
lly
6510fbb66d
ble_mesh: ci: Add PB-ADV & PB-GATT sdkconfig test files
2020-12-11 13:15:54 +00:00
lly
5f2a5cdcab
ble_mesh: stack: Need uuid when adding device for provisioning
2020-12-11 13:15:54 +00:00
Island
938b9f3098
Merge branch 'feat/ble_mesh_node_local_data_func_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Add node local netkey/appkey func (v4.2)
See merge request espressif/esp-idf!11575
2020-12-11 21:13:57 +08:00
martin.gano
5bb0237860
Add checking if the build directory exists and move expression after docstring
2020-12-11 13:13:50 +01:00
Krzysztof Budzynski
c923c99f09
Merge branch 'feature/python2-deprecation-warn_v4.2' into 'release/v4.2'
...
Tools: Add Python 2 deprecation warning (v4.2)
See merge request espressif/esp-idf!11524
2020-12-11 17:26:06 +08:00
lly
7505e1458f
ble_mesh: stack: Fix wrong declaration of node bind AppKey func
2020-12-11 17:19:02 +08:00
lly
d4575ccfe9
ble_mesh: stack: Add node local netkey/appkey func
2020-12-11 17:18:22 +08:00
Ivan Grokhotkov
71e7f000c4
Merge branch 'bugfix/log-error-run-esptool_v4.2' into 'release/v4.2'
...
parttool.py: Add file stream parameter and log stdout and stderr to same stream (v4.2)
See merge request espressif/esp-idf!10516
2020-12-11 16:51:48 +08:00
Island
58afa32a1a
Merge branch 'optimize/ble_mesh_reduce_code_size_v4.2' into 'release/v4.2'
...
Optimize/ble mesh reduce code size (v4.2)
See merge request espressif/esp-idf!11518
2020-12-11 16:50:51 +08:00
daiziyan
81eb9f280f
add CN translation for adding python2 deprecation warning(MR 11115)
2020-12-11 09:16:18 +01:00
martin.gano
d0d7c53ee1
Tools: add Python 2 deprecation warning
2020-12-11 09:14:57 +01:00
lly
6f104362c7
ble_mesh: example: Update sdkconfig test files for disabling Health Server model
2020-12-10 09:32:10 +00:00
lly
da8a577408
ble_mesh: stack: Add a Kconfig option to make Health Server model optional
2020-12-10 09:32:10 +00:00
lly
2b2abcd6f9
ble_mesh: stack: Split model Kconfig menu into foundation and others
2020-12-10 09:32:10 +00:00
lly
5fd4d53922
ble_mesh: example: Fix fast provisioning compile error
2020-12-10 09:32:10 +00:00
lly
7f1a0e1552
ble_mesh: ci: Add disabling mesh model sdkconfig test files
2020-12-10 09:32:10 +00:00
lly
e4451376f3
ble_mesh: stack: Add Kconfig options to make server models optional
2020-12-10 09:32:10 +00:00
lly
2602f26753
ble_mesh: stack: Use Kconfig option to make client models optional
2020-12-10 09:32:10 +00:00
lly
9c8c56f081
ble_mesh: stack: Make some internal static functions inline
2020-12-10 09:32:10 +00:00
lly
7e945e5fa8
ble_mesh: ci: Add disabling mesh deinit sdkconfig test files
2020-12-10 09:32:10 +00:00
lly
f27a151478
ble_mesh: stack: Add a Kconfig option to make deinit optional
2020-12-10 09:32:10 +00:00
lly
01d0843c4d
ble_mesh: stack: Introduce a new header file mesh_config.h
2020-12-10 09:32:10 +00:00
Angus Gratton
1771aea076
Merge branch 'bugfix/increase_ci_build_example_parallel' into 'release/v4.2'
...
ci: Add 1 parallel count for building example
See merge request espressif/esp-idf!11554
2020-12-10 17:09:47 +08:00
lly
c3c0ca0aff
ci: Add 1 parallel count for building example
2020-12-10 13:59:36 +08:00
Jiang Jiang Jian
22b33adb2f
Merge branch 'optimization/AP_STAIPASSIGNED_passes_IP_send_through_event_data_for_4.2' into 'release/v4.2'
...
esp-event:AP_STAIPASSIGNED now passes the IP through 'event_data'(backport 4.2)
See merge request espressif/esp-idf!11241
2020-12-09 22:32:19 +08:00
Jiang Jiang Jian
e287e3ef9d
Merge branch 'bugfix/backport_some_lwip_bugs_1120_v4.2' into 'release/v4.2'
...
lw-ip:backport bugfix lwip for v4.2(backport 4.2)
See merge request espressif/esp-idf!11307
2020-12-09 22:31:32 +08:00
Jiang Jiang Jian
f03d543139
Merge branch 'bugfix/blufi_config_potential_double_free_v4.2' into 'release/v4.2'
...
Bugfix/blufi config potential double free v4.2
See merge request espressif/esp-idf!11163
2020-12-09 22:26:19 +08:00