httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pgollu...@apache.org
Subject svn commit: r598343 [6/22] - in /httpd/httpd/vendor/pcre/current: ./ doc/ doc/html/ testdata/
Date Mon, 26 Nov 2007 17:04:37 GMT
Modified: httpd/httpd/vendor/pcre/current/dftables.c
URL: http://svn.apache.org/viewvc/httpd/httpd/vendor/pcre/current/dftables.c?rev=598343&r1=598342&r2=598343&view=diff
==============================================================================
--- httpd/httpd/vendor/pcre/current/dftables.c (original)
+++ httpd/httpd/vendor/pcre/current/dftables.c Mon Nov 26 09:04:19 2007
@@ -2,11 +2,13 @@
 *      Perl-Compatible Regular Expressions       *
 *************************************************/
 
-/* PCRE is a library of functions to support regular expressions whose syntax
+/*
+PCRE is a library of functions to support regular expressions whose syntax
 and semantics are as close as possible to those of the Perl 5 language.
 
-                       Written by Philip Hazel
-           Copyright (c) 1997-2007 University of Cambridge
+Written by: Philip Hazel <ph10@cam.ac.uk>
+
+           Copyright (c) 1997-2004 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -38,83 +40,56 @@
 */
 
 
-/* This is a freestanding support program to generate a file containing
-character tables for PCRE. The tables are built according to the current
-locale. Now that pcre_maketables is a function visible to the outside world, we
-make use of its code from here in order to be consistent. */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* This is a support program to generate the file chartables.c, containing
+character tables of various kinds. They are built according to the default C
+locale and used as the default tables by PCRE. Now that pcre_maketables is
+a function visible to the outside world, we make use of its code from here in
+order to be consistent. */
 
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
-#include <locale.h>
 
-#include "pcre_internal.h"
+#include "internal.h"
 
-#define DFTABLES          /* pcre_maketables.c notices this */
-#include "pcre_maketables.c"
+#define DFTABLES          /* maketables.c notices this */
+#include "maketables.c"
 
 
 int main(int argc, char **argv)
 {
+int i;
 FILE *f;
-int i = 1;
-const unsigned char *tables;
-const unsigned char *base_of_tables;
-
-/* By default, the default C locale is used rather than what the building user
-happens to have set. However, if the -L option is given, set the locale from
-the LC_xxx environment variables. */
+const unsigned char *tables = pcre_maketables();
 
-if (argc > 1 && strcmp(argv[1], "-L") == 0)
-  {
-  setlocale(LC_ALL, "");        /* Set from environment variables */
-  i++;
-  }
-
-if (argc < i + 1)
+if (argc != 2)
   {
   fprintf(stderr, "dftables: one filename argument is required\n");
   return 1;
   }
 
-tables = pcre_maketables();
-base_of_tables = tables;
-
-f = fopen(argv[i], "wb");
+f = fopen(argv[1], "w");
 if (f == NULL)
   {
   fprintf(stderr, "dftables: failed to open %s for writing\n", argv[1]);
   return 1;
   }
 
-/* There are several fprintf() calls here, because gcc in pedantic mode
-complains about the very long string otherwise. */
+/* There are two fprintf() calls here, because gcc in pedantic mode complains
+about the very long string otherwise. */
 
 fprintf(f,
   "/*************************************************\n"
   "*      Perl-Compatible Regular Expressions       *\n"
   "*************************************************/\n\n"
-  "/* This file was automatically written by the dftables auxiliary\n"
-  "program. It contains character tables that are used when no external\n"
-  "tables are passed to PCRE by the application that calls it. The tables\n"
-  "are used only for characters whose code values are less than 256.\n\n");
-fprintf(f,
-  "The following #includes are present because without them gcc 4.x may remove\n"
-  "the array definition from the final binary if PCRE is built into a static\n"
-  "library and dead code stripping is activated. This leads to link errors.\n"
-  "Pulling in the header ensures that the array gets flagged as \"someone\n"
-  "outside this compilation unit might reference this\" and so it will always\n"
-  "be supplied to the linker. */\n\n"
-  "#ifdef HAVE_CONFIG_H\n"
-  "#include \"config.h\"\n"
-  "#endif\n\n"
-  "#include \"pcre_internal.h\"\n\n");
+  "/* This file is automatically written by the dftables auxiliary \n"
+  "program. If you edit it by hand, you might like to edit the Makefile to \n"
+  "prevent its ever being regenerated.\n\n");
 fprintf(f,
-  "const unsigned char _pcre_default_tables[] = {\n\n"
+  "This file is #included in the compilation of pcre.c to build the default\n"
+  "character tables which are used when no tables are passed to the compile\n"
+  "function. */\n\n"
+  "static unsigned char pcre_default_tables[] = {\n\n"
   "/* This table is a lower casing table. */\n\n");
 
 fprintf(f, "  ");
@@ -189,10 +164,9 @@
   else fprintf(f, "%3d-", i-8);
 if (isprint(i-1)) fprintf(f, " %c ", i-1);
   else fprintf(f, "%3d", i-1);
