One more backported (Nick expressed his -1 wasn't ment to be a veto,

next time please state something other than -1.  -.999 would be fine.)

Fix building PCRE with -DDEBUG on just about all the platforms under
my roof (FreeBSD, Darwin, Ubuntu Breezy)

Submitted by: sctemme
Backports: r381783

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

diff --git a/STATUS b/STATUS
index 223faeb936dabe87beff500ec6081dd79e97e385..4164a5b77f0de519d458837d1173819b1977d377 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -96,21 +96,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         going on in this patch to no net effect.  The WAIT_TIMEOUT
         result value seems to be ignored in the revised code?
 
-    * Bundled PCRE: backport r381783 from trunk
-      Fix brokenness on certain platforms when building with -DDEBUG.
-      http://svn.apache.org/viewvc?view=rev&revision=381783
-      +1 sctemme, fielding, pquerna, jerenkrantz
-      -1 niq: Why are we hacking a third-party package as bundled,
-              rather than upstream?  This has potential for chaos
-              for modules (and we have a history of PCRE trouble)
-              as well as a maintenance nightmare!
-      jerenkrantz: I don't believe that's a valid reason to block this.
-                   We're bundling PCRE for the duration of the 2.2.x series,
-                   but we can re-evaluate for future major/minor revs.
-      wrowe: nak niq, ack je; this is a silly debate, fix, push fixes upstream
-             and adopt a newer PCRE at trunk/.
-      niq: see http://mail-archives.apache.org/mod_mbox/httpd-dev/200611.mbox/raw/%3c20061108180201.6ad45937@grimnir%3e/
-
     * PKCS#7: backport PCKS#7 patches from trunk.
       +1 ben
       jerenkrantz: What's the revision number to backport?

diff --git a/srclib/pcre/printint.c b/srclib/pcre/printint.c
index 8e5da42684703ce74da3c9b18345b1ca778334a3..ed1849586d58672312f047dbe7e6452b50a395f5 100644 (file)
--- a/srclib/pcre/printint.c
+++ b/srclib/pcre/printint.c
@@ -107,6 +107,7 @@ else
 
 
 
+#ifdef SUPPORT_UCP
 /*************************************************
 *          Find Unicode property name            *
 *************************************************/
@@ -121,6 +122,7 @@ for (i = sizeof(utt)/sizeof(ucp_type_table); i >= 0; i--)
   }
 return (i >= 0)? utt[i].name : "??";
 }
+#endif /* SUPPORT_UCP */
 
 
 
@@ -255,11 +257,13 @@ for(;;)
     if (*code >= OP_TYPESTAR)
       {
       fprintf(f, "%s", OP_names[code[1]]);
+#ifdef SUPPORT_UCP
       if (code[1] == OP_PROP || code[1] == OP_NOTPROP)
         {
         fprintf(f, " %s ", get_ucpname(code[2]));
         extra = 1;
         }
+#endif
       }
     else extra = print_char(f, code+1, utf8);
     fprintf(f, "%s", OP_names[*code]);
@@ -280,11 +284,13 @@ for(;;)
     case OP_TYPEUPTO:
     case OP_TYPEMINUPTO:
     fprintf(f, "    %s", OP_names[code[3]]);
+#ifdef SUPPORT_UCP
     if (code[3] == OP_PROP || code[3] == OP_NOTPROP)
       {
       fprintf(f, " %s ", get_ucpname(code[4]));
       extra = 1;
       }
+#endif
     fprintf(f, "{");
     if (*code != OP_TYPEEXACT) fprintf(f, "0,");
     fprintf(f, "%d}", GET2(code,1));
@@ -331,10 +337,12 @@ for(;;)
       GET(code, 2 + LINK_SIZE));
     break;
 
+#ifdef SUPPORT_UCP
     case OP_PROP:
     case OP_NOTPROP:
     fprintf(f, "    %s %s", OP_names[*code], get_ucpname(code[1]));
     break;
+#endif
 
     /* OP_XCLASS can only occur in UTF-8 mode. However, there's no harm in
     having this code always here, and it makes it less messy without all those
@@ -394,6 +402,7 @@ for(;;)
         int ch;
         while ((ch = *ccode++) != XCL_END)
           {
+#ifdef SUPPORT_UCP
           if (ch == XCL_PROP)
             {
             fprintf(f, "\\p{%s}", get_ucpname(*ccode++));
@@ -403,6 +412,7 @@ for(;;)
             fprintf(f, "\\P{%s}", get_ucpname(*ccode++));
             }
           else
+#endif
             {
             ccode += 1 + print_char(f, ccode, TRUE);
             if (ch == XCL_RANGE)