Merge remote branch 'upstream/maint'

* upstream/maint:
  [xmerl] Fix bug for comments in XSD files
  [xmerl] Fix error message and documentation bug
  Corrected dialyzer specs and exported some dialyzer specs

7 files changed, 27 insertions, 10 deletions

diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 1048583eca..0bcdffbeff 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -40,6 +40,12 @@
 
 -include_lib("public_key/include/public_key.hrl"). 
 
+%% Visible in API
+-export_type([connect_option/0, listen_option/0, ssl_option/0, transport_option/0,
+	      erl_cipher_suite/0, %% From ssl_cipher.hrl 
+	      tls_atom_version/0, %% From ssl_internal.hrl
+	      prf_random/0]).
+
 -record(config, {ssl,               %% SSL parameters
 		 inet_user,         %% User set inet options
 		 emulated,          %% #socket_option{} emulated
diff --git a/lib/ssl/src/ssl_certificate.erl b/lib/ssl/src/ssl_certificate.erl
index 61876e1158..0931b86782 100644
--- a/lib/ssl/src/ssl_certificate.erl
+++ b/lib/ssl/src/ssl_certificate.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -111,7 +111,7 @@ file_to_certificats(File, DbHandle) ->
     {ok, List} = ssl_manager:cache_pem_file(File, DbHandle),
     [Bin || {'Certificate', Bin, not_encrypted} <- List].
 %%--------------------------------------------------------------------
--spec validate_extension(term(), #'Extension'{} | {bad_cert, atom()} | valid,
+-spec validate_extension(term(), {extension, #'Extension'{}} | {bad_cert, atom()} | valid,
 			 term()) -> {valid, term()} |
 				    {fail, tuple()} |
 				    {unknown, term()}.
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 59133dccf0..6c06baff98 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -276,7 +276,7 @@ renegotiation(ConnectionPid) ->
 
 %%--------------------------------------------------------------------
 -spec prf(pid(), binary() | 'master_secret', binary(),
-	  binary() | ssl:prf_secret(), non_neg_integer()) ->
+	  binary() | ssl:prf_random(), non_neg_integer()) ->
 		 {ok, binary()} | {error, reason()} | {'EXIT', term()}.
 %%
 %% Description: use a ssl sessions TLS PRF to generate key material
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index ef60cac6df..2e0a3de182 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -543,7 +543,7 @@ server_key_exchange_hash(dhe_dss, Value) ->
     crypto:sha(Value).
 
 %%--------------------------------------------------------------------
--spec prf(tls_version(), binary(), binary(), binary(), non_neg_integer()) ->
+-spec prf(tls_version(), binary(), binary(), [binary()], non_neg_integer()) ->
 		 {ok, binary()} | {error, undefined}.
 %%
 %% Description: use the TLS PRF to generate key material
diff --git a/lib/xmerl/doc/src/xmerl_sax_parser.xml b/lib/xmerl/doc/src/xmerl_sax_parser.xml
index 972023622e..eb22711a75 100644
--- a/lib/xmerl/doc/src/xmerl_sax_parser.xml
+++ b/lib/xmerl/doc/src/xmerl_sax_parser.xml
@@ -206,10 +206,15 @@
            Report the end of a CDATA section.
          </item>
 
-         <tag><c>startDTD</c></tag>
+         <tag><c>{startDTD, Name, PublicId, SystemId}</c></tag>
          <item>
            Report the start of DTD declarations, it's reporting the start of the DOCTYPE declaration.
            If the document has no DOCTYPE declaration, this event will not be sent.
+            <list>
+             <item><c>Name = string()</c></item>
+             <item><c>PublicId = string()</c></item>
+             <item><c>SystemId = string()</c></item>
+            </list>
          </item>
 
          <tag><c>endDTD</c></tag>
diff --git a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
index e988c49292..df0970ef14 100644
--- a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
+++ b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
@@ -762,7 +762,7 @@ parse_attributes(?STRING_UNBOUND_REST(C, Rest), State, {Tag, AttList, NsList}) -
 		    end
 	    end;
 	false ->
-	    ?fatal_error(State,  "Invalid start character in attribute name: " ++ C)
+	    ?fatal_error(State,  "Invalid start character in attribute name: " ++ [C])
     end;
 parse_attributes(Bytes, State, CurrentTag) ->
     unicode_incomplete_check([Bytes, State, CurrentTag, fun parse_attributes/3],
@@ -2057,14 +2057,18 @@ parse_element_content(Bytes, State) ->
 parse_element_content_1(?STRING_EMPTY, State, Acc) ->
         cf(?STRING_EMPTY, State, Acc, fun parse_element_content_1/3);
 parse_element_content_1(?STRING_REST(">", Rest), State, Acc) ->
-    {lists:reverse(Acc), Rest, State};
+    {lists:reverse(delete_leading_whitespace(Acc)), Rest, State};
 parse_element_content_1(?STRING_UNBOUND_REST(C, Rest), State, Acc) ->
     parse_element_content_1(Rest, State, [C|Acc]);
 parse_element_content_1(Bytes, State, Acc) ->
     unicode_incomplete_check([Bytes, State, Acc, fun parse_element_content_1/3], 
 			     undefined).
 
-
+delete_leading_whitespace([C |Acc]) when ?is_whitespace(C)->
+    delete_leading_whitespace(Acc);
+delete_leading_whitespace(Acc) ->
+    Acc.
+								   
 %%----------------------------------------------------------------------
 %% Function  : parse_att_list_decl(Rest, State) -> Result
 %% Parameters: Rest = string() | binary()
diff --git a/lib/xmerl/src/xmerl_xsd.erl b/lib/xmerl/src/xmerl_xsd.erl
index ed0890f0d0..f0d9acb976 100644
--- a/lib/xmerl/src/xmerl_xsd.erl
+++ b/lib/xmerl/src/xmerl_xsd.erl
@@ -2338,6 +2338,8 @@ complexity([]) ->
     undefined;
 complexity([#xmlText{}|T]) ->
     complexity(T);
+complexity([#xmlComment{}|T]) ->
+    complexity(T);
 complexity([H|T]) ->
     case kind(H) of
 	simpleContent ->