-fprintf(f, " */\n\n/* End of pcre_chartables.c */\n");
+fprintf(f, " */\n\n/* End of chartables.c */\n");
 
 fclose(f);
-free((void *)base_of_tables);
 return 0;
 }
 

Modified: httpd/httpd/vendor/pcre/current/doc/html/index.html
URL: http://svn.apache.org/viewvc/httpd/httpd/vendor/pcre/current/doc/html/index.html?rev=598343&r1=598342&r2=598343&view=diff
==============================================================================
--- httpd/httpd/vendor/pcre/current/doc/html/index.html (original)
+++ httpd/httpd/vendor/pcre/current/doc/html/index.html Mon Nov 26 09:04:19 2007
@@ -1,10 +1,4 @@
 <html>
-<!-- This is a manually maintained file that is the root of the HTML version of
-     the PCRE documentation. When the HTML documents are built from the man
-     page versions, the entire doc/html directory is emptied, this file is then
-     copied into doc/html/index.html, and the remaining files therein are
-     created by the 132html script.
--->
 <head>
 <title>PCRE specification</title>
 </head>
@@ -18,9 +12,6 @@
 <tr><td><a href="pcre.html">pcre</a></td>
     <td>&nbsp;&nbsp;Introductory page</td></tr>
 
-<tr><td><a href="pcre-config.html">pcre-config</a></td>
-    <td>&nbsp;&nbsp;Information about the installation configuration</td></tr>
-
 <tr><td><a href="pcreapi.html">pcreapi</a></td>
     <td>&nbsp;&nbsp;PCRE's native API</td></tr>
 
@@ -33,15 +24,9 @@
 <tr><td><a href="pcrecompat.html">pcrecompat</a></td>
     <td>&nbsp;&nbsp;Compability with Perl</td></tr>
 
-<tr><td><a href="pcrecpp.html">pcrecpp</a></td>
-    <td>&nbsp;&nbsp;The C++ wrapper for the PCRE library</td></tr>
-
 <tr><td><a href="pcregrep.html">pcregrep</a></td>
     <td>&nbsp;&nbsp;The <b>pcregrep</b> command</td></tr>
 
-<tr><td><a href="pcrematching.html">pcrematching</a></td>
-    <td>&nbsp;&nbsp;Discussion of the two matching algorithms</td></tr>
-
 <tr><td><a href="pcrepartial.html">pcrepartial</a></td>
     <td>&nbsp;&nbsp;Using PCRE for partial matching</td></tr>
 
@@ -60,12 +45,6 @@
 <tr><td><a href="pcresample.html">pcresample</a></td>
     <td>&nbsp;&nbsp;Description of the sample program</td></tr>
 
-<tr><td><a href="pcrestack.html">pcrestack</a></td>
-    <td>&nbsp;&nbsp;Discussion of PCRE's stack usage</td></tr>
-
-<tr><td><a href="pcresyntax.html">pcresyntax</a></td>
-    <td>&nbsp;&nbsp;Syntax quick-reference summary</td></tr>
-
 <tr><td><a href="pcretest.html">pcretest</a></td>
     <td>&nbsp;&nbsp;The <b>pcretest</b> command for testing PCRE</td></tr>
 </table>
@@ -80,9 +59,6 @@
 <tr><td><a href="pcre_compile.html">pcre_compile</a></td>
     <td>&nbsp;&nbsp;Compile a regular expression</td></tr>
 
-<tr><td><a href="pcre_compile2.html">pcre_compile2</a></td>
-    <td>&nbsp;&nbsp;Compile a regular expression (alternate interface)</td></tr>
-
 <tr><td><a href="pcre_config.html">pcre_config</a></td>
     <td>&nbsp;&nbsp;Show build-time configuration options</td></tr>
 
@@ -92,13 +68,8 @@
 <tr><td><a href="pcre_copy_substring.html">pcre_copy_substring</a></td>
     <td>&nbsp;&nbsp;Extract numbered substring into given buffer</td></tr>
 
-<tr><td><a href="pcre_dfa_exec.html">pcre_dfa_exec</a></td>
-    <td>&nbsp;&nbsp;Match a compiled pattern to a subject string
-    (DFA algorithm; <i>not</i> Perl compatible)</td></tr>
-
 <tr><td><a href="pcre_exec.html">pcre_exec</a></td>
-    <td>&nbsp;&nbsp;Match a compiled pattern to a subject string
-    (Perl compatible)</td></tr>
+    <td>&nbsp;&nbsp;Match a compiled pattern to a subject string</td></tr>
 
 <tr><td><a href="pcre_free_substring.html">pcre_free_substring</a></td>
     <td>&nbsp;&nbsp;Free extracted substring</td></tr>
@@ -126,9 +97,6 @@
 
 <tr><td><a href="pcre_maketables.html">pcre_maketables</a></td>
     <td>&nbsp;&nbsp;Build character tables in current locale</td></tr>
-
-<tr><td><a href="pcre_refcount.html">pcre_refcount</a></td>
-    <td>&nbsp;&nbsp;Maintain reference count in compiled pattern</td></tr>
 
 <tr><td><a href="pcre_study.html">pcre_study</a></td>
     <td>&nbsp;&nbsp;Study a compiled pattern</td></tr>

