tony2001 Tue Jul 24 22:35:19 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/pcre php_pcre.c
Log:
[DOC] MFH: add PCRE_VERSION constant to ext/pcre
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.855&r2=1.2027.2.547.2.856&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.855 php-src/NEWS:1.2027.2.547.2.856
--- php-src/NEWS:1.2027.2.547.2.855 Tue Jul 24 19:24:39 2007
+++ php-src/NEWS Tue Jul 24 22:35:18 2007
@@ -34,6 +34,7 @@
- Added CURLOPT_PRIVATE & CURLINFO_PRIVATE constants.
(Andrey A. Belashkov, Tony)
- Added missing MSG_EOR and MSG_EOF constants to sockets extension. (Jani)
+- Added PCRE_VERSION constant. (Tony)
- Implemented FR #41884 (ReflectionClass::getDefaultProperties() does not
handle
static attributes). (Tony)
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.18&r2=1.168.2.9.2.19&diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.18
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.19
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.18 Tue Jun 12 14:08:16 2007
+++ php-src/ext/pcre/php_pcre.c Tue Jul 24 22:35:18 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.18 2007/06/12 14:08:16 scottmac Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.19 2007/07/24 22:35:18 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -56,7 +56,7 @@
};
-ZEND_DECLARE_MODULE_GLOBALS(pcre);
+ZEND_DECLARE_MODULE_GLOBALS(pcre)
static void pcre_handle_exec_error(int pcre_code TSRMLS_DC) /* {{{ */
@@ -149,6 +149,7 @@
REGISTER_LONG_CONSTANT("PREG_BACKTRACK_LIMIT_ERROR",
PHP_PCRE_BACKTRACK_LIMIT_ERROR, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PREG_RECURSION_LIMIT_ERROR",
PHP_PCRE_RECURSION_LIMIT_ERROR, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PREG_BAD_UTF8_ERROR", PHP_PCRE_BAD_UTF8_ERROR,
CONST_CS | CONST_PERSISTENT);
+ REGISTER_STRING_CONSTANT("PCRE_VERSION", (char *)pcre_version(),
CONST_CS | CONST_PERSISTENT);
return SUCCESS;
}
