[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/Zend/zend.h branches/PHP_5_3/Zend/zend.h trunk/Zend/zend.h
moriyoshiSun, 06 Sep 2009 14:43:09 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288109 Log: - Fix leaks. Changed paths: U php/php-src/branches/PHP_5_2/Zend/zend.h U php/php-src/branches/PHP_5_3/Zend/zend.h U php/php-src/trunk/Zend/zend.h Modified: php/php-src/branches/PHP_5_2/Zend/zend.h === --- php/php-src/branches/PHP_5_2/Zend/zend.h2009-09-06 14:34:21 UTC (rev 288108) +++ php/php-src/branches/PHP_5_2/Zend/zend.h2009-09-06 14:43:09 UTC (rev 288109) @@ -200,8 +200,8 @@ # define do_alloca(p) emalloc(p) # define free_alloca(p)efree(p) # define ALLOCA_FLAG(name) -# define do_alloca_with_limit(p, use_heap) emalloc(p) -# define free_alloca_with_limit(p, use_heap) efree(p) +# define do_alloca_with_limit(p, use_heap) emalloc(p), use_heap = 1 +# define free_alloca_with_limit(p, use_heap) efree(p), use_heap = 1 #endif #if ZEND_DEBUG Modified: php/php-src/branches/PHP_5_3/Zend/zend.h === --- php/php-src/branches/PHP_5_3/Zend/zend.h2009-09-06 14:34:21 UTC (rev 288108) +++ php/php-src/branches/PHP_5_3/Zend/zend.h2009-09-06 14:43:09 UTC (rev 288109) @@ -195,8 +195,8 @@ #else # define ALLOCA_FLAG(name) # define SET_ALLOCA_FLAG(name) -# define do_alloca(p, use_heap)emalloc(p) -# define free_alloca(p, use_heap) efree(p) +# define do_alloca(p, use_heap)emalloc(p), use_heap = 1 +# define free_alloca(p, use_heap) efree(p), use_heap = 1 #endif #if ZEND_DEBUG Modified: php/php-src/trunk/Zend/zend.h === --- php/php-src/trunk/Zend/zend.h 2009-09-06 14:34:21 UTC (rev 288108) +++ php/php-src/trunk/Zend/zend.h 2009-09-06 14:43:09 UTC (rev 288109) @@ -196,8 +196,8 @@ #else # define ALLOCA_FLAG(name) # define SET_ALLOCA_FLAG(name) -# define do_alloca(p, use_heap)emalloc(p) -# define free_alloca(p, use_heap) efree(p) +# define do_alloca(p, use_heap)emalloc(p), use_heap = 1 +# define free_alloca(p, use_heap) efree(p), use_heap = 1 #endif #if ZEND_DEBUG -- 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/Zend/zend.h branches/PHP_5_3/Zend/zend.h trunk/Zend/zend.h
Hi, This change breaks the build, sounds wrong and I did not see any leak in there. Do you have a test case to reproduce the leak you are trying to fix? In the mean time, please revert this change. On Sun, Sep 6, 2009 at 4:43 PM, Moriyoshi Koizumimoriyo...@php.net wrote: moriyoshi Sun, 06 Sep 2009 14:43:09 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288109 Log: - Fix leaks. Changed paths: U php/php-src/branches/PHP_5_2/Zend/zend.h U php/php-src/branches/PHP_5_3/Zend/zend.h U php/php-src/trunk/Zend/zend.h Modified: php/php-src/branches/PHP_5_2/Zend/zend.h === --- php/php-src/branches/PHP_5_2/Zend/zend.h 2009-09-06 14:34:21 UTC (rev 288108) +++ php/php-src/branches/PHP_5_2/Zend/zend.h 2009-09-06 14:43:09 UTC (rev 288109) @@ -200,8 +200,8 @@ # define do_alloca(p) emalloc(p) # define free_alloca(p) efree(p) # define ALLOCA_FLAG(name) -# define do_alloca_with_limit(p, use_heap) emalloc(p) -# define free_alloca_with_limit(p, use_heap) efree(p) +# define do_alloca_with_limit(p, use_heap) emalloc(p), use_heap = 1 +# define free_alloca_with_limit(p, use_heap) efree(p), use_heap = 1 #endif #if ZEND_DEBUG Modified: php/php-src/branches/PHP_5_3/Zend/zend.h === --- php/php-src/branches/PHP_5_3/Zend/zend.h 2009-09-06 14:34:21 UTC (rev 288108) +++ php/php-src/branches/PHP_5_3/Zend/zend.h 2009-09-06 14:43:09 UTC (rev 288109) @@ -195,8 +195,8 @@ #else # define ALLOCA_FLAG(name) # define SET_ALLOCA_FLAG(name) -# define do_alloca(p, use_heap) emalloc(p) -# define free_alloca(p, use_heap) efree(p) +# define do_alloca(p, use_heap) emalloc(p), use_heap = 1 +# define free_alloca(p, use_heap) efree(p), use_heap = 1 #endif #if ZEND_DEBUG Modified: php/php-src/trunk/Zend/zend.h === --- php/php-src/trunk/Zend/zend.h 2009-09-06 14:34:21 UTC (rev 288108) +++ php/php-src/trunk/Zend/zend.h 2009-09-06 14:43:09 UTC (rev 288109) @@ -196,8 +196,8 @@ #else # define ALLOCA_FLAG(name) # define SET_ALLOCA_FLAG(name) -# define do_alloca(p, use_heap) emalloc(p) -# define free_alloca(p, use_heap) efree(p) +# define do_alloca(p, use_heap) emalloc(p), use_heap = 1 +# define free_alloca(p, use_heap) efree(p), use_heap = 1 #endif #if ZEND_DEBUG -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Pierre 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
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/Zend/zend.h branches/PHP_5_3/Zend/zend.h trunk/Zend/zend.h
pajoye Sun, 06 Sep 2009 15:56:58 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288110 Log: - revert last commit, breaks the build and needs test case(s) Changed paths: U php/php-src/branches/PHP_5_2/Zend/zend.h U php/php-src/branches/PHP_5_3/Zend/zend.h U php/php-src/trunk/Zend/zend.h Modified: php/php-src/branches/PHP_5_2/Zend/zend.h === --- php/php-src/branches/PHP_5_2/Zend/zend.h2009-09-06 14:43:09 UTC (rev 288109) +++ php/php-src/branches/PHP_5_2/Zend/zend.h2009-09-06 15:56:58 UTC (rev 288110) @@ -200,8 +200,8 @@ # define do_alloca(p) emalloc(p) # define free_alloca(p)efree(p) # define ALLOCA_FLAG(name) -# define do_alloca_with_limit(p, use_heap) emalloc(p), use_heap = 1 -# define free_alloca_with_limit(p, use_heap) efree(p), use_heap = 1 +# define do_alloca_with_limit(p, use_heap) emalloc(p) +# define free_alloca_with_limit(p, use_heap) efree(p) #endif #if ZEND_DEBUG Modified: php/php-src/branches/PHP_5_3/Zend/zend.h === --- php/php-src/branches/PHP_5_3/Zend/zend.h2009-09-06 14:43:09 UTC (rev 288109) +++ php/php-src/branches/PHP_5_3/Zend/zend.h2009-09-06 15:56:58 UTC (rev 288110) @@ -195,8 +195,8 @@ #else # define ALLOCA_FLAG(name) # define SET_ALLOCA_FLAG(name) -# define do_alloca(p, use_heap)emalloc(p), use_heap = 1 -# define free_alloca(p, use_heap) efree(p), use_heap = 1 +# define do_alloca(p, use_heap)emalloc(p) +# define free_alloca(p, use_heap) efree(p) #endif #if ZEND_DEBUG Modified: php/php-src/trunk/Zend/zend.h === --- php/php-src/trunk/Zend/zend.h 2009-09-06 14:43:09 UTC (rev 288109) +++ php/php-src/trunk/Zend/zend.h 2009-09-06 15:56:58 UTC (rev 288110) @@ -196,8 +196,8 @@ #else # define ALLOCA_FLAG(name) # define SET_ALLOCA_FLAG(name) -# define do_alloca(p, use_heap)emalloc(p), use_heap = 1 -# define free_alloca(p, use_heap) efree(p), use_heap = 1 +# define do_alloca(p, use_heap)emalloc(p) +# define free_alloca(p, use_heap) efree(p) #endif #if ZEND_DEBUG -- 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/Zend/zend.h branches/PHP_5_3/Zend/zend.h trunk/Zend/zend.h
Ok, I just figured out now. I'm gonna revert'em shortly Moriyoshi On Mon, Sep 7, 2009 at 1:02 AM, Moriyoshi Koizumim...@mozo.jp wrote: Hi, Obviously use_heap has to be set to true whenever the heap is used. Doesn't it? The problem only occurs on Mac OS X and I noticed this during developing an extension that is just a private one. Moriyoshi On Sun, Sep 6, 2009 at 11:55 PM, Pierre Joyepierre@gmail.com wrote: Hi, This change breaks the build, sounds wrong and I did not see any leak in there. Do you have a test case to reproduce the leak you are trying to fix? In the mean time, please revert this change. On Sun, Sep 6, 2009 at 4:43 PM, Moriyoshi Koizumimoriyo...@php.net wrote: moriyoshi Sun, 06 Sep 2009 14:43:09 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288109 Log: - Fix leaks. Changed paths: U php/php-src/branches/PHP_5_2/Zend/zend.h U php/php-src/branches/PHP_5_3/Zend/zend.h U php/php-src/trunk/Zend/zend.h Modified: php/php-src/branches/PHP_5_2/Zend/zend.h === --- php/php-src/branches/PHP_5_2/Zend/zend.h 2009-09-06 14:34:21 UTC (rev 288108) +++ php/php-src/branches/PHP_5_2/Zend/zend.h 2009-09-06 14:43:09 UTC (rev 288109) @@ -200,8 +200,8 @@ # define do_alloca(p) emalloc(p) # define free_alloca(p) efree(p) # define ALLOCA_FLAG(name) -# define do_alloca_with_limit(p, use_heap) emalloc(p) -# define free_alloca_with_limit(p, use_heap) efree(p) +# define do_alloca_with_limit(p, use_heap) emalloc(p), use_heap = 1 +# define free_alloca_with_limit(p, use_heap) efree(p), use_heap = 1 #endif #if ZEND_DEBUG Modified: php/php-src/branches/PHP_5_3/Zend/zend.h === --- php/php-src/branches/PHP_5_3/Zend/zend.h 2009-09-06 14:34:21 UTC (rev 288108) +++ php/php-src/branches/PHP_5_3/Zend/zend.h 2009-09-06 14:43:09 UTC (rev 288109) @@ -195,8 +195,8 @@ #else # define ALLOCA_FLAG(name) # define SET_ALLOCA_FLAG(name) -# define do_alloca(p, use_heap) emalloc(p) -# define free_alloca(p, use_heap) efree(p) +# define do_alloca(p, use_heap) emalloc(p), use_heap = 1 +# define free_alloca(p, use_heap) efree(p), use_heap = 1 #endif #if ZEND_DEBUG Modified: php/php-src/trunk/Zend/zend.h === --- php/php-src/trunk/Zend/zend.h 2009-09-06 14:34:21 UTC (rev 288108) +++ php/php-src/trunk/Zend/zend.h 2009-09-06 14:43:09 UTC (rev 288109) @@ -196,8 +196,8 @@ #else # define ALLOCA_FLAG(name) # define SET_ALLOCA_FLAG(name) -# define do_alloca(p, use_heap) emalloc(p) -# define free_alloca(p, use_heap) efree(p) +# define do_alloca(p, use_heap) emalloc(p), use_heap = 1 +# define free_alloca(p, use_heap) efree(p), use_heap = 1 #endif #if ZEND_DEBUG -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Pierre 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 -- 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/Zend/zend.h branches/PHP_5_3/Zend/zend.h trunk/Zend/zend.h
already done :) On Sun, Sep 6, 2009 at 6:03 PM, Moriyoshi Koizumim...@mozo.jp wrote: Ok, I just figured out now. I'm gonna revert'em shortly Moriyoshi On Mon, Sep 7, 2009 at 1:02 AM, Moriyoshi Koizumim...@mozo.jp wrote: Hi, Obviously use_heap has to be set to true whenever the heap is used. Doesn't it? The problem only occurs on Mac OS X and I noticed this during developing an extension that is just a private one. Moriyoshi On Sun, Sep 6, 2009 at 11:55 PM, Pierre Joyepierre@gmail.com wrote: Hi, This change breaks the build, sounds wrong and I did not see any leak in there. Do you have a test case to reproduce the leak you are trying to fix? In the mean time, please revert this change. On Sun, Sep 6, 2009 at 4:43 PM, Moriyoshi Koizumimoriyo...@php.net wrote: moriyoshi Sun, 06 Sep 2009 14:43:09 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288109 Log: - Fix leaks. Changed paths: U php/php-src/branches/PHP_5_2/Zend/zend.h U php/php-src/branches/PHP_5_3/Zend/zend.h U php/php-src/trunk/Zend/zend.h Modified: php/php-src/branches/PHP_5_2/Zend/zend.h === --- php/php-src/branches/PHP_5_2/Zend/zend.h 2009-09-06 14:34:21 UTC (rev 288108) +++ php/php-src/branches/PHP_5_2/Zend/zend.h 2009-09-06 14:43:09 UTC (rev 288109) @@ -200,8 +200,8 @@ # define do_alloca(p) emalloc(p) # define free_alloca(p) efree(p) # define ALLOCA_FLAG(name) -# define do_alloca_with_limit(p, use_heap) emalloc(p) -# define free_alloca_with_limit(p, use_heap) efree(p) +# define do_alloca_with_limit(p, use_heap) emalloc(p), use_heap = 1 +# define free_alloca_with_limit(p, use_heap) efree(p), use_heap = 1 #endif #if ZEND_DEBUG Modified: php/php-src/branches/PHP_5_3/Zend/zend.h === --- php/php-src/branches/PHP_5_3/Zend/zend.h 2009-09-06 14:34:21 UTC (rev 288108) +++ php/php-src/branches/PHP_5_3/Zend/zend.h 2009-09-06 14:43:09 UTC (rev 288109) @@ -195,8 +195,8 @@ #else # define ALLOCA_FLAG(name) # define SET_ALLOCA_FLAG(name) -# define do_alloca(p, use_heap) emalloc(p) -# define free_alloca(p, use_heap) efree(p) +# define do_alloca(p, use_heap) emalloc(p), use_heap = 1 +# define free_alloca(p, use_heap) efree(p), use_heap = 1 #endif #if ZEND_DEBUG Modified: php/php-src/trunk/Zend/zend.h === --- php/php-src/trunk/Zend/zend.h 2009-09-06 14:34:21 UTC (rev 288108) +++ php/php-src/trunk/Zend/zend.h 2009-09-06 14:43:09 UTC (rev 288109) @@ -196,8 +196,8 @@ #else # define ALLOCA_FLAG(name) # define SET_ALLOCA_FLAG(name) -# define do_alloca(p, use_heap) emalloc(p) -# define free_alloca(p, use_heap) efree(p) +# define do_alloca(p, use_heap) emalloc(p), use_heap = 1 +# define free_alloca(p, use_heap) efree(p), use_heap = 1 #endif #if ZEND_DEBUG -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Pierre 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 -- Pierre 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
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pcre/php_pcre.c trunk/ext/pcre/php_pcre.c
felipe Sun, 06 Sep 2009 17:41:34 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288111 Log: - Fixed bug #49483 (preg_replace 'subject' parameter listed as optional) Bug: http://bugs.php.net/49483 (Open) preg_replace 'subject' parameter listed as optional Changed paths: U php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c U php/php-src/trunk/ext/pcre/php_pcre.c Modified: php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c === --- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c2009-09-06 15:56:58 UTC (rev 288110) +++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c2009-09-06 17:41:34 UTC (rev 288111) @@ -1836,7 +1836,7 @@ ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace, 0, 0, 3) ZEND_ARG_INFO(0, regex) ZEND_ARG_INFO(0, replace) ZEND_ARG_INFO(0, subject) Modified: php/php-src/trunk/ext/pcre/php_pcre.c === --- php/php-src/trunk/ext/pcre/php_pcre.c 2009-09-06 15:56:58 UTC (rev 288110) +++ php/php-src/trunk/ext/pcre/php_pcre.c 2009-09-06 17:41:34 UTC (rev 288111) @@ -2046,7 +2046,7 @@ ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace, 0, 0, 3) ZEND_ARG_INFO(0, regex) ZEND_ARG_INFO(0, replace) ZEND_ARG_INFO(0, subject) -- 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/ info.c
pajoye Sun, 06 Sep 2009 22:01:18 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288116
Log:
- fix #40013, php_uname() doesnt return nodename (MFH)
Bug: http://bugs.php.net/40013 (Open) php_uname() doesnt return nodename
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/info.c
Modified: php/php-src/branches/PHP_5_3/ext/standard/info.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/info.c2009-09-06 21:48:55 UTC
(rev 288115)
+++ php/php-src/branches/PHP_5_3/ext/standard/info.c2009-09-06 22:01:18 UTC
(rev 288116)
@@ -527,9 +527,33 @@
if (uname((struct utsname *)buf) == -1) {
php_uname = PHP_UNAME;
} else {
+#ifdef NETWARE
if (mode == 's') {
php_uname = buf.sysname;
} else if (mode == 'r') {
+ snprintf(tmp_uname, sizeof(tmp_uname), %d.%d.%d,
+buf.netware_major, buf.netware_minor,
buf.netware_revision);
+ php_uname = tmp_uname;
+ } else if (mode == 'n') {
+ php_uname = buf.servername;
+ } else if (mode == 'v') {
+ snprintf(tmp_uname, sizeof(tmp_uname), libc-%d.%d.%d
#%d,
+buf.libmajor, buf.libminor,
buf.librevision, buf.libthreshold);
+ php_uname = tmp_uname;
+ } else if (mode == 'm') {
+ php_uname = buf.machine;
+ } else { /* assume mode == 'a' */
+ snprintf(tmp_uname, sizeof(tmp_uname), %s %s %d.%d.%d
libc-%d.%d.%d #%d %s,
+buf.sysname, buf.servername,
+buf.netware_major, buf.netware_minor,
buf.netware_revision,
+buf.libmajor, buf.libminor,
buf.librevision, buf.libthreshold,
+buf.machine);
+ php_uname = tmp_uname;
+ }
+#else
+ if (mode == 's') {
+ php_uname = buf.sysname;
+ } else if (mode == 'r') {
php_uname = buf.release;
} else if (mode == 'n') {
php_uname = buf.nodename;
@@ -543,6 +567,7 @@
buf.machine);
php_uname = tmp_uname;
}
+#endif /* NETWARE */
}
#else
php_uname = PHP_UNAME;
--
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/filter/sanitizing_filters.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/filter/sanitizing_filters.c trunk/ext/filter/sanitizing_f
iliaaMon, 07 Sep 2009 02:35:25 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288117
Log:
Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters).
Bug: http://bugs.php.net/49470 (Verified) FILTER_SANITIZE_EMAIL does not work
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/filter/sanitizing_filters.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/filter/sanitizing_filters.c
U php/php-src/trunk/ext/filter/sanitizing_filters.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2009-09-06 22:01:18 UTC (rev 288116)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-09-07 02:35:25 UTC (rev 288117)
@@ -1,11 +1,11 @@
PHPNEWS
|||
0? Sep 2009, PHP 5.2.11
-- Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo)
+- Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters).
- Fixed bug #49447 (php engine needs to correctly check for socket API return
status on windows). (Sriram Natarajan)
+- Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo)
-
03 Sep 2009, PHP 5.2.11RC2
- Added missing sanity checks around exif processing. (Ilia)
Modified: php/php-src/branches/PHP_5_2/ext/filter/sanitizing_filters.c
===
--- php/php-src/branches/PHP_5_2/ext/filter/sanitizing_filters.c
2009-09-06 22:01:18 UTC (rev 288116)
+++ php/php-src/branches/PHP_5_2/ext/filter/sanitizing_filters.c
2009-09-07 02:35:25 UTC (rev 288117)
@@ -275,7 +275,7 @@
void php_filter_email(PHP_INPUT_FILTER_PARAM_DECL)
{
/* Check section 6 of rfc 822 http://www.faqs.org/rfcs/rfc822.html */
- const unsigned char allowed_list[] = LOWALPHA HIALPHA DIGIT
!#$%'*+-/=?^_`{|}...@.[];
+ const unsigned char allowed_list[] = LOWALPHA HIALPHA DIGIT
!#$%'*+-=?^_`{|}...@.[];
filter_map map;
filter_map_init(map);
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-09-06 22:01:18 UTC (rev 288116)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-09-07 02:35:25 UTC (rev 288117)
@@ -5,6 +5,8 @@
?? ??? 2009, PHP 5.3.1RC?
- Restored shebang line check to CGI sapi (not checked by scanner anymore).
(Jani)
+- Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters).
+ (Ilia)
?? ??? 2009, PHP 5.3.1
- Upgraded bundled sqlite to version 3.6.17. (Scott)
Modified: php/php-src/branches/PHP_5_3/ext/filter/sanitizing_filters.c
===
--- php/php-src/branches/PHP_5_3/ext/filter/sanitizing_filters.c
2009-09-06 22:01:18 UTC (rev 288116)
+++ php/php-src/branches/PHP_5_3/ext/filter/sanitizing_filters.c
2009-09-07 02:35:25 UTC (rev 288117)
@@ -275,7 +275,7 @@
void php_filter_email(PHP_INPUT_FILTER_PARAM_DECL)
{
/* Check section 6 of rfc 822 http://www.faqs.org/rfcs/rfc822.html */
- const unsigned char allowed_list[] = LOWALPHA HIALPHA DIGIT
!#$%'*+-/=?^_`{|}...@.[];
+ const unsigned char allowed_list[] = LOWALPHA HIALPHA DIGIT
!#$%'*+-=?^_`{|}...@.[];
filter_map map;
filter_map_init(map);
Modified: php/php-src/trunk/ext/filter/sanitizing_filters.c
===
--- php/php-src/trunk/ext/filter/sanitizing_filters.c 2009-09-06 22:01:18 UTC
(rev 288116)
+++ php/php-src/trunk/ext/filter/sanitizing_filters.c 2009-09-07 02:35:25 UTC
(rev 288117)
@@ -275,7 +275,7 @@
void php_filter_email(PHP_INPUT_FILTER_PARAM_DECL)
{
/* Check section 6 of rfc 822 http://www.faqs.org/rfcs/rfc822.html */
- const unsigned char allowed_list[] = LOWALPHA HIALPHA DIGIT
!#$%'*+-/=?^_`{|}...@.[];
+ const unsigned char allowed_list[] = LOWALPHA HIALPHA DIGIT
!#$%'*+-=?^_`{|}...@.[];
filter_map map;
filter_map_init(map);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