Modified: httpd/httpd/vendor/pcre/current/doc/html/pcre.html
URL: http://svn.apache.org/viewvc/httpd/httpd/vendor/pcre/current/doc/html/pcre.html?rev=598343&r1=598342&r2=598343&view=diff
==============================================================================
--- httpd/httpd/vendor/pcre/current/doc/html/pcre.html (original)
+++ httpd/httpd/vendor/pcre/current/doc/html/pcre.html Mon Nov 26 09:04:19 2007
@@ -18,38 +18,21 @@
 <li><a name="TOC3" href="#SEC3">LIMITATIONS</a>
 <li><a name="TOC4" href="#SEC4">UTF-8 AND UNICODE PROPERTY SUPPORT</a>
 <li><a name="TOC5" href="#SEC5">AUTHOR</a>
-<li><a name="TOC6" href="#SEC6">REVISION</a>
 </ul>
 <br><a name="SEC1" href="#TOC1">INTRODUCTION</a><br>
 <P>
 The PCRE library is a set of functions that implement regular expression
 pattern matching using the same syntax and semantics as Perl, with just a few
-differences. (Certain features that appeared in Python and PCRE before they
-appeared in Perl are also available using the Python syntax.)
-</P>
-<P>
-The current implementation of PCRE (release 7.x) corresponds approximately with
-Perl 5.10, including support for UTF-8 encoded strings and Unicode general
-category properties. However, UTF-8 and Unicode support has to be explicitly
-enabled; it is not the default. The Unicode tables correspond to Unicode
-release 5.0.0.
-</P>
-<P>
-In addition to the Perl-compatible matching function, PCRE contains an
-alternative matching function that matches the same compiled patterns in a
-different way. In certain circumstances, the alternative function has some
-advantages. For a discussion of the two matching algorithms, see the
-<a href="pcrematching.html"><b>pcrematching</b></a>
-page.
+differences. The current implementation of PCRE (release 5.x) corresponds
+approximately with Perl 5.8, including support for UTF-8 encoded strings and
+Unicode general category properties. However, this support has to be explicitly
+enabled; it is not the default.
 </P>
 <P>
 PCRE is written in C and released as a C library. A number of people have
-written wrappers and interfaces of various kinds. In particular, Google Inc.
-have provided a comprehensive C++ wrapper. This is now included as part of the
-PCRE distribution. The
-<a href="pcrecpp.html"><b>pcrecpp</b></a>
-page has details of this interface. Other people's contributions can be found
-in the <i>Contrib</i> directory at the primary FTP site, which is:
+written wrappers and interfaces of various kinds. A C++ class is included in
+these contributions, which can be found in the <i>Contrib</i> directory at the
+primary FTP site, which is:
 <a href="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre">ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre</a>
 </P>
 <P>
@@ -58,9 +41,7 @@
 <a href="pcrepattern.html"><b>pcrepattern</b></a>
 and
 <a href="pcrecompat.html"><b>pcrecompat</b></a>
-pages. There is a syntax summary in the
-<a href="pcresyntax.html"><b>pcresyntax</b></a>
-page.
+pages.
 </P>
 <P>
 Some features of PCRE can be included, excluded, or changed when the library is
@@ -72,15 +53,6 @@
 page. Documentation about building PCRE for various operating systems can be
 found in the <b>README</b> file in the source distribution.
 </P>
-<P>
-The library contains a number of undocumented internal functions and data
-tables that are used by more than one of the exported external functions, but
-which are not intended for use by external callers. Their names all begin with
-"_pcre_", which hopefully will not provoke any name clashes. In some
-environments, it is possible to control which external symbols are exported
-when a shared library is built, and in these cases the undocumented symbols are
-not exported.
-</P>
 <br><a name="SEC2" href="#TOC1">USER DOCUMENTATION</a><br>
 <P>
 The user documentation for PCRE comprises a number of different sections. In
@@ -90,26 +62,21 @@
 follows:
 <pre>
   pcre              this document
-  pcre-config       show PCRE installation configuration information
-  pcreapi           details of PCRE's native C API
+  pcreapi           details of PCRE's native API
   pcrebuild         options for building PCRE
   pcrecallout       details of the callout feature
   pcrecompat        discussion of Perl compatibility
-  pcrecpp           details of the C++ wrapper
   pcregrep          description of the <b>pcregrep</b> command
-  pcrematching      discussion of the two matching algorithms
   pcrepartial       details of the partial matching facility
   pcrepattern       syntax and semantics of supported regular expressions
-  pcresyntax        quick syntax reference
   pcreperform       discussion of performance issues
-  pcreposix         the POSIX-compatible C API
+  pcreposix         the POSIX-compatible API
   pcreprecompile    details of saving and re-using precompiled patterns
   pcresample        discussion of the sample program
-  pcrestack         discussion of stack usage
   pcretest          description of the <b>pcretest</b> testing command
 </pre>
 In addition, in the "man" and HTML formats, there is a short page for each
-C library function, listing its arguments and results.
+library function, listing its arguments and results.
 </P>
 <br><a name="SEC3" href="#TOC1">LIMITATIONS</a><br>
 <P>
