[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/simplexml/simplexml.c trunk/ext/simplexml/simplexml.c
dmitry Mon, 17 May 2010 07:50:33 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=299424
Log:
Fixed a possible crash because of recursive GC invocation
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c
U php/php-src/trunk/ext/simplexml/simplexml.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-05-17 07:44:30 UTC (rev 299423)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-05-17 07:50:33 UTC (rev 299424)
@@ -23,6 +23,7 @@
- Fixed very rare memory leak in mysqlnd, when binding thousands of columns.
(Andrey)
+- Fixed a possible crash because of recursive GC invocation. (Dmitry)
- Fixed a possible resource destruction issues in shm_put_var()
Reported by Stefan Esser (Dmitry)
- Fixed a possible information leak because of interruption of XOR operator.
Modified: php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c
===
--- php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c 2010-05-17
07:44:30 UTC (rev 299423)
+++ php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c 2010-05-17
07:50:33 UTC (rev 299424)
@@ -1083,6 +1083,9 @@
zend_hash_clean(sxe-properties);
rv = sxe-properties;
} else {
+ if (GC_G(gc_active)) {
+ return NULL;
+ }
ALLOC_HASHTABLE(rv);
zend_hash_init(rv, 0, NULL, ZVAL_PTR_DTOR, 0);
sxe-properties = rv;
Modified: php/php-src/trunk/ext/simplexml/simplexml.c
===
--- php/php-src/trunk/ext/simplexml/simplexml.c 2010-05-17 07:44:30 UTC (rev
299423)
+++ php/php-src/trunk/ext/simplexml/simplexml.c 2010-05-17 07:50:33 UTC (rev
299424)
@@ -1083,6 +1083,9 @@
zend_hash_clean(sxe-properties);
rv = sxe-properties;
} else {
+ if (GC_G(gc_active)) {
+ return NULL;
+ }
ALLOC_HASHTABLE(rv);
zend_hash_init(rv, 0, NULL, ZVAL_PTR_DTOR, 0);
sxe-properties = rv;
--
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/standard/dns_win32.c trunk/ext/standard/dns_win32.c
pajoye Mon, 17 May 2010 18:55:35 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=299432
Log:
- #51844, checkdnsrr does not support types other than MX
Bug: http://bugs.php.net/51844 (Assigned) checkdnsrr does not support types
other than MX
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c
U php/php-src/trunk/ext/standard/dns_win32.c
Modified: php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c 2010-05-17
16:14:27 UTC (rev 299431)
+++ php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c 2010-05-17
18:55:35 UTC (rev 299432)
@@ -122,7 +122,7 @@
}
}
- status = DnsQuery_A(hostname, DNS_TYPE_MX, DNS_QUERY_STANDARD, NULL,
pResult, NULL);
+ status = DnsQuery_A(hostname, type, DNS_QUERY_STANDARD, NULL, pResult,
NULL);
if (status) {
RETURN_FALSE;
Modified: php/php-src/trunk/ext/standard/dns_win32.c
===
--- php/php-src/trunk/ext/standard/dns_win32.c 2010-05-17 16:14:27 UTC (rev
299431)
+++ php/php-src/trunk/ext/standard/dns_win32.c 2010-05-17 18:55:35 UTC (rev
299432)
@@ -122,8 +122,10 @@
}
}
- status = DnsQuery_A(hostname, DNS_TYPE_MX, DNS_QUERY_STANDARD, NULL,
pResult, NULL);
+ status = DnsQuery_A(hostname, type, DNS_QUERY_STANDARD, NULL, pResult,
NULL);
+
+
if (status) {
RETURN_FALSE;
}
--
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 Mon, 17 May 2010 18:56:43 + Revision: http://svn.php.net/viewvc?view=revisionrevision=299433 Log: - 51844 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 2010-05-17 18:55:35 UTC (rev 299432) +++ php/php-src/branches/PHP_5_3/NEWS 2010-05-17 18:56:43 UTC (rev 299433) @@ -55,6 +55,7 @@ requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert) - Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas) +- Fixed bug #51844 (checkdnsrr does not support types other than MX). (Pierre) - Fixed bug #51827 (Bad warning when register_shutdown_function called with wrong num of parameters). (Felipe) - Fixed bug #51791 (constant() aborts execution when fail to check undefined -- 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/ldap/config.w32 branches/PHP_5_3/ext/ldap/ldap.c branches/PHP_5_3/ext/ldap/php_ldap.h trunk/ext/ldap/config.w32 trunk/ext/ldap/ldap.c trunk/ext/ldap/p
pajoye Mon, 17 May 2010 20:09:42 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=299434
Log:
- #43233, sasl support for ldap on windows
Bug: http://bugs.php.net/43233 (Assigned) SASL options do not load - Missing
SASL support in windows builds
Changed paths:
U php/php-src/branches/PHP_5_3/ext/ldap/config.w32
U php/php-src/branches/PHP_5_3/ext/ldap/ldap.c
U php/php-src/branches/PHP_5_3/ext/ldap/php_ldap.h
U php/php-src/trunk/ext/ldap/config.w32
U php/php-src/trunk/ext/ldap/ldap.c
U php/php-src/trunk/ext/ldap/php_ldap.h
Modified: php/php-src/branches/PHP_5_3/ext/ldap/config.w32
===
--- php/php-src/branches/PHP_5_3/ext/ldap/config.w322010-05-17 18:56:43 UTC
(rev 299433)
+++ php/php-src/branches/PHP_5_3/ext/ldap/config.w322010-05-17 20:09:42 UTC
(rev 299434)
@@ -11,13 +11,17 @@
CHECK_LIB(ssleay32.lib, ldap, PHP_LDAP)
CHECK_LIB(libeay32.lib, ldap, PHP_LDAP)
CHECK_LIB(oldap32_a.lib, ldap, PHP_LDAP)
- CHECK_LIB(olber32_a.lib, ldap, PHP_LDAP)) {
+ CHECK_LIB(olber32_a.lib, ldap, PHP_LDAP)
+ CHECK_LIB(libsasl.lib, ldap, PHP_LDAP)) {
EXTENSION('ldap', 'ldap.c');
AC_DEFINE('HAVE_LDAP_PARSE_RESULT', 1);
AC_DEFINE('HAVE_LDAP_PARSE_REFERENCE', 1);
AC_DEFINE('HAVE_LDAP_START_TLS_S', 1);
AC_DEFINE('HAVE_LDAP', 1);
+ AC_DEFINE('HAVE_LDAP_SASL', 1);
+ AC_DEFINE('HAVE_LDAP_SASL_SASL_H', 1);
+ AC_DEFINE('LDAP_DEPRECATED', 1);
} else {
WARNING(ldap not enabled; libraries and headers not found);
Modified: php/php-src/branches/PHP_5_3/ext/ldap/ldap.c
===
--- php/php-src/branches/PHP_5_3/ext/ldap/ldap.c2010-05-17 18:56:43 UTC
(rev 299433)
+++ php/php-src/branches/PHP_5_3/ext/ldap/ldap.c2010-05-17 20:09:42 UTC
(rev 299434)
@@ -46,6 +46,7 @@
#ifdef PHP_WIN32
#include string.h
+#include config.w32.h
#if HAVE_NSLDAP
#include winsock2.h
#endif
Modified: php/php-src/branches/PHP_5_3/ext/ldap/php_ldap.h
===
--- php/php-src/branches/PHP_5_3/ext/ldap/php_ldap.h2010-05-17 18:56:43 UTC
(rev 299433)
+++ php/php-src/branches/PHP_5_3/ext/ldap/php_ldap.h2010-05-17 20:09:42 UTC
(rev 299434)
@@ -26,6 +26,7 @@
#ifndef HAVE_ORALDAP
#include lber.h
#endif
+
#include ldap.h
extern zend_module_entry ldap_module_entry;
Modified: php/php-src/trunk/ext/ldap/config.w32
===
--- php/php-src/trunk/ext/ldap/config.w32 2010-05-17 18:56:43 UTC (rev
299433)
+++ php/php-src/trunk/ext/ldap/config.w32 2010-05-17 20:09:42 UTC (rev
299434)
@@ -11,13 +11,17 @@
CHECK_LIB(ssleay32.lib, ldap, PHP_LDAP)
CHECK_LIB(libeay32.lib, ldap, PHP_LDAP)
CHECK_LIB(oldap32_a.lib, ldap, PHP_LDAP)
- CHECK_LIB(olber32_a.lib, ldap, PHP_LDAP)) {
+ CHECK_LIB(olber32_a.lib, ldap, PHP_LDAP)
+ CHECK_LIB(libsasl.lib, ldap, PHP_LDAP)) {
EXTENSION('ldap', 'ldap.c');
AC_DEFINE('HAVE_LDAP_PARSE_RESULT', 1);
AC_DEFINE('HAVE_LDAP_PARSE_REFERENCE', 1);
AC_DEFINE('HAVE_LDAP_START_TLS_S', 1);
AC_DEFINE('HAVE_LDAP', 1);
+ AC_DEFINE('HAVE_LDAP_SASL', 1);
+ AC_DEFINE('HAVE_LDAP_SASL_SASL_H', 1);
+ AC_DEFINE('LDAP_DEPRECATED', 1);
} else {
WARNING(ldap not enabled; libraries and headers not found);
Modified: php/php-src/trunk/ext/ldap/ldap.c
===
--- php/php-src/trunk/ext/ldap/ldap.c 2010-05-17 18:56:43 UTC (rev 299433)
+++ php/php-src/trunk/ext/ldap/ldap.c 2010-05-17 20:09:42 UTC (rev 299434)
@@ -46,6 +46,7 @@
#ifdef PHP_WIN32
#include string.h
+#include config.w32.h
#if HAVE_NSLDAP
#include winsock2.h
#endif
Modified: php/php-src/trunk/ext/ldap/php_ldap.h
===
--- php/php-src/trunk/ext/ldap/php_ldap.h 2010-05-17 18:56:43 UTC (rev
299433)
+++ php/php-src/trunk/ext/ldap/php_ldap.h 2010-05-17 20:09:42 UTC (rev
299434)
@@ -26,6 +26,7 @@
#ifndef HAVE_ORALDAP
#include lber.h
#endif
+
#include ldap.h
extern zend_module_entry ldap_module_entry;
--
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 Mon, 17 May 2010 20:22:20 + Revision: http://svn.php.net/viewvc?view=revisionrevision=299435 Log: - #43233 Bug: http://bugs.php.net/43233 (Closed) SASL options do not load - Missing SASL support in windows builds 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 2010-05-17 20:09:42 UTC (rev 299434) +++ php/php-src/branches/PHP_5_3/NEWS 2010-05-17 20:22:20 UTC (rev 299435) @@ -170,6 +170,7 @@ - Fixed bug #48289 (iconv_mime_encode() quoted-printable scheme is broken). (Adam, patch from hiroaki dot kawai at gmail dot com). - Fixed bug #46111 (Some timezone identifiers can not be parsed). (Derick) +- Fixed bug #43233 (sasl support for ldap on Windows). (Pierre) - Fixed bug #35673 (formatOutput does not work with saveHTML). (Rob) -- 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/ext/standard/dns_win32.c trunk/ext/standard/dns_win32.c
test? (lookup php.net or so ... previously there were discussions about
adding test.php.net or so to our zone ...)
johannes
On Mon, 2010-05-17 at 18:55 +, Pierre Joye wrote:
pajoye Mon, 17 May 2010 18:55:35 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=299432
Log:
- #51844, checkdnsrr does not support types other than MX
Bug: http://bugs.php.net/51844 (Assigned) checkdnsrr does not support types
other than MX
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c
U php/php-src/trunk/ext/standard/dns_win32.c
Modified: php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c 2010-05-17
16:14:27 UTC (rev 299431)
+++ php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c 2010-05-17
18:55:35 UTC (rev 299432)
@@ -122,7 +122,7 @@
}
}
- status = DnsQuery_A(hostname, DNS_TYPE_MX, DNS_QUERY_STANDARD, NULL,
pResult, NULL);
+ status = DnsQuery_A(hostname, type, DNS_QUERY_STANDARD, NULL, pResult,
NULL);
if (status) {
RETURN_FALSE;
Modified: php/php-src/trunk/ext/standard/dns_win32.c
===
--- php/php-src/trunk/ext/standard/dns_win32.c2010-05-17 16:14:27 UTC
(rev 299431)
+++ php/php-src/trunk/ext/standard/dns_win32.c2010-05-17 18:55:35 UTC
(rev 299432)
@@ -122,8 +122,10 @@
}
}
- status = DnsQuery_A(hostname, DNS_TYPE_MX, DNS_QUERY_STANDARD, NULL,
pResult, NULL);
+ status = DnsQuery_A(hostname, type, DNS_QUERY_STANDARD, NULL, pResult,
NULL);
+
+
if (status) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
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/ext/standard/dns_win32.c trunk/ext/standard/dns_win32.c
2010/5/17 Johannes Schlüter johan...@schlueters.de: test? (lookup php.net or so ... previously there were discussions about adding test.php.net or so to our zone ...) yes, I wanted to be sure what we use prior to add a test. Cheers, -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- 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/ext/standard/dns_win32.c trunk/ext/standard/dns_win32.c
2010/5/18 Pierre Joye pierre@gmail.com: 2010/5/17 Johannes Schlüter johan...@schlueters.de: test? (lookup php.net or so ... previously there were discussions about adding test.php.net or so to our zone ...) yes, I wanted to be sure what we use prior to add a test. Last I heard, Martin had sent a proposal to the systems list to add a couple of test domains. Haven't heard back since. Adam -- 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/ext/standard/dns_win32.c trunk/ext/standard/dns_win32.c
On 18.05.10 05:22, Adam Harvey wrote: 2010/5/18 Pierre Joye pierre@gmail.com: 2010/5/17 Johannes Schlüter johan...@schlueters.de: test? (lookup php.net or so ... previously there were discussions about adding test.php.net or so to our zone ...) yes, I wanted to be sure what we use prior to add a test. Last I heard, Martin had sent a proposal to the systems list to add a couple of test domains. Haven't heard back since. Right. I'll query the systems folks today to see what the status is. - Martin -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
