merge r1495501 from trunk:

fix doc for ap_pregsub_ex() return code

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

diff --git a/include/httpd.h b/include/httpd.h
index 3b87e49cf880f2be39ae31bf297d828e85750c96..36cd58d542e181d3dc5e0bc044bba00599b24f7d 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -1871,7 +1871,7 @@ AP_DECLARE(char *) ap_pregsub(apr_pool_t *p, const char *input,
  * @param nmatch the nmatch returned from ap_pregex
  * @param pmatch the pmatch array returned from ap_pregex
  * @param maxlen the maximum string length to return, 0 for unlimited
- * @return The substituted string, or NULL on error
+ * @return APR_SUCCESS if successful, APR_ENOMEM or other error code otherwise.
  */
 AP_DECLARE(apr_status_t) ap_pregsub_ex(apr_pool_t *p, char **result,
                                        const char *input, const char *source,