@@ -124,28 +91,22 @@
 distribution and the
 <a href="pcrebuild.html"><b>pcrebuild</b></a>
 documentation for details). In these cases the limit is substantially larger.
-However, the speed of execution is slower.
+However, the speed of execution will be slower.
 </P>
 <P>
 All values in repeating quantifiers must be less than 65536.
+The maximum number of capturing subpatterns is 65535.
 </P>
 <P>
-There is no limit to the number of parenthesized subpatterns, but there can be
-no more than 65535 capturing subpatterns.
-</P>
-<P>
-The maximum length of name for a named subpattern is 32 characters, and the
-maximum number of named subpatterns is 10000.
+There is no limit to the number of non-capturing subpatterns, but the maximum
+depth of nesting of all kinds of parenthesized subpattern, including capturing
+subpatterns, assertions, and other types of subpattern, is 200.
 </P>
 <P>
 The maximum length of a subject string is the largest positive number that an
-integer variable can hold. However, when using the traditional matching
-function, PCRE uses recursion to handle subpatterns and indefinite repetition.
-This means that the available stack space may limit the size of a subject
-string that can be processed by certain patterns. For a discussion of stack
-issues, see the
-<a href="pcrestack.html"><b>pcrestack</b></a>
-documentation.
+integer variable can hold. However, PCRE uses recursion to handle subpatterns
+and indefinite repetition. This means that the available stack space may limit
+the size of a subject string that can be processed by certain patterns.
 <a name="utf8support"></a></P>
 <br><a name="SEC4" href="#TOC1">UTF-8 AND UNICODE PROPERTY SUPPORT</a><br>
 <P>
@@ -165,92 +126,58 @@
 <P>
 If you compile PCRE with UTF-8 support, but do not use it at run time, the
 library will be a bit bigger, but the additional run time overhead is limited
-to testing the PCRE_UTF8 flag occasionally, so should not be very big.
+to testing the PCRE_UTF8 flag in several places, so should not be very large.
 </P>
 <P>
 If PCRE is built with Unicode character property support (which implies UTF-8
 support), the escape sequences \p{..}, \P{..}, and \X are supported.
 The available properties that can be tested are limited to the general
 category properties such as Lu for an upper case letter or Nd for a decimal
-number, the Unicode script names such as Arabic or Han, and the derived
-properties Any and L&. A full list is given in the
+number. A full list is given in the
 <a href="pcrepattern.html"><b>pcrepattern</b></a>
-documentation. Only the short names for properties are supported. For example,
-\p{L} matches a letter. Its Perl synonym, \p{Letter}, is not supported.
-Furthermore, in Perl, many properties may optionally be prefixed by "Is", for
-compatibility with Perl 5.6. PCRE does not support this.
-<a name="utf8strings"></a></P>
-<br><b>
-Validity of UTF-8 strings
-</b><br>
-<P>
-When you set the PCRE_UTF8 flag, the strings passed as patterns and subjects
-are (by default) checked for validity on entry to the relevant functions. From
-release 7.3 of PCRE, the check is according the rules of RFC 3629, which are
-themselves derived from the Unicode specification. Earlier releases of PCRE
-followed the rules of RFC 2279, which allows the full range of 31-bit values (0
-to 0x7FFFFFFF). The current check allows only values in the range U+0 to
-U+10FFFF, excluding U+D800 to U+DFFF.
-</P>
-<P>
-The excluded code points are the "Low Surrogate Area" of Unicode, of which the
-Unicode Standard says this: "The Low Surrogate Area does not contain any
-character assignments, consequently no character code charts or namelists are
-provided for this area. Surrogates are reserved for use with UTF-16 and then
-must be used in pairs." The code points that are encoded by UTF-16 pairs are
-available as independent code points in the UTF-8 encoding. (In other words,
-the whole surrogate thing is a fudge for UTF-16 which unfortunately messes up
-UTF-8.)
-</P>
-<P>
-If an invalid UTF-8 string is passed to PCRE, an error return
-(PCRE_ERROR_BADUTF8) is given. In some situations, you may already know that
-your strings are valid, and therefore want to skip these checks in order to
-improve performance. If you set the PCRE_NO_UTF8_CHECK flag at compile time or
-at run time, PCRE assumes that the pattern or subject it is given
-(respectively) contains only valid UTF-8 codes. In this case, it does not
-diagnose an invalid UTF-8 string.
-</P>
-<P>
-If you pass an invalid UTF-8 string when PCRE_NO_UTF8_CHECK is set, what
-happens depends on why the string is invalid. If the string conforms to the
-"old" definition of UTF-8 (RFC 2279), it is processed as a string of characters
-in the range 0 to 0x7FFFFFFF. In other words, apart from the initial validity
-test, PCRE (when in UTF-8 mode) handles strings according to the more liberal
-rules of RFC 2279. However, if the string does not even conform to RFC 2279,
-the result is undefined. Your program may crash.
-</P>
-<P>
-If you want to process strings of values in the full range 0 to 0x7FFFFFFF,
-encoded in a UTF-8-like manner as per the old RFC, you can set
-PCRE_NO_UTF8_CHECK to bypass the more restrictive test. However, in this
-situation, you will have to apply your own validity check.
-</P>
-<br><b>
-General comments about UTF-8 mode
-</b><br>
-<P>
-1. An unbraced hexadecimal escape sequence (such as \xb3) matches a two-byte
-UTF-8 character if the value is greater than 127.
+documentation. The PCRE library is increased in size by about 90K when Unicode
+property support is included.
+</P>
+<P>
+The following comments apply when PCRE is running in UTF-8 mode:
+</P>
+<P>
+1. When you set the PCRE_UTF8 flag, the strings passed as patterns and subjects
+are checked for validity on entry to the relevant functions. If an invalid
+UTF-8 string is passed, an error return is given. In some situations, you may
+already know that your strings are valid, and therefore want to skip these
+checks in order to improve performance. If you set the PCRE_NO_UTF8_CHECK flag
+at compile time or at run time, PCRE assumes that the pattern or subject it
+is given (respectively) contains only valid UTF-8 codes. In this case, it does
+not diagnose an invalid UTF-8 string. If you pass an invalid UTF-8 string to
+PCRE when PCRE_NO_UTF8_CHECK is set, the results are undefined. Your program
+may crash.
 </P>
 <P>
