You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by iv...@apache.org on 2022/01/20 14:27:19 UTC
svn commit: r1897254 - in /apr/apr/branches/win32-pollset-wakeup-no-file-socket-emulation: file_io/win32/readwrite.c include/arch/win32/apr_arch_file_io.h
Author: ivan
Date: Thu Jan 20 14:27:19 2022
New Revision: 1897254
URL: http://svn.apache.org/viewvc?rev=1897254&view=rev
Log:
On 'win32-pollset-wakeup-no-file-socket-emulation' branch:
Remove code in win32 apr_file_t implementation that emulates working with
sockets as files. Sockets on Windows are not kernel objects and should be
used only via Winsock API.
* file_io/win32/readwrite.c
(): Do not include apr_arch_networkio.h.
(read_with_timeout): Remove APR_FILETYPE_SOCKET support code.
* include/arch/win32/apr_arch_file_io.h
(apr_filetype_e): Remove APR_FILETYPE_SOCKET enum value.
Modified:
apr/apr/branches/win32-pollset-wakeup-no-file-socket-emulation/file_io/win32/readwrite.c
apr/apr/branches/win32-pollset-wakeup-no-file-socket-emulation/include/arch/win32/apr_arch_file_io.h
Modified: apr/apr/branches/win32-pollset-wakeup-no-file-socket-emulation/file_io/win32/readwrite.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/win32-pollset-wakeup-no-file-socket-emulation/file_io/win32/readwrite.c?rev=1897254&r1=1897253&r2=1897254&view=diff
==============================================================================
--- apr/apr/branches/win32-pollset-wakeup-no-file-socket-emulation/file_io/win32/readwrite.c (original)
+++ apr/apr/branches/win32-pollset-wakeup-no-file-socket-emulation/file_io/win32/readwrite.c Thu Jan 20 14:27:19 2022
@@ -20,7 +20,6 @@
#include "apr_strings.h"
#include "apr_lib.h"
#include "apr_errno.h"
-#include "apr_arch_networkio.h"
#include "apr_arch_atime.h"
#include "apr_arch_misc.h"
@@ -74,23 +73,8 @@ static apr_status_t read_with_timeout(ap
file->pOverlapped->OffsetHigh = (DWORD)(file->filePtr >> 32);
}
- if (file->ftype == APR_FILETYPE_SOCKET) {
- WSABUF wsaData;
- DWORD flags = 0;
-
- wsaData.buf = (char*) buf;
- wsaData.len = (u_long)len;
- if (WSARecv((SOCKET)file->filehand, &wsaData, 1, &bytesread,
- &flags, NULL, NULL) == SOCKET_ERROR) {
- rv = apr_get_netos_error();
- bytesread = 0;
- }
- else {
- rv = APR_SUCCESS;
- }
- }
- else if (ReadFile(file->filehand, buf, len,
- &bytesread, file->pOverlapped)) {
+ if (ReadFile(file->filehand, buf, len,
+ &bytesread, file->pOverlapped)) {
rv = APR_SUCCESS;
}
else {
@@ -426,25 +410,9 @@ APR_DECLARE(apr_status_t) apr_file_write
if (thefile->flags & APR_FOPEN_XTHREAD) {
apr_thread_mutex_unlock(thefile->mutex);
}
- }
- else if (thefile->ftype == APR_FILETYPE_SOCKET) {
- WSABUF wsaData;
- DWORD flags = 0;
-
- wsaData.buf = (char*) buf;
- wsaData.len = (u_long)*nbytes;
- if (WSASend((SOCKET)thefile->filehand, &wsaData, 1, &bwrote,
- flags, NULL, NULL) == SOCKET_ERROR) {
- rv = apr_get_netos_error();
- bwrote = 0;
- }
- else {
- rv = APR_SUCCESS;
- }
- *nbytes = bwrote;
- }
- else {
- if (thefile->ftype != APR_FILETYPE_FILE) {
+ return rv;
+ } else {
+ if (thefile->ftype == APR_FILETYPE_PIPE) {
rv = WriteFile(thefile->filehand, buf, (DWORD)*nbytes, &bwrote,
thefile->pOverlapped);
}
Modified: apr/apr/branches/win32-pollset-wakeup-no-file-socket-emulation/include/arch/win32/apr_arch_file_io.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/win32-pollset-wakeup-no-file-socket-emulation/include/arch/win32/apr_arch_file_io.h?rev=1897254&r1=1897253&r2=1897254&view=diff
==============================================================================
--- apr/apr/branches/win32-pollset-wakeup-no-file-socket-emulation/include/arch/win32/apr_arch_file_io.h (original)
+++ apr/apr/branches/win32-pollset-wakeup-no-file-socket-emulation/include/arch/win32/apr_arch_file_io.h Thu Jan 20 14:27:19 2022
@@ -161,8 +161,7 @@ apr_status_t more_finfo(apr_finfo_t *fin
typedef enum {
APR_FILETYPE_FILE = 0,
- APR_FILETYPE_PIPE,
- APR_FILETYPE_SOCKET
+ APR_FILETYPE_PIPE
} apr_filetype_e;
struct apr_file_t {