You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2014/07/23 22:27:32 UTC

svn commit: r1612940 - /httpd/httpd/trunk/include/ap_regex.h

Author: rjung
Date: Wed Jul 23 20:27:32 2014
New Revision: 1612940

URL: http://svn.apache.org/r1612940
Log:
Forgotten file needed for r1612934.

Modified:
    httpd/httpd/trunk/include/ap_regex.h

Modified: httpd/httpd/trunk/include/ap_regex.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_regex.h?rev=1612940&r1=1612939&r2=1612940&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_regex.h (original)
+++ httpd/httpd/trunk/include/ap_regex.h Wed Jul 23 20:27:32 2014
@@ -79,6 +79,12 @@ extern "C" {
 
 #define AP_REG_MATCH "MATCH_" /**< suggested prefix for ap_regname */
 
+/* Arguments for ap_pcre_version_string */
+enum {
+  AP_REG_PCRE_COMPILED = 0, /** PCRE version used during program compilation */
+  AP_REG_PCRE_LOADED        /** PCRE version loaded at runtime */
+};
+
 /* Error values: */
 enum {
   AP_REG_ASSERT = 1,  /** internal error ? */
@@ -103,6 +109,15 @@ typedef struct {
 /* The functions */
 
 /**
+ * Return PCRE version string.
+ * @param which Either AP_REG_PCRE_COMPILED (PCRE version used
+ *              during program compilation) or AP_REG_PCRE_LOADED
+ *              (PCRE version used at runtime)
+ * @return The PCRE version string
+ */
+AP_DECLARE(const char *) ap_pcre_version_string(int which);
+
+/**
  * Compile a regular expression.
  * @param preg Returned compiled regex
  * @param regex The regular expression string



Re: svn commit: r1612940 - /httpd/httpd/trunk/include/ap_regex.h

Posted by Rainer Jung <ra...@kippdata.de>.
Am 24.07.2014 um 11:56 schrieb Takashi Sato:
>> --- httpd/httpd/trunk/include/ap_regex.h (original)
>> +++ httpd/httpd/trunk/include/ap_regex.h Wed Jul 23 20:27:32 2014
>> @@ -79,6 +79,12 @@ extern "C" {
>>
>>   #define AP_REG_MATCH "MATCH_" /**< suggested prefix for ap_regname */
>>
>> +/* Arguments for ap_pcre_version_string */
>> +enum {
>> +  AP_REG_PCRE_COMPILED = 0, /** PCRE version used during program compilation */
>> +  AP_REG_PCRE_LOADED        /** PCRE version loaded at runtime */
>> +};
>> +
>>   /* Error values: */
>>   enum {
>>     AP_REG_ASSERT = 1,  /** internal error ? */
>> @@ -103,6 +109,15 @@ typedef struct {
>>   /* The functions */
>>
>>   /**
>> + * Return PCRE version string.
>> + * @param which Either AP_REG_PCRE_COMPILED (PCRE version used
>> + *              during program compilation) or AP_REG_PCRE_LOADED
>> + *              (PCRE version used at runtime)
>> + * @return The PCRE version string
>> + */
>> +AP_DECLARE(const char *) ap_pcre_version_string(int which);
>> +
>> +/**
>>    * Compile a regular expression.
>>    * @param preg Returned compiled regex
>>    * @param regex The regular expression string
>
> This added a new API, so we need MMN minor bump?

You are right, this occurred to me this night as well. Will add later today.

Regards,

Rainer


Re: svn commit: r1612940 - /httpd/httpd/trunk/include/ap_regex.h

Posted by Takashi Sato <ta...@tks.st>.
> --- httpd/httpd/trunk/include/ap_regex.h (original)
> +++ httpd/httpd/trunk/include/ap_regex.h Wed Jul 23 20:27:32 2014
> @@ -79,6 +79,12 @@ extern "C" {
>
>  #define AP_REG_MATCH "MATCH_" /**< suggested prefix for ap_regname */
>
> +/* Arguments for ap_pcre_version_string */
> +enum {
> +  AP_REG_PCRE_COMPILED = 0, /** PCRE version used during program compilation */
> +  AP_REG_PCRE_LOADED        /** PCRE version loaded at runtime */
> +};
> +
>  /* Error values: */
>  enum {
>    AP_REG_ASSERT = 1,  /** internal error ? */
> @@ -103,6 +109,15 @@ typedef struct {
>  /* The functions */
>
>  /**
> + * Return PCRE version string.
> + * @param which Either AP_REG_PCRE_COMPILED (PCRE version used
> + *              during program compilation) or AP_REG_PCRE_LOADED
> + *              (PCRE version used at runtime)
> + * @return The PCRE version string
> + */
> +AP_DECLARE(const char *) ap_pcre_version_string(int which);
> +
> +/**
>   * Compile a regular expression.
>   * @param preg Returned compiled regex
>   * @param regex The regular expression string

This added a new API, so we need MMN minor bump?