-2. Octal numbers up to \777 are recognized, and match two-byte UTF-8
-characters for values greater than \177.
+2. In a pattern, the escape sequence \x{...}, where the contents of the braces
+is a string of hexadecimal digits, is interpreted as a UTF-8 character whose
+code number is the given hexadecimal number, for example: \x{1234}. If a
+non-hexadecimal digit appears between the braces, the item is not recognized.
+This escape sequence can be used either as a literal, or within a character
+class.
 </P>
 <P>
-3. Repeat quantifiers apply to complete UTF-8 characters, not to individual
+3. The original hexadecimal escape sequence, \xhh, matches a two-byte UTF-8
+character if the value is greater than 127.
+</P>
+<P>
+4. Repeat quantifiers apply to complete UTF-8 characters, not to individual
 bytes, for example: \x{100}{3}.
 </P>
 <P>
-4. The dot metacharacter matches one UTF-8 character instead of a single byte.
+5. The dot metacharacter matches one UTF-8 character instead of a single byte.
 </P>
 <P>
-5. The escape sequence \C can be used to match a single byte in UTF-8 mode,
-but its use can lead to some strange effects. This facility is not available in
-the alternative matching function, <b>pcre_dfa_exec()</b>.
+6. The escape sequence \C can be used to match a single byte in UTF-8 mode,
+but its use can lead to some strange effects.
 </P>
 <P>
-6. The character escapes \b, \B, \d, \D, \s, \S, \w, and \W correctly
+7. The character escapes \b, \B, \d, \D, \s, \S, \w, and \W correctly
 test characters of any code value, but the characters that PCRE recognizes as
 digits, spaces, or word characters remain the same set as before, all with
 values less than 256. This remains true even when PCRE includes Unicode
@@ -259,44 +186,29 @@
 must use Unicode property tests such as \p{Nd}.
 </P>
 <P>
-7. Similarly, characters that match the POSIX named character classes are all
+8. Similarly, characters that match the POSIX named character classes are all
 low-valued characters.
 </P>
 <P>
-8. However, the Perl 5.10 horizontal and vertical whitespace matching escapes
-(\h, \H, \v, and \V) do match all the appropriate Unicode characters.
-</P>
-<P>
 9. Case-insensitive matching applies only to characters whose values are less
 than 128, unless PCRE is built with Unicode property support. Even when Unicode
 property support is available, PCRE still uses its own character tables when
 checking the case of low-valued characters, so as not to degrade performance.
 The Unicode property information is used only for characters with higher
-values. Even when Unicode property support is available, PCRE supports
-case-insensitive matching only when there is a one-to-one mapping between a
-letter's cases. There are a small number of many-to-one mappings in Unicode;
-these are not supported by PCRE.
+values.
 </P>
 <br><a name="SEC5" href="#TOC1">AUTHOR</a><br>
 <P>
-Philip Hazel
-<br>
-University Computing Service
+Philip Hazel &#60;ph10@cam.ac.uk&#62;
 <br>
-Cambridge CB2 3QH, England.
+University Computing Service,
 <br>
-</P>
-<P>
-Putting an actual email address here seems to have been a spam magnet, so I've
-taken it away. If you want to email me, use my two initials, followed by the
-two digits 10, at the domain cam.ac.uk.
-</P>
-<br><a name="SEC6" href="#TOC1">REVISION</a><br>
-<P>
-Last updated: 09 August 2007
+Cambridge CB2 3QG, England.
 <br>
-Copyright &copy; 1997-2007 University of Cambridge.
+Phone: +44 1223 334714
+Last updated: 09 September 2004
 <br>
+Copyright &copy; 1997-2004 University of Cambridge.
 <p>
 Return to the <a href="index.html">PCRE index page</a>.
 </p>

