Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(esp_http_server): prevent concurrent access to socket used in async http requests (IDFGH-13263) #14196

Merged
merged 1 commit into from
Jul 29, 2024

Conversation

fgrfl
Copy link
Contributor

@fgrfl fgrfl commented Jul 16, 2024

This resolves #13998 with the proposed patch.

With this fix, once a request handler detaches itself from the main http thread with httpd_req_async_handler_begin, the main thread does not read from that socket until the asynchronous handler gives back the session context with httpd_req_async_handler_complete.

@CLAassistant
Copy link

CLAassistant commented Jul 16, 2024

CLA assistant check
All committers have signed the CLA.

Copy link

Messages
📖 🎉 Good Job! All checks are passing!

👋 Hello fgrfl, we appreciate your contribution to this project!


📘 Please review the project's Contributions Guide for key guidelines on code, documentation, testing, and more.

🖊️ Please also make sure you have read and signed the Contributor License Agreement for this project.

Click to see more instructions ...


This automated output is generated by the PR linter DangerJS, which checks if your Pull Request meets the project's requirements and helps you fix potential issues.

DangerJS is triggered with each push event to a Pull Request and modify the contents of this comment.

Please consider the following:
- Danger mainly focuses on the PR structure and formatting and can't understand the meaning behind your code or changes.
- Danger is not a substitute for human code reviews; it's still important to request a code review from your colleagues.
- To manually retry these Danger checks, please navigate to the Actions tab and re-run last Danger workflow.

Review and merge process you can expect ...


We do welcome contributions in the form of bug reports, feature requests and pull requests via this public GitHub repository.

This GitHub project is public mirror of our internal git repository

1. An internal issue has been created for the PR, we assign it to the relevant engineer.
2. They review the PR and either approve it or ask you for changes or clarifications.
3. Once the GitHub PR is approved, we synchronize it into our internal git repository.
4. In the internal git repository we do the final review, collect approvals from core owners and make sure all the automated tests are passing.
- At this point we may do some adjustments to the proposed change, or extend it by adding tests or documentation.
5. If the change is approved and passes the tests it is merged into the default branch.
5. On next sync from the internal git repository merged change will appear in this public GitHub repository.

Generated by 🚫 dangerJS against 4a7f371

@espressif-bot espressif-bot added the Status: Opened Issue is new label Jul 16, 2024
@github-actions github-actions bot changed the title fix(esp_http_server): prevent concurrent access to socket used in async http requests fix(esp_http_server): prevent concurrent access to socket used in async http requests (IDFGH-13263) Jul 16, 2024
@hmalpani
Copy link
Contributor

hmalpani commented Jul 16, 2024

Thanks @fgrfl for the PR.

Hello @chipweinberger, can you please take a look at the proposed change?
Thanks!

@chipweinberger
Copy link
Contributor

it's been awhile since i've looked at this code

but looks reasonable

@espressif-bot espressif-bot added Status: In Progress Work is in progress and removed Status: Opened Issue is new labels Jul 22, 2024
@hmalpani
Copy link
Contributor

sha=4a7f37105659383e154d38d89fbc89cc26e29d9a

@hmalpani hmalpani added the PR-Sync-Merge Pull request sync as merge commit label Jul 22, 2024
@espressif-bot espressif-bot added Status: Done Issue is done internally Resolution: NA Issue resolution is unavailable and removed Status: In Progress Work is in progress labels Jul 26, 2024
@espressif-bot espressif-bot merged commit 940578f into espressif:master Jul 29, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR-Sync-Merge Pull request sync as merge commit Resolution: NA Issue resolution is unavailable Status: Done Issue is done internally
Projects
None yet
Development

Successfully merging this pull request may close these issues.

esp_http_server: Reading data from PUT request in async handler doesn't return any data (IDFGH-13053)
5 participants