andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed missed conflicts by 1ff8c76

Browse Source
This commit is contained in:
Norman Maurer 2017-02-22 08:58:08 +01:00
parent 1ff8c762cd
commit 5d28bd1110
1 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaders.java
View File

@ -896,13 +896,7 @@ public abstract class HttpHeaders implements Iterable<Map.Entry<String, String>>
}
/**
<<<<<<< HEAD
* @see {@link #setDateHeader(HttpMessage, CharSequence, Date)}
=======
* @deprecated Use {@link #set(CharSequence, Object)} instead.
*
* @see #setDateHeader(HttpMessage, CharSequence, Date)
>>>>>>> 0623c6c... Fix javadoc issues
*/
public static void setDateHeader(HttpMessage message, String name, Date value) {
setDateHeader(message, (CharSequence) name, value);
@ -923,13 +917,7 @@ public abstract class HttpHeaders implements Iterable<Map.Entry<String, String>>
}
/**
<<<<<<< HEAD
* @see {@link #setDateHeader(HttpMessage, CharSequence, Iterable)}
=======
* @deprecated Use {@link #set(CharSequence, Iterable)} instead.
*
* @see #setDateHeader(HttpMessage, CharSequence, Iterable)
>>>>>>> 0623c6c... Fix javadoc issues
*/
public static void setDateHeader(HttpMessage message, String name, Iterable<Date> values) {
message.headers().set(name, values);
@ -946,13 +934,7 @@ public abstract class HttpHeaders implements Iterable<Map.Entry<String, String>>
}
/**
<<<<<<< HEAD
* @see {@link #addDateHeader(HttpMessage, CharSequence, Date)}
=======
* @deprecated Use {@link #add(CharSequence, Object)} instead.
*
* @see #addDateHeader(HttpMessage, CharSequence, Date)
>>>>>>> 0623c6c... Fix javadoc issues
*/
public static void addDateHeader(HttpMessage message, String name, Date value) {
message.headers().add(name, value);
@ -1077,13 +1059,7 @@ public abstract class HttpHeaders implements Iterable<Map.Entry<String, String>>
}
/**
<<<<<<< HEAD
* @see {@link #setHost(HttpMessage, CharSequence)}
=======
* @deprecated Use {@link #set(CharSequence, Object)} instead.
*
* @see #setHost(HttpMessage, CharSequence)
>>>>>>> 0623c6c... Fix javadoc issues
*/
public static void setHost(HttpMessage message, String value) {
message.headers().set(HOST_ENTITY, value);