[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
tony2001Mon Feb 12 08:57:41 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: fix news entry http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.531r2=1.2027.2.547.2.532diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.531 php-src/NEWS:1.2027.2.547.2.532 --- php-src/NEWS:1.2027.2.547.2.531 Sun Feb 11 16:07:30 2007 +++ php-src/NEWSMon Feb 12 08:57:41 2007 @@ -7,7 +7,7 @@ - Added tidyNode::getParent() method (John, Nuno) - Fixed bug #40431 (dynamic properties may cause crash in ReflectionProperty methods). (Tony) -- Fixed bug #40428, imagepstext() doesn't accept optional parameter (Pierre) +- Fixed bug #40428 (imagepstext() doesn't accept optional parameter). (Pierre) - Fixed bug #40410 (ext/posix does not compile on MacOS 10.3.9). (Tony) - Fixed bug #39836 (SplObjectStorage empty after unserialize). (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 config.m4 oci8.c php_oci8_int.h
tony2001Mon Feb 12 09:36:11 2007 UTC
Modified files:
/php-src/ext/oci8 oci8.c config.m4 php_oci8_int.h
Log:
typofixes and other improvements by Chris Jones
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.328r2=1.329diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.328 php-src/ext/oci8/oci8.c:1.329
--- php-src/ext/oci8/oci8.c:1.328 Wed Jan 31 12:45:55 2007
+++ php-src/ext/oci8/oci8.c Mon Feb 12 09:36:11 2007
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.328 2007/01/31 12:45:55 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.329 2007/02/12 09:36:11 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -674,7 +674,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
php_info_print_table_row(2, Version, 1.2.2);
- php_info_print_table_row(2, Revision, $Revision: 1.328 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.329 $);
sprintf(buf, %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);
@@ -1088,7 +1088,7 @@
size_t rsize = 0;
sword result;
- PHP_OCI_CALL_RETURN(result,
OCINlsEnvironmentVariableGet, (charsetid_nls_lang, 0, OCI_NLS_CHARSET_ID, 0,
rsize))
+ PHP_OCI_CALL_RETURN(result,
OCINlsEnvironmentVariableGet, (charsetid_nls_lang, 0, OCI_NLS_CHARSET_ID, 0,
rsize));
if (result != OCI_SUCCESS) {
charsetid_nls_lang = 0;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.62r2=1.63diff_format=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.62 php-src/ext/oci8/config.m4:1.63
--- php-src/ext/oci8/config.m4:1.62 Thu Jun 22 20:28:51 2006
+++ php-src/ext/oci8/config.m4 Mon Feb 12 09:36:11 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.62 2006/06/22 20:28:51 tony2001 Exp $
+dnl $Id: config.m4,v 1.63 2007/02/12 09:36:11 tony2001 Exp $
dnl
if test -z $SED; then
@@ -99,7 +99,7 @@
[ --with-oci8[=DIR] Include Oracle (OCI8) support.
The default DIR is ORACLE_HOME.
Use --with-oci8=instantclient,/path/to/oic/lib
- to use Oracle Instant Client installation])
+ to use an Oracle Instant Client installation])
AC_MSG_CHECKING([checking PHP version])
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8_int.h?r1=1.30r2=1.31diff_format=u
Index: php-src/ext/oci8/php_oci8_int.h
diff -u php-src/ext/oci8/php_oci8_int.h:1.30
php-src/ext/oci8/php_oci8_int.h:1.31
--- php-src/ext/oci8/php_oci8_int.h:1.30Wed Jan 31 10:36:20 2007
+++ php-src/ext/oci8/php_oci8_int.h Mon Feb 12 09:36:11 2007
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: php_oci8_int.h,v 1.30 2007/01/31 10:36:20 tony2001 Exp $ */
+/* $Id: php_oci8_int.h,v 1.31 2007/02/12 09:36:11 tony2001 Exp $ */
#if HAVE_OCI8
# ifndef PHP_OCI8_INT_H
@@ -231,41 +231,47 @@
/* {{{ macros */
#define PHP_OCI_CALL(func, params) \
- OCI_G(in_call) = 1; \
- func params; \
- OCI_G(in_call) = 0; \
- if (OCI_G(debug_mode)) { \
- php_printf (OCI8 DEBUG: #func at (%s:%d) \n, __FILE__,
__LINE__); \
- }
+ do { \
+ OCI_G(in_call) = 1; \
+ func params; \
+ OCI_G(in_call) = 0; \
+ if (OCI_G(debug_mode)) { \
+ php_printf (OCI8 DEBUG: #func at (%s:%d) \n,
__FILE__, __LINE__); \
+ } \
+ } while (0)
#define PHP_OCI_CALL_RETURN(__retval, func, params) \
- OCI_G(in_call) = 1; \
- __retval = func params; \
- OCI_G(in_call) = 0; \
- if (OCI_G(debug_mode)) { \
- php_printf (OCI8 DEBUG: #func at (%s:%d) \n, __FILE__,
__LINE__); \
- }
+ do { \
+ OCI_G(in_call) = 1; \
+ __retval = func params; \
+ OCI_G(in_call) = 0; \
+ if (OCI_G(debug_mode)) { \
+ php_printf (OCI8 DEBUG: #func at (%s:%d) \n,
__FILE__, __LINE__); \
+ } \
+ } while (0)
#define PHP_OCI_HANDLE_ERROR(connection, errcode) \
-{ \
- switch (errcode) { \
- case 1013: \
- zend_bailout(); \
+ do { \
+ switch (errcode) { \
+ case 1013: \
+ zend_bailout(); \
break; \
- case 22: \
- case 1012: \
- case 3113: \
- case 604: \
- case 1041: \
-
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/oci8 config.m4 oci8.c php_oci8_int.h
tony2001Mon Feb 12 09:36:24 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/oci8 oci8.c config.m4 php_oci8_int.h
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.30r2=1.269.2.16.2.31diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.30
php-src/ext/oci8/oci8.c:1.269.2.16.2.31
--- php-src/ext/oci8/oci8.c:1.269.2.16.2.30 Wed Jan 31 13:55:43 2007
+++ php-src/ext/oci8/oci8.c Mon Feb 12 09:36:23 2007
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.269.2.16.2.30 2007/01/31 13:55:43 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.31 2007/02/12 09:36:23 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -674,7 +674,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
php_info_print_table_row(2, Version, 1.2.3);
- php_info_print_table_row(2, Revision, $Revision: 1.269.2.16.2.30 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.269.2.16.2.31 $);
sprintf(buf, %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);
@@ -1054,7 +1054,7 @@
size_t rsize = 0;
sword result;
- PHP_OCI_CALL_RETURN(result, OCINlsEnvironmentVariableGet,
(charsetid_nls_lang, 0, OCI_NLS_CHARSET_ID, 0, rsize))
+ PHP_OCI_CALL_RETURN(result, OCINlsEnvironmentVariableGet,
(charsetid_nls_lang, 0, OCI_NLS_CHARSET_ID, 0, rsize));
if (result != OCI_SUCCESS) {
charsetid_nls_lang = 0;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.55.2.3.2.3r2=1.55.2.3.2.4diff_format=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.55.2.3.2.3
php-src/ext/oci8/config.m4:1.55.2.3.2.4
--- php-src/ext/oci8/config.m4:1.55.2.3.2.3 Mon Sep 18 21:23:42 2006
+++ php-src/ext/oci8/config.m4 Mon Feb 12 09:36:23 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.55.2.3.2.3 2006/09/18 21:23:42 tony2001 Exp $
+dnl $Id: config.m4,v 1.55.2.3.2.4 2007/02/12 09:36:23 tony2001 Exp $
dnl
if test -z $SED; then
@@ -99,7 +99,7 @@
[ --with-oci8[=DIR] Include Oracle (OCI8) support.
The default DIR is ORACLE_HOME.
Use --with-oci8=instantclient,/path/to/oic/lib
- to use Oracle Instant Client installation])
+ to use an Oracle Instant Client installation])
AC_MSG_CHECKING([checking PHP version])
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8_int.h?r1=1.11.2.6.2.14r2=1.11.2.6.2.15diff_format=u
Index: php-src/ext/oci8/php_oci8_int.h
diff -u php-src/ext/oci8/php_oci8_int.h:1.11.2.6.2.14
php-src/ext/oci8/php_oci8_int.h:1.11.2.6.2.15
--- php-src/ext/oci8/php_oci8_int.h:1.11.2.6.2.14 Wed Jan 31 13:55:43 2007
+++ php-src/ext/oci8/php_oci8_int.h Mon Feb 12 09:36:23 2007
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: php_oci8_int.h,v 1.11.2.6.2.14 2007/01/31 13:55:43 tony2001 Exp $ */
+/* $Id: php_oci8_int.h,v 1.11.2.6.2.15 2007/02/12 09:36:23 tony2001 Exp $ */
#if HAVE_OCI8
# ifndef PHP_OCI8_INT_H
@@ -222,41 +222,47 @@
/* {{{ macros */
#define PHP_OCI_CALL(func, params) \
- OCI_G(in_call) = 1; \
- func params; \
- OCI_G(in_call) = 0; \
- if (OCI_G(debug_mode)) { \
- php_printf (OCI8 DEBUG: #func at (%s:%d) \n, __FILE__,
__LINE__); \
- }
+ do { \
+ OCI_G(in_call) = 1; \
+ func params; \
+ OCI_G(in_call) = 0; \
+ if (OCI_G(debug_mode)) { \
+ php_printf (OCI8 DEBUG: #func at (%s:%d) \n,
__FILE__, __LINE__); \
+ } \
+ } while (0)
#define PHP_OCI_CALL_RETURN(__retval, func, params) \
- OCI_G(in_call) = 1; \
- __retval = func params; \
- OCI_G(in_call) = 0; \
- if (OCI_G(debug_mode)) { \
- php_printf (OCI8 DEBUG: #func at (%s:%d) \n, __FILE__,
__LINE__); \
- }
+ do { \
+ OCI_G(in_call) = 1; \
+ __retval = func params; \
+ OCI_G(in_call) = 0; \
+ if (OCI_G(debug_mode)) { \
+ php_printf (OCI8 DEBUG: #func at (%s:%d) \n,
__FILE__, __LINE__); \
+ } \
+ } while (0)
#define PHP_OCI_HANDLE_ERROR(connection, errcode) \
-{ \
- switch (errcode) { \
- case 1013: \
- zend_bailout(); \
+ do { \
+ switch (errcode) { \
+ case 1013: \
+ zend_bailout(); \
break; \
- case
[PHP-CVS] cvs: php-src /ext/pcre/tests backtrack_limit.phpt bug27103.phpt invalid_utf8.phpt pcre_anchored.phpt preg_replace2.phpt recursion_limit.phpt
tony2001Mon Feb 12 14:22:02 2007 UTC
Modified files:
/php-src/ext/pcre/tests backtrack_limit.phpt bug27103.phpt
invalid_utf8.phpt pcre_anchored.phpt
preg_replace2.phpt recursion_limit.phpt
Log:
add SKIPIF sections to check if PCRE has the functionality tested/used
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/backtrack_limit.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/pcre/tests/backtrack_limit.phpt
diff -u php-src/ext/pcre/tests/backtrack_limit.phpt:1.2
php-src/ext/pcre/tests/backtrack_limit.phpt:1.3
--- php-src/ext/pcre/tests/backtrack_limit.phpt:1.2 Tue Jun 13 22:05:26 2006
+++ php-src/ext/pcre/tests/backtrack_limit.phpt Mon Feb 12 14:22:02 2007
@@ -1,5 +1,11 @@
--TEST--
Backtracking limit
+--SKIPIF--
+?php
+if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) {
+ die(skip no support for \p support PCRE library);
+}
+?
--INI--
pcre.backtrack_limit=2
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug27103.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/pcre/tests/bug27103.phpt
diff -u php-src/ext/pcre/tests/bug27103.phpt:1.1
php-src/ext/pcre/tests/bug27103.phpt:1.2
--- php-src/ext/pcre/tests/bug27103.phpt:1.1Sun Feb 1 03:03:15 2004
+++ php-src/ext/pcre/tests/bug27103.phptMon Feb 12 14:22:02 2007
@@ -1,5 +1,11 @@
--TEST--
Bug #27103 (preg_split('//u') incorrectly splits UTF-8 strings into octets)
+--SKIPIF--
+?php
+if (@preg_match_all('/./u', , $matches) === false) {
+ die(skip no utf8 support in PCRE library);
+}
+?
--FILE--
?php
function iter($ar)
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/invalid_utf8.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/pcre/tests/invalid_utf8.phpt
diff -u php-src/ext/pcre/tests/invalid_utf8.phpt:1.1
php-src/ext/pcre/tests/invalid_utf8.phpt:1.2
--- php-src/ext/pcre/tests/invalid_utf8.phpt:1.1Mon May 29 20:31:33 2006
+++ php-src/ext/pcre/tests/invalid_utf8.phptMon Feb 12 14:22:02 2007
@@ -1,5 +1,11 @@
--TEST--
preg_replace() and invalid UTF8
+--SKIPIF--
+?php
+if (@preg_match_all('/./u', , $matches) === false) {
+ die(skip no utf8 support in PCRE library);
+}
+?
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/pcre_anchored.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/pcre/tests/pcre_anchored.phpt
diff -u php-src/ext/pcre/tests/pcre_anchored.phpt:1.3
php-src/ext/pcre/tests/pcre_anchored.phpt:1.4
--- php-src/ext/pcre/tests/pcre_anchored.phpt:1.3 Tue Aug 29 22:12:31 2006
+++ php-src/ext/pcre/tests/pcre_anchored.phpt Mon Feb 12 14:22:02 2007
@@ -1,5 +1,11 @@
--TEST--
A (PCRE_ANCHORED) modififer
+--SKIPIF--
+?php
+if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) {
+ die(skip no support for \p support PCRE library);
+}
+?
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace2.phpt?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/pcre/tests/preg_replace2.phpt
diff -u php-src/ext/pcre/tests/preg_replace2.phpt:1.5
php-src/ext/pcre/tests/preg_replace2.phpt:1.6
--- php-src/ext/pcre/tests/preg_replace2.phpt:1.5 Tue Oct 10 12:43:34 2006
+++ php-src/ext/pcre/tests/preg_replace2.phpt Mon Feb 12 14:22:02 2007
@@ -1,5 +1,11 @@
--TEST--
preg_replace()
+--SKIPIF--
+?php
+if (@preg_match_all('/./u', , $matches) === false) {
+ die(skip no utf8 support in PCRE library);
+}
+?
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/recursion_limit.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/pcre/tests/recursion_limit.phpt
diff -u php-src/ext/pcre/tests/recursion_limit.phpt:1.2
php-src/ext/pcre/tests/recursion_limit.phpt:1.3
--- php-src/ext/pcre/tests/recursion_limit.phpt:1.2 Tue Jun 13 22:05:26 2006
+++ php-src/ext/pcre/tests/recursion_limit.phpt Mon Feb 12 14:22:02 2007
@@ -1,5 +1,11 @@
--TEST--
PCRE Recursion limit
+--SKIPIF--
+?php
+if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) {
+ die(skip no support for \p support PCRE library);
+}
+?
--INI--
pcre.recursion_limit=2
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre/tests backtrack_limit.phpt bug27103.phpt invalid_utf8.phpt pcre_anchored.phpt preg_replace2.phpt recursion_limit.phpt
tony2001Mon Feb 12 14:22:19 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre/tests backtrack_limit.phpt bug27103.phpt
invalid_utf8.phpt pcre_anchored.phpt
preg_replace2.phpt recursion_limit.phpt
Log:
MFH: fix pcre tests
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/backtrack_limit.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/pcre/tests/backtrack_limit.phpt
diff -u php-src/ext/pcre/tests/backtrack_limit.phpt:1.1.2.1
php-src/ext/pcre/tests/backtrack_limit.phpt:1.1.2.2
--- php-src/ext/pcre/tests/backtrack_limit.phpt:1.1.2.1 Tue Jun 13 21:55:38 2006
+++ php-src/ext/pcre/tests/backtrack_limit.phpt Mon Feb 12 14:22:19 2007
@@ -1,5 +1,11 @@
--TEST--
Backtracking limit
+--SKIPIF--
+?php
+if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) {
+ die(skip no support for \p support PCRE library);
+}
+?
--INI--
pcre.backtrack_limit=2
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug27103.phpt?r1=1.1r2=1.1.6.1diff_format=u
Index: php-src/ext/pcre/tests/bug27103.phpt
diff -u php-src/ext/pcre/tests/bug27103.phpt:1.1
php-src/ext/pcre/tests/bug27103.phpt:1.1.6.1
--- php-src/ext/pcre/tests/bug27103.phpt:1.1Sun Feb 1 03:03:15 2004
+++ php-src/ext/pcre/tests/bug27103.phptMon Feb 12 14:22:19 2007
@@ -1,5 +1,11 @@
--TEST--
Bug #27103 (preg_split('//u') incorrectly splits UTF-8 strings into octets)
+--SKIPIF--
+?php
+if (@preg_match_all('/./u', , $matches) === false) {
+ die(skip no utf8 support in PCRE library);
+}
+?
--FILE--
?php
function iter($ar)
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/invalid_utf8.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/pcre/tests/invalid_utf8.phpt
diff -u php-src/ext/pcre/tests/invalid_utf8.phpt:1.1.2.2
php-src/ext/pcre/tests/invalid_utf8.phpt:1.1.2.3
--- php-src/ext/pcre/tests/invalid_utf8.phpt:1.1.2.2Mon May 29 20:31:48 2006
+++ php-src/ext/pcre/tests/invalid_utf8.phptMon Feb 12 14:22:19 2007
@@ -1,5 +1,11 @@
--TEST--
preg_replace() and invalid UTF8
+--SKIPIF--
+?php
+if (@preg_match_all('/./u', , $matches) === false) {
+ die(skip no utf8 support in PCRE library);
+}
+?
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/pcre_anchored.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/pcre/tests/pcre_anchored.phpt
diff -u php-src/ext/pcre/tests/pcre_anchored.phpt:1.1.2.1
php-src/ext/pcre/tests/pcre_anchored.phpt:1.1.2.2
--- php-src/ext/pcre/tests/pcre_anchored.phpt:1.1.2.1 Wed Jun 14 17:37:53 2006
+++ php-src/ext/pcre/tests/pcre_anchored.phpt Mon Feb 12 14:22:19 2007
@@ -1,5 +1,11 @@
--TEST--
A (PCRE_ANCHORED) modififer
+--SKIPIF--
+?php
+if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) {
+ die(skip no support for \p support PCRE library);
+}
+?
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace2.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/pcre/tests/preg_replace2.phpt
diff -u php-src/ext/pcre/tests/preg_replace2.phpt:1.1.2.2
php-src/ext/pcre/tests/preg_replace2.phpt:1.1.2.3
--- php-src/ext/pcre/tests/preg_replace2.phpt:1.1.2.2 Tue Oct 10 12:44:02 2006
+++ php-src/ext/pcre/tests/preg_replace2.phpt Mon Feb 12 14:22:19 2007
@@ -1,5 +1,11 @@
--TEST--
preg_replace()
+--SKIPIF--
+?php
+if (@preg_match_all('/./u', , $matches) === false) {
+ die(skip no utf8 support in PCRE library);
+}
+?
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/recursion_limit.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/pcre/tests/recursion_limit.phpt
diff -u php-src/ext/pcre/tests/recursion_limit.phpt:1.1.2.1
php-src/ext/pcre/tests/recursion_limit.phpt:1.1.2.2
--- php-src/ext/pcre/tests/recursion_limit.phpt:1.1.2.1 Tue Jun 13 21:55:38 2006
+++ php-src/ext/pcre/tests/recursion_limit.phpt Mon Feb 12 14:22:19 2007
@@ -1,5 +1,11 @@
--TEST--
PCRE Recursion limit
+--SKIPIF--
+?php
+if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) {
+ die(skip no support for \p support PCRE library);
+}
+?
--INI--
pcre.recursion_limit=2
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/network inet.phpt inet_ipv6.phpt
tony2001Mon Feb 12 14:42:25 2007 UTC
Added files:
/php-src/ext/standard/tests/network inet_ipv6.phpt
Modified files:
/php-src/ext/standard/tests/network inet.phpt
Log:
add separate IPv6 test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/inet.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/network/inet.phpt
diff -u php-src/ext/standard/tests/network/inet.phpt:1.1
php-src/ext/standard/tests/network/inet.phpt:1.2
--- php-src/ext/standard/tests/network/inet.phpt:1.1Thu Nov 16 13:00:03 2006
+++ php-src/ext/standard/tests/network/inet.phptMon Feb 12 14:42:25 2007
@@ -14,9 +14,6 @@
$packed = chr(255) . chr(255) . chr(255) . chr(0);
var_dump(inet_ntop((binary)$packed));
-$packed = str_repeat(chr(0), 15) . chr(38);
-var_dump(inet_ntop((binary)$packed));
-
var_dump(inet_ntop());
var_dump(inet_ntop(-1));
var_dump(inet_ntop(b));
@@ -43,7 +40,6 @@
--EXPECTF--
string(9) 127.0.0.1
string(13) 255.255.255.0
-string(4) ::26
Warning: inet_ntop() expects exactly 1 parameter, 0 given in %s on line %d
bool(false)
@@ -80,7 +76,6 @@
--UEXPECTF--
unicode(9) 127.0.0.1
unicode(13) 255.255.255.0
-unicode(4) ::26
Warning: inet_ntop() expects exactly 1 parameter, 0 given in %s on line %d
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/inet_ipv6.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/network/inet_ipv6.phpt
+++ php-src/ext/standard/tests/network/inet_ipv6.phpt
--TEST--
inet_ntop() inet_pton() IPv6 tests
--SKIPIF--
?php
if (!function_exists(inet_ntop)) die(skip no inet_ntop());
if (!function_exists(inet_pton)) die(skip no inet_pton());
$packed = str_repeat(chr(0), 15) . chr(1);
if (@inet_ntop((binary)$packed) === false) {
die(skip no IPv6 support);
}
?
--FILE--
?php
$a = array(
'::1',
'::2',
'::35',
'::255',
'::1024',
'',
'2001:0db8:85a3:08d3:1319:8a2e:0370:7344',
'2001:0db8:1234:::::',
'2001:0db8:1234:::::',
);
foreach ($a as $address) {
$packed = inet_pton($address);
var_dump(inet_ntop($packed));
}
echo Done\n;
?
--EXPECTF--
string(3) ::1
string(3) ::2
string(4) ::35
string(5) ::255
string(6) ::1024
Warning: inet_pton(): Unrecognized address in %s on line %d
Warning: inet_ntop(): Invalid in_addr value in %s on line %d
bool(false)
string(36) 2001:db8:85a3:8d3:1319:8a2e:370:7344
string(15) 2001:db8:1234::
string(38) 2001:db8:1234:::::
Done
--UEXPECTF--
unicode(3) ::1
unicode(3) ::2
unicode(4) ::35
unicode(5) ::255
unicode(6) ::1024
Warning: inet_pton(): Unrecognized address in %s on line %d
Warning: inet_ntop(): Invalid in_addr value in %s on line %d
bool(false)
unicode(36) 2001:db8:85a3:8d3:1319:8a2e:370:7344
unicode(15) 2001:db8:1234::
unicode(38) 2001:db8:1234:::::
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/network inet.phpt inet_ipv6.phpt
tony2001Mon Feb 12 14:43:00 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/network inet_ipv6.phpt
Modified files:
/php-src/ext/standard/tests/network inet.phpt
Log:
MFH: add separate IPv6 test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/inet.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/tests/network/inet.phpt
diff -u php-src/ext/standard/tests/network/inet.phpt:1.1.2.2
php-src/ext/standard/tests/network/inet.phpt:1.1.2.3
--- php-src/ext/standard/tests/network/inet.phpt:1.1.2.2Thu Nov 16
13:01:23 2006
+++ php-src/ext/standard/tests/network/inet.phptMon Feb 12 14:43:00 2007
@@ -14,9 +14,6 @@
$packed = chr(255) . chr(255) . chr(255) . chr(0);
var_dump(inet_ntop($packed));
-$packed = str_repeat(chr(0), 15) . chr(38);
-var_dump(inet_ntop($packed));
-
var_dump(inet_ntop());
var_dump(inet_ntop(-1));
var_dump(inet_ntop());
@@ -43,7 +40,6 @@
--EXPECTF--
string(9) 127.0.0.1
string(13) 255.255.255.0
-string(4) ::26
Warning: inet_ntop() expects exactly 1 parameter, 0 given in %s on line %d
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/inet_ipv6.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/network/inet_ipv6.phpt
+++ php-src/ext/standard/tests/network/inet_ipv6.phpt
--TEST--
inet_ntop() inet_pton() IPv6 tests
--SKIPIF--
?php
if (!function_exists(inet_ntop)) die(skip no inet_ntop());
if (!function_exists(inet_pton)) die(skip no inet_pton());
$packed = str_repeat(chr(0), 15) . chr(1);
if (@inet_ntop((binary)$packed) === false) {
die(skip no IPv6 support);
}
?
--FILE--
?php
$a = array(
'::1',
'::2',
'::35',
'::255',
'::1024',
'',
'2001:0db8:85a3:08d3:1319:8a2e:0370:7344',
'2001:0db8:1234:::::',
'2001:0db8:1234:::::',
);
foreach ($a as $address) {
$packed = inet_pton($address);
var_dump(inet_ntop($packed));
}
echo Done\n;
?
--EXPECTF--
string(3) ::1
string(3) ::2
string(4) ::35
string(5) ::255
string(6) ::1024
Warning: inet_pton(): Unrecognized address in %s on line %d
Warning: inet_ntop(): Invalid in_addr value in %s on line %d
bool(false)
string(36) 2001:db8:85a3:8d3:1319:8a2e:370:7344
string(15) 2001:db8:1234::
string(38) 2001:db8:1234:::::
Done
--UEXPECTF--
unicode(3) ::1
unicode(3) ::2
unicode(4) ::35
unicode(5) ::255
unicode(6) ::1024
Warning: inet_pton(): Unrecognized address in %s on line %d
Warning: inet_ntop(): Invalid in_addr value in %s on line %d
bool(false)
unicode(36) 2001:db8:85a3:8d3:1319:8a2e:370:7344
unicode(15) 2001:db8:1234::
unicode(38) 2001:db8:1234:::::
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sockets/tests ipv6loop.phpt /ext/standard/tests/file stream_002.phpt
tony2001Mon Feb 12 14:48:53 2007 UTC
Modified files:
/php-src/ext/sockets/tests ipv6loop.phpt
/php-src/ext/standard/tests/filestream_002.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv6loop.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/sockets/tests/ipv6loop.phpt
diff -u php-src/ext/sockets/tests/ipv6loop.phpt:1.2
php-src/ext/sockets/tests/ipv6loop.phpt:1.3
--- php-src/ext/sockets/tests/ipv6loop.phpt:1.2 Tue Aug 12 00:44:05 2003
+++ php-src/ext/sockets/tests/ipv6loop.phpt Mon Feb 12 14:48:52 2007
@@ -5,7 +5,7 @@
if (!extension_loaded('sockets')) {
die('skip sockets extenion not available.');
}
- if (!defined(AF_INET6)) {
+ if (!defined(AF_INET6)) {
die('skip no IPv6 support');
}
?
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/stream_002.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/file/stream_002.phpt
diff -u php-src/ext/standard/tests/file/stream_002.phpt:1.1
php-src/ext/standard/tests/file/stream_002.phpt:1.2
--- php-src/ext/standard/tests/file/stream_002.phpt:1.1 Wed Oct 11 12:53:38 2006
+++ php-src/ext/standard/tests/file/stream_002.phpt Mon Feb 12 14:48:52 2007
@@ -31,10 +31,10 @@
int(0)
string(27) Failed to parse address [
-Warning: stream_socket_client(): unable to connect to [ (Failed to parse IPv6
address [ ) in %s on line %d
+Warning: stream_socket_client(): unable to connect to [ (Failed to
parse%saddress [ ) in %s on line %d
bool(false)
int(0)
-string(33) Failed to parse IPv6 address [
+string(%d) Failed to parse%saddress [
Warning: stream_socket_client(): unable to connect to . (Failed to parse
address .) in %s on line %d
bool(false)
@@ -62,10 +62,10 @@
int(0)
unicode(27) Failed to parse address [
-Warning: stream_socket_client(): unable to connect to [ (Failed to parse IPv6
address [ ) in %s on line %d
+Warning: stream_socket_client(): unable to connect to [ (Failed to
parse%saddress [ ) in %s on line %d
bool(false)
int(0)
-unicode(33) Failed to parse IPv6 address [
+unicode(%d) Failed to parse%saddress [
Warning: stream_socket_client(): unable to connect to . (Failed to parse
address .) in %s on line %d
bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/sockets/tests ipv6loop.phpt /ext/standard/tests/file stream_002.phpt
tony2001Mon Feb 12 14:49:05 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sockets/tests ipv6loop.phpt
/php-src/ext/standard/tests/filestream_002.phpt
Log:
MFH: fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv6loop.phpt?r1=1.2r2=1.2.6.1diff_format=u
Index: php-src/ext/sockets/tests/ipv6loop.phpt
diff -u php-src/ext/sockets/tests/ipv6loop.phpt:1.2
php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.1
--- php-src/ext/sockets/tests/ipv6loop.phpt:1.2 Tue Aug 12 00:44:05 2003
+++ php-src/ext/sockets/tests/ipv6loop.phpt Mon Feb 12 14:49:04 2007
@@ -5,7 +5,7 @@
if (!extension_loaded('sockets')) {
die('skip sockets extenion not available.');
}
- if (!defined(AF_INET6)) {
+ if (!defined(AF_INET6)) {
die('skip no IPv6 support');
}
?
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/stream_002.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/tests/file/stream_002.phpt
diff -u php-src/ext/standard/tests/file/stream_002.phpt:1.1.2.2
php-src/ext/standard/tests/file/stream_002.phpt:1.1.2.3
--- php-src/ext/standard/tests/file/stream_002.phpt:1.1.2.2 Wed Oct 11
12:53:56 2006
+++ php-src/ext/standard/tests/file/stream_002.phpt Mon Feb 12 14:49:05 2007
@@ -31,10 +31,10 @@
int(0)
string(27) Failed to parse address [
-Warning: stream_socket_client(): unable to connect to [ (Failed to parse IPv6
address [ ) in %s on line %d
+Warning: stream_socket_client(): unable to connect to [ (Failed to
parse%saddress [ ) in %s on line %d
bool(false)
int(0)
-string(33) Failed to parse IPv6 address [
+string(%d) Failed to parse%saddress [
Warning: stream_socket_client(): unable to connect to . (Failed to parse
address .) in %s on line %d
bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /main output.c php_output.h
tony2001Mon Feb 12 17:13:23 2007 UTC
Modified files: (Branch: PHP_4_4)
/php-srcNEWS
/php-src/main output.c php_output.h
Log:
fix #40335 (Compile fails when using GCC 4.1.1/binutils 2.17)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.189r2=1.1247.2.920.2.190diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.189 php-src/NEWS:1.1247.2.920.2.190
--- php-src/NEWS:1.1247.2.920.2.189 Thu Feb 1 08:55:40 2007
+++ php-src/NEWSMon Feb 12 17:13:22 2007
@@ -1,6 +1,7 @@
PHP 4 NEWS
|||
?? Feb 2007, Version 4.4.5
+- Fixed bug #40335 (Compile fails when using GCC 4.1.1/binutils 2.17). (Tony)
01 Feb 2007, Version 4.4.5RC2
- Fixed bug #39819 (Using $this not in object context can cause segfaults).
http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.142.2.16.2.5r2=1.142.2.16.2.6diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.142.2.16.2.5
php-src/main/output.c:1.142.2.16.2.6
--- php-src/main/output.c:1.142.2.16.2.5Mon Jan 1 09:46:50 2007
+++ php-src/main/output.c Mon Feb 12 17:13:22 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: output.c,v 1.142.2.16.2.5 2007/01/01 09:46:50 sebastian Exp $ */
+/* $Id: output.c,v 1.142.2.16.2.6 2007/02/12 17:13:22 tony2001 Exp $ */
#include php.h
#include ext/standard/head.h
@@ -49,7 +49,7 @@
#endif
/* {{{ php_default_output_func */
-static inline int php_default_output_func(const char *str, uint str_len
TSRMLS_DC)
+PHPAPI int php_default_output_func(const char *str, uint str_len TSRMLS_DC)
{
fwrite(str, 1, str_len, stderr);
return str_len;
http://cvs.php.net/viewvc.cgi/php-src/main/php_output.h?r1=1.47.2.1.8.2r2=1.47.2.1.8.3diff_format=u
Index: php-src/main/php_output.h
diff -u php-src/main/php_output.h:1.47.2.1.8.2
php-src/main/php_output.h:1.47.2.1.8.3
--- php-src/main/php_output.h:1.47.2.1.8.2 Mon Jan 1 09:46:50 2007
+++ php-src/main/php_output.h Mon Feb 12 17:13:22 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_output.h,v 1.47.2.1.8.2 2007/01/01 09:46:50 sebastian Exp $ */
+/* $Id: php_output.h,v 1.47.2.1.8.3 2007/02/12 17:13:22 tony2001 Exp $ */
#ifndef PHP_OUTPUT_H
#define PHP_OUTPUT_H
@@ -27,6 +27,7 @@
PHPAPI void php_output_activate(TSRMLS_D);
PHPAPI void php_output_set_status(zend_bool status TSRMLS_DC);
PHPAPI void php_output_register_constants(TSRMLS_D);
+PHPAPI int php_default_output_func(const char *str, uint str_len TSRMLS_DC);
PHPAPI int php_body_write(const char *str, uint str_length TSRMLS_DC);
PHPAPI int php_header_write(const char *str, uint str_length TSRMLS_DC);
PHPAPI int php_start_ob_buffer(zval *output_handler, uint chunk_size,
zend_bool erase TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard iptc.c
tony2001Mon Feb 12 20:27:48 2007 UTC
Modified files:
/php-src/ext/standard iptc.c
Log:
fix bug #40109 (iptcembed fails on non-jfif jpegs)
+ use safe_emalloc
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/iptc.c?r1=1.59r2=1.60diff_format=u
Index: php-src/ext/standard/iptc.c
diff -u php-src/ext/standard/iptc.c:1.59 php-src/ext/standard/iptc.c:1.60
--- php-src/ext/standard/iptc.c:1.59Mon Jan 1 09:29:32 2007
+++ php-src/ext/standard/iptc.c Mon Feb 12 20:27:48 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: iptc.c,v 1.59 2007/01/01 09:29:32 sebastian Exp $ */
+/* $Id: iptc.c,v 1.60 2007/02/12 20:27:48 tony2001 Exp $ */
/*
* Functions to parse compse IPTC data.
@@ -186,6 +186,7 @@
unsigned int spool = 0, done = 0, inx;
unsigned char *spoolbuf=0, *poi=0;
struct stat sb;
+ zend_bool written = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, SZ|l, iptcdata,
iptcdata_len, pp_jpeg_file, spool) == FAILURE ||
php_stream_path_param_encode(pp_jpeg_file, jpeg_file,
jpeg_file_len, REPORT_ERRORS, FG(default_context)) == FAILURE) {
@@ -204,7 +205,8 @@
if (spool 2) {
fstat(fileno(fp), sb);
- poi = spoolbuf = emalloc(iptcdata_len + sizeof(psheader) +
sb.st_size + 1024);
+ poi = spoolbuf = safe_emalloc(1, iptcdata_len +
sizeof(psheader) + sb.st_size + 1024, 1);
+ memset(poi, 0, iptcdata_len + sizeof(psheader) + sb.st_size +
1024 + 1);
}
if (php_iptc_get1(fp, spool, poi?poi:0 TSRMLS_CC) != 0xFF) {
@@ -242,6 +244,14 @@
case M_APP0:
/* APP0 is in each and every JPEG, so when we
hit APP0 we insert our new APP13! */
+ case M_APP1:
+ /* APP1 is present in JFIF */
+ if (written) {
+ /* don't try to write the data twice */
+ break;
+ }
+ written = 1;
+
php_iptc_skip_variable(fp, spool, poi?poi:0
TSRMLS_CC);
if (iptcdata_len 1) iptcdata_len++; /* make
the length even */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard iptc.c
tony2001Mon Feb 12 20:30:52 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/standard iptc.c
Log:
MFH: fix #40109 (iptcembed fails on non-jfif jpegs)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.532r2=1.2027.2.547.2.533diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.532 php-src/NEWS:1.2027.2.547.2.533
--- php-src/NEWS:1.2027.2.547.2.532 Mon Feb 12 08:57:41 2007
+++ php-src/NEWSMon Feb 12 20:30:51 2007
@@ -9,6 +9,7 @@
methods). (Tony)
- Fixed bug #40428 (imagepstext() doesn't accept optional parameter). (Pierre)
- Fixed bug #40410 (ext/posix does not compile on MacOS 10.3.9). (Tony)
+- Fixed bug #40109 (iptcembed fails on non-jfif jpegs). (Tony)
- Fixed bug #39836 (SplObjectStorage empty after unserialize). (Marcus)
08 Feb 2007, PHP 5.2.1
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/iptc.c?r1=1.50.2.2.2.2r2=1.50.2.2.2.3diff_format=u
Index: php-src/ext/standard/iptc.c
diff -u php-src/ext/standard/iptc.c:1.50.2.2.2.2
php-src/ext/standard/iptc.c:1.50.2.2.2.3
--- php-src/ext/standard/iptc.c:1.50.2.2.2.2Mon Jan 1 09:36:08 2007
+++ php-src/ext/standard/iptc.c Mon Feb 12 20:30:52 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: iptc.c,v 1.50.2.2.2.2 2007/01/01 09:36:08 sebastian Exp $ */
+/* $Id: iptc.c,v 1.50.2.2.2.3 2007/02/12 20:30:52 tony2001 Exp $ */
/*
* Functions to parse compse IPTC data.
@@ -183,6 +183,7 @@
unsigned int spool = 0, done = 0, inx, len;
unsigned char *spoolbuf=0, *poi=0;
struct stat sb;
+ zend_bool written = 0;
switch(ZEND_NUM_ARGS()){
case 3:
@@ -226,7 +227,8 @@
if (spool 2) {
fstat(fileno(fp), sb);
- poi = spoolbuf = emalloc(len + sizeof(psheader) + sb.st_size +
1024);
+ poi = spoolbuf = safe_emalloc(1, len + sizeof(psheader) +
sb.st_size + 1024, 1);
+ memset(poi, 0, len + sizeof(psheader) + sb.st_size + 1024 + 1);
}
if (php_iptc_get1(fp, spool, poi?poi:0 TSRMLS_CC) != 0xFF) {
@@ -264,6 +266,13 @@
case M_APP0:
/* APP0 is in each and every JPEG, so when we
hit APP0 we insert our new APP13! */
+ case M_APP1:
+ if (written) {
+ /* don't try to write the data twice */
+ break;
+ }
+ written = 1;
+
php_iptc_skip_variable(fp, spool, poi?poi:0
TSRMLS_CC);
if (len 1) len++; /* make the length even */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard iptc.c
tony2001Mon Feb 12 20:40:11 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard iptc.c
Log:
upgrade to new parameter parsing API
+ mostly ws/cs fixes, sort of MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/iptc.c?r1=1.50.2.2.2.3r2=1.50.2.2.2.4diff_format=u
Index: php-src/ext/standard/iptc.c
diff -u php-src/ext/standard/iptc.c:1.50.2.2.2.3
php-src/ext/standard/iptc.c:1.50.2.2.2.4
--- php-src/ext/standard/iptc.c:1.50.2.2.2.3Mon Feb 12 20:30:52 2007
+++ php-src/ext/standard/iptc.c Mon Feb 12 20:40:11 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: iptc.c,v 1.50.2.2.2.3 2007/02/12 20:30:52 tony2001 Exp $ */
+/* $Id: iptc.c,v 1.50.2.2.2.4 2007/02/12 20:40:11 tony2001 Exp $ */
/*
* Functions to parse compse IPTC data.
@@ -177,58 +177,37 @@
Embed binary IPTC data into a JPEG image. */
PHP_FUNCTION(iptcembed)
{
-zval **iptcdata, **jpeg_file, **spool_flag;
-FILE *fp;
- unsigned int marker;
- unsigned int spool = 0, done = 0, inx, len;
- unsigned char *spoolbuf=0, *poi=0;
+ char *iptcdata, *jpeg_file;
+ int iptcdata_len, jpeg_file_len;
+ long spool = 0;
+ FILE *fp;
+ unsigned int marker, done = 0, inx;
+ unsigned char *spoolbuf = NULL, *poi = NULL;
struct stat sb;
zend_bool written = 0;
-switch(ZEND_NUM_ARGS()){
-case 3:
-if (zend_get_parameters_ex(3, iptcdata, jpeg_file, spool_flag) ==
FAILURE) {
-WRONG_PARAM_COUNT;
-}
-convert_to_string_ex(iptcdata);
-convert_to_string_ex(jpeg_file);
-convert_to_long_ex(spool_flag);
- spool = Z_LVAL_PP(spool_flag);
-break;
-
-case 2:
-if (zend_get_parameters_ex(2, iptcdata, jpeg_file) == FAILURE) {
-WRONG_PARAM_COUNT;
-}
-convert_to_string_ex(iptcdata);
-convert_to_string_ex(jpeg_file);
-break;
-
-default:
-WRONG_PARAM_COUNT;
-break;
-}
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ss|l, iptcdata,
iptcdata_len, jpeg_file, jpeg_file_len, spool) != SUCCESS) {
+ return;
+ }
-if (PG(safe_mode) (!php_checkuid(Z_STRVAL_PP(jpeg_file), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
+ if (PG(safe_mode) (!php_checkuid(jpeg_file, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
RETURN_FALSE;
}
-if (php_check_open_basedir(Z_STRVAL_PP(jpeg_file) TSRMLS_CC)) {
+ if (php_check_open_basedir(jpeg_file TSRMLS_CC)) {
RETURN_FALSE;
}
-if ((fp = VCWD_FOPEN(Z_STRVAL_PP(jpeg_file), rb)) == 0) {
-php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to open %s,
Z_STRVAL_PP(jpeg_file));
-RETURN_FALSE;
-}
-
- len = Z_STRLEN_PP(iptcdata);
+ if ((fp = VCWD_FOPEN(jpeg_file, rb)) == 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to open
%s, jpeg_file);
+ RETURN_FALSE;
+ }
if (spool 2) {
fstat(fileno(fp), sb);
- poi = spoolbuf = safe_emalloc(1, len + sizeof(psheader) +
sb.st_size + 1024, 1);
- memset(poi, 0, len + sizeof(psheader) + sb.st_size + 1024 + 1);
+ poi = spoolbuf = safe_emalloc(1, iptcdata_len +
sizeof(psheader) + sb.st_size + 1024, 1);
+ memset(poi, 0, iptcdata_len + sizeof(psheader) + sb.st_size +
1024 + 1);
}
if (php_iptc_get1(fp, spool, poi?poi:0 TSRMLS_CC) != 0xFF) {
@@ -275,19 +254,23 @@
php_iptc_skip_variable(fp, spool, poi?poi:0
TSRMLS_CC);
- if (len 1) len++; /* make the length even */
+ if (iptcdata_len 1) {
+ iptcdata_len++; /* make the length even
*/
+ }
- psheader[ 2 ] = (len+28)8;
- psheader[ 3 ] = (len+28)0xff;
+ psheader[ 2 ] = (iptcdata_len+28)8;
+ psheader[ 3 ] = (iptcdata_len+28)0xff;
- for (inx = 0; inx 28; inx++)
+ for (inx = 0; inx 28; inx++) {
php_iptc_put1(fp, spool, psheader[inx],
poi?poi:0 TSRMLS_CC);
+ }
- php_iptc_put1(fp, spool, (unsigned
char)(len8), poi?poi:0 TSRMLS_CC);
- php_iptc_put1(fp, spool, (unsigned
char)(len0xff), poi?poi:0 TSRMLS_CC);
-
- for (inx = 0; inx len; inx++)
- php_iptc_put1(fp, spool,
Z_STRVAL_PP(iptcdata)[inx], poi?poi:0 TSRMLS_CC);
+ php_iptc_put1(fp,
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/simplexml simplexml.c /ext/simplexml/tests bug40451.phpt
tony2001Mon Feb 12 21:06:29 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/simplexml/testsbug40451.phpt
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
fix #40451 (addAttribute() may crash when used with non-existent child node)
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.20r2=1.151.2.22.2.21diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.20
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.21
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.20 Mon Jan 1 09:36:06 2007
+++ php-src/ext/simplexml/simplexml.c Mon Feb 12 21:06:29 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.20 2007/01/01 09:36:06 sebastian Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.21 2007/02/12 21:06:29 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1526,7 +1526,7 @@
node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
- if (node-type != XML_ELEMENT_NODE) {
+ if (node node-type != XML_ELEMENT_NODE) {
node = node-parent;
}
@@ -2342,7 +2342,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.20 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.21 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug40451.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug40451.phpt
+++ php-src/ext/simplexml/tests/bug40451.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c /ext/simplexml/tests bug40451.phpt
tony2001Mon Feb 12 21:13:01 2007 UTC
Modified files:
/php-src/ext/simplexml simplexml.c
/php-src/ext/simplexml/testsbug40451.phpt
Log:
MFB: #40451 (addAttribute() may crash when used with non-existent child node)
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.227r2=1.228diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.227
php-src/ext/simplexml/simplexml.c:1.228
--- php-src/ext/simplexml/simplexml.c:1.227 Thu Jan 18 23:23:50 2007
+++ php-src/ext/simplexml/simplexml.c Mon Feb 12 21:13:01 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.227 2007/01/18 23:23:50 helly Exp $ */
+/* $Id: simplexml.c,v 1.228 2007/02/12 21:13:01 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1586,7 +1586,7 @@
node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
- if (node-type != XML_ELEMENT_NODE) {
+ if (node node-type != XML_ELEMENT_NODE) {
node = node-parent;
}
@@ -2396,7 +2396,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.227 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.228 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug40451.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/simplexml/tests/bug40451.phpt
diff -u /dev/null php-src/ext/simplexml/tests/bug40451.phpt:1.2
--- /dev/null Mon Feb 12 21:13:01 2007
+++ php-src/ext/simplexml/tests/bug40451.phpt Mon Feb 12 21:13:01 2007
@@ -0,0 +1,22 @@
+--TEST--
+Bug #40451 (addAttribute() may crash when used with non-existent child node)
+--FILE--
+?php
+
+$string = XML
+?xml version=1.0?
+ Host enable=true
+Namehost.server.com/Name
+/Host
+XML;
+
+$xml = simplexml_load_string((binary)$string);
+
+$add = $xml-addChild('Host');
+$add-Host-addAttribute('enable', 'true');
+
+echo Done\n;
+?
+--EXPECTF--
+Warning: SimpleXMLElement::addAttribute(): Unable to locate parent Element in
%s on line %d
+Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/examples phar_from_dir.php
helly Tue Feb 13 00:18:36 2007 UTC
Added files:
/php-src/ext/spl/examples phar_from_dir.php
Log:
- Add new example
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/examples/phar_from_dir.php?view=markuprev=1.1
Index: php-src/ext/spl/examples/phar_from_dir.php
+++ php-src/ext/spl/examples/phar_from_dir.php
?php
/** @file phar_from_dir.php
* @brief Create phar archive from directory
* @ingroup examples
* @author Marcus Boerger
* @date2003 - 2007
* @version 1.0
*
* Usage: php phar_create_from_dir.php \archive\ \directory\ [\regex\]
*
* Create phar archive \archive\ using entries from \directory\ that
* optionally match \regex\.
*/
if ($argc 3)
{
echo EOF
php phar_from_dir.php archive directory [regex]
Packs files in a given directory into a phar archive.
archivename of the archive to create
directory input directory to pack
regex optional expression to match files in directory
EOF;
exit(1);
}
$phar = new Phar($argv[1], 0, 'newphar');
$dir = new RecursiveDirectoryIterator($argv[2]);
$dir = new RecursiveIteratorIterator($dir);
if ($argc 3)
{
$dir = new RegexIterator($dir, '/'.$argv[3].'/');
}
$cwd .= DIRECTORY_SEPARATOR;
$phar-begin();
foreach($dir as $file)
{
echo $file\n;
copy($file, phar://newphar/$file);
}
$phar-commit();
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl/examples phar_from_dir.php
helly Tue Feb 13 00:19:00 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/spl/examples phar_from_dir.php
Log:
- MFH Add new example
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/examples/phar_from_dir.php?view=markuprev=1.1
Index: php-src/ext/spl/examples/phar_from_dir.php
+++ php-src/ext/spl/examples/phar_from_dir.php
?php
/** @file phar_from_dir.php
* @brief Create phar archive from directory
* @ingroup examples
* @author Marcus Boerger
* @date2003 - 2007
* @version 1.0
*
* Usage: php phar_create_from_dir.php \archive\ \directory\ [\regex\]
*
* Create phar archive \archive\ using entries from \directory\ that
* optionally match \regex\.
*/
if ($argc 3)
{
echo EOF
php phar_from_dir.php archive directory [regex]
Packs files in a given directory into a phar archive.
archivename of the archive to create
directory input directory to pack
regex optional expression to match files in directory
EOF;
exit(1);
}
$phar = new Phar($argv[1], 0, 'newphar');
$dir = new RecursiveDirectoryIterator($argv[2]);
$dir = new RecursiveIteratorIterator($dir);
if ($argc 3)
{
$dir = new RegexIterator($dir, '/'.$argv[3].'/');
}
$cwd .= DIRECTORY_SEPARATOR;
$phar-begin();
foreach($dir as $file)
{
echo $file\n;
copy($file, phar://newphar/$file);
}
$phar-commit();
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/examples phar_from_dir.php
helly Tue Feb 13 00:32:21 2007 UTC Modified files: /php-src/ext/spl/examples phar_from_dir.php Log: - Drop useless stuff http://cvs.php.net/viewvc.cgi/php-src/ext/spl/examples/phar_from_dir.php?r1=1.1r2=1.2diff_format=u Index: php-src/ext/spl/examples/phar_from_dir.php diff -u php-src/ext/spl/examples/phar_from_dir.php:1.1 php-src/ext/spl/examples/phar_from_dir.php:1.2 --- php-src/ext/spl/examples/phar_from_dir.php:1.1 Tue Feb 13 00:18:36 2007 +++ php-src/ext/spl/examples/phar_from_dir.php Tue Feb 13 00:32:20 2007 @@ -37,9 +37,6 @@ $dir = new RegexIterator($dir, '/'.$argv[3].'/'); } - -$cwd .= DIRECTORY_SEPARATOR; - $phar-begin(); foreach($dir as $file) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl/examples phar_from_dir.php
helly Tue Feb 13 00:32:32 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/spl/examples phar_from_dir.php Log: - MFH Drop useless stuff http://cvs.php.net/viewvc.cgi/php-src/ext/spl/examples/phar_from_dir.php?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/spl/examples/phar_from_dir.php diff -u php-src/ext/spl/examples/phar_from_dir.php:1.1.2.2 php-src/ext/spl/examples/phar_from_dir.php:1.1.2.3 --- php-src/ext/spl/examples/phar_from_dir.php:1.1.2.2 Tue Feb 13 00:19:00 2007 +++ php-src/ext/spl/examples/phar_from_dir.php Tue Feb 13 00:32:32 2007 @@ -37,9 +37,6 @@ $dir = new RegexIterator($dir, '/'.$argv[3].'/'); } - -$cwd .= DIRECTORY_SEPARATOR; - $phar-begin(); foreach($dir as $file) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / loginfo
derick Tue Feb 13 02:11:49 2007 UTC
Modified files:
/CVSROOTloginfo
Log:
- Redirect pear/installphars commit logs to pear-core@ per Greg's request.
http://cvs.php.net/viewvc.cgi/CVSROOT/loginfo?r1=1.117r2=1.118diff_format=u
Index: CVSROOT/loginfo
diff -u CVSROOT/loginfo:1.117 CVSROOT/loginfo:1.118
--- CVSROOT/loginfo:1.117 Tue Sep 5 09:25:47 2006
+++ CVSROOT/loginfo Tue Feb 13 02:11:49 2007
@@ -1,5 +1,5 @@
#
-#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.117 2006/09/05 09:25:47
derick Exp $
+#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.118 2007/02/13 02:11:49
derick Exp $
#
# The loginfo file is used to control where cvs commit log information
# is sent. The first entry on a line is a regular expression which is tested
@@ -95,6 +95,7 @@
^peardoc$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
^pear-core $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED],[EMAIL PROTECTED]
$USER %{sVv}
^pearweb$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED],[EMAIL PROTECTED]
$USER %{sVv}
+^pear/installphars $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]
$USER %{sVv}
^pear $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
^pecl $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard string.c /ext/standard/tests/strings bug40432.phpt
iliaa Tue Feb 13 02:16:22 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings bug40432.phpt
Modified files:
/php-src/ext/standard string.c
/php-srcNEWS
Log:
Fixed bug #40432 (strip_tags() fails with greater than in attribute).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.39r2=1.445.2.14.2.40diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.39
php-src/ext/standard/string.c:1.445.2.14.2.40
--- php-src/ext/standard/string.c:1.445.2.14.2.39 Sat Feb 10 00:48:28 2007
+++ php-src/ext/standard/string.c Tue Feb 13 02:16:22 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14.2.39 2007/02/10 00:48:28 tony2001 Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.40 2007/02/13 02:16:22 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -4130,7 +4130,7 @@
PHPAPI size_t php_strip_tags_ex(char *rbuf, int len, int *stateptr, char
*allow, int allow_len, zend_bool allow_tag_spaces)
{
char *tbuf, *buf, *p, *tp, *rp, c, lc;
- int br, i=0, depth=0;
+ int br, i=0, depth=0, in_q = 0;
int state = 0;
if (stateptr)
@@ -4164,7 +4164,7 @@
if (allow) {
tp = ((tp-tbuf) =
PHP_TAG_BUF_SIZE ? tbuf: tp);
*(tp++) = '';
- }
+ }
} else if (state == 1) {
depth++;
}
@@ -4203,7 +4203,11 @@
depth--;
break;
}
-
+
+ if (in_q) {
+ break;
+ }
+
switch (state) {
case 1: /* HTML/XML */
lc = '';
@@ -4259,6 +4263,9 @@
tp = ((tp-tbuf) = PHP_TAG_BUF_SIZE ?
tbuf: tp);
*(tp++) = c;
}
+ if (*(p-1) != '\\') {
+ in_q = !in_q;
+ }
break;
case '!':
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.533r2=1.2027.2.547.2.534diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.533 php-src/NEWS:1.2027.2.547.2.534
--- php-src/NEWS:1.2027.2.547.2.533 Mon Feb 12 20:30:51 2007
+++ php-src/NEWSTue Feb 13 02:16:22 2007
@@ -5,6 +5,7 @@
- Upgraded PCRE to version 7.0 (Nuno)
- Add --ri switch to CLI which allows to check extension information. (Marcus)
- Added tidyNode::getParent() method (John, Nuno)
+- Fixed bug #40432 (strip_tags() fails with greater than in attribute). (Ilia)
- Fixed bug #40431 (dynamic properties may cause crash in ReflectionProperty
methods). (Tony)
- Fixed bug #40428 (imagepstext() doesn't accept optional parameter). (Pierre)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug40432.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/bug40432.phpt
+++ php-src/ext/standard/tests/strings/bug40432.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
alan_k Tue Feb 13 07:48:15 2007 UTC Modified files: /CVSROOTavail Log: give shangxiao permissions to edit HTML_QuickForm_altselect http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1241r2=1.1242diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1241 CVSROOT/avail:1.1242 --- CVSROOT/avail:1.1241Fri Feb 9 12:41:38 2007 +++ CVSROOT/avail Tue Feb 13 07:48:15 2007 @@ -372,6 +372,7 @@ avail|hudeldudel|pear/Net_IMAP,peardoc avail|ssttoo|pear/Image_Text,pear/Text_Highlighter avail|wharmby|php-src +avail|shangxiao|pear/HTML_QuickForm_altselect # php windows installer avail|jmertic|php-src/win32/installer -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
