"Henrik Nordström" <hen...@henriknordstrom.net> wrote in message news:1281821946.9220.16.ca...@henriknordstrom.net...
lör 2010-08-14 klockan 21:10 +0100 skrev Markus Moeller:Hi,Please find attached a patch to add Proxy- and WWW-Authenticate. Regards MarkusLooks fine, but need to be wrapped up in kerberos ifdefs, same as used for the main code kerberos client.
Oh yes. Here it is.I have also a WIN32 version, but I can't get squid-3-head compiled under cygwin to test.
$ make Making all in compat make[1]: Entering directory `/home/markus/squid-3/compat'/bin/sh ../libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I.. -I../include -I../src -I../include -Wall -Wpointer-arith -Wwrite-strings -Wcomments -Werror -pipe -D_REENTRANT -g -O2 -MT assert.lo -MD -MP -MF .deps/assert.Tpo -c -o assert.lo assert.cc libtool: compile: g++ -DHAVE_CONFIG_H -I.. -I../include -I../src -I../include -Wall -Wpointer-arith -Wwrite-strings -Wcomments -Wer ror -pipe -D_REENTRANT -g -O2 -MT assert.lo -MD -MP -MF .deps/assert.Tpo -c assert.cc -DDLL_EXPORT -DPIC -o .libs/assert.o In file included from /usr/lib/gcc/i686-pc-cygwin/4.3.4/../../../../include/w32api/ws2tcpip.h:19,
from ../compat/os/mswin.h:221,
from ../compat/compat.h:69,
from ../include/config.h:68,
from assert.cc:34:
/usr/lib/gcc/i686-pc-cygwin/4.3.4/../../../../include/w32api/winsock2.h:103:2:
error: #warning "fd_set and associated macros have be
en defined in sys/types. This may cause runtime problems with W32
sockets"
In file included from
/usr/lib/gcc/i686-pc-cygwin/4.3.4/../../../../include/w32api/ws2tcpip.h:19,
from ../compat/os/mswin.h:221,
from ../compat/compat.h:69,
from ../include/config.h:68,
from assert.cc:34:
/usr/lib/gcc/i686-pc-cygwin/4.3.4/../../../../include/w32api/winsock2.h:632:
error: declaration of C function 'int select(int, _type
s_fd_set*, _types_fd_set*, _types_fd_set*, const timeval*)' conflicts with/usr/include/sys/select.h:31: error: previous declaration 'int select(int, _types_fd_set*, _types_fd_set*, _types_fd_set*, timeval*)
' here
In file included from ../compat/compat.h:69,
from ../include/config.h:68,
from assert.cc:34:
../compat/os/mswin.h: In function 'int close(int)':
../compat/os/mswin.h:358: error: '_get_osfhandle' was not declared in this
scope
../compat/os/mswin.h:366: error: '_free_osfhnd' was not declared in this
scope
../compat/os/mswin.h:367: error: '__pioinfo' was not declared in this scope ../compat/os/mswin.h:370: error: '_close' was not declared in this scope ../compat/os/mswin.h: In function 'int read(int, void*, size_t)':../compat/os/mswin.h:395: error: '_get_osfhandle' was not declared in this scope
../compat/os/mswin.h:400: error: '_read' was not declared in this scope ../compat/os/mswin.h: In function 'int write(int, const void*, size_t)':../compat/os/mswin.h:408: error: '_get_osfhandle' was not declared in this scope
../compat/os/mswin.h:413: error: '_write' was not declared in this scope../compat/os/mswin.h: In function 'int Squid::accept(int, sockaddr*, size_t*)': ../compat/os/mswin.h:431: error: '_get_osfhandle' was not declared in this scope ../compat/os/mswin.h:436: error: '_open_osfhandle' was not declared in this scope
../compat/os/mswin.h: In function 'int Squid::bind(int, sockaddr*, int)':../compat/os/mswin.h:442: error: '_get_osfhandle' was not declared in this scope ../compat/os/mswin.h: In function 'int Squid::connect(int, const sockaddr*, int)': ../compat/os/mswin.h:452: error: '_get_osfhandle' was not declared in this scope ../compat/os/mswin.h: In function 'int Squid::getsockname(int, sockaddr*, size_t*)': ../compat/os/mswin.h:492: error: '_get_osfhandle' was not declared in this scope ../compat/os/mswin.h: In function 'int Squid::getsockopt(int, int, int, void*, int*)': ../compat/os/mswin.h:514: error: '_get_osfhandle' was not declared in this scope
../compat/os/mswin.h: In function 'int Squid::ioctl(int, int, void*)':../compat/os/mswin.h:525: error: '_get_osfhandle' was not declared in this scope ../compat/os/mswin.h: In function 'int Squid::ioctlsocket(int, long int, u_long*)': ../compat/os/mswin.h:535: error: '_get_osfhandle' was not declared in this scope
../compat/os/mswin.h: In function 'int Squid::listen(int, int)':../compat/os/mswin.h:545: error: '_get_osfhandle' was not declared in this scope ../compat/os/mswin.h: In function 'int Squid::recv(int, void*, size_t, int)': ../compat/os/mswin.h:558: error: '_get_osfhandle' was not declared in this scope ../compat/os/mswin.h: In function 'int Squid::recvfrom(int, void*, size_t, int, sockaddr*, size_t*)': ../compat/os/mswin.h:569: error: '_get_osfhandle' was not declared in this scope ../compat/os/mswin.h: In function 'int Squid::send(int, const void*, size_t, int)': ../compat/os/mswin.h:592: error: '_get_osfhandle' was not declared in this scope ../compat/os/mswin.h: In function 'int Squid::sendto(int, const void*, size_t, int, const sockaddr*, int)': ../compat/os/mswin.h:603: error: '_get_osfhandle' was not declared in this scope ../compat/os/mswin.h: In function 'int Squid::setsockopt(SOCKET, int, int, const char*, int)': ../compat/os/mswin.h:615: error: '_get_osfhandle' was not declared in this scope
../compat/os/mswin.h: In function 'int Squid::shutdown(int, int)':../compat/os/mswin.h:628: error: '_get_osfhandle' was not declared in this scope
../compat/os/mswin.h: In function 'int Squid::socket(int, int, int)':../compat/os/mswin.h:644: error: '_open_osfhandle' was not declared in this scope ../compat/os/mswin.h: In function 'int Squid::WSAAsyncSelect(int, HWND__*, unsigned int, long int)': ../compat/os/mswin.h:651: error: '_get_osfhandle' was not declared in this scope ../compat/os/mswin.h: In function 'int Squid::WSADuplicateSocket(int, DWORD, _WSAPROTOCOL_INFOA*)': ../compat/os/mswin.h:665: error: '_get_osfhandle' was not declared in this scope ../compat/os/mswin.h: In function 'int Squid::WSASocket(int, int, int, _WSAPROTOCOL_INFOA*, GROUP, DWORD)': ../compat/os/mswin.h:687: error: '_open_osfhandle' was not declared in this scope
In file included from /usr/include/unistd.h:4,
from ../compat/debug.h:18,
from ../compat/compat.h:96,
from ../include/config.h:68,
from assert.cc:34:
../compat/os/mswin.h: At global scope:
../compat/os/mswin.h:354: error: previous declaration of 'int close(int)'
with 'C++' linkage
/usr/include/sys/unistd.h:29: error: conflicts with new declaration with 'C'
linkage
/usr/include/sys/unistd.h:89: error: declaration of C function 'int
getpagesize()' conflicts with
../compat/os/mswin.h:749: error: previous declaration 'size_t getpagesize()'
here
../compat/os/mswin.h:391: error: previous declaration of 'int read(int,
void*, size_t)' with 'C++' linkage
/usr/include/sys/unistd.h:138: error: conflicts with new declaration with
'C' linkage
/usr/include/sys/unistd.h:171: error: 'unsigned int Sleep' redeclared as
different kind of symbol
/usr/lib/gcc/i686-pc-cygwin/4.3.4/../../../../include/w32api/winbase.h:1995:
error: previous declaration of 'void Sleep(DWORD)'
/usr/include/sys/unistd.h:171: error: expected primary-expression before
'unsigned'
/usr/include/sys/unistd.h:171: error: expected `)' before 'unsigned'../compat/os/mswin.h:404: error: previous declaration of 'int write(int, const void*, size_t)' with 'C++' linkage /usr/include/sys/unistd.h:183: error: conflicts with new declaration with 'C' linkage
make[1]: *** [assert.lo] Error 1 make[1]: Leaving directory `/home/markus/squid-3/compat' make: *** [all-recursive] Error 1
Regards Henrik
RegardsMarkus
squid-3-head-tools-20100815.diff
Description: Binary data
