Merge r1409437 from trunk:

Give the opportunity to the compiler to compute at compile time the strlen of the given
string. Most of the calls to ap_fputs are done with constant strings.
Submitted by: jailletc36
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1439393 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 3a4f435c39c0efe111142ba3e1a7c0534bda84f2..d51ccce42dbceba69d381b5daa4366aab912f11c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -95,12 +95,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      trunk patch: https://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?r1=1396440&r2=1429228
      2.4.x patch: trunk patch works
      +1: kbrand, jorton, jerenkrantz
-
-  * Speed-up 'ap_fputs'. This change is just the inline version of what is remaining
-    in apr_brigade_puts() after http://svn.apache.org/viewvc?view=revision&revision=1402870
-    trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1409437
-    2.4.x patch: trunk patches works
-    +1: jailletc36, rjung, covener
     
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/include/util_filter.h b/include/util_filter.h
index ebe8de463779e5a819182c842b953a72a55707d3..5f6f9afab6210338210b72542813c1a0ea35bec1 100644 (file)
--- a/include/util_filter.h
+++ b/include/util_filter.h
@@ -548,7 +548,7 @@ AP_DECLARE(apr_status_t) ap_fflush(ap_filter_t *f, apr_bucket_brigade *bb);
  * @param str The string to write
  */
 #define ap_fputs(f, bb, str) \
-        apr_brigade_puts(bb, ap_filter_flush, f, str)
+        apr_brigade_write(bb, ap_filter_flush, f, str, strlen(str))
 
 /**
  * Write a character for the current filter, buffering if possible.