Modified: httpd/httpd/vendor/pcre/current/doc/html/pcre_compile.html
URL: http://svn.apache.org/viewvc/httpd/httpd/vendor/pcre/current/doc/html/pcre_compile.html?rev=598343&r1=598342&r2=598343&view=diff
==============================================================================
--- httpd/httpd/vendor/pcre/current/doc/html/pcre_compile.html (original)
+++ httpd/httpd/vendor/pcre/current/doc/html/pcre_compile.html Mon Nov 26 09:04:19 2007
@@ -27,9 +27,8 @@
 DESCRIPTION
 </b><br>
 <P>
-This function compiles a regular expression into an internal form. It is the
-same as <b>pcre_compile2()</b>, except for the absence of the <i>errorcodeptr</i>
-argument. Its arguments are:
+This function compiles a regular expression into an internal form. Its
+arguments are:
 <pre>
   <i>pattern</i>       A zero-terminated string containing the
                   regular expression to be compiled
@@ -43,22 +42,13 @@
 <pre>
   PCRE_ANCHORED         Force pattern anchoring
   PCRE_AUTO_CALLOUT     Compile automatic callouts
-  PCRE_BSR_ANYCRLF      \R matches only CR, LF, or CRLF
-  PCRE_BSR_UNICODE      \R matches all Unicode line endings
   PCRE_CASELESS         Do caseless matching
   PCRE_DOLLAR_ENDONLY   $ not to match newline at end
   PCRE_DOTALL           . matches anything including NL
-  PCRE_DUPNAMES         Allow duplicate names for subpatterns
   PCRE_EXTENDED         Ignore whitespace and # comments
   PCRE_EXTRA            PCRE extra features
                           (not much use currently)
-  PCRE_FIRSTLINE        Force matching to be before newline
   PCRE_MULTILINE        ^ and $ match newlines within data
-  PCRE_NEWLINE_ANY      Recognize any Unicode newline sequence
-  PCRE_NEWLINE_ANYCRLF  Recognize CR, LF, and CRLF as newline sequences
-  PCRE_NEWLINE_CR       Set CR as the newline sequence
-  PCRE_NEWLINE_CRLF     Set CRLF as the newline sequence
-  PCRE_NEWLINE_LF       Set LF as the newline sequence
   PCRE_NO_AUTO_CAPTURE  Disable numbered capturing paren-
                           theses (named ones available)
   PCRE_UNGREEDY         Invert greediness of quantifiers
@@ -72,9 +62,7 @@
 </P>
 <P>
 The yield of the function is a pointer to a private data structure that
-contains the compiled pattern, or NULL if an error was detected. Note that
-compiling regular expressions with one version of PCRE for use with a different
-version is not guaranteed to work and may cause crashes.
+contains the compiled pattern, or NULL if an error was detected.
 </P>
 <P>
 There is a complete description of the PCRE native API in the

Modified: httpd/httpd/vendor/pcre/current/doc/html/pcre_config.html
URL: http://svn.apache.org/viewvc/httpd/httpd/vendor/pcre/current/doc/html/pcre_config.html?rev=598343&r1=598342&r2=598343&view=diff
==============================================================================
--- httpd/httpd/vendor/pcre/current/doc/html/pcre_config.html (original)
+++ httpd/httpd/vendor/pcre/current/doc/html/pcre_config.html Mon Nov 26 09:04:19 2007
@@ -36,17 +36,7 @@
 <pre>
   PCRE_CONFIG_LINK_SIZE     Internal link size: 2, 3, or 4
   PCRE_CONFIG_MATCH_LIMIT   Internal resource limit
-  PCRE_CONFIG_MATCH_LIMIT_RECURSION
-                            Internal recursion depth limit
-  PCRE_CONFIG_NEWLINE       Value of the default newline sequence:
-                                13 (0x000d)    for CR
-                                10 (0x000a)    for LF
-                              3338 (0x0d0a)    for CRLF
-                                -2             for ANYCRLF
-                                -1             for ANY
-  PCRE_CONFIG_BSR           Indicates what \R matches by default:
-                                 0             all Unicode line endings
-                                 1             CR, LF, or CRLF only
+  PCRE_CONFIG_NEWLINE       Value of the newline character
   PCRE_CONFIG_POSIX_MALLOC_THRESHOLD
                             Threshold of return slots, above
                               which <b>malloc()</b> is used by

Modified: httpd/httpd/vendor/pcre/current/doc/html/pcre_copy_substring.html
URL: http://svn.apache.org/viewvc/httpd/httpd/vendor/pcre/current/doc/html/pcre_copy_substring.html?rev=598343&r1=598342&r2=598343&view=diff
==============================================================================
--- httpd/httpd/vendor/pcre/current/doc/html/pcre_copy_substring.html (original)
+++ httpd/httpd/vendor/pcre/current/doc/html/pcre_copy_substring.html Mon Nov 26 09:04:19
2007
@@ -37,7 +37,7 @@
   <i>buffer</i>        Buffer to receive the string
   <i>buffersize</i>    Size of buffer
 </pre>
-The yield is the length of the string, PCRE_ERROR_NOMEMORY if the buffer was
+The yield is the legnth of the string, PCRE_ERROR_NOMEMORY if the buffer was
 too small, or PCRE_ERROR_NOSUBSTRING if the string number is invalid.
 </P>
 <P>

