Jiang Jiang Jian
ca95f699ad
Merge branch 'feat/update_wifi_iperf_example_v6.0' into 'release/v6.0'
...
Feat: update wifi iperf example v6.0
See merge request espressif/esp-idf!46083
2026-03-21 14:08:09 +08:00
Mahavir Jain
9c6ca38ab3
Merge branch 'contrib/github_pr_18310_v6.0' into 'release/v6.0'
...
fix(esp_http_server): Dispatch PONG frames to WebSocket handler (GitHub PR) (v6.0)
See merge request espressif/esp-idf!46655
2026-03-20 19:06:42 +05:30
Rahul Tank
f00f4b73d6
Merge branch 'bugfix/fix_nimble_issues_2702026' into 'release/v6.0'
...
fix(nimble) : Fix few nimble issues 27022026
See merge request espressif/esp-idf!46096
2026-03-20 18:47:32 +05:30
Jiang Jiang Jian
329ed7ddce
Merge branch 'fix/ble_mesh_bug_report_v6.0' into 'release/v6.0'
...
Fix/ble mesh bug report (v6.0)
See merge request espressif/esp-idf!46101
2026-03-20 16:42:08 +08:00
Jiang Jiang Jian
50cae2f7b1
Merge branch 'bugfix/wps_disable_stop_scan_v6.0' into 'release/v6.0'
...
fix(wifi): Stop scan when wps is disabled (v6.0)
See merge request espressif/esp-idf!46319
2026-03-20 16:39:30 +08:00
Jiang Jiang Jian
2aaad17dc7
Merge branch 'fix/f_getfree_crash_issue_v6.0' into 'release/v6.0'
...
fix(fatfs): fix f_getfree crash when volume not mounted or mount failed (v6.0)
See merge request espressif/esp-idf!46716
2026-03-20 16:38:21 +08:00
Sumeet Singh
4e84a3df57
fix(nimble): modify logic to print mbuf in ble_hs_log_mbuf (v6.0)
2026-03-20 12:58:38 +05:30
Peter Backeris
b830f81296
fix(esp_http_server): Dispatch PONG frames to WebSocket handler
...
PONG frames (opcode 0xA) were never dispatched to the user's WebSocket
handler despite an existing comment stating they should be. The dispatch
condition `ra->ws_type < HTTPD_WS_TYPE_CLOSE` excluded PONG (0xA)
since CLOSE is 0x8.
This caused a critical secondary bug: when the server sends PING frames
and the client responds with PONG, httpd_ws_recv_frame() is never
called for the PONG, leaving the remaining frame bytes (second_byte
plus 4-byte mask_key) unconsumed in the TCP buffer. On the next
WebSocket read, these orphaned bytes are misinterpreted as a new frame
header, causing either "WS frame is not properly masked" errors or
EAGAIN timeouts with garbage length values, effectively destroying
the connection.
Add `ra->ws_type == HTTPD_WS_TYPE_PONG` to the dispatch condition so
PONG frames reach the user handler, which calls httpd_ws_recv_frame()
to properly consume the frame bytes from the socket.
Closes https://github.com/espressif/esp-idf/issues/18227
2026-03-20 15:10:52 +08:00
Chen Yudong
23aed3ef28
ci: add 'depends_components' to wifi test apps
2026-03-20 15:05:14 +08:00
Jiang Jiang Jian
cdcb4cbce8
Merge branch 'ci/esp_tee_fixes_v6.0' into 'release/v6.0'
...
feat(esp_tee): Miscellaneous fixes and improvements (v6.0)
See merge request espressif/esp-idf!46800
2026-03-20 14:47:23 +08:00
Liu Linyan
bb7035f838
fix(ble_mesh): Miscellaneous bugfixes according to our internal bug report
2026-03-20 13:59:28 +08:00
luoxu
b738036ee5
feat(ble_mesh): fixed configuration of core nums
2026-03-20 13:59:28 +08:00
morris
23e199d646
Merge branch 'feature/esp32c61_flash_psram_timing_tuning_v6.0' into 'release/v6.0'
...
feat(mspi): support 120MHz flash and psram for esp32c61 (v6.0)
See merge request espressif/esp-idf!45886
2026-03-20 13:55:06 +08:00
morris
308feafe23
Merge branch 'docs/fixed_bitscrambler_typo_v6.0' into 'release/v6.0'
...
docs(pms): fixed bitscrambler typo in pmu module (v6.0)
See merge request espressif/esp-idf!46792
2026-03-20 13:43:25 +08:00
Rahul Tank
235397dc75
feat(nimble): Added changes in examples to have code under flags
2026-03-20 11:07:00 +05:30
Rahul Tank
47038aea2f
fix(nimble): Fix tinycrypt compilation issues when enabled
2026-03-20 11:00:39 +05:30
Rahul Tank
3813ee6502
fix(nimble): Bugfixes for various issues
2026-03-20 11:00:21 +05:30
Laukik Hase
83e2777a3b
feat(esp_tee): Miscellaneous fixes and improvements
...
- Fix intermittent TEE stack underflow test failures
- Fix out-of-bounds access Coverity report from the attestation
component
- Add appropriate checks and asserts for TEE flash memory regions'
sizes
2026-03-20 10:54:14 +05:30
morris
2c0e86512d
Merge branch 'contrib/github_pr_18283_v6.0' into 'release/v6.0'
...
Kampi/feature 18282 (GitHub PR) (v6.0)
See merge request espressif/esp-idf!46473
2026-03-20 13:17:52 +08:00
morris
ef747beca2
Merge branch 'fix/disable_cam_spi_build_error_v6.0' into 'release/v6.0'
...
test(esp_cam_sensor): fixed cam_spi_slave build errors (v6.0)
See merge request espressif/esp-idf!46791
2026-03-20 13:14:44 +08:00
Jiang Jiang Jian
f99faef51d
Merge branch 'feat/support_bleqabr25_1521_v6.0' into 'release/v6.0'
...
feat(ble/bluedroid): Add an API to resolve RPA (v6.0)
See merge request espressif/esp-idf!46500
2026-03-20 11:22:55 +08:00
Jiang Jiang Jian
93c374f011
Merge branch 'bugfix/ws-transport-buffer-timeout-v6.0' into 'release/v6.0'
...
fix(ws_transport): fix WebSocket buffer overflow and timeout handling
See merge request espressif/esp-idf!46568
2026-03-20 11:21:48 +08:00
Jiang Jiang Jian
4f5a2b9e34
Merge branch 'bugfix/wps_deauth_during_scan_v6.0' into 'release/v6.0'
...
fix(wifi): ignore disconnect events outside WPS handshake phase in wps (Backport v6.0)
See merge request espressif/esp-idf!46769
2026-03-20 11:04:02 +08:00
wanckl
f784342fd2
test(esp_cam_sensor): fixed cam_spi_slave build errors
2026-03-20 11:00:57 +08:00
wanckl
ee45f289f4
test(esp_cam_sensor): fixed cam_spi_slave build errors
2026-03-20 10:58:04 +08:00
laokaiyao
114417d067
docs(pms): fixed bitscrambler typo in pmu module
2026-03-20 10:58:04 +08:00
Jiang Jiang Jian
b556757c94
Merge branch 'refactor/fatfs_vfs_change_esp_vfs_fat_register_prototype_v6.0' into 'release/v6.0'
...
refactor(fatfs): Update esp_vfs_fat_register function prototype (v6.0)
See merge request espressif/esp-idf!45980
2026-03-20 10:55:02 +08:00
Jiang Jiang Jian
9bf6972f2b
Merge branch 'fix/sdmmc_sdspi_retry_crc_check_v6.0' into 'release/v6.0'
...
fix(sdspi): 0x106 error during SD card init via SPI related fixes (v6.0)
See merge request espressif/esp-idf!45691
2026-03-20 10:51:38 +08:00
Jiang Jiang Jian
8b4c344ddd
Merge branch 'fix/vfs_missing_va_end_v6.0' into 'release/v6.0'
...
fix(storage/vfs): Remove va_end leak in ioctl caused by early return in macro (v6.0)
See merge request espressif/esp-idf!45521
2026-03-20 10:50:03 +08:00
Jiang Jiang Jian
fcd9cd1bb9
Merge branch 'feat/delete_content_length_header_with_transfer_encoding_v6.0' into 'release/v6.0'
...
fix(esp_http_client): delete Content-Length header when using Transfer-Encoding (v6.0)
See merge request espressif/esp-idf!46683
2026-03-20 10:47:57 +08:00
Jiang Jiang Jian
83c3c25a45
Merge branch 'bugfix/fix_call_spp_start_discovert_twice_crash_v6.0' into 'release/v6.0'
...
fix(bt): fix crash when calling esp_spp_start_discovery twice in succession(v6.0)
See merge request espressif/esp-idf!46664
2026-03-20 10:47:42 +08:00
Jiang Jiang Jian
5d0b18edb9
Merge branch 'fix/picolibc-specs-drop-gc-sections_v6.0' into 'release/v6.0'
...
fix(esp_libc): remove --gc-sections from picolibc.specs for CMake checks (v6.0)
See merge request espressif/esp-idf!46574
2026-03-20 10:46:55 +08:00
Jiang Jiang Jian
b32f2828aa
Merge branch 'fix/remove_unused_psa_migration_code_http_server_v6.0' into 'release/v6.0'
...
Fix/remove unused psa migration code http server (v6.0)
See merge request espressif/esp-idf!46558
2026-03-20 10:46:35 +08:00
Jiang Jiang Jian
1aba789643
Merge branch 'fix/flaky_test_with_memory_leak_v6.0' into 'release/v6.0'
...
fix(esp_system): Fix flaky tests with memory leak in sleep test (v6.0)
See merge request espressif/esp-idf!46415
2026-03-20 10:40:05 +08:00
Jiang Jiang Jian
d6000ccecd
Merge branch 'feat/use_common_config_to_sel_crypt_lib_v6.0' into 'release/v6.0'
...
Feat/use common config to sel crypt lib (v6.0)
See merge request espressif/esp-idf!46408
2026-03-20 10:39:59 +08:00
Jiang Jiang Jian
bea959e55f
Merge branch 'bugfix/fix_kconfig_for_ble_cte_depends_v6.0' into 'release/v6.0'
...
bugfix(ble): remove BT_LE_SECURITY_ENABLE dependency for CTE on ESP32-C5 (v6.0)
See merge request espressif/esp-idf!46342
2026-03-20 10:39:26 +08:00
Jiang Jiang Jian
edf0bf67de
Merge branch 'fix/use_apb_max_state_for_ble_events_v6.0' into 'release/v6.0'
...
fix(ble): use apb max state for bt and enable should skip (v6.0)
See merge request espressif/esp-idf!46334
2026-03-20 10:39:19 +08:00
Jiang Jiang Jian
77d11e6381
Merge branch 'fix/ble_hci_log_direction_v6.0' into 'release/v6.0'
...
feat(ble_log): encode HCI direction in ble_log pipeline (v6.0)
See merge request espressif/esp-idf!46303
2026-03-20 10:38:49 +08:00
Jiang Jiang Jian
7908812022
Merge branch 'bugfix/fix_blufi_nimble_gatt_pkt_v6.0' into 'release/v6.0'
...
fix(blufi): Handle flattened ATT write payloads correctly in NimBLE BLUFI host (v6.0)
See merge request espressif/esp-idf!46260
2026-03-20 10:38:43 +08:00
Jiang Jiang Jian
ea5e61dba8
Merge branch 'bugfix/support_for_alt_snounce_v6.0' into 'release/v6.0'
...
fix(esp_wifi): Add alt snonce verification in softAP (v6.0)
See merge request espressif/esp-idf!46249
2026-03-20 10:38:26 +08:00
Jiang Jiang Jian
c9daea6b54
Merge branch 'feat/improve_ws_server_handshake_handling_v6.0' into 'release/v6.0'
...
feat(http_server): improve websocket server handling (v6.0)
See merge request espressif/esp-idf!46247
2026-03-20 10:38:23 +08:00
Jiang Jiang Jian
4922d627cd
Merge branch 'feat/ble_bluedroid_log_full_compression_enable_v6.0' into 'release/v6.0'
...
feat(ble_mesh): enable log full compression function for bluedroid host (v6.0)
See merge request espressif/esp-idf!46156
2026-03-20 10:37:19 +08:00
Jiang Jiang Jian
e4caa65b0b
Merge branch 'fix/ble_mesh_nimble_connection_failed_v6.0' into 'release/v6.0'
...
fix(ble_mesh):fixed nimble connection failed (v6.0)
See merge request espressif/esp-idf!46118
2026-03-20 10:37:10 +08:00
Jiang Jiang Jian
00fca66b48
Merge branch 'fix/apptrace_rb_init_v6.0' into 'release/v6.0'
...
fix(app_trace): Fix warning in ring buffer initialization (v6.0)
See merge request espressif/esp-idf!46063
2026-03-20 10:36:21 +08:00
Jiang Jiang Jian
37580eaf5d
Merge branch 'fix/c61_wp_bp_nums_v6.0' into 'release/v6.0'
...
Fix number of available BPs/WPs for esp32c61 (v6.0)
See merge request espressif/esp-idf!46032
2026-03-20 10:35:51 +08:00
morris
a7650a3260
Merge branch 'feat/add_jpeg_pixel_reverse_enc_etc_v6.0' into 'release/v6.0'
...
feat(jpeg): Add config for reversing input pixel format in jpeg encoder (backport v6.0)
See merge request espressif/esp-idf!46381
2026-03-20 10:35:35 +08:00
Jiang Jiang Jian
780907b01e
Merge branch 'fix/p4_120_suspened_v6.0' into 'release/v6.0'
...
fix(spi_flash): Fix esp32p4 120m flash suspend failed (backport v6.0)
See merge request espressif/esp-idf!46045
2026-03-20 10:35:05 +08:00
Jiang Jiang Jian
88e7db86d5
Merge branch 'contrib/github_pr_18241_v6.0' into 'release/v6.0'
...
fix(esp_https_server): SSL context leak when HTTPS server fails to start (GitHub PR) (v6.0)
See merge request espressif/esp-idf!45988
2026-03-20 10:33:57 +08:00
Jiang Jiang Jian
45f2afa1cd
Merge branch 'update/spiffs_sync_upstream_6.0' into 'release/v6.0'
...
change(spiffs): upgrade spiffs module to 0.2-265-gad902ca version (v6.0)
See merge request espressif/esp-idf!45968
2026-03-20 10:33:25 +08:00
Jiang Jiang Jian
2676490557
Merge branch 'feat/fix_esp32c2_rom_rewrite_issue_rebase_v6.0' into 'release/v6.0'
...
Feat/fix esp32c2 rom rewrite issue rebase (v6.0)
See merge request espressif/esp-idf!45769
2026-03-20 10:30:46 +08:00