[NOTE] Rerolled due to:

- Requested commit message improvements
- Squashed previous commits 4 and 5 by Daniel's request

This patched is made on top of the recent work of David Woodhouse.
It consequently fixed macros, options and switches, as well as
names. Patch has been already approved by David.

fbopenssl is finally gone. One dependency less.
What is left? Documentation has to be updated to reflect those changes.
That will be done in another patch set for the next release.

Since this is a bigger change, I would bump to 7.38.0 from 7.37.1.

GitHub diff: https://github.com/michael-o/curl/compare/1abc42b26c...6627a9b435

Testing:

Extensive tests have been made (logs are available on request privately):

Environment:
  - Corporate with a multi-realm setup
  - With filled credential cache, no credential cache and expired one (last two
    not on Windows because it is not that easy to achive that)

Clients:
  - Windows 7 64 bit (SSPI)
  - RHEL 6 (MIT Kerberos 1.10.3)
  - FreeBSD 9.2 (MIT Kerberos 1.12.1)
  - HP-UX 11.31 (MIT Kerberos 1.12.1)

Servers:
  - Apache 2.2.27 on FreeBSD with mod_spnego (MIT Kerberos 1.12.1)
  - Apache Tomcat 6 on HP-UX (JGSS 7)
  - Microsoft IIS 7.5 on Windows Server (SSPI)
  - Microsoft TMG (Proxy) on Windows Server (SSPI)

Michael Osipov (5):
  curl_gssapi: Add macros for common mechs and pass them appropriately
  HTTP: Remove checkprefix("GSS-Negotiate")
  configure/features: Add feature and version info for GSS-API and
    SPNEGO
  curl.h/features: Deprecate GSS-Negotiate macros due to bad naming
  docs: Improve inline GSS-API naming in code documentation

 configure.ac | 17 ++++++++++----
 include/curl/curl.h | 13 +++++++----
 lib/curl_gssapi.c | 20 ++++++++--------
 lib/curl_gssapi.h | 18 +++++++++++----
 lib/curl_setup.h | 2 +-
 lib/http.c | 29 ++++++++++++------------
 lib/http_negotiate.c | 45 ++++--------------------------------
 lib/http_negotiate.h | 4 ++--
 lib/http_negotiate_sspi.c | 49 +++++----------------------------------
 lib/krb5.c | 2 +-
 lib/socks.c | 8 +++----
 lib/socks.h | 2 +-
 lib/socks_gssapi.c | 58 +++++++++++++++++++++++------------------------
 lib/socks_sspi.c | 20 ++++++++--------
 lib/url.c | 18 +++++++--------
 lib/urldata.h | 12 ++++------
 lib/version.c | 9 +++++---
 src/tool_getparam.c | 12 +++++-----
 src/tool_help.c | 12 ++++++----
 19 files changed, 149 insertions(+), 201 deletions(-)

-- 
2.0.1
-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette:  http://curl.haxx.se/mail/etiquette.html