Modified: httpd/httpd/vendor/pcre/current/doc/html/pcre_exec.html
URL: http://svn.apache.org/viewvc/httpd/httpd/vendor/pcre/current/doc/html/pcre_exec.html?rev=598343&r1=598342&r2=598343&view=diff
==============================================================================
--- httpd/httpd/vendor/pcre/current/doc/html/pcre_exec.html (original)
+++ httpd/httpd/vendor/pcre/current/doc/html/pcre_exec.html Mon Nov 26 09:04:19 2007
@@ -28,8 +28,7 @@
 </b><br>
 <P>
 This function matches a compiled regular expression against a given subject
-string, using a matching algorithm that is similar to Perl's. It returns
-offsets to captured substrings. Its arguments are:
+string, and returns offsets to capturing subexpressions. Its arguments are:
 <pre>
   <i>code</i>         Points to the compiled pattern
   <i>extra</i>        Points to an associated <b>pcre_extra</b> structure,
@@ -45,13 +44,6 @@
 The options are:
 <pre>
   PCRE_ANCHORED      Match only at the first position
-  PCRE_BSR_ANYCRLF   \R matches only CR, LF, or CRLF
-  PCRE_BSR_UNICODE   \R matches all Unicode line endings
-  PCRE_NEWLINE_ANY   Recognize any Unicode newline sequence
-  PCRE_NEWLINE_ANYCRLF  Recognize CR, LF, and CRLF as newline sequences
-  PCRE_NEWLINE_CR    Set CR as the newline sequence
-  PCRE_NEWLINE_CRLF  Set CRLF as the newline sequence
-  PCRE_NEWLINE_LF    Set LF as the newline sequence
   PCRE_NOTBOL        Subject is not the beginning of a line
   PCRE_NOTEOL        Subject is not the end of a line
   PCRE_NOTEMPTY      An empty string is not a valid match
@@ -61,23 +53,19 @@
   PCRE_PARTIAL       Return PCRE_ERROR_PARTIAL for a partial match
 </pre>
 There are restrictions on what may appear in a pattern when partial matching is
-requested. For details, see the
-<a href="pcrepartial.html"><b>pcrepartial</b></a>
-page.
+requested.
 </P>
 <P>
 A <b>pcre_extra</b> structure contains the following fields:
 <pre>
   <i>flags</i>        Bits indicating which fields are set
   <i>study_data</i>   Opaque data from <b>pcre_study()</b>
-  <i>match_limit</i>  Limit on internal resource use
-  <i>match_limit_recursion</i>  Limit on internal recursion depth
+  <i>match_limit</i>  Limit on internal recursion
   <i>callout_data</i> Opaque data passed back to callouts
   <i>tables</i>       Points to character tables or is NULL
 </pre>
 The flag bits are PCRE_EXTRA_STUDY_DATA, PCRE_EXTRA_MATCH_LIMIT,
-PCRE_EXTRA_MATCH_LIMIT_RECURSION, PCRE_EXTRA_CALLOUT_DATA, and
-PCRE_EXTRA_TABLES.
+PCRE_EXTRA_CALLOUT_DATA, and PCRE_EXTRA_TABLES.
 </P>
 <P>
 There is a complete description of the PCRE native API in the

Modified: httpd/httpd/vendor/pcre/current/doc/html/pcre_fullinfo.html
URL: http://svn.apache.org/viewvc/httpd/httpd/vendor/pcre/current/doc/html/pcre_fullinfo.html?rev=598343&r1=598342&r2=598343&view=diff
==============================================================================
--- httpd/httpd/vendor/pcre/current/doc/html/pcre_fullinfo.html (original)
+++ httpd/httpd/vendor/pcre/current/doc/html/pcre_fullinfo.html Mon Nov 26 09:04:19 2007
@@ -42,14 +42,13 @@
                               -1 for start of string
                                  or after newline, or
                               -2 otherwise
-  PCRE_INFO_FIRSTTABLE      Table of first bytes (after studying)
-  PCRE_INFO_JCHANGED        Return 1 if (?J) was used
+  PCRE_INFO_FIRSTTABLE      Table of first bytes
+                              (after studying)
   PCRE_INFO_LASTLITERAL     Literal last byte required
   PCRE_INFO_NAMECOUNT       Number of named subpatterns
   PCRE_INFO_NAMEENTRYSIZE   Size of name table entry
   PCRE_INFO_NAMETABLE       Pointer to name table
-  PCRE_INFO_OKPARTIAL       Return 1 if partial matching can be tried
-  PCRE_INFO_OPTIONS         Option bits used for compilation
+  PCRE_INFO_OPTIONS         Options used for compilation
   PCRE_INFO_SIZE            Size of compiled pattern
   PCRE_INFO_STUDYSIZE       Size of study data
 </pre>

