[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS
scottmac Wed, 12 Aug 2009 00:21:42 +
Revision: http://svn.php.net/viewvc?view=revision&revision=287128
Log:
BFN
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2009-08-12 00:18:36 UTC (rev 287127)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-08-12 00:21:42 UTC (rev 287128)
@@ -66,6 +66,7 @@
- Fixed bug #48450 (Compile failure under IRIX 6.5.30 building gd.c). (Kalle)
- Fixed bug #48400 (imap crashes when closing stream opened with
OP_PROTOTYPE flag). (Jani)
+- Fixed bug #48284 (hash "adler32" byte order is reversed). (Scott)
- Fixed bug #48276 (date("Y") on big endian machines produces the
wrong result). (Scott)
- Fixed bug #48247 (Infinite loop and possible crash during startup with
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ext/hash/ hash_adler32.c tests/adler32.phpt tests/hash_file_basic1.phpt tests/hash_hmac_basic.phpt tests/hash_hmac_file_basic.phpt
scottmac Wed, 12 Aug 2009 00:18:36 +
Revision: http://svn.php.net/viewvc?view=revision&revision=287127
Log:
MFB 5.3: Fix bug #48284 (r283144) - adler32 is in the wrong order. Changed to
match what zlib produces.
Bug: http://bugs.php.net/48284 (Assigned) hash "adler32" byte order is reversed
Changed paths:
U php/php-src/branches/PHP_5_2/ext/hash/hash_adler32.c
U php/php-src/branches/PHP_5_2/ext/hash/tests/adler32.phpt
U php/php-src/branches/PHP_5_2/ext/hash/tests/hash_file_basic1.phpt
U php/php-src/branches/PHP_5_2/ext/hash/tests/hash_hmac_basic.phpt
U php/php-src/branches/PHP_5_2/ext/hash/tests/hash_hmac_file_basic.phpt
Modified: php/php-src/branches/PHP_5_2/ext/hash/hash_adler32.c
===
--- php/php-src/branches/PHP_5_2/ext/hash/hash_adler32.c2009-08-11
23:45:35 UTC (rev 287126)
+++ php/php-src/branches/PHP_5_2/ext/hash/hash_adler32.c2009-08-12
00:18:36 UTC (rev 287127)
@@ -42,10 +42,10 @@
PHP_HASH_API void PHP_ADLER32Final(unsigned char digest[4], PHP_ADLER32_CTX
*context)
{
- digest[3] = (unsigned char) ((context->state >> 24) & 0xff);
- digest[2] = (unsigned char) ((context->state >> 16) & 0xff);
- digest[1] = (unsigned char) ((context->state >> 8) & 0xff);
- digest[0] = (unsigned char) (context->state & 0xff);
+ digest[0] = (unsigned char) ((context->state >> 24) & 0xff);
+ digest[1] = (unsigned char) ((context->state >> 16) & 0xff);
+ digest[2] = (unsigned char) ((context->state >> 8) & 0xff);
+ digest[3] = (unsigned char) (context->state & 0xff);
context->state = 0;
}
Modified: php/php-src/branches/PHP_5_2/ext/hash/tests/adler32.phpt
===
--- php/php-src/branches/PHP_5_2/ext/hash/tests/adler32.phpt2009-08-11
23:45:35 UTC (rev 287126)
+++ php/php-src/branches/PHP_5_2/ext/hash/tests/adler32.phpt2009-08-12
00:18:36 UTC (rev 287127)
@@ -13,10 +13,10 @@
echo hash('adler32',
'12345678901234567890123456789012345678901234567890123456789012345678901234567890'),
"\n";
?>
--EXPECT--
-0100
-62006200
-27014d02
-86057529
-200b8690
-0c15db8a
-6910b697
+0001
+00620062
+024d0127
+29750586
+90860b20
+8adb150c
+97b61069
Modified: php/php-src/branches/PHP_5_2/ext/hash/tests/hash_file_basic1.phpt
===
--- php/php-src/branches/PHP_5_2/ext/hash/tests/hash_file_basic1.phpt
2009-08-11 23:45:35 UTC (rev 287126)
+++ php/php-src/branches/PHP_5_2/ext/hash/tests/hash_file_basic1.phpt
2009-08-12 00:18:36 UTC (rev 287127)
@@ -63,7 +63,7 @@
===Done===
--EXPECTF--
*** Testing hash_file() : basic functionality ***
-adler32: 2e2287ff
+adler32: ff87222e
crc32: 61664d33
gost: d9e65f0c0c2ef944e4f8a01f4a46365c4f33a2853756878182a7f03e1490a4cd
haval128,3: 8bb81269aca8b7f87829020d76a4e841
@@ -81,7 +81,7 @@
snefru: d414b2345d3e7fa1a31c044cf334bfc1fec24d89e464411998d579d24663895f
tiger192,3: c6fa75a0be4ecf7afa3cafb4e2a08efc3a40534c0e46b971
whirlpool:
4248b149e000477269a4a5f1a84d97cfc3d0199b7aaf505913e6f010a6f83276029d11a9ad545374bc710eb59c7d958985023ab886ffa9ec9a23852844c764ec
-adler32(raw): 2e2287ff
+adler32(raw): ff87222e
md5(raw): 704bf818448f5bbb94061332d2c889aa
sha256(raw): a0f5702fa5d3670b80033d668e8732b70550392abb53841355447f8bb0f72245
===Done===
\ No newline at end of file
Modified: php/php-src/branches/PHP_5_2/ext/hash/tests/hash_hmac_basic.phpt
===
--- php/php-src/branches/PHP_5_2/ext/hash/tests/hash_hmac_basic.phpt
2009-08-11 23:45:35 UTC (rev 287126)
+++ php/php-src/branches/PHP_5_2/ext/hash/tests/hash_hmac_basic.phpt
2009-08-12 00:18:36 UTC (rev 287127)
@@ -44,7 +44,7 @@
===Done===
--EXPECTF--
*** Testing hash_hmac() : basic functionality ***
-adler32: 9e033311
+adler32: 12c803f7
crc32: 96859101
gost: a4a3c80bdf3f8665bf07376a34dc9c1b11af7c813f4928f62e39f0c0dc564dad
haval128,3: 82cd0f4bd36729b5c80c33efa8c13ac5
@@ -62,7 +62,7 @@
snefru: 67af483046f9cf16fe19f9087929ccfc6ad176ade3290b4d33f43e0ddb07e711
tiger192,3: 82779797cdc439e886884953ba21fa38e35679041e95ee27
whirlpool:
4a0f1582b21b7aff59bfba7f9c29131c69741b2ce80acdc7d314040f3b768cf5a17e30b74cceb86fbc6b34b1692e0addd5bfd7cfc043d40c0621f1b97e26fa49
-adler32(raw): 9e033311
+adler32(raw): 12c803f7
md5(raw): 2a632783e2812cf23de100d7d6a463ae
sha256(raw): 49bde3496b9510a17d0edd8a4b0ac70148e32a1d51e881ec76faa96534125838
===Done===
\ No newline at end of file
Modified: php/php-src/branches/PHP_5_2/ext/hash/tests/hash_hmac_file_basic.phpt
===
--- php/php-src/branches/PHP_5_2/ext/hash/tests/hash_hmac_file_basic.phpt
2009-08-11 23:45:35 UTC (rev 287126)
+++ php/php-src/branches/PHP_5_2/ext/hash/tests/hash_hmac_file_basic.phpt
2009-08-12 00:18:36 UTC
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/acinclude.m4 branches/PHP_5_3/acinclude.m4 trunk/acinclude.m4
srinatar Tue, 11 Aug 2009 23:45:35 + Revision: http://svn.php.net/viewvc?view=revision&revision=287126 Log: - Simplify default flags for Sun C compiler. Changed paths: U php/php-src/branches/PHP_5_2/acinclude.m4 U php/php-src/branches/PHP_5_3/acinclude.m4 U php/php-src/trunk/acinclude.m4 Modified: php/php-src/branches/PHP_5_2/acinclude.m4 === --- php/php-src/branches/PHP_5_2/acinclude.m4 2009-08-11 23:05:13 UTC (rev 287125) +++ php/php-src/branches/PHP_5_2/acinclude.m4 2009-08-11 23:45:35 UTC (rev 287126) @@ -2780,7 +2780,7 @@ AC_MSG_RESULT([no]), SUNCC="yes" GCC="no" -test -n "$auto_cflags" && CFLAGS="-fsimple=2 -xnorunpath -xO4 -xalias_level=basic -xipo=1 -xlibmopt -xprefetch_level=1 -xprefetch=auto -xstrconst -xtarget=native -zlazyload" +test -n "$auto_cflags" && CFLAGS="-O -xs -xstrconst -zlazyload" GCC="" AC_MSG_RESULT([yes]) ) Modified: php/php-src/branches/PHP_5_3/acinclude.m4 === --- php/php-src/branches/PHP_5_3/acinclude.m4 2009-08-11 23:05:13 UTC (rev 287125) +++ php/php-src/branches/PHP_5_3/acinclude.m4 2009-08-11 23:45:35 UTC (rev 287126) @@ -2780,7 +2780,7 @@ AC_MSG_RESULT([no]), SUNCC="yes" GCC="no" -test -n "$auto_cflags" && CFLAGS="-fsimple=2 -xnorunpath -xO4 -xalias_level=basic -xipo=1 -xlibmopt -xprefetch_level=1 -xprefetch=auto -xstrconst -xtarget=native -zlazyload" +test -n "$auto_cflags" && CFLAGS="-O -xs -xstrconst -zlazyload" GCC="" AC_MSG_RESULT([yes]) ) Modified: php/php-src/trunk/acinclude.m4 === --- php/php-src/trunk/acinclude.m4 2009-08-11 23:05:13 UTC (rev 287125) +++ php/php-src/trunk/acinclude.m4 2009-08-11 23:45:35 UTC (rev 287126) @@ -2780,7 +2780,7 @@ AC_MSG_RESULT([no]), SUNCC="yes" GCC="no" -test -n "$auto_cflags" && CFLAGS="-fsimple=2 -xnorunpath -xO4 -xalias_level=basic -xipo=1 -xlibmopt -xprefetch_level=1 -xprefetch=auto -xstrconst -xtarget=native -zlazyload" +test -n "$auto_cflags" && CFLAGS="-O -xs -xstrconst -zlazyload" GCC="" AC_MSG_RESULT([yes]) ) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/fileinfo/fileinfo.c trunk/ext/fileinfo/fileinfo.c
scottmac Tue, 11 Aug 2009 23:05:13 +
Revision: http://svn.php.net/viewvc?view=revision&revision=287125
Log:
Fix BC break in mime_content_type()
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/fileinfo/fileinfo.c
U php/php-src/trunk/ext/fileinfo/fileinfo.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-08-11 22:55:19 UTC (rev 287124)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-08-11 23:05:13 UTC (rev 287125)
@@ -19,6 +19,7 @@
Stas)
- Fixed signature generation/validation for zip archives in ext/phar. (Greg)
- Fixed memory leak in stream_is_local(). (Felipe, Tony)
+- Fixed BC break in mime_content_type(), removes the content encoding. (Scott)
- Fixed bug #49193 (gdJpegGetVersionString() inside gd_compact identifies
wrong type in declaration). (Ilia)
Modified: php/php-src/branches/PHP_5_3/ext/fileinfo/fileinfo.c
===
--- php/php-src/branches/PHP_5_3/ext/fileinfo/fileinfo.c2009-08-11
22:55:19 UTC (rev 287124)
+++ php/php-src/branches/PHP_5_3/ext/fileinfo/fileinfo.c2009-08-11
23:05:13 UTC (rev 287125)
@@ -414,7 +414,7 @@
RETURN_FALSE;
}
- magic = magic_open(MAGIC_MIME);
+ magic = magic_open(MAGIC_MIME_TYPE);
if (magic_load(magic, NULL) == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to
load magic database.");
goto common;
Modified: php/php-src/trunk/ext/fileinfo/fileinfo.c
===
--- php/php-src/trunk/ext/fileinfo/fileinfo.c 2009-08-11 22:55:19 UTC (rev
287124)
+++ php/php-src/trunk/ext/fileinfo/fileinfo.c 2009-08-11 23:05:13 UTC (rev
287125)
@@ -419,7 +419,7 @@
RETURN_FALSE;
}
- magic = magic_open(MAGIC_MIME);
+ magic = magic_open(MAGIC_MIME_TYPE);
if (magic_load(magic, NULL) == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to
load magic database.");
goto common;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/standard/var.c branches/PHP_5_3/ext/standard/var.c trunk/ext/standard/var.c
stas Tue, 11 Aug 2009 22:46:07 +
Revision: http://svn.php.net/viewvc?view=revision&revision=287123
Log:
fix potential memory issue on serialization
# When internal class uses zend_mangle_property_name it's malloc()
# so it should be freed with free()
Changed paths:
U php/php-src/branches/PHP_5_2/ext/standard/var.c
U php/php-src/branches/PHP_5_3/ext/standard/var.c
U php/php-src/trunk/ext/standard/var.c
Modified: php/php-src/branches/PHP_5_2/ext/standard/var.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/var.c 2009-08-11 22:45:21 UTC
(rev 287122)
+++ php/php-src/branches/PHP_5_2/ext/standard/var.c 2009-08-11 22:46:07 UTC
(rev 287123)
@@ -617,20 +617,20 @@
Z_STRVAL_PP(name), Z_STRLEN_PP(name), ce->type & ZEND_INTERNAL_CLASS);
if
(zend_hash_find(Z_OBJPROP_P(struc), priv_name, prop_name_length+1, (void *) &d)
== SUCCESS) {
php_var_serialize_string(buf, priv_name, prop_name_length);
- efree(priv_name);
+ pefree(priv_name,
ce->type & ZEND_INTERNAL_CLASS);
php_var_serialize_intern(buf, *d, var_hash TSRMLS_CC);
break;
}
- efree(priv_name);
+ pefree(priv_name, ce->type &
ZEND_INTERNAL_CLASS);
zend_mangle_property_name(&prot_name, &prop_name_length, "*", 1,
Z_STRVAL_PP(name), Z_STRLEN_PP(name), ce->type & ZEND_INTERNAL_CLASS);
if
(zend_hash_find(Z_OBJPROP_P(struc), prot_name, prop_name_length+1, (void *) &d)
== SUCCESS) {
php_var_serialize_string(buf, prot_name, prop_name_length);
- efree(prot_name);
+ pefree(prot_name,
ce->type & ZEND_INTERNAL_CLASS);
php_var_serialize_intern(buf, *d, var_hash TSRMLS_CC);
break;
}
- efree(prot_name);
+ pefree(prot_name, ce->type &
ZEND_INTERNAL_CLASS);
php_error_docref(NULL
TSRMLS_CC, E_NOTICE, "\"%s\" returned as member variable from __sleep() but
does not exist", Z_STRVAL_PP(name));
php_var_serialize_string(buf,
Z_STRVAL_PP(name), Z_STRLEN_PP(name));
php_var_serialize_intern(buf,
nvalp, var_hash TSRMLS_CC);
Modified: php/php-src/branches/PHP_5_3/ext/standard/var.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/var.c 2009-08-11 22:45:21 UTC
(rev 287122)
+++ php/php-src/branches/PHP_5_3/ext/standard/var.c 2009-08-11 22:46:07 UTC
(rev 287123)
@@ -599,19 +599,19 @@
zend_mangle_property_name(&priv_name, &prop_name_length, ce->name,
ce->name_length, Z_STRVAL_PP(name), Z_STRLEN_PP(name), ce->type &
ZEND_INTERNAL_CLASS);
if
(zend_hash_find(Z_OBJPROP_P(struc), priv_name, prop_name_length + 1, (void *)
&d) == SUCCESS) {
php_var_serialize_string(buf, priv_name, prop_name_length);
- efree(priv_name);
+ pefree(priv_name,
ce->type & ZEND_INTERNAL_CLASS);
php_var_serialize_intern(buf, *d, var_hash TSRMLS_CC);
break;
}
- efree(priv_name);
+ pefree(priv_name, ce->type &
ZEND_INTERNAL_CLASS);
zend_mangle_property_name(&prot_name, &prop_name_length, "*", 1,
Z_STRVAL_PP(name), Z_STRLEN_PP(name), ce->type & ZEND_INTERNAL_CLASS);
if
(zend_hash_find(Z_OBJPROP_P(struc), prot_name, prop_name_length + 1, (void *)
&d) == SUC
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
scottmac Tue, 11 Aug 2009 22:45:21 + Revision: http://svn.php.net/viewvc?view=revision&revision=287122 Log: Update NEWS entry with some stuff I missed. Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-08-11 22:22:21 UTC (rev 287121) +++ php/php-src/branches/PHP_5_3/NEWS 2009-08-11 22:45:21 UTC (rev 287122) @@ -1,9 +1,18 @@ PHPNEWS ||| ?? ??? 2009, PHP 5.3.1 +- Upgraded bundled sqlite to version 3.6.17. (Scott) + - Improve dns_get_record support on windows. Always available when IPv6 is support is installed, format is now the same than on unix. (Pierre) +- Improve the DNS functions on OSX to use newer APIs, also use Bind 9 API + where available on other platforms. (Scott) +- Improve shared extension loading on OSX to use the standard Unix dlopen() API. + (Scott) +- Added error constant when json_encode() detects an invalid UTF-8 sequence. + (Scott) + - Fixed spl_autoload_unregister/spl_autoload_functions wrt. Closures and Functors. (Christian Seiler) - Fixed open_basedir circumvention for mail.log. (Maksymilian Arciemowicz, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.c branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.h trunk/ext/sqlite3/libsqlite/sqlite3.c trunk/ext/sqlite3/libsqlite/sqlite3
scottmac Tue, 11 Aug 2009 22:22:21 + Revision: http://svn.php.net/viewvc?view=revision&revision=287121 Log: Update libsqlite to 3.6.17. Changed paths: U php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.c U php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.h U php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.c U php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ configure.in ext/standard/basic_functions.c ext/standard/config.m4 ext/standard/dns.c ext/standard/php_dns.h
scottmac Tue, 11 Aug 2009 22:07:35 +
Revision: http://svn.php.net/viewvc?view=revision&revision=287120
Log:
Merge chanes from head to improve DNS on OSX and allow usage of bind9 stuff
with the bind8 compatibility layer.
Changed paths:
U php/php-src/branches/PHP_5_3/configure.in
U php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
U php/php-src/branches/PHP_5_3/ext/standard/config.m4
U php/php-src/branches/PHP_5_3/ext/standard/dns.c
U php/php-src/branches/PHP_5_3/ext/standard/php_dns.h
Modified: php/php-src/branches/PHP_5_3/configure.in
===
--- php/php-src/branches/PHP_5_3/configure.in 2009-08-11 21:49:55 UTC (rev 287119)
+++ php/php-src/branches/PHP_5_3/configure.in 2009-08-11 22:07:35 UTC (rev 287120)
@@ -254,7 +254,6 @@
CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
fi
fi
-AC_DEFINE(BIND_8_COMPAT, 1, [Enabling BIND8 compatibility for Panther])
php_multiple_shlib_versions_ok=yes
;;
*beos*)
Modified: php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2009-08-11 21:49:55 UTC (rev 287119)
+++ php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2009-08-11 22:07:35 UTC (rev 287120)
@@ -995,22 +995,20 @@
ZEND_END_ARG_INFO()
#endif
-#if defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE)))
+#if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !(defined(__BEOS__) || defined(NETWARE)))
ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_check_record, 0, 0, 1)
ZEND_ARG_INFO(0, host)
ZEND_ARG_INFO(0, type)
ZEND_END_ARG_INFO()
-# if defined(PHP_WIN32) || HAVE_DNS_FUNCS
+# if defined(PHP_WIN32) || HAVE_FULL_DNS_FUNCS
ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_get_record, 1, 0, 1)
ZEND_ARG_INFO(0, hostname)
ZEND_ARG_INFO(0, type)
ZEND_ARG_INFO(1, authns) /* ARRAY_INFO(1, authns, 1) */
ZEND_ARG_INFO(1, addtl) /* ARRAY_INFO(1, addtl, 1) */
ZEND_END_ARG_INFO()
-# endif
-# if defined(PHP_WIN32) || (HAVE_DN_SKIPNAME && HAVE_DN_EXPAND)
ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_get_mx, 0, 0, 2)
ZEND_ARG_INFO(0, hostname)
ZEND_ARG_INFO(1, mxhosts) /* ARRAY_INFO(1, mxhosts, 1) */
@@ -1018,7 +1016,7 @@
ZEND_END_ARG_INFO()
# endif
-#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE))) */
+#endif /* defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !(defined(__BEOS__) || defined(NETWARE))) */
/* }}} */
/* {{{ exec.c */
@@ -3000,17 +2998,14 @@
PHP_FE(gethostname, arginfo_gethostname)
#endif
-#if defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE)))
+#if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !(defined(__BEOS__) || defined(NETWARE)))
PHP_FE(dns_check_record,arginfo_dns_check_record)
PHP_FALIAS(checkdnsrr, dns_check_record, arginfo_dns_check_record)
-# if defined(PHP_WIN32) || (HAVE_DN_SKIPNAME && HAVE_DN_EXPAND)
+# if defined(PHP_WIN32) || HAVE_FULL_DNS_FUNCS
PHP_FE(dns_get_mx, arginfo_dns_get_mx)
PHP_FALIAS(getmxrr,dns_get_mx, arginfo_dns_get_mx)
-# endif
-
-# if defined(PHP_WIN32) || HAVE_DNS_FUNCS
PHP_FE(dns_get_record, arginfo_dns_get_record)
# endif
#endif
@@ -3639,8 +3634,8 @@
php_register_url_stream_wrapper("ftp", &php_stream_ftp_wrapper TSRMLS_CC);
#endif
-#if defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE)))
-# if defined(PHP_WIN32) || HAVE_DNS_FUNCS
+#if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !(defined(__BEOS__) || defined(NETWARE)))
+# if defined(PHP_WIN32) || HAVE_FULL_DNS_FUNCS
PHP_MINIT(dns)(INIT_FUNC_ARGS_PASSTHRU);
# endif
#endif
Modified: php/php-src/branches/PHP_5_3/ext/standard/config.m4
===
--- php/php-src/branches/PHP_5_3/ext/standard/config.m4 2009-08-11 21:49:55 UTC (rev 287119)
+++ php/php-src/branches/PHP_5_3/ext/standard/config.m4 2009-08-11 22:07:35 UTC (rev 287120)
@@ -247,21 +247,18 @@
dnl
dnl Detect library functions needed by php dns_xxx functions
-dnl ext/standard/php_dns.h will collect these in a single define: HAVE_DNS_FUNCS
+dnl ext/standard/php_dns.h will collect these in a single define: HAVE_FULL_DNS_FUNCS
dnl
-PHP_CHECK_FUNC(res_nmkquery, resolv, bind, socket)
-PHP_CHECK_FUNC(res_nsend, resolv, bind, socket)
-PHP_CHECK_FUNC(res_search, resolv, bind, socket)
+PHP_CHECK_FUNC(res_nsearch, resolv, bind, socket)
+PHP_CHECK_FUNC(dns_search, resolv, bind, socket)
PHP_CHECK_FUNC(dn_expand, resolv, bind, socket)
PHP_CHECK_FUNC(dn_skipname, resolv, bind, socket)
dnl
-dnl These are old deprecated functions, a single define of HAVE_DEPRECATED_DNS_FUNCS
-dnl will be set in ext/standard/php_dns.h
+dnl These are old deprecated functions
dnl
-PHP_CHECK_FUNC(res_mkquery, resolv, bind, socke
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/pcre/config0.m4 branches/PHP_5_3/ext/pcre/config0.m4 trunk/ext/pcre/config0.m4
scottmac Tue, 11 Aug 2009 21:40:15 + Revision: http://svn.php.net/viewvc?view=revision&revision=287118 Log: We should check /usr/local/include last Changed paths: U php/php-src/branches/PHP_5_2/ext/pcre/config0.m4 U php/php-src/branches/PHP_5_3/ext/pcre/config0.m4 U php/php-src/trunk/ext/pcre/config0.m4 Modified: php/php-src/branches/PHP_5_2/ext/pcre/config0.m4 === --- php/php-src/branches/PHP_5_2/ext/pcre/config0.m42009-08-11 21:33:36 UTC (rev 287117) +++ php/php-src/branches/PHP_5_2/ext/pcre/config0.m42009-08-11 21:40:15 UTC (rev 287118) @@ -16,7 +16,7 @@ PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/]) AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ]) else -for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/local/include $PHP_PCRE_REGEX/include/pcre; do +for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; do test -f $i/pcre.h && PCRE_INCDIR=$i done Modified: php/php-src/branches/PHP_5_3/ext/pcre/config0.m4 === --- php/php-src/branches/PHP_5_3/ext/pcre/config0.m42009-08-11 21:33:36 UTC (rev 287117) +++ php/php-src/branches/PHP_5_3/ext/pcre/config0.m42009-08-11 21:40:15 UTC (rev 287118) @@ -11,7 +11,7 @@ if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then AC_MSG_CHECKING([for PCRE headers location]) -for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/local/include $PHP_PCRE_REGEX/include/pcre; do +for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; do test -f $i/pcre.h && PCRE_INCDIR=$i done Modified: php/php-src/trunk/ext/pcre/config0.m4 === --- php/php-src/trunk/ext/pcre/config0.m4 2009-08-11 21:33:36 UTC (rev 287117) +++ php/php-src/trunk/ext/pcre/config0.m4 2009-08-11 21:40:15 UTC (rev 287118) @@ -11,7 +11,7 @@ if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then AC_MSG_CHECKING([for PCRE headers location]) -for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/local/include $PHP_PCRE_REGEX/include/pcre; do +for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; do test -f $i/pcre.h && PCRE_INCDIR=$i done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
philip Tue, 11 Aug 2009 19:12:35 + Revision: http://svn.php.net/viewvc?view=revision&revision=287111 Log: - phpdoc karma for Brandon Savage (brandon) Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail 2009-08-11 18:51:15 UTC (rev 287110) +++ SVNROOT/global_avail 2009-08-11 19:12:35 UTC (rev 287111) @@ -47,7 +47,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,frogger,coldocean,fleaslob,torben,lynch,kk,ted,paul,mbritton,bibi,mrobinso,perugini,tzwenny,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,danbeck,sli,jmcastagnetto,mohrt,samesch,soneca,ronabop,glace,latoserver,rafael,jcmeloni,chrullrich,mk,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zimt,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,hakan,chief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,hwin,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj,adhitama,engkongs,preilly,dave,marcelo,curt,fd,javi,mrmaster,fa,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,eflorin,adywarna,kyokpae,milans,lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott,mg,kennyt,tomsommer,poz,zamolxe,bishmila,ph1,irchtml,rogamer,bortolini,sapfir,guru,ahmed,robinhood,sohli,amt,romain,hlecuanda,thessoro,nforbes,jolan,laze,bagilevi,young,shakaali,chokobo,portalufpa,teecee,blindman,holst,schst,mnv,sodhi,aidan,jellybob,lauer,shenkong,jad,robert,peterhuewe,ogre,techtonik,narigone,realtebo,krid,mclay,dasch,miwaniec,abdshomad,sammywg,aeoris,mez,jed,hsc,luckec,dmytton,choudesh,phpvcn,simp,michael,grantc,atex,katja,sthulbourn,mikl,kevinsz,roast,tessus,gavinfo,rant,ramsey,arkadius,erinet,omar,oliver,rquadling,timo,shadda,joeaccord,ezyang,ljbuesch,knut,asonge,ron,nicobn,jacques,void,mcbrown,simionea,preinheimer,stanprog,msaraujo,asbjornit,philippe,sezer,rmlr,hradtke,alan,danielc,danbrown,alexxed,psalehpoor,loudi,abedford,morgue,nilgun,saltybeagle,dedemorton,eniac2008,jawed,ch,mgdm,ericstewart,mager,keito,juxecl,salathe,chx,vito,beverloo,joris,mumumu|phpdoc,phd,web/doc,web/doc-editor +avail|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,frogger,coldocean,fleaslob,torben,lynch,kk,ted,paul,mbritton,bibi,mrobinso,perugini,tzwenny,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,danbeck,sli,jmcastagnetto,mohrt,samesch,soneca,ronabop,glace,latoserver,rafael,jcmeloni,chrullrich,mk,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina
[PHP-CVS] svn: /php/php-src/trunk/ext/zip/ zip_stream.c
pajoye Tue, 11 Aug 2009 17:19:35 +
Revision: http://svn.php.net/viewvc?view=revision&revision=287104
Log:
- destroy the file entry stream first
Changed paths:
U php/php-src/trunk/ext/zip/zip_stream.c
Modified: php/php-src/trunk/ext/zip/zip_stream.c
===
--- php/php-src/trunk/ext/zip/zip_stream.c 2009-08-11 17:15:24 UTC (rev
287103)
+++ php/php-src/trunk/ext/zip/zip_stream.c 2009-08-11 17:19:35 UTC (rev
287104)
@@ -68,14 +68,14 @@
{
STREAM_DATA_FROM_STREAM();
if (close_handle) {
+ if (self->zf) {
+ zip_fclose(self->zf);
+ self->zf = NULL;
+ }
if (self->za) {
zip_close(self->za);
self->za = NULL;
}
- if (self->zf) {
- zip_fclose(self->zf);
- self->zf = NULL;
- }
}
efree(self);
stream->abstract = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/zip/ zip_stream.c
pajoye Tue, 11 Aug 2009 17:08:23 + Revision: http://svn.php.net/viewvc?view=revision&revision=287101 Log: - remove double include Changed paths: U php/php-src/branches/PHP_5_3/ext/zip/zip_stream.c Modified: php/php-src/branches/PHP_5_3/ext/zip/zip_stream.c === --- php/php-src/branches/PHP_5_3/ext/zip/zip_stream.c 2009-08-11 16:11:23 UTC (rev 287100) +++ php/php-src/branches/PHP_5_3/ext/zip/zip_stream.c 2009-08-11 17:08:23 UTC (rev 287101) @@ -7,7 +7,6 @@ #ifdef ZEND_ENGINE_2 #include "lib/zip.h" -#include "lib/zip.h" #include "php_streams.h" #include "ext/standard/file.h" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS
iliaaTue, 11 Aug 2009 16:11:23 + Revision: http://svn.php.net/viewvc?view=revision&revision=287100 Log: Fixed typo Changed paths: U php/php-src/branches/PHP_5_2/NEWS Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-08-11 15:46:59 UTC (rev 287099) +++ php/php-src/branches/PHP_5_2/NEWS 2009-08-11 16:11:23 UTC (rev 287100) @@ -18,7 +18,7 @@ (Jani) - Fixed bug #49026 (proc_open() can bypass safe_mode_protected_env_vars restrictions). (Ilia) -- Fixed bug #48994 (zlib.output_compression does not ouput HTTP headers when +- Fixed bug #48994 (zlib.output_compression does not output HTTP headers when set to a string value). (Jani) - Fixed bug #48980 (Crash when compiling with pdo_firebird). (Felipe) - Fixed bug #48962 (cURL does not upload files with specified filename). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
pajoye Tue, 11 Aug 2009 15:12:38 +
Revision: http://svn.php.net/viewvc?view=revision&revision=287096
Log:
- fix news
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-08-11 15:12:00 UTC (rev 287095)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-08-11 15:12:38 UTC (rev 287096)
@@ -19,13 +19,13 @@
- Fixed bug #49125 (Error in dba_exists C code). (jdornan at stanford dot edu)
- Fixed bug #49122 (undefined reference to mysqlnd_stmt_next_result on compile
with --with-mysqli and MySQL 6.0). (Jani)
+- Fixed bug #49108 (2nd scan_dir produces segfault). (Felipe)
- Fixed bug #49095 (proc_get_status['exitcode'] fails on win32). (Felipe)
- Fixed bug #49092 (ReflectionFunction fails to work with functions in fully
qualified namespaces). (Kalle, Jani)
- Fixed bug #49074 (private class static fields can be modified by using
reflection). (Jani)
- Fixed bug #49072 (feof never returns true for damaged file in zip). (Pierre)
-- Fixed bug #49108 (2nd scan_dir produces segfault). (Felipe)
- Fixed bug #49065 ("disable_functions" php.ini option does not work on
Zend extensions). (Stas)
- Fixed bug #49064 (--enable-session=shared does not work: undefined symbol:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/zip/lib/zip_fread.c branches/PHP_5_2/ext/zip/tests/bug49072.phpt branches/PHP_5_2/ext/zip/tests/bug49072.zip branches/PHP_5_2/ex
pajoye Tue, 11 Aug 2009 15:12:00 +
Revision: http://svn.php.net/viewvc?view=revision&revision=287095
Log:
- fixed bug #49072, feof never returns true for damaged file in zip
Bug: http://bugs.php.net/49072 (No Feedback) feof never returns true for
damaged file in zip
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/zip/lib/zip_fread.c
A php/php-src/branches/PHP_5_2/ext/zip/tests/bug49072.phpt
A php/php-src/branches/PHP_5_2/ext/zip/tests/bug49072.zip
U php/php-src/branches/PHP_5_2/ext/zip/zip_stream.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/zip/lib/zip_fread.c
A php/php-src/branches/PHP_5_3/ext/zip/tests/bug49072.phpt
A php/php-src/branches/PHP_5_3/ext/zip/tests/bug49072.zip
U php/php-src/branches/PHP_5_3/ext/zip/zip_stream.c
U php/php-src/trunk/ext/zip/lib/zip_fread.c
A php/php-src/trunk/ext/zip/tests/bug49072.phpt
A php/php-src/trunk/ext/zip/tests/bug49072.zip
U php/php-src/trunk/ext/zip/zip_stream.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2009-08-11 14:35:20 UTC (rev 287094)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-08-11 15:12:00 UTC (rev 287095)
@@ -11,6 +11,7 @@
- Fixed bug #49095 (proc_get_status['exitcode'] fails on win32). (Felipe)
- Fixed bug #49074 (private class static fields can be modified by using
reflection). (Jani)
+- Fixed bug #49072 (feof never returns true for damaged file in zip). (Pierre)
- Fixed bug #49052 (context option headers freed too early when using
--with-curlwrappers). (Jani)
- Fixed bug #49032 (SplFileObject::fscanf() variables passed by reference).
Modified: php/php-src/branches/PHP_5_2/ext/zip/lib/zip_fread.c
===
--- php/php-src/branches/PHP_5_2/ext/zip/lib/zip_fread.c 2009-08-11 14:35:20 UTC (rev 287094)
+++ php/php-src/branches/PHP_5_2/ext/zip/lib/zip_fread.c 2009-08-11 15:12:00 UTC (rev 287095)
@@ -83,15 +83,26 @@
ret = inflate(zf->zstr, Z_SYNC_FLUSH);
switch (ret) {
+ case Z_STREAM_END:
+ zf->flags |= ZIP_ZF_EOF;
+
case Z_OK:
- case Z_STREAM_END:
+
/* all ok */
/* Z_STREAM_END probably won't happen, since we didn't
have a header */
len = zf->zstr->total_out - out_before;
if (len >= zf->bytes_left || len >= toread) {
- if (zf->flags & ZIP_ZF_CRC)
- zf->crc = crc32(zf->crc, (Bytef *)outbuf, len);
+ if (zf->flags & ZIP_ZF_CRC) {
+ zf->crc = crc32(zf->crc, (Bytef *)outbuf, len);
+ if (zf->flags & ZIP_ZF_EOF == 1) {
+if (zf->crc != zf->crc_orig) {
+ _zip_error_set(&zf->error, ZIP_ER_CRC, 0);
+ return -1;
+}
+
+ }
+ }
zf->bytes_left -= len;
return len;
}
Added: php/php-src/branches/PHP_5_2/ext/zip/tests/bug49072.phpt
===
--- php/php-src/branches/PHP_5_2/ext/zip/tests/bug49072.phpt (rev 0)
+++ php/php-src/branches/PHP_5_2/ext/zip/tests/bug49072.phpt 2009-08-11 15:12:00 UTC (rev 287095)
@@ -0,0 +1,24 @@
+--TEST--
+Bug #49072 (feof never returns true for damaged file in zip)
+--SKIPIF--
+
+--FILE--
+open($f, ZipArchive::CHECKCONS)) {
+ exit ('error can\'t open');
+}
+$r = $o->getStream('file1'); // this file has a wrong crc
+if (!$r)die('failed to open a stream for file1');
+$s = '';
+while (! feof($r)) {
+ $s .= fread($r,1024);
+}
+?>
+--EXPECTF--
+
+Warning: fread(): Zip stream error: CRC error in %s on line %d
Added: php/php-src/branches/PHP_5_2/ext/zip/tests/bug49072.zip
===
(Binary files differ)
Property changes on: php/php-src/branches/PHP_5_2/ext/zip/tests/bug49072.zip
___
Added: svn:mime-type
+ application/octet-stream
Modified: php/php-src/branches/PHP_5_2/ext/zip/zip_stream.c
===
--- php/php-src/branches/PHP_5_2/ext/zip/zip_stream.c 2009-08-11 14:35:20 UTC (rev 287094)
+++ php/php-src/branches/PHP_5_2/ext/zip/zip_stream.c 2009-08-11 15:12:00 UTC (rev 287095)
@@ -35,9 +35,15 @@
if (self->za && self->zf) {
n = (size_t)zip_fread(self->zf, buf, (int)count);
-
- if (n == 0) {
+ if (n < 0) {
+ int ze, se;
+ zip_file_error_get(self->zf, &ze, &se);
stream->eof = 1;
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Zip stream error: %s", zip_file_strerror(self->zf));
+ return 0;
+ }
+ if (n == 0 || n < count) {
+ stream->eof = 1;
} else {
self->cursor += n;
}
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-08-11 14:35:20 UTC (rev 287094)
+++ php/php-src/b
RE: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/Zend/ zend_alloc.c
Sure.
> -Original Message-
> From: Derick Rethans [mailto:der...@php.net]
> Sent: Tuesday, August 11, 2009 2:11 AM
> To: Andi Gutmans
> Cc: php-cvs@lists.php.net; gwy...@php.net
> Subject: Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/Zend/
zend_alloc.c
>
> On Sun, 9 Aug 2009, Andi Gutmans wrote:
>
> > andi Sun, 09 Aug 2009 04:46:30
+
> >
> > Revision: http://svn.php.net/viewvc?view=revision&revision=286941
> >
> > Log:
> > - MFH
>
> Could you please commit those changes to trunk and branches/* at the
> same time? Or at least repeat the log message? "MFH" is not very
useful
> if you're trying to figure out what this patch does.
>
> regards,
> Derick
>
> >
> > Changed paths:
> > U php/php-src/branches/PHP_5_3/Zend/zend_alloc.c
> >
> > Modified: php/php-src/branches/PHP_5_3/Zend/zend_alloc.c
> > ===
> > --- php/php-src/branches/PHP_5_3/Zend/zend_alloc.c 2009-08-09
04:46:02 UTC
> (rev 286940)
> > +++ php/php-src/branches/PHP_5_3/Zend/zend_alloc.c 2009-08-09
04:46:30 UTC
> (rev 286941)
> > @@ -709,12 +709,14 @@
> > unsigned int n;
> > unsigned int index = 0;
> >
> > - do {
> > - n = offset[_size & 15];
> > + n = offset[_size & 15];
> > + while (n == 4) {
> > _size >>= 4;
> > index += n;
> > - } while (n == 4);
> > - return index;
> > + n = offset[_size & 15];
> > + }
> > +
> > + return index + n;
> > #endif
> > }
> >
> >
> >
>
> --
> http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org
> twitter: @derickr
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pear_avail
saltybeagle Tue, 11 Aug 2009 13:16:32 + Revision: http://svn.php.net/viewvc?view=revision&revision=287087 Log: Grant Michiel Rook (mrook) karma for Archive_Tar Changed paths: U SVNROOT/pear_avail Modified: SVNROOT/pear_avail === --- SVNROOT/pear_avail 2009-08-11 13:10:45 UTC (rev 287086) +++ SVNROOT/pear_avail 2009-08-11 13:16:32 UTC (rev 287087) @@ -173,7 +173,7 @@ avail|rodrigosprimo|pear/packages/Text_Wiki,pear/packages/Text_Wiki_Tiki,pear/packages/Text_Wiki_Mediawiki avail|hschletz|pear/packages/MDB2 avail|tacker|pear/packages/File_Bittorrent,pear/packages/File_Bittorrent2 -avail|mrook|pear/packages/VersionControl_SVN +avail|mrook|pear/packages/VersionControl_SVN,pear/packages/Archive_Tar # But members of the PHP Group get access to everything. # Note: This line MUST be at the end so that it overrides any unavail settings -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pear_avail
saltybeagle Tue, 11 Aug 2009 13:10:45 +
Revision: http://svn.php.net/viewvc?view=revision&revision=287086
Log:
pear2 is not needed here because the call for matching paths is
fnmatch("{$path}*") - thanks Gwynne.
Changed paths:
U SVNROOT/pear_avail
Modified: SVNROOT/pear_avail
===
--- SVNROOT/pear_avail 2009-08-11 13:09:11 UTC (rev 287085)
+++ SVNROOT/pear_avail 2009-08-11 13:10:45 UTC (rev 287086)
@@ -15,8 +15,8 @@
avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino,neufeind,didou,schst,alain,mrcool,mroch,mike,vgoebbels,mixtli,farell,pmjones,jw,darknoise,!
tarjei,toby,danielc,ieure,metz,gurugeek,rich_y,asnagy,muesli,hcebay,khassani,zamana,aidan,dufuz,sergiosgc,kouber,enemerson,iridium,ortega,guillaume,koyama,scottmattocks,eric,wenz,goetsch,tacker,aph,bolk,cweiske,amt,jinxidoru,cbleek,nosey,abaker,jayeshsh,fredericpoeydome,sean,toggg,navin,pfischer,davidc,markus,cross,crafics,roychri,kore,troehr,sfrausch,bdunlap,drewish,firman,epte,timj,taak,ssuceveanu,bate,anant,hirose31,amistry,thesee,jausions,ostborn,wiesemann,amir,clockwerx|pear/packages,pear/peardoc,pear2
-# The PEAR group has access to full pear tree, and pear2
-avail|ashnazg,clockwerx,cweiske,gauthierm,kguest,saltybeagle,shupp|pear,pear2
+# The PEAR group has access to pear*
+avail|ashnazg,clockwerx,cweiske,gauthierm,kguest,saltybeagle,shupp|pear
# PEAR bits in the main php-src module
avail|cox,mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,cellog,pajoye,timj,clay,dufuz,bjori,davidc,saltybeagle,derick|pear/pear-core
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/zip/tests/ bug38943_2.phpt
pajoye Tue, 11 Aug 2009 13:09:11 +
Revision: http://svn.php.net/viewvc?view=revision&revision=287085
Log:
-skip if not 5.3
Changed paths:
U php/php-src/trunk/ext/zip/tests/bug38943_2.phpt
Modified: php/php-src/trunk/ext/zip/tests/bug38943_2.phpt
===
--- php/php-src/trunk/ext/zip/tests/bug38943_2.phpt 2009-08-11 12:45:36 UTC
(rev 287084)
+++ php/php-src/trunk/ext/zip/tests/bug38943_2.phpt 2009-08-11 13:09:11 UTC
(rev 287085)
@@ -4,7 +4,9 @@
=")) die('skip test for 5.x
only');
+
?>
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/pcre/config0.m4 branches/PHP_5_3/ext/pcre/config0.m4 trunk/ext/pcre/config0.m4
On Tue, 11 Aug 2009, Scott MacVicar wrote: > scottmac Tue, 11 Aug 2009 12:03:29 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=287081 > > Log: > Search /usr/include too for those wanting to use a system PCRE. This message says something else than you did: > -for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include > $PHP_PCRE_REGEX/include/pcre; do > +for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include > $PHP_PCRE_REGEX/local/include $PHP_PCRE_REGEX/include/pcre; do regards, Derick -- http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org twitter: @derickr -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/pcre/config0.m4 branches/PHP_5_3/ext/pcre/config0.m4 trunk/ext/pcre/config0.m4
scottmac Tue, 11 Aug 2009 12:03:29 + Revision: http://svn.php.net/viewvc?view=revision&revision=287081 Log: Search /usr/include too for those wanting to use a system PCRE. Changed paths: U php/php-src/branches/PHP_5_2/ext/pcre/config0.m4 U php/php-src/branches/PHP_5_3/ext/pcre/config0.m4 U php/php-src/trunk/ext/pcre/config0.m4 Modified: php/php-src/branches/PHP_5_2/ext/pcre/config0.m4 === --- php/php-src/branches/PHP_5_2/ext/pcre/config0.m42009-08-11 11:58:11 UTC (rev 287080) +++ php/php-src/branches/PHP_5_2/ext/pcre/config0.m42009-08-11 12:03:29 UTC (rev 287081) @@ -16,7 +16,7 @@ PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/]) AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ]) else -for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre; do +for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/local/include $PHP_PCRE_REGEX/include/pcre; do test -f $i/pcre.h && PCRE_INCDIR=$i done Modified: php/php-src/branches/PHP_5_3/ext/pcre/config0.m4 === --- php/php-src/branches/PHP_5_3/ext/pcre/config0.m42009-08-11 11:58:11 UTC (rev 287080) +++ php/php-src/branches/PHP_5_3/ext/pcre/config0.m42009-08-11 12:03:29 UTC (rev 287081) @@ -11,7 +11,7 @@ if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then AC_MSG_CHECKING([for PCRE headers location]) -for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre; do +for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/local/include $PHP_PCRE_REGEX/include/pcre; do test -f $i/pcre.h && PCRE_INCDIR=$i done Modified: php/php-src/trunk/ext/pcre/config0.m4 === --- php/php-src/trunk/ext/pcre/config0.m4 2009-08-11 11:58:11 UTC (rev 287080) +++ php/php-src/trunk/ext/pcre/config0.m4 2009-08-11 12:03:29 UTC (rev 287081) @@ -11,7 +11,7 @@ if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then AC_MSG_CHECKING([for PCRE headers location]) -for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre; do +for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/local/include $PHP_PCRE_REGEX/include/pcre; do test -f $i/pcre.h && PCRE_INCDIR=$i done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/Zend/ zend_alloc.c
On Sun, 9 Aug 2009, Andi Gutmans wrote:
> andi Sun, 09 Aug 2009 04:46:30 +
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=286941
>
> Log:
> - MFH
Could you please commit those changes to trunk and branches/* at the
same time? Or at least repeat the log message? "MFH" is not very useful
if you're trying to figure out what this patch does.
regards,
Derick
>
> Changed paths:
> U php/php-src/branches/PHP_5_3/Zend/zend_alloc.c
>
> Modified: php/php-src/branches/PHP_5_3/Zend/zend_alloc.c
> ===
> --- php/php-src/branches/PHP_5_3/Zend/zend_alloc.c2009-08-09 04:46:02 UTC
> (rev 286940)
> +++ php/php-src/branches/PHP_5_3/Zend/zend_alloc.c2009-08-09 04:46:30 UTC
> (rev 286941)
> @@ -709,12 +709,14 @@
> unsigned int n;
> unsigned int index = 0;
>
> - do {
> - n = offset[_size & 15];
> + n = offset[_size & 15];
> + while (n == 4) {
> _size >>= 4;
> index += n;
> - } while (n == 4);
> - return index;
> + n = offset[_size & 15];
> + }
> +
> + return index + n;
> #endif
> }
>
>
>
--
http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org
twitter: @derickr
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
