X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=project.h;h=7918780f2e389a7e8a48c4de5de3437a3d4d4646;hb=c1814461cf26780888442d71e47413544531fbd9;hp=0999e80d0852d2ba4e1ae9d6230187c9ba349891;hpb=f9b953ed3f2bc2de510352e56dfbf91efd19ac7e;p=privoxy.git diff --git a/project.h b/project.h index 0999e80d..7918780f 100644 --- a/project.h +++ b/project.h @@ -75,6 +75,11 @@ #endif /* FEATURE_HTTPS_INSPECTION_MBEDTLS */ #ifdef FEATURE_HTTPS_INSPECTION_OPENSSL +#ifdef _WIN32 +#include +#undef X509_NAME +#undef X509_EXTENSIONS +#endif #include #include #include @@ -488,13 +493,6 @@ struct iob }; -/** - * Return the number of bytes in the I/O buffer associated with the passed - * I/O buffer. May be zero. - */ -#define IOB_PEEK(IOB) ((IOB->cur > IOB->eod) ? (IOB->eod - IOB->cur) : 0) - - /* Bits for csp->content_type bitmask: */ #define CT_TEXT 0x0001U /**< Suitable for pcrs filtering. */ #define CT_GIF 0x0002U /**< Suitable for GIF filtering. */ @@ -773,6 +771,9 @@ struct reusable_connection enum forwarder_type forwarder_type; char *gateway_host; int gateway_port; + char *auth_username; + char *auth_password; + char *forward_host; int forward_port; };