Modified: httpd/httpd/vendor/pcre/current/doc/html/pcre_get_named_substring.html
URL: http://svn.apache.org/viewvc/httpd/httpd/vendor/pcre/current/doc/html/pcre_get_named_substring.html?rev=598343&r1=598342&r2=598343&view=diff
==============================================================================
--- httpd/httpd/vendor/pcre/current/doc/html/pcre_get_named_substring.html (original)
+++ httpd/httpd/vendor/pcre/current/doc/html/pcre_get_named_substring.html Mon Nov 26 09:04:19
2007
@@ -39,10 +39,9 @@
   <i>stringptr</i>     Where to put the string pointer
 </pre>
 The memory in which the substring is placed is obtained by calling
-<b>pcre_malloc()</b>. The convenience function <b>pcre_free_substring()</b>
can
-be used to free it when it is no longer needed. The yield of the function is
-the length of the extracted substring, PCRE_ERROR_NOMEMORY if sufficient memory
-could not be obtained, or PCRE_ERROR_NOSUBSTRING if the string name is invalid.
+<b>pcre_malloc()</b>. The yield of the function is the length of the extracted
+substring, PCRE_ERROR_NOMEMORY if sufficient memory could not be obtained, or
+PCRE_ERROR_NOSUBSTRING if the string name is invalid.
 </P>
 <P>
 There is a complete description of the PCRE native API in the

Modified: httpd/httpd/vendor/pcre/current/doc/html/pcre_get_stringnumber.html
URL: http://svn.apache.org/viewvc/httpd/httpd/vendor/pcre/current/doc/html/pcre_get_stringnumber.html?rev=598343&r1=598342&r2=598343&view=diff
==============================================================================
--- httpd/httpd/vendor/pcre/current/doc/html/pcre_get_stringnumber.html (original)
+++ httpd/httpd/vendor/pcre/current/doc/html/pcre_get_stringnumber.html Mon Nov 26 09:04:19
2007
@@ -33,10 +33,7 @@
   <i>name</i>    Name whose number is required
 </pre>
 The yield of the function is the number of the parenthesis if the name is
-found, or PCRE_ERROR_NOSUBSTRING otherwise. When duplicate names are allowed
-(PCRE_DUPNAMES is set), it is not defined which of the numbers is returned by
-<b>pcre_get_stringnumber()</b>. You can obtain the complete list by calling
-<b>pcre_get_stringtable_entries()</b>.
+found, or PCRE_ERROR_NOSUBSTRING otherwise.
 </P>
 <P>
 There is a complete description of the PCRE native API in the

Modified: httpd/httpd/vendor/pcre/current/doc/html/pcre_get_substring.html
URL: http://svn.apache.org/viewvc/httpd/httpd/vendor/pcre/current/doc/html/pcre_get_substring.html?rev=598343&r1=598342&r2=598343&view=diff
==============================================================================
--- httpd/httpd/vendor/pcre/current/doc/html/pcre_get_substring.html (original)
+++ httpd/httpd/vendor/pcre/current/doc/html/pcre_get_substring.html Mon Nov 26 09:04:19 2007
@@ -37,10 +37,9 @@
   <i>stringptr</i>     Where to put the string pointer
 </pre>
 The memory in which the substring is placed is obtained by calling
-<b>pcre_malloc()</b>. The convenience function <b>pcre_free_substring()</b>
can
-be used to free it when it is no longer needed. The yield of the function is
-the length of the substring, PCRE_ERROR_NOMEMORY if sufficient memory could not
-be obtained, or PCRE_ERROR_NOSUBSTRING if the string number is invalid.
+<b>pcre_malloc()</b>. The yield of the function is the length of the substring,
+PCRE_ERROR_NOMEMORY if sufficient memory could not be obtained, or
+PCRE_ERROR_NOSUBSTRING if the string number is invalid.
 </P>
 <P>
 There is a complete description of the PCRE native API in the

Modified: httpd/httpd/vendor/pcre/current/doc/html/pcre_get_substring_list.html
URL: http://svn.apache.org/viewvc/httpd/httpd/vendor/pcre/current/doc/html/pcre_get_substring_list.html?rev=598343&r1=598342&r2=598343&view=diff
==============================================================================
--- httpd/httpd/vendor/pcre/current/doc/html/pcre_get_substring_list.html (original)
+++ httpd/httpd/vendor/pcre/current/doc/html/pcre_get_substring_list.html Mon Nov 26 09:04:19
2007
@@ -35,12 +35,10 @@
   <i>listptr</i>       Where to put a pointer to the list
 </pre>
 The memory in which the substrings and the list are placed is obtained by
-calling <b>pcre_malloc()</b>. The convenience function
-<b>pcre_free_substring_list()</b> can be used to free it when it is no longer
-needed. A pointer to a list of pointers is put in the variable whose address is
-in <i>listptr</i>. The list is terminated by a NULL pointer. The yield of the
-function is zero on success or PCRE_ERROR_NOMEMORY if sufficient memory could
-not be obtained.
+calling <b>pcre_malloc()</b>. A pointer to a list of pointers is put in
+the variable whose address is in <i>listptr</i>. The list is terminated by a
+NULL pointer. The yield of the function is zero on success or
+PCRE_ERROR_NOMEMORY if sufficient memory could not be obtained.
 </P>
 <P>
 There is a complete description of the PCRE native API in the



Mime
View raw message