You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2013/06/21 18:47:34 UTC
svn commit: r1495502 - in /httpd/httpd/branches/2.4.x: ./ include/httpd.h
Author: trawick
Date: Fri Jun 21 16:47:34 2013
New Revision: 1495502
URL: http://svn.apache.org/r1495502
Log:
merge r1495501 from trunk:
fix doc for ap_pregsub_ex() return code
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/include/httpd.h
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1495501
Modified: httpd/httpd/branches/2.4.x/include/httpd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/httpd.h?rev=1495502&r1=1495501&r2=1495502&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/httpd.h (original)
+++ httpd/httpd/branches/2.4.x/include/httpd.h Fri Jun 21 16:47:34 2013
@@ -1871,7 +1871,7 @@ AP_DECLARE(char *) ap_pregsub(apr_pool_t
* @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,