[MOD] web:response-header: deprecated 'message' attribute dropped

Author: ChristianGruen

basex-api/src/main/java/org/basex/http/HTTPConnection.java

@@ -187,7 +187,7 @@ public ArrayList<MediaType> accepts() {
    */
   public void error(final int code, final String info) throws IOException {
     log(code, info);
-    status(code, null, info);
+    status(code, info);
   }
 
   /**
@@ -304,19 +304,17 @@ void stop(final JobException ex) throws IOException {
       response.getOutputStream().write(token(info));
     } catch(final IllegalStateException e) {
       // too late (response has already been committed)
-      logError(code, null, info, e);
+      logError(code, info, e);
     }
   }
 
   /**
    * Sets a status and sends an info message.
    * @param code status code
-   * @param message status message (can be {@code null})
    * @param body message for response body (can be {@code null})
    * @throws IOException I/O exception
    */
-  @SuppressWarnings("deprecation")
-  public void status(final int code, final String message, final String body) throws IOException {
+  public void status(final int code, final String body) throws IOException {
     try {
       response.resetBuffer();
       if(code == SC_UNAUTHORIZED && !response.containsHeader(WWW_AUTHENTICATE)) {
@@ -330,21 +328,13 @@ public void status(final int code, final String message, final String body) thro
         response.setHeader(WWW_AUTHENTICATE, header.toString());
       }
 
-      final int c = code < 0 || code > 999 ? 500 : code;
-      if(message == null) {
-        response.setStatus(c);
-      } else {
-        // do not allow Jetty to create a custom error html page
-        // control characters and non-ASCII codes will be removed (GH-1632)
-        response.setStatus(c, message.replaceAll("[^\\x20-\\x7F]", "?"));
-      }
-
+      response.setStatus(code < 0 || code > 999 ? 500 : code);
       if(body != null) {
         response.setContentType(MediaType.TEXT_PLAIN + "; " + CHARSET + '=' + Strings.UTF8);
         response.getOutputStream().write(new TokenBuilder(token(body)).normalize().finish());
       }
     } catch(final IllegalStateException | IllegalArgumentException ex) {
-      logError(code, message, body, ex);
+      logError(code, body, ex);
     }
   }
 
@@ -589,17 +579,13 @@ private String getRemoteAddr() {
   /**
    * Sets a status and sends an info message.
    * @param code status code
-   * @param message status message (can be {@code null})
    * @param info detailed information (can be {@code null})
    * @param ex exception
    */
-  private void logError(final int code, final String message, final String info,
-      final Exception ex) {
-
+  private void logError(final int code, final String info, final Exception ex) {
     final StringBuilder sb = new StringBuilder();
     sb.append("Code: ").append(code);
     if(info != null) sb.append(", Info: ").append(info);
-    if(message != null) sb.append(", Message: ").append(message);
     sb.append(", Error: ").append(Util.message(ex));
     log(SC_INTERNAL_SERVER_ERROR, sb.toString());
   }

basex-api/src/main/java/org/basex/http/restxq/RestXqResponse.java

@@ -37,8 +37,6 @@ final class RestXqResponse extends WebResponse {
   private boolean registered;
   /** Function. */
   private RestXqFunction func;
-  /** Status message. */
-  private String message;
   /** Status code. */
   private Integer status;
   /** Forwarding. */
@@ -116,13 +114,12 @@ public Response serialize(final boolean body) throws QueryException, IOException
       if(status != null) {
         final int s = status;
         final StringBuilder msg = new StringBuilder();
-        if(message != null) msg.append(message);
         if(s == 302) {
           if(!msg.isEmpty()) msg.append("; ");
           msg.append(HTTPText.LOCATION + ": ").append(conn.response.getHeader(HTTPText.LOCATION));
         }
         conn.log(s, msg.toString());
-        conn.status(s, message, null);
+        conn.status(s, null);
       }
 
       // serialize result
@@ -178,17 +175,14 @@ private SerializerOptions build(final GNode response) throws QueryException {
       // process http:response element
       if(T_HTTP_RESPONSE.matches(node)) {
         // check status and reason
-        byte[] sta = null, msg = null;
+        byte[] sta = null;
         for(final GNode a : node.attributeIter()) {
           final QNm qnm = a.qname();
           if(qnm.eq(Q_STATUS)) sta = a.string();
-          else if(qnm.eq(Q_REASON) || qnm.eq(Q_MESSAGE)) msg = a.string();
+          else if(qnm.eq(Q_REASON) || qnm.eq(Q_MESSAGE)); // ignored
           else throw func.error(UNEXP_NODE_X, a);
         }
-        if(sta != null) {
-          status = toInt(sta);
-          message = msg != null ? string(msg) : null;
-        }
+        if(sta != null) status = toInt(sta);
 
         for(final GNode gchild : node.childIter()) {
           final XNode child = (XNode) gchild;