Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Greg Wilkins 2016-09-02 15:54:50 +10:00
commit 3b9db6bcd4
2 changed files with 2 additions and 2 deletions

View File

@ -69,7 +69,7 @@ public class HostPortHttpField extends HttpField
/* ------------------------------------------------------------ */
/** Get the port.
* @param defaultPort
* @param defaultPort The default port to return if no port set
* @return the port
*/
public int getPort(int defaultPort)

View File

@ -315,7 +315,7 @@ public class HttpFields implements Iterable<HttpField>
/**
* Add comma separated values, but only if not already
* present.
* @param header The header to add the value(s) to
* @param name The header to add the value(s) to
* @param values The value(s) to add
* @return True if headers were modified
*/