Bug fix for OS_WIN32 errno vs. WSAGetLastError()

6 views
Skip to first unread message

Bill Kelly

unread,
Apr 16, 2013, 5:58:10 AM4/16/13
to EventMachine
Hi,

I've created a pull request for the following commit:

https://github.com/spatulasnout/eventmachine/commit/84b3d4d05d16fa2b9200705c096a18c5c0e1039b

Bug fix for OS_WIN32: Replaced errno with WSAGetLastError() where
result is compared with WSAE... codes.

Per http://msdn.microsoft.com/en-us/library/windows/desktop/ms737828%28v=vs.85%29.aspx
Error codes set by Windows Sockets are not made available through the
errno variable.

Comparison of errno values with WSAE codes was causing EventMachine
to spontaneously close socket connections when the errno value didn't
match the expected WSAE codes.


However the pull request seems to include my entire branch
history, which is not what I'd intended:

https://github.com/eventmachine/eventmachine/pull/436


Pardon my newbishness but so far I'm not sure how to create a pull
request for a single commit.


Regards,

Bill

Aman Gupta

unread,
Apr 16, 2013, 6:03:26 AM4/16/13
to eventm...@googlegroups.com
I've cherry-picked the commit to master. Thanks for the fix.

To create a pull request for this commit, you would've done something like:

git checkout -b win32-errno-fix upstream/master
git cherry-pick 84b3d4d05d16fa2b9200705c096a18c5c0e1039b
git push

and then created a pull request for the win32-errno-fix branch.

Aman
> --
> You received this message because you are subscribed to the Google Groups "EventMachine" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to eventmachine...@googlegroups.com.
> To post to this group, send email to eventm...@googlegroups.com.
> Visit this group at http://groups.google.com/group/eventmachine?hl=en.
> For more options, visit https://groups.google.com/groups/opt_out.
>
>

Bill Kelly

unread,
Apr 16, 2013, 7:02:06 AM4/16/13
to eventm...@googlegroups.com
Aman Gupta wrote:
>
> To create a pull request for this commit, you would've done something like:
>
> git checkout -b win32-errno-fix upstream/master
> git cherry-pick 84b3d4d05d16fa2b9200705c096a18c5c0e1039b
> git push
>
> and then created a pull request for the win32-errno-fix branch.

Ah, thanks!


Bill



Reply all
Reply to author
Forward
0 new messages