hitch.c (hitch-1.7.0) | : | hitch.c (hitch-1.7.2) | ||
---|---|---|---|---|
skipping to change at line 42 | skipping to change at line 42 | |||
* documentation are those of the authors and should not be | * documentation are those of the authors and should not be | |||
* interpreted as representing official policies, either expressed or | * interpreted as representing official policies, either expressed or | |||
* implied, of Bump Technologies, Inc. | * implied, of Bump Technologies, Inc. | |||
* | * | |||
*/ | */ | |||
#include "config.h" | #include "config.h" | |||
#include <openssl/x509.h> | #include <openssl/x509.h> | |||
#include <openssl/x509_vfy.h> | #include <openssl/x509_vfy.h> | |||
#include <openssl/engine.h> | ||||
#include <sys/socket.h> | #include <sys/socket.h> | |||
#include <sys/time.h> | #include <sys/time.h> | |||
#include <sys/types.h> | #include <sys/types.h> | |||
#include <sys/un.h> | #include <sys/un.h> | |||
#include <sys/wait.h> /* WAIT_PID */ | #include <sys/wait.h> /* WAIT_PID */ | |||
#ifdef __linux__ | #ifdef __linux__ | |||
# include <sys/prctl.h> | # include <sys/prctl.h> | |||
#endif | #endif | |||
skipping to change at line 2474 | skipping to change at line 2475 | |||
if (memcmp(buf, "PROXY ", 6) == 0) { | if (memcmp(buf, "PROXY ", 6) == 0) { | |||
if (client_proxy_proxy1(ps, b, buf, n)) | if (client_proxy_proxy1(ps, b, buf, n)) | |||
return; | return; | |||
} else if (memcmp(buf, PP2_SIG, 12) == 0) { | } else if (memcmp(buf, PP2_SIG, 12) == 0) { | |||
if (client_proxy_proxy2(ps, b, buf, n)) | if (client_proxy_proxy2(ps, b, buf, n)) | |||
return; | return; | |||
} else { | } else { | |||
LOG("{client} Received invalid PROXY/PROXYv2 header\n"); | LOG("{client} Received invalid PROXY/PROXYv2 header\n"); | |||
shutdown_proxy(ps, SHUTDOWN_SSL); | shutdown_proxy(ps, SHUTDOWN_SSL); | |||
return; | ||||
} | } | |||
ev_io_stop(loop, &ps->ev_proxy); | ev_io_stop(loop, &ps->ev_proxy); | |||
start_handshake(ps, SSL_ERROR_WANT_READ); | start_handshake(ps, SSL_ERROR_WANT_READ); | |||
} | } | |||
/* The libev I/O handler during the OpenSSL handshake phase. Basically, just | /* The libev I/O handler during the OpenSSL handshake phase. Basically, just | |||
* let OpenSSL do what it likes with the socket and obey its requests for reads | * let OpenSSL do what it likes with the socket and obey its requests for reads | |||
* or writes */ | * or writes */ | |||
static void | static void | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 2 lines changed or added |