Skip to content

Pr 171 merge main#188

Merged
FoamyGuy merged 2 commits intoadafruit:mainfrom
FoamyGuy:pr_171_merge_main
Jan 23, 2026
Merged

Pr 171 merge main#188
FoamyGuy merged 2 commits intoadafruit:mainfrom
FoamyGuy:pr_171_merge_main

Conversation

@FoamyGuy
Copy link
Contributor

This PR supersedes #171. I tried to merge main and resolve conflicts in that branch, but library maintainers do not have access to push to the branch so I cannot update the PR.

Will close #171 in favor of this one which has main merged and is all up to date.

aggieNick02 and others added 2 commits October 10, 2024 12:13
failures.

The issue is caused by the code checking socket status *after* checking
if bytes are available. Bytes may have become available between the
last byte available check and the socket status check. This causes us to
incorrectly ignore the newly available bytes and return 0 to the caller,
which in any blocking/timeout scenario tells the caller no more bytes
will ever be available.

This was introduced in commit 89b9f10
See also
adafruit#151
as a fix for
adafruit#135
# Conflicts:
#	adafruit_wiznet5k/adafruit_wiznet5k_socketpool.py
Copy link
Contributor Author

@FoamyGuy FoamyGuy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change makes sense and looks good to me. I tested it successfully with the simpletest, httpserver, and aio_post examples from this repo with an Ethernet FeatherWing + Feather RP2350.

@FoamyGuy FoamyGuy merged commit fa2e95d into adafruit:main Jan 23, 2026
1 check passed
adafruit-adabot pushed a commit to adafruit/Adafruit_CircuitPython_Bundle that referenced this pull request Jan 24, 2026
Updating https://github.com/adafruit/Adafruit_CircuitPython_Wiznet5k to 7.4.1 from 7.3.1:
  > Merge pull request adafruit/Adafruit_CircuitPython_Wiznet5k#188 from FoamyGuy/pr_171_merge_main
  > Merge pull request adafruit/Adafruit_CircuitPython_Wiznet5k#178 from fasteddy516/match_core_sockets
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants