honeymoose
/
jjwt
mirror of https://github.com/jwtk/jjwt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into jwe 

# Conflicts:
#	src/main/java/io/jsonwebtoken/Header.java
#	src/main/java/io/jsonwebtoken/impl/DefaultHeader.java
This commit is contained in:
Les Hazlewood 2016-04-17 13:54:07 -07:00
parent a543545dcf e392524919
commit cb5734d8a6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/io/jsonwebtoken/Header.java
View File

@ -51,8 +51,9 @@ public interface Header<T extends Header<T>> extends Map<String,Object> {
/** JWT {@code Compression Algorithm} header parameter name: <code>"zip"</code> */ /** JWT {@code Compression Algorithm} header parameter name: <code>"zip"</code> */
public static final String COMPRESSION_ALGORITHM = "zip"; public static final String COMPRESSION_ALGORITHM = "zip";
/** JJWT legacy/deprecated {@code Compression Algorithm} header parameter names <code>"calg"</code> /** JJWT legacy/deprecated compression algorithm header parameter name: <code>"calg"</code>
* @deprecated use {@link #COMPRESSION_ALGORITHM} instead. */ * @deprecated use {@link #COMPRESSION_ALGORITHM} instead. */
@Deprecated
public static final String DEPRECATED_COMPRESSION_ALGORITHM = "calg"; public static final String DEPRECATED_COMPRESSION_ALGORITHM = "calg";
/** /**