Attachment 39672 Details for Bug 68912 – Patch that adds RFC9110 status codes

[patch] Patch that adds RFC9110 status codes

rfc9110.diff (text/plain), 34.81 KB, created by Michiel on 2024-04-17 19:27:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michiel

Created: 2024-04-17 19:27:54 UTC

Size: 34.81 KB

patch

obsolete

>Index: docs/conf/extra/httpd-multilang-errordoc.conf.in
>===================================================================
>--- docs/conf/extra/httpd-multilang-errordoc.conf.in	(revision 1917070)
>+++ docs/conf/extra/httpd-multilang-errordoc.conf.in	(working copy)
>@@ -41,8 +41,8 @@
> ErrorDocument 410 /error/HTTP_GONE.html.var
> ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
> ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
>-ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
>-ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
>+ErrorDocument 413 /error/HTTP_CONTENT_TOO_LARGE.html.var
>+ErrorDocument 414 /error/HTTP_URI_TOO_LONG.html.var
> ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
> ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
> ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
>Index: docs/error/HTTP_CONTENT_TOO_LARGE.html.var
>===================================================================
>Index: docs/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
>===================================================================
>--- docs/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var	(revision 1917070)
>+++ docs/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var	(nonexistent)
>@@ -1,282 +0,0 @@
>-Content-language: cs
>-Content-type: text/html; charset=UTF-8
>-Body:----------cs--
>-
>-
>- Metoda 
>- nedovoluje pÅenos dat nebo objem dat
>- pÅesahuje kapacitnÃ limit.
>-
>-
>-----------cs--
>-
>-Content-language: de
>-Content-type: text/html; charset=UTF-8
>-Body:----------de--
>-
>-
>- Die bei der Anfrage &uuml;bermittelten Daten sind f&uuml;r
>- die -Methode
>- nicht erlaubt oder die Datenmenge hat das Maximum &uuml;berschritten.
>-
>-
>-----------de--
>-
>-Content-language: en
>-Content-type: text/html; charset=UTF-8
>-Body:----------en--
>-
>-
>- The 
>- method does not allow the data transmitted, or the data volume
>- exceeds the capacity limit.
>-
>-
>-----------en--
>-
>-Content-language: es
>-Content-type: text/html
>-Body:----------es--
>-
>-
>-
>- El m&eacute;todo 
>- no permite transmitir la informaci&oacute;n, o el
>- volumen de la informaci&oacute;n excede los l&iacute;mites
>- de capacidad del mismo.
>-
>-
>-----------es--
>-
>-Content-language: fr
>-Content-type: text/html; charset=UTF-8
>-Body:----------fr--
>-
>-
>- La m&eacute;thode 
>- n'autorise pas le transfert de ces donn&eacute;es ou bien le volume
>- des donn&eacute;es exc&egrave;de la limite de capacit&eacute;.
>-
>- 
>-----------fr--
>-
>-Content-language: ga
>-Content-type: text/html; charset=UTF-8
>-Body:----------ga--
>-
>-
>- N&iacute; ligeann an modh  an
>- tarchur sonra&iacute;ocht tr&iacute;d, n&oacute; t&aacute; an m&eacute;id
>- sonra&iacute;ocht breis ar an teoireann cumas.
>-
>-
>-----------ga--
>-
>-Content-language: it
>-Content-type: text/html; charset=UTF-8
>-Body:----------it--
>-
>-
>- Il metodo 
>- non consente di trasferire dati, oppure la quantit&agrave; di dati
>- richiesti &egrave; eccessiva.
>-
>-
>-----------it--
>-
>-Content-language: ja
>-Content-type: text/html; charset=UTF-8
>-Body:----------ja--
>-
>-
>- 
>- ã¡ã½ããããã¼ã¿ã®éä¿¡ãè¨±å¯ãã¦ããªããã
>- ãã¼ã¿éãè¨±å®¹éãè¶ãã¦ãã¾ãã
>-
>-
>-----------ja--
>-
>-Content-language: ko
>-Content-type: text/html; charset=UTF-8
>-Body:----------ko--
>-
>-
>-  ë°©ìì
>- ìì²ì¼ë¡ë ë´ì©ì ë³´ë¼ ì ìê±°ë, ëë ë³´ë´ì¨ ë´ì©ì´ ê·¸ ë°©ììì íì©íë
>- ìµë ê¸¸ì´ë¥¼ ëììµëë¤.
>-
>-
>-----------ko--
>-
>-Content-language: nl
>-Content-type: text/html; charset=UTF-8
>-Body:----------nl--
>-
>-
>- Het  type methode laat niet toe
>- data te versturen of het datavolume is groter dan maximaal toegelaten.
>-
>-
>-----------nl--
>-
>-Content-language: nb
>-Content-type: text/html; charset=UTF-8
>-Body:----------nb--
>-
>-
>-  metoden tillater ikke
>- de sendte data eller sÃ¥ overskrider datamengenden
>- kapasitetsbegrensningen.
>-
>-
>-----------nb--
>-
>-Content-language: pl
>-Content-type: text/html; charset=UTF-8
>-Body:----------pl--
>-
>-
>- Metoda 
>- nie zezwala na typ przesy&#322;anych danych lub rozmiar danych przekracza
>- ustalony limit.
>-
>-
>-----------pl--
>-
>-Content-language: pt-br
>-Content-type: text/html; charset=UTF-8
>-Body:-------pt-br--
>-
>-
>- O m&eacute;todo 
>- n&atilde;o permite a transmiss&atilde;o dos dados,
>- ou o volume de dados excede a capacidade limite.
>- 
>-
>--------pt-br--
>-
>-Content-language: pt
>-Content-type: text/html; charset=ISO-8859-1
>-Body:----------pt--
>-
>-
>-	O m&eacute;todo 
>-	n&atilde;o permite todos os dados que foram transmitidos,
>-	ou o volume de dados excede o limite da capacidade.
>-
>-
>-----------pt--
>-
>-Content-language: ro
>-Content-type: text/html; charset=UTF-8
>-Body:----------ro--
>-
>-
>- Metoda 
>- nu permite transmiterea datelor, sau volumul de date
>- depaseste limita capacitatii.
>-
>-
>-----------ro--
>-
>-Content-language: ru
>-Content-type: text/html; charset=UTF-8
>-Body:----------ru--
>-
>-
>- Ð¢Ð¸Ð¿ Ð¿ÐµÑÐµÐ´Ð°Ð²Ð°ÐµÐ¸ÑÑ Ð´Ð°Ð½Ð½ÑÑ Ð·Ð°Ð¿ÑÐµÑÑÐ½ Ð¼ÐµÑÐ¾Ð´Ð¾Ð¼ ,
>- Ð¸Ð»Ð¸ ÑÐ°Ð·Ð¼ÐµÑÐ° ÑÐµÐ»Ð° Ð·Ð°Ð¿ÑÐ¾ÑÐ° ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð²ÐµÐ»Ð¸Ðº.
>-
>-
>-----------ru--
>-
>-Content-language: sr
>-Content-type: text/html; charset=UTF-8
>-Body:----------sr--
>-
>-
>- 
>- Ð¼ÐµÑÐ¾Ð´ Ð½Ðµ Ð´Ð¾Ð·Ð²Ð¾ÑÐ°Ð²Ð° Ð¿ÑÐµÐ½Ð¾Ñ Ð¾Ð²Ð¸Ñ Ð¿Ð¾Ð´Ð°ÑÐ°ÐºÐ°, Ð¸Ð»Ð¸ ÐºÐ¾Ð»Ð¸ÑÐ¸Ð½Ð° Ð¿Ð¾Ð´Ð°ÑÐ°ÐºÐ°
>- Ð¿ÑÐµÐ¼Ð°ÑÑÑÐµ Ð¾Ð³ÑÐ°Ð½Ð¸ÑÐµÑÐ° Ð¼Ð¾Ð³ÑÑÐ½Ð¾ÑÑÐ¸.
>-
>-
>-----------sr--
>-
>-Content-language: sv
>-Content-type: text/html; charset=UTF-8
>-Body:----------sv--
>-
>-
>-  metoden till&aring;ter
>- inte den skickade datan eller s&aring; &ouml;verskrider datavolymen
>- kapacitetsniv&aring;n.
>-
>-
>-----------sv--
>-
>-Content-language: tr
>-Content-type: text/html; charset=UTF-8
>-Body:----------tr--
>-
>-
>-  yÃ¶ntemi ya veri aktarÄ±mÄ±na
>- izin vermiyor ya da veri hacmi iÅlenemeyecek kadar bÃ¼yÃ¼k.
>-
>-
>-----------tr--
>-
>-Content-language: zh-cn
>-Content-type: text/html; charset=UTF-8
>-Body:----------zh-cn--
>-
>-
>-  æ¹æ³ä¸åè®¸ä¼ è¾æ°æ®ï¼ææ°æ®éè¶è¿å®¹ééå¶ã
>-
>-
>-----------zh-cn--
>-
>-Content-language: zh-tw
>-Content-type: text/html; charset=UTF-8
>-Body:----------zh-tw--
>-
>-
>-  æ¹æ³ä¸åè¨±å³è¼¸è³æï¼æè³æéè¶éå®¹ééå¶ã
>-
>-
>-----------zh-tw--
>
>Property changes on: docs/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Index: docs/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
>===================================================================
>--- docs/error/HTTP_REQUEST_URI_TOO_LARGE.html.var	(revision 1917070)
>+++ docs/error/HTTP_REQUEST_URI_TOO_LARGE.html.var	(nonexistent)
>@@ -1,271 +0,0 @@
>-Content-language: cs
>-Content-type: text/html; charset=UTF-8
>-Body:----------cs--
>-
>-
>- DÃ©lka poÅ¾adovanÃ©ho URL pÅesahuje kapacitnÃ limit tohoto
>- serveru. PoÅ¾adavek nemÅ¯Å¾e bÃ½t zpracovÃ¡n.
>- 
>-
>-----------cs--
>-
>-Content-language: de
>-Content-type: text/html; charset=UTF-8
>-Body:----------de--
>-
>-
>- Der bei der Anfrage &uuml;bermittelte URI &uuml;berschreitet
>- die maximale L&auml;nge.
>- Die Anfrage kann nicht ausgef&uuml;hrt werden.
>- 
>-
>-----------de--
>-
>-Content-language: en
>-Content-type: text/html; charset=UTF-8
>-Body:----------en--
>-
>-
>- The length of the requested URL exceeds the capacity limit for
>-	this server. The request cannot be processed.
>- 
>-
>-----------en--
>-
>-Content-language: es
>-Content-type: text/html
>-Body:----------es--
>-
>-
>-
>- La longitud de la URL solicitada excede el l&iacute;mite de
>- capacidad para este servidor. No se puede procesar la solicitud.
>-
>-
>-----------es--
>-
>-Content-language: fr
>-Content-type: text/html; charset=UTF-8
>-Body:----------fr--
>-
>-
>- La longueur de l'URL demand&eacute;e exc&egrave;de la limite de
>- capacit&egrave; pour ce serveur. Nous ne pouvons donner suite
>- &agrave; votre requ&ecirc;te.
>-
>-
>-----------fr--
>-
>-Content-language: ga
>-Content-type: text/html; charset=UTF-8
>-Body:----------ga--
>-
>-
>- T&aacute; faid an URL iarraithe breis ar an teorainn cumas don 
>- freastala&iacute; seo. N&iacute; f&eacute;idir an iarratas a
>- phr&oacute;ise&aacute;il.
>-
>-
>-----------ga--
>-
>-Content-language: it
>-Content-type: text/html; charset=UTF-8
>-Body:----------it--
>-
>-
>- La lunghezza dell'indirizzo (URL) trasmesso supera il
>- limite massimo imposto da questo server.
>- La richiesta non pu&ograve; essere soddisfatta.
>-
>-
>-----------it--
>-
>-Content-language: ja
>-Content-type: text/html; charset=UTF-8
>-Body:----------ja--
>-
>-
>- ãªã¯ã¨ã¹ãã® URL ã®é·ãããæ±ããé·ããè¶ãã¦ãã¾ãã
>- ãªã¯ã¨ã¹ãã®å¦çãç¶ãããã¾ããã
>- 
>-
>-----------ja--
>-
>-Content-language: ko
>-Content-type: text/html; charset=UTF-8
>-Body:----------ko--
>-
>-
>- ìì²í URLì´ ëë¬´ ê¸¸ì´ì ì´ ìë²ê° ì²ë¦¬í  ì ììµëë¤.
>-
>-
>-----------ko--
>-
>-Content-language: nl
>-Content-type: text/html; charset=UTF-8
>-Body:----------nl--
>-
>-
>- De lengte van de aangeboden URL overschreidt het maximum
>- voor deze server. De vraag kan niet verwerkt worden.
>-
>-
>-----------nl--
>-
>-Content-language: nb
>-Content-type: text/html; charset=UTF-8
>-Body:----------nb--
>-
>-
>- Lengden pÃ¥ adressen som etterspurtes overskrider
>- kapasitetsgrensen for denne serveren. ForespÃ¸rselen kan
>- ikke prosesseres.
>-
>-
>-----------nb--
>-
>-Content-language: pl
>-Content-type: text/html; charset=UTF-8
>-Body:----------pl--
>-
>-
>- D&#322;ugo&#347;&#263; &#380;&#261;danego URL-a przekracza limit ustanowiony dla tego
>- serwera. &#379;&#261;danie nie mo&#380;e zosta&#263; zrealizowane.
>-
>-
>-----------pl--
>-
>-Content-language: pt-br
>-Content-type: text/html; charset=UTF-8
>-Body:-------pt-br--
>-
>-
>- O tamanho do endere&ccedil;o (URL) excede a capacidade limite
>- desse servidor. A requisi&ccedil;&atilde;o n&atilde;o pode ser
>- processada.
>-
>-
>--------pt-br--
>-
>-Content-language: pt
>-Content-type: text/html; charset=ISO-8859-1
>-Body:----------pt--
>-
>-
>-	O tamanho do URL pedido excede o limite da capacidade deste
>-	servidor. O pedido n&atilde;o pode ser processado.
>-
>-
>-----------pt--
>-
>-Content-language: ro
>-Content-type: text/html; charset=UTF-8
>-Body:----------ro--
>-
>-
>- Lungimea URL-ului cerut depaseste limita capacitatii pentru
>- acest server. Cererea nu poate fi procesata.
>-
>-
>-----------ro--
>-
>-Content-language: ru
>-Content-type: text/html; charset=UTF-8
>-Body:----------ru--
>-
>-
>- ÐÐ»Ð¸Ð½Ð° Ð·Ð°Ð¿ÑÐ°ÑÐ¸Ð²Ð°ÐµÐ¼Ð¾Ð³Ð¾ URL Ð¿ÑÐµÐ²ÑÑÐ°ÐµÑ Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð¾ Ð´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÑ
>- ÑÐµÑÐ²ÐµÑÐ¾Ð¼. ÐÐ°Ð¿ÑÐ¾Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐ°Ð½.
>-
>-
>-----------ru--
>-
>-Content-language: sr
>-Content-type: text/html; charset=UTF-8
>-Body:----------sr--
>-
>-
>- ÐÑÐ¶Ð¸Ð½Ð° Ð·Ð°ÑÑÐµÐ²Ð°Ð½Ð¾Ð³ Ð£Ð Ð-Ð° Ð¿ÑÐµÐ¼Ð°ÑÑÑÐµ Ð¾Ð³ÑÐ°Ð½Ð¸ÑÐµÑÐ° Ð¼Ð¾Ð³ÑÑÐ½Ð¾ÑÑÐ¸
>- Ð¾Ð²Ð¾Ð³ ÑÐµÑÐ²ÐµÑÐ°. ÐÐ°ÑÑÐµÐ² Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸ÑÐ¸ Ð¾Ð±ÑÐ°ÑÐµÐ½.
>-
>-
>-----------sr--
>-
>-Content-language: sv
>-Content-type: text/html; charset=UTF-8
>-Body:----------sv--
>-
>-
>- L&auml;ngden p&aring; adressen som efterfr&aring;gas &ouml;verskrider
>- kapacitetsgr&auml;nsen f&ouml;r denna server. F&ouml;rfr&aring;gan kan
>- inte verkst&auml;llas.
>-
>-
>-----------sv--
>-
>-Content-language: tr
>-Content-type: text/html; charset=UTF-8
>-Body:----------tr--
>-
>-
>- Talep edilen URI'nin uzunluÄu, sunucunun sÄ±nÄ±rlarÄ±nÄ±
>- aÅtÄ±ÄÄ±ndan istek yerine getirilemiyor.
>-
>-
>-----------tr--
>-
>-Content-language: zh-cn
>-Content-type: text/html; charset=UTF-8
>-Body:----------zh-cn--
>-
>-
>- è¯·æ± URL çé¿åº¦è¶åºäºæå¡å¨çé¿åº¦éå¶ãè¯¥è¯·æ±æ æ³å¤çã
>- 
>-
>-----------zh-cn--
>-
>-Content-language: zh-tw
>-Content-type: text/html; charset=UTF-8
>-Body:----------zh-tw--
>-
>-
>- è«æ± URL çé·åº¦è¶åºäºä¼ºæå¨çé·åº¦éå¶ãè©²è«æ±ç¡æ³èçã
>- 
>-
>-----------zh-tw--
>
>Property changes on: docs/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Index: docs/error/HTTP_URI_TOO_LONG.html.var
>===================================================================
>Index: include/httpd.h
>===================================================================
>--- include/httpd.h	(revision 1917070)
>+++ include/httpd.h	(working copy)
>@@ -523,14 +523,14 @@
> #define HTTP_GONE 410
> #define HTTP_LENGTH_REQUIRED 411
> #define HTTP_PRECONDITION_FAILED 412
>-#define HTTP_REQUEST_ENTITY_TOO_LARGE 413
>-#define HTTP_REQUEST_URI_TOO_LARGE 414
>+#define HTTP_CONTENT_TOO_LARGE 413
>+#define HTTP_URI_TOO_LONG 414
> #define HTTP_UNSUPPORTED_MEDIA_TYPE 415
> #define HTTP_RANGE_NOT_SATISFIABLE 416
> #define HTTP_EXPECTATION_FAILED 417
> #define HTTP_IM_A_TEAPOT 418
> #define HTTP_MISDIRECTED_REQUEST 421
>-#define HTTP_UNPROCESSABLE_ENTITY 422
>+#define HTTP_UNPROCESSABLE_CONTENT 422
> #define HTTP_LOCKED 423
> #define HTTP_FAILED_DEPENDENCY 424
> #define HTTP_TOO_EARLY 425
>@@ -551,6 +551,11 @@
> #define HTTP_NOT_EXTENDED 510
> #define HTTP_NETWORK_AUTHENTICATION_REQUIRED 511
> 
>+/** for backwards compatibility */
>+#define HTTP_REQUEST_ENTITY_TOO_LARGE HTTP_CONTENT_TOO_LARGE
>+#define HTTP_REQUEST_URI_TOO_LARGE HTTP_URI_TOO_LONG
>+#define HTTP_UNPROCESSABLE_ENTITY HTTP_UNPROCESSABLE_CONTENT
>+
> /** is the status code informational */
> #define ap_is_HTTP_INFO(x) (((x) >= 100)&&((x) < 200))
> /** is the status code OK ?*/
>@@ -571,10 +576,10 @@
> (((x) == HTTP_BAD_REQUEST) || \
> ((x) == HTTP_REQUEST_TIME_OUT) || \
> ((x) == HTTP_LENGTH_REQUIRED) || \
>- ((x) == HTTP_REQUEST_ENTITY_TOO_LARGE) || \
>- ((x) == HTTP_REQUEST_URI_TOO_LARGE) || \
>+ ((x) == HTTP_CONTENT_TOO_LARGE) || \
>+ ((x) == HTTP_URI_TOO_LONG) || \
> ((x) == HTTP_INTERNAL_SERVER_ERROR) || \
>- ((x) == HTTP_SERVICE_UNAVAILABLE) || \
>+ ((x) == HTTP_SERVICE_UNAVAILABLE) || \
> ((x) == HTTP_NOT_IMPLEMENTED))
> 
> /** does the status imply header only response (i.e. never w/ a body)? */
>Index: modules/dav/main/mod_dav.c
>===================================================================
>--- modules/dav/main/mod_dav.c	(revision 1917070)
>+++ modules/dav/main/mod_dav.c	(working copy)
>@@ -2669,7 +2669,7 @@
> /* This is snarfed from ap_setup_client_block(). We could get pretty
> * close to this behavior by passing REQUEST_NO_BODY, but we need to
> * return HTTP_UNSUPPORTED_MEDIA_TYPE (while ap_setup_client_block
>- * returns HTTP_REQUEST_ENTITY_TOO_LARGE). */
>+ * returns HTTP_CONTENT_TOO_LARGE). */
> 
> const char *tenc = apr_table_get(r->headers_in, "Transfer-Encoding");
> const char *lenp = apr_table_get(r->headers_in, "Content-Length");
>Index: modules/filters/mod_request.c
>===================================================================
>--- modules/filters/mod_request.c	(revision 1917070)
>+++ modules/filters/mod_request.c	(working copy)
>@@ -99,7 +99,7 @@
> "Invalid Content-Length '%s'", lenp);
> 
> ap_remove_input_filter(f);
>- return bail_out_on_error(b, f, HTTP_REQUEST_ENTITY_TOO_LARGE);
>+ return bail_out_on_error(b, f, HTTP_CONTENT_TOO_LARGE);
> }
> 
> /* If we have a limit in effect and we know the C-L ahead of
>@@ -111,7 +111,7 @@
> " is larger than the configured limit"
> " of %" APR_OFF_T_FMT, ctx->remaining, dconf->keep_body);
> ap_remove_input_filter(f);
>- return bail_out_on_error(b, f, HTTP_REQUEST_ENTITY_TOO_LARGE);
>+ return bail_out_on_error(b, f, HTTP_CONTENT_TOO_LARGE);
> }
> 
> }
>@@ -136,7 +136,7 @@
> "Requested content-length of %" APR_OFF_T_FMT
> " is larger than the configured limit"
> " of %" APR_OFF_T_FMT, len, ctx->keep_body);
>- return bail_out_on_error(b, f, HTTP_REQUEST_ENTITY_TOO_LARGE);
>+ return bail_out_on_error(b, f, HTTP_CONTENT_TOO_LARGE);
> }
> ctx->remaining -= len;
> 
>Index: modules/http/http_filters.c
>===================================================================
>--- modules/http/http_filters.c	(revision 1917070)
>+++ modules/http/http_filters.c	(working copy)
>@@ -1070,7 +1070,7 @@
> body = REQUEST_NO_BODY;
> 
> if ((rv = ap_setup_client_block(r, body))) {
>- if (rv == HTTP_REQUEST_ENTITY_TOO_LARGE)
>+ if (rv == HTTP_CONTENT_TOO_LARGE)
> apr_table_setn(r->notes, "error-notes",
> "TRACE with a request body is not allowed");
> return rv;
>@@ -1082,7 +1082,7 @@
> if (r->remaining > 65536) {
> apr_table_setn(r->notes, "error-notes",
> "Extended TRACE request bodies cannot exceed 64k\n");
>- return HTTP_REQUEST_ENTITY_TOO_LARGE;
>+ return HTTP_CONTENT_TOO_LARGE;
> }
> /* always 32 extra bytes to catch chunk header exceptions */
> bodybuf = (apr_size_t)r->remaining + 32;
>@@ -1107,7 +1107,7 @@
> ;
> apr_table_setn(r->notes, "error-notes",
> "Extended TRACE request bodies cannot exceed 64k\n");
>- return HTTP_REQUEST_ENTITY_TOO_LARGE;
>+ return HTTP_CONTENT_TOO_LARGE;
> }
> 
> if (res < 0) {
>@@ -1407,7 +1407,7 @@
> return HTTP_BAD_REQUEST;
> 
> case APR_ENOSPC:
>- return HTTP_REQUEST_ENTITY_TOO_LARGE;
>+ return HTTP_CONTENT_TOO_LARGE;
> 
> case APR_ENOTIMPL:
> return HTTP_NOT_IMPLEMENTED;
>@@ -1572,7 +1572,7 @@
> && (r->read_chunked || (r->remaining > 0))) {
> ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01595)
> "%s with body is not allowed for %s", r->method, r->uri);
>- return HTTP_REQUEST_ENTITY_TOO_LARGE;
>+ return HTTP_CONTENT_TOO_LARGE;
> }
> 
> if (limit_req_body > 0 && (r->remaining > limit_req_body)) {
>@@ -1584,7 +1584,7 @@
> " is larger than the configured limit"
> " of %" APR_OFF_T_FMT, r->remaining, limit_req_body);
> 
>- return HTTP_REQUEST_ENTITY_TOO_LARGE;
>+ return HTTP_CONTENT_TOO_LARGE;
> }
> 
> #ifdef AP_DEBUG
>@@ -2269,7 +2269,7 @@
> ctx->method = ctx->uri = "-";
> ctx->protocol = "HTTP/1.0";
> if (APR_STATUS_IS_ENOSPC(rv)) {
>- http_status = HTTP_REQUEST_URI_TOO_LARGE;
>+ http_status = HTTP_URI_TOO_LONG;
> }
> else if (APR_STATUS_IS_TIMEUP(rv)) {
> http_status = HTTP_REQUEST_TIME_OUT;
>Index: modules/http/http_protocol.c
>===================================================================
>--- modules/http/http_protocol.c	(revision 1917070)
>+++ modules/http/http_protocol.c	(working copy)
>@@ -1049,7 +1049,7 @@
> return("The requested resource is no longer available on this server"
> " and there is no forwarding address.\n"
> "Please remove all references to this resource.\n");
>- case HTTP_REQUEST_ENTITY_TOO_LARGE:
>+ case HTTP_CONTENT_TOO_LARGE:
> return(apr_pstrcat(p,
> "The requested resource does not allow request data with ",
> ap_escape_html(r->pool, r->method),
>@@ -1056,7 +1056,7 @@
> " requests, or the amount of data provided in\n"
> "the request exceeds the capacity limit.\n",
> NULL));
>- case HTTP_REQUEST_URI_TOO_LARGE:
>+ case HTTP_URI_TOO_LONG:
> s1 = "The requested URL's length exceeds the capacity\n"
> "limit for this server. \n";
> return(add_optional_notes(r, s1, "error-notes", "\n"));
>@@ -1081,7 +1081,7 @@
> "field was not presented by the client.\n";
> return add_optional_notes(r, s1, "error-notes", ""
> "Only the 100-continue expectation is supported.\n");
>- case HTTP_UNPROCESSABLE_ENTITY:
>+ case HTTP_UNPROCESSABLE_CONTENT:
> return("The server understands the media type of the\n"
> "request entity, but was unable to process the\n"
> "contained instructions.\n");
>Index: modules/http2/h2_stream.c
>===================================================================
>--- modules/http2/h2_stream.c	(revision 1917070)
>+++ modules/http2/h2_stream.c	(working copy)
>@@ -749,7 +749,7 @@
> "Request pseudo header exceeds "
> "LimitRequestFieldSize: %s"), name);
> }
>- error = HTTP_REQUEST_URI_TOO_LARGE;
>+ error = HTTP_URI_TOO_LONG;
> goto cleanup;
> }
> }
>Index: modules/lua/lua_vmprep.c
>===================================================================
>--- modules/lua/lua_vmprep.c	(revision 1917070)
>+++ modules/lua/lua_vmprep.c	(working copy)
>@@ -206,12 +206,12 @@
> makeintegerfield(L, HTTP_GONE);
> makeintegerfield(L, HTTP_LENGTH_REQUIRED);
> makeintegerfield(L, HTTP_PRECONDITION_FAILED);
>- makeintegerfield(L, HTTP_REQUEST_ENTITY_TOO_LARGE);
>- makeintegerfield(L, HTTP_REQUEST_URI_TOO_LARGE);
>+ makeintegerfield(L, HTTP_CONTENT_TOO_LARGE);
>+ makeintegerfield(L, HTTP_URI_TOO_LONG);
> makeintegerfield(L, HTTP_UNSUPPORTED_MEDIA_TYPE);
> makeintegerfield(L, HTTP_RANGE_NOT_SATISFIABLE);
> makeintegerfield(L, HTTP_EXPECTATION_FAILED);
>- makeintegerfield(L, HTTP_UNPROCESSABLE_ENTITY);
>+ makeintegerfield(L, HTTP_UNPROCESSABLE_CONTENT);
> makeintegerfield(L, HTTP_LOCKED);
> makeintegerfield(L, HTTP_FAILED_DEPENDENCY);
> makeintegerfield(L, HTTP_UPGRADE_REQUIRED);
>Index: modules/proxy/mod_proxy.c
>===================================================================
>--- modules/proxy/mod_proxy.c	(revision 1917070)
>+++ modules/proxy/mod_proxy.c	(working copy)
>@@ -1409,7 +1409,7 @@
> apr_table_setn(r->notes, "verbose-error-to", "*");
> ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01140)
> "TRACE with request body is not allowed");
>- return HTTP_REQUEST_ENTITY_TOO_LARGE;
>+ return HTTP_CONTENT_TOO_LARGE;
> }
> }
> 
>Index: modules/ssl/ssl_engine_io.c
>===================================================================
>--- modules/ssl/ssl_engine_io.c	(revision 1917070)
>+++ modules/ssl/ssl_engine_io.c	(working copy)
>@@ -2090,7 +2090,7 @@
> ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02018)
> "request body exceeds maximum size (%" APR_SIZE_T_FMT
> ") for SSL buffer", maxlen);
>- return HTTP_REQUEST_ENTITY_TOO_LARGE;
>+ return HTTP_CONTENT_TOO_LARGE;
> }
> 
> } while (!eos);
>Index: modules/ssl/ssl_engine_kernel.c
>===================================================================
>--- modules/ssl/ssl_engine_kernel.c	(revision 1917070)
>+++ modules/ssl/ssl_engine_kernel.c	(working copy)
>@@ -146,7 +146,7 @@
> }
> else {
> /* If the reneg buffer size is set to zero, just fail. */
>- rv = HTTP_REQUEST_ENTITY_TOO_LARGE;
>+ rv = HTTP_CONTENT_TOO_LARGE;
> }
> 
> return rv;
>Index: server/protocol.c
>===================================================================
>--- server/protocol.c	(revision 1917070)
>+++ server/protocol.c	(working copy)
>@@ -1385,11 +1385,11 @@
> if (!ap_assign_request_line(r, method, uri, protocol)) {
> apr_brigade_cleanup(tmp_bb);
> switch (r->status) {
>- case HTTP_REQUEST_URI_TOO_LARGE:
>+ case HTTP_URI_TOO_LONG:
> case HTTP_BAD_REQUEST:
> case HTTP_VERSION_NOT_SUPPORTED:
> case HTTP_NOT_IMPLEMENTED:
>- if (r->status == HTTP_REQUEST_URI_TOO_LARGE) {
>+ if (r->status == HTTP_URI_TOO_LONG) {
> ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(00565)
> "request failed: client's request-line exceeds LimitRequestLine (longer than %d)",
> r->server->limit_req_line);
>Index: server/util.c
>===================================================================
>--- server/util.c	(revision 1917070)
>+++ server/util.c	(working copy)
>@@ -2868,11 +2868,11 @@
> * In order to ensure that resource limits are not exceeded, a
> * maximum size must be provided. If the sum of the lengths of
> * the names and the values exceed this size, this function
>- * will return HTTP_REQUEST_ENTITY_TOO_LARGE.
>+ * will return HTTP_CONTENT_TOO_LARGE.
> *
> * An optional number of parameters can be provided, if the number
> * of parameters provided exceeds this amount, this function will
>- * return HTTP_REQUEST_ENTITY_TOO_LARGE. If this value is negative,
>+ * return HTTP_CONTENT_TOO_LARGE. If this value is negative,
> * no limit is imposed, and the number of parameters is in turn
> * constrained by the size parameter above.
> *
>@@ -3035,7 +3035,7 @@
> } while (!seen_eos);
> 
> if (FORM_ABORT == state || size < 0 || num == 0) {
>- return HTTP_REQUEST_ENTITY_TOO_LARGE;
>+ return HTTP_CONTENT_TOO_LARGE;
> }
> else if (FORM_VALUE == state && pair && offset > 0) {
> const char *tmp = apr_pmemdup(r->pool, buffer, offset);
>Index: server/util_xml.c
>===================================================================
>--- server/util_xml.c	(revision 1917070)
>+++ server/util_xml.c	(working copy)
>@@ -89,7 +89,7 @@
> ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00539)
> "XML request body is larger than the configured "
> "limit of %lu", (unsigned long)limit_xml_body);
>- result = HTTP_REQUEST_ENTITY_TOO_LARGE;
>+ result = HTTP_CONTENT_TOO_LARGE;
> goto read_error;
> }
>

Actions: View | Diff

Attachments on bug 68912: 39672