[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Mar 26 01:32:58 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3354r2=1.3355diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3354 php-src/ChangeLog:1.3355 --- php-src/ChangeLog:1.3354Wed Mar 25 01:32:49 2009 +++ php-src/ChangeLog Thu Mar 26 01:32:57 2009 @@ -1,3 +1,130 @@ +2009-03-25 Christian Seiler chris...@gmx.net + +* (PHP_5_3) + main/output.c: + - Fixed memory leak in ob_get_clean/ob_get_flush. + +2009-03-25 Arnaud Le Blanc arnaud...@gmail.com + +* (PHP_5_3) + ext/pcntl/pcntl.c + ext/pcntl/tests/002.phpt: + MFH: Fix build on FreeBSD 7 (fixes #4) + +* ext/pcntl/pcntl.c + ext/pcntl/tests/002.phpt: + Fix build on FreeBSD 7 (fixes #4) + +2009-03-25 Felipe Pena felipe...@gmail.com + +* (PHP_5_3) + NEWS + ext/pcntl/pcntl.c + ext/pcntl/tests/003.phpt: + MFH: + - Fixed bug #47779 (Wrong value for SIG_UNBLOCK and SIG_SETMASK + constants). +Patch by: mbeccati at php.net + +* ext/pcntl/tests/003.phpt + ext/pcntl/tests/003.phpt: + + - Fixed bug #47779 (Wrong value for SIG_UNBLOCK and SIG_SETMASK + constants). +Patch by: mbeccati at php.net + +* ext/pcntl/pcntl.c: + - Fixed bug #47779 (Wrong value for SIG_UNBLOCK and SIG_SETMASK constants). +Patch by: mbeccati at php.net + +2009-03-25 Hannes Magnusson hannes.magnus...@gmail.com + +* main/streams/userspace.c + main/streams/userspace.c: + Add missing proto + +2009-03-25 Ilia Alshanetsky i...@prohost.org + +* (PHP_5_2) + NEWS + ext/filter/logical_filters.c + ext/filter/logical_filters.c: + + MFB: Fixed bug #47772 (FILTER_VALIDATE_EMAIL allows f...@bar. addresses) + +* (PHP_5_3) + ext/filter/logical_filters.c: + + Fixed bug #47772 (FILTER_VALIDATE_EMAIL allows f...@bar. addresses) + +2009-03-25 Takeshi Abe t...@fixedpoint.jp + +* ext/gd/libgd/gdft.c + ext/gd/tests/bug43073.phpt: + MFB: #43073, TrueType bounding box is wrong for angle0 + +* ext/gd/tests/gd_info_variation1.phpt: + fix test to follow #47757 + +2009-03-25 Dmitry Stogov dmi...@zend.com + +* (PHP_5_3) + NEWS + ZendEngine2/zend_globals.h + ZendEngine2/zend_globals.h + ZendEngine2/zend_language_scanner.c + ZendEngine2/zend_language_scanner.c + ZendEngine2/zend_language_scanner.l + ZendEngine2/zend_language_scanner.l + ZendEngine2/zend_language_scanner_defs.h + ZendEngine2/zend_language_scanner_defs.h + ext/standard/basic_functions.c + ext/tokenizer/tokenizer.c + ext/tokenizer/tokenizer.c: + Fixed bug #47038 (Memory leak in include) + +2009-03-25 Felipe Pena felipe...@gmail.com + +* ext/pdo/pdo_dbh.c + ext/pdo/pdo_stmt.c: + - Fixed some code to be working with unicode + +2009-03-25 Dmitry Stogov dmi...@zend.com + +* (PHP_5_3) + NEWS + ZendEngine2/zend_interfaces.c + ZendEngine2/zend_interfaces.c + ZendEngine2/tests/bug47699.phpt + ZendEngine2/tests/bug47699.phpt + ZendEngine2/tests/bug47699.phpt: + Fixed bug #47699 (autoload and late static binding) + +2009-03-25 Johannes Schlüter johan...@schlueters.de + +* (PHP_5_3) + ext/mysql/php_mysql.c + ext/mysql/tests/mysql_db_query.phpt: + MFH: mysql_db_query() is always deprecated + +* ext/mysql/php_mysql.c + ext/mysql/tests/mysql_db_query.phpt: + mysql_db_query() is always deprecated + +2009-03-25 Christopher Jones christopher.jo...@oracle.com + +* (PHP_5_3) + ext/oci8/package.xml + ext/oci8/package2.xml: + Obsolete package2.xml: resume using package.xml + +* ext/oci8/package.xml: + sync with 5.3 + +* ext/oci8/tests/bind_long.phpt + ext/oci8/tests/test.txt: + use random text + 2009-03-24 Ilia Alshanetsky i...@prohost.org * (PHP_5_3) @@ -33990,7 +34117,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3354 2009/03/25 01:32:49 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3355 2009/03/26 01:32:57 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
[PHP-CVS] cvs: php-src /ext/mysql php_mysql.c /ext/mysql/tests mysql_db_query.phpt
johannesWed Mar 25 10:27:22 2009 UTC
Modified files:
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysql/testsmysql_db_query.phpt
Log:
mysql_db_query() is always deprecated
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.273r2=1.274diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.273 php-src/ext/mysql/php_mysql.c:1.274
--- php-src/ext/mysql/php_mysql.c:1.273 Wed Feb 18 16:33:28 2009
+++ php-src/ext/mysql/php_mysql.c Wed Mar 25 10:27:21 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.273 2009/02/18 16:33:28 johannes Exp $ */
+/* $Id: php_mysql.c,v 1.274 2009/03/25 10:27:21 johannes Exp $ */
/* TODO:
*
@@ -1505,10 +1505,7 @@
CHECK_LINK(id);
}
- /* FIXME: Unicode support??? */
- if (MySG(trace_mode) ||
!strcasecmp(get_active_function_name(TSRMLS_C).s, mysql)) {
- php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, use
mysql_query() instead);
- }
+ php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, use mysql_query()
instead);
php_mysql_do_query_general(query, mysql_link, id, db,
MYSQL_STORE_RESULT, return_value TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_db_query.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/mysql/tests/mysql_db_query.phpt
diff -u php-src/ext/mysql/tests/mysql_db_query.phpt:1.3
php-src/ext/mysql/tests/mysql_db_query.phpt:1.4
--- php-src/ext/mysql/tests/mysql_db_query.phpt:1.3 Fri Oct 12 12:32:39 2007
+++ php-src/ext/mysql/tests/mysql_db_query.phpt Wed Mar 25 10:27:22 2009
@@ -25,7 +25,7 @@
printf([003] Expecting NULL/NULL, got %s/%s\n, gettype($tmp), $tmp);
require('table.inc');
-if (!$res = mysql_db_query($db, 'SELECT id, label FROM test ORDER BY id LIMIT
1', $link))
+if (!$res = @mysql_db_query($db, 'SELECT id, label FROM test ORDER BY id LIMIT
1', $link))
printf([004] [%d] %s\n, mysql_errno($link), mysql_error($link));
$row = mysql_fetch_assoc($res);
@@ -40,7 +40,7 @@
mysql_free_result($res);
-if (!$res = mysql_db_query($db, 'SELECT id, label FROM test ORDER BY id LIMIT
1'))
+if (!$res = @mysql_db_query($db, 'SELECT id, label FROM test ORDER BY id LIMIT
1'))
printf([007] [%d] %s\n, mysql_errno(), mysql_error());
$row = mysql_fetch_assoc($res);
@@ -58,4 +58,4 @@
print done!\n;
?
--EXPECTF--
-done!
\ No newline at end of file
+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_3) /ext/mysql php_mysql.c /ext/mysql/tests mysql_db_query.phpt
johannesWed Mar 25 10:27:38 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysql/testsmysql_db_query.phpt
Log:
MFH: mysql_db_query() is always deprecated
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.35r2=1.213.2.6.2.16.2.36diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.35
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.36
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.35 Wed Feb 18 16:34:47 2009
+++ php-src/ext/mysql/php_mysql.c Wed Mar 25 10:27:38 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.35 2009/02/18 16:34:47 johannes Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.36 2009/03/25 10:27:38 johannes Exp $ */
/* TODO:
*
@@ -1472,9 +1472,7 @@
CHECK_LINK(id);
}
- if (MySG(trace_mode) || !strcasecmp(get_active_function_name(TSRMLS_C),
mysql)) {
- php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, This function
is deprecated; use mysql_query() instead.);
- }
+ php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, This function is
deprecated; use mysql_query() instead);
php_mysql_do_query_general(query, query_len, mysql_link, id, db,
MYSQL_STORE_RESULT, return_value TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_db_query.phpt?r1=1.2.2.3r2=1.2.2.4diff_format=u
Index: php-src/ext/mysql/tests/mysql_db_query.phpt
diff -u php-src/ext/mysql/tests/mysql_db_query.phpt:1.2.2.3
php-src/ext/mysql/tests/mysql_db_query.phpt:1.2.2.4
--- php-src/ext/mysql/tests/mysql_db_query.phpt:1.2.2.3 Fri Oct 12 11:57:18 2007
+++ php-src/ext/mysql/tests/mysql_db_query.phpt Wed Mar 25 10:27:38 2009
@@ -25,7 +25,7 @@
printf([003] Expecting NULL/NULL, got %s/%s\n, gettype($tmp), $tmp);
require('table.inc');
-if (!$res = mysql_db_query($db, 'SELECT id, label FROM test ORDER BY id LIMIT
1', $link))
+if (!$res = @mysql_db_query($db, 'SELECT id, label FROM test ORDER BY id LIMIT
1', $link))
printf([004] [%d] %s\n, mysql_errno($link), mysql_error($link));
$row = mysql_fetch_assoc($res);
@@ -40,7 +40,7 @@
mysql_free_result($res);
-if (!$res = mysql_db_query($db, 'SELECT id, label FROM test ORDER BY id LIMIT
1'))
+if (!$res = @mysql_db_query($db, 'SELECT id, label FROM test ORDER BY id LIMIT
1'))
printf([007] [%d] %s\n, mysql_errno(), mysql_error());
$row = mysql_fetch_assoc($res);
@@ -58,4 +58,4 @@
print done!\n;
?
--EXPECTF--
-done!
\ No newline at end of file
+done!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo pdo_dbh.c pdo_stmt.c
felipe Wed Mar 25 12:05:51 2009 UTC
Modified files:
/php-src/ext/pdopdo_dbh.c pdo_stmt.c
Log:
- Fixed some code to be working with unicode
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.164r2=1.165diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.164 php-src/ext/pdo/pdo_dbh.c:1.165
--- php-src/ext/pdo/pdo_dbh.c:1.164 Mon Mar 23 23:58:49 2009
+++ php-src/ext/pdo/pdo_dbh.c Wed Mar 25 12:05:51 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.164 2009/03/23 23:58:49 felipe Exp $ */
+/* $Id: pdo_dbh.c,v 1.165 2009/03/25 12:05:51 felipe Exp $ */
/* The PDO Database Handle Class */
@@ -1033,9 +1033,9 @@
array_init(return_value);
if (dbh-query_stmt) {
- add_next_index_string(return_value,
dbh-query_stmt-error_code, 1);
+ add_next_index_ascii_string(return_value,
dbh-query_stmt-error_code, 1);
} else {
- add_next_index_string(return_value, dbh-error_code, 1);
+ add_next_index_ascii_string(return_value, dbh-error_code, 1);
}
if (dbh-methods-fetch_err) {
@@ -1265,7 +1265,6 @@
const zend_function_entry *funcs;
zend_function func;
zend_internal_function *ifunc = (zend_internal_function*)func;
- int namelen;
char *lc_name;
if (!dbh || !dbh-methods || !dbh-methods-get_driver_methods) {
@@ -1282,9 +1281,12 @@
zend_hash_init_ex(dbh-cls_methods[kind], 8, NULL, NULL,
dbh-is_persistent, 0);
while (funcs-fname) {
+ int namelen = strlen(funcs-fname)+1;
+
ifunc-type = ZEND_INTERNAL_FUNCTION;
ifunc-handler = funcs-handler;
- pdo_zstr_sval(ifunc-function_name) = (char*)funcs-fname;
+ ifunc-function_name.u = malloc(UBYTES(namelen));
+ u_charsToUChars(funcs-fname, ifunc-function_name.u, namelen);
ifunc-scope = dbh-ce;
ifunc-prototype = NULL;
if (funcs-arg_info) {
@@ -1309,10 +1311,9 @@
} else {
ifunc-fn_flags = ZEND_ACC_PUBLIC;
}
- namelen = strlen(funcs-fname);
lc_name = emalloc(namelen+1);
zend_str_tolower_copy(lc_name, funcs-fname, namelen);
- zend_hash_add(dbh-cls_methods[kind], lc_name, namelen+1,
func, sizeof(func), NULL);
+ zend_ascii_hash_add(dbh-cls_methods[kind], lc_name, namelen+1,
func, sizeof(zend_function), NULL);
efree(lc_name);
funcs++;
}
@@ -1365,7 +1366,7 @@
}
out:
- if (std_object_handlers.get_method) {
+ if (!fbc std_object_handlers.get_method) {
fbc = std_object_handlers.get_method(object_pp, method_name,
method_len TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.218r2=1.219diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.218 php-src/ext/pdo/pdo_stmt.c:1.219
--- php-src/ext/pdo/pdo_stmt.c:1.218Tue Mar 24 19:32:06 2009
+++ php-src/ext/pdo/pdo_stmt.c Wed Mar 25 12:05:51 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.218 2009/03/24 19:32:06 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.219 2009/03/25 12:05:51 felipe Exp $ */
/* The PDO Statement Handle Class */
@@ -1537,12 +1537,12 @@
/* no break */
case 2:
stmt-fetch.cls.ctor_args = ctor_args; /* we're not
going to free these */
- if (Z_TYPE_P(arg2) != IS_STRING) {
+ if (Z_TYPE_P(arg2) != IS_STRING Z_TYPE_P(arg2) !=
IS_UNICODE) {
pdo_raise_impl_error(stmt-dbh, stmt, HY000,
Invalid class name (should be a string) TSRMLS_CC);
error = 1;
break;
} else {
- stmt-fetch.cls.ce =
zend_fetch_class(Z_STRVAL_P(arg2), Z_STRLEN_P(arg2), ZEND_FETCH_CLASS_AUTO
TSRMLS_CC);
+ stmt-fetch.cls.ce =
zend_u_fetch_class(Z_TYPE_P(arg2), Z_UNIVAL_P(arg2), Z_UNILEN_P(arg2),
ZEND_FETCH_CLASS_AUTO TSRMLS_CC);
if (!stmt-fetch.cls.ce) {
pdo_raise_impl_error(stmt-dbh, stmt,
HY000, could not find user-specified class TSRMLS_CC);
error = 1;
@@ -2746,9 +2746,11 @@
static union _zend_function *row_get_ctor(zval *object TSRMLS_DC)
{
static zend_internal_function ctor = {0};
+ int namelen = sizeof(__construct);
ctor.type = ZEND_INTERNAL_FUNCTION;
- pdo_zstr_sval(ctor.function_name) = __construct;
+
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/mbstring/oniguruma regint.h /ext/sysvshm sysvshm.c
Moriyoshi,
The change relates to alignment issues on platforms that are strict in
that regard. If you use instead of longs, you could end up with
crashes where sizeof(int) != sizeof(long)
Ilia Alshanetsky
On 24-Mar-09, at 10:05 PM, Moriyoshi Koizumi wrote:
Hey, we need to be more specific on what was the problem and what this
patch actually fixes; oniguruma is a third-party library and I really
don't think we'll be good at keeping up to upstream-updates with such
a site specific change.
Moriyoshi
2009/3/20 Ilia Alshanetsky il...@php.net:
iliaa Thu Mar 19 23:10:45 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mbstring/oniguruma regint.h
/php-src/ext/sysvshmsysvshm.c
/php-srcNEWS
Log:
Fixed bug #47721 (Aligment issues in mbstring and sysvshm extension)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/oniguruma/regint.h?r1=1.5.4.7r2=1.5.4.8diff_format=u
Index: php-src/ext/mbstring/oniguruma/regint.h
diff -u php-src/ext/mbstring/oniguruma/regint.h:1.5.4.7 php-src/ext/
mbstring/oniguruma/regint.h:1.5.4.8
--- php-src/ext/mbstring/oniguruma/regint.h:1.5.4.7 Wed Dec 31
11:17:39 2008
+++ php-src/ext/mbstring/oniguruma/regint.h Thu Mar 19 23:10:44
2009
@@ -256,7 +256,7 @@
#define NULL_UCHARP ((UChar* )0)
#ifndef PLATFORM_UNALIGNED_WORD_ACCESS
-#define WORD_ALIGNMENT_SIZE SIZEOF_INT
+#define WORD_ALIGNMENT_SIZE SIZEOF_LONG
#define GET_ALIGNMENT_PAD_SIZE(addr,pad_size) do {\
(pad_size) = WORD_ALIGNMENT_SIZE \
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/sysvshm.c?r1=1.70.2.2.2.7r2=1.70.2.2.2.8diff_format=u
Index: php-src/ext/sysvshm/sysvshm.c
diff -u php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.7 php-src/ext/
sysvshm/sysvshm.c:1.70.2.2.2.8
--- php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.7 Wed Dec 31 11:17:46
2008
+++ php-src/ext/sysvshm/sysvshm.c Thu Mar 19 23:10:44 2009
@@ -16,7 +16,7 @@
+
--+
*/
-/* $Id: sysvshm.c,v 1.70.2.2.2.7 2008/12/31 11:17:46 sebastian Exp
$ */
+/* $Id: sysvshm.c,v 1.70.2.2.2.8 2009/03/19 23:10:44 iliaa Exp $ */
/* This has been built and tested on Linux 2.2.14
*
@@ -375,7 +375,7 @@
long total_size;
long shm_varpos;
- total_size = ((long) (len + sizeof(sysvshm_chunk) - 1) / 4)
* 4 + 4; /* 4-byte alligment */
+ total_size = ((long) (len + sizeof(sysvshm_chunk) - 1) /
sizeof(long)) * sizeof(long) + sizeof(long); /* long alligment */
if ((shm_varpos = php_check_shm_data(ptr, key)) 0) {
php_remove_shm_data(ptr, shm_varpos);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1445r2=1.2027.2.547.2.1446diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1445 php-src/NEWS:1.2027.2.547.2.1446
--- php-src/NEWS:1.2027.2.547.2.1445Thu Mar 19 17:56:01 2009
+++ php-src/NEWSThu Mar 19 23:10:44 2009
@@ -6,6 +6,8 @@
- Fixed memory corruptions while reading properties of zip files.
(Ilia)
+- Fixed bug #47721 (Aligment issues in mbstring and sysvshm
extension)
+ (crrodriguez at opensuse dot org, Ilia)
- Fixed bug #47704 (PHP crashes on some bad operations with
string offsets).
(Dmitry)
- Fixed bug #47667 (ZipArchive::OVERWRITE seems to have no
effect). (Mikko, Pierre)
--
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c /ext/tokenizer tokenizer.c ZendEngine2 zend_globals.h zend_language_scanner.l
dmitry Wed Mar 25 15:24:28 2009 UTC
Modified files:
/ZendEngine2zend_globals.h zend_language_scanner.l
/php-src/ext/tokenizer tokenizer.c
/php-src/ext/standard basic_functions.c
Log:
Fixed bug #47038 (Memory leak in include)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_globals.h?r1=1.185r2=1.186diff_format=u
Index: ZendEngine2/zend_globals.h
diff -u ZendEngine2/zend_globals.h:1.185 ZendEngine2/zend_globals.h:1.186
--- ZendEngine2/zend_globals.h:1.185Wed Mar 18 10:49:35 2009
+++ ZendEngine2/zend_globals.h Wed Mar 25 15:24:27 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_globals.h,v 1.185 2009/03/18 10:49:35 dmitry Exp $ */
+/* $Id: zend_globals.h,v 1.186 2009/03/25 15:24:27 dmitry Exp $ */
#ifndef ZEND_GLOBALS_H
#define ZEND_GLOBALS_H
@@ -279,8 +279,6 @@
int yy_state;
zend_stack state_stack;
- zend_llist used_state_stacks;
-
UConverter *input_conv; /* converter for flex input */
UConverter *output_conv;/* converter for data from flex output */
zend_bool encoding_checked;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.l?r1=1.202r2=1.203diff_format=u
Index: ZendEngine2/zend_language_scanner.l
diff -u ZendEngine2/zend_language_scanner.l:1.202
ZendEngine2/zend_language_scanner.l:1.203
--- ZendEngine2/zend_language_scanner.l:1.202 Mon Mar 16 01:40:01 2009
+++ ZendEngine2/zend_language_scanner.l Wed Mar 25 15:24:27 2009
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: zend_language_scanner.l,v 1.202 2009/03/16 01:40:01 shire Exp $ */
+/* $Id: zend_language_scanner.l,v 1.203 2009/03/25 15:24:27 dmitry Exp $ */
#if 0
# define YYDEBUG(s, c) printf(state: %d char: %c\n, s, c)
@@ -156,9 +156,7 @@
SCNG(rest_str) = NULL;
SCNG(rest_len) = 0;
- zend_llist_init(SCNG(used_state_stacks), sizeof(zend_stack),
(llist_dtor_func_t) zend_stack_destroy, 0);
zend_stack_init(SCNG(state_stack));
- zend_llist_add_element(SCNG(used_state_stacks), SCNG(state_stack));
}
@@ -168,7 +166,7 @@
efree(CG(heredoc));
CG(heredoc_len)=0;
}
- zend_llist_destroy(SCNG(used_state_stacks));
+ zend_stack_destroy(SCNG(state_stack));
RESET_DOC_COMMENT();
if (SCNG(input_conv)) {
@@ -187,11 +185,6 @@
SCNG(rest_len) = 0;
}
-static int compare_stacks(zend_stack *stack1, zend_stack *stack2)
-{
- return (stack1 == stack2);
-}
-
ZEND_API void zend_save_lexical_state(zend_lex_state *lex_state TSRMLS_DC)
{
lex_state-yy_leng = SCNG(yy_leng);
@@ -203,7 +196,6 @@
lex_state-state_stack = SCNG(state_stack);
zend_stack_init(SCNG(state_stack));
- zend_llist_add_element(SCNG(used_state_stacks), SCNG(state_stack));
lex_state-in = SCNG(yy_in);
lex_state-yy_state = YYSTATE;
@@ -231,7 +223,7 @@
SCNG(yy_marker) = lex_state-yy_marker;
SCNG(yy_limit) = lex_state-yy_limit;
- zend_llist_del_element(SCNG(used_state_stacks), SCNG(state_stack),
(int (*)(void *, void *)) compare_stacks);
+ zend_stack_destroy(SCNG(state_stack));
SCNG(state_stack) = lex_state-state_stack;
SCNG(yy_in) = lex_state-in;
@@ -780,9 +772,7 @@
retval = NULL;
}
}
- if (compilation_successful) {
- zend_restore_lexical_state(original_lex_state TSRMLS_CC);
- }
+ zend_restore_lexical_state(original_lex_state TSRMLS_CC);
return retval;
}
@@ -891,6 +881,7 @@
zend_save_lexical_state(original_lex_state TSRMLS_CC);
if (zend_prepare_string_for_scanning(source_string, filename
TSRMLS_CC)==FAILURE) {
+ zend_restore_lexical_state(original_lex_state TSRMLS_CC);
efree(op_array);
retval = NULL;
} else {
@@ -934,6 +925,7 @@
file_handle.opened_path = NULL;
zend_save_lexical_state(original_lex_state TSRMLS_CC);
if (open_file_for_scanning(file_handle TSRMLS_CC)==FAILURE) {
+ zend_restore_lexical_state(original_lex_state TSRMLS_CC);
zend_message_dispatcher(ZMSG_FAILED_HIGHLIGHT_FOPEN, filename
TSRMLS_CC);
return FAILURE;
}
@@ -952,6 +944,7 @@
zval_copy_ctor(str);
zend_save_lexical_state(original_lex_state TSRMLS_CC);
if (zend_prepare_string_for_scanning(str, str_name TSRMLS_CC)==FAILURE)
{
+ zend_restore_lexical_state(original_lex_state TSRMLS_CC);
return FAILURE;
}
BEGIN(INITIAL);
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/tokenizer.c?r1=1.56r2=1.57diff_format=u
Index: php-src/ext/tokenizer/tokenizer.c
diff -u php-src/ext/tokenizer/tokenizer.c:1.56
php-src/ext/tokenizer/tokenizer.c:1.57
[PHP-CVS] cvs: php-src /ext/gd/tests gd_info_variation1.phpt
tabeWed Mar 25 15:25:06 2009 UTC Modified files: /php-src/ext/gd/tests gd_info_variation1.phpt Log: fix test to follow #47757 http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/gd_info_variation1.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/gd/tests/gd_info_variation1.phpt diff -u php-src/ext/gd/tests/gd_info_variation1.phpt:1.2 php-src/ext/gd/tests/gd_info_variation1.phpt:1.3 --- php-src/ext/gd/tests/gd_info_variation1.phpt:1.2Fri Jun 13 15:59:31 2008 +++ php-src/ext/gd/tests/gd_info_variation1.phptWed Mar 25 15:25:05 2009 @@ -34,7 +34,7 @@ bool%a [uGIF Create Support]= bool%a - [uJPG Support]= + [uJPEG Support]= bool%a [uPNG Support]= bool%a -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd/tests gd_info_variation1.phpt
tabeWed Mar 25 15:25:59 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd/tests gd_info_variation1.phpt Log: MFH: fix test to follow #47757 http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/gd_info_variation1.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/gd/tests/gd_info_variation1.phpt diff -u php-src/ext/gd/tests/gd_info_variation1.phpt:1.1.2.1 php-src/ext/gd/tests/gd_info_variation1.phpt:1.1.2.2 --- php-src/ext/gd/tests/gd_info_variation1.phpt:1.1.2.1Fri Jun 13 15:57:42 2008 +++ php-src/ext/gd/tests/gd_info_variation1.phptWed Mar 25 15:25:59 2009 @@ -34,7 +34,7 @@ bool%a [GIF Create Support]= bool%a - [JPG Support]= + [JPEG Support]= bool%a [PNG Support]= bool%a -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd gdft.c /ext/gd/tests bug43073.phpt
tabeWed Mar 25 16:15:18 2009 UTC
Added files:
/php-src/ext/gd/tests bug43073.phpt
Modified files:
/php-src/ext/gd/libgd gdft.c
Log:
MFB: #43073, TrueType bounding box is wrong for angle0
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.46r2=1.47diff_format=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.46 php-src/ext/gd/libgd/gdft.c:1.47
--- php-src/ext/gd/libgd/gdft.c:1.46Wed Jan 9 01:52:03 2008
+++ php-src/ext/gd/libgd/gdft.c Wed Mar 25 16:15:18 2009
@@ -1108,15 +1108,23 @@
double d1 = sin (angle + 0.78539816339744830962);
double d2 = sin (angle - 0.78539816339744830962);
+ /* make the center of rotation at (0, 0) */
+ FT_BBox normbox;
+
+ normbox.xMin = 0;
+ normbox.yMin = 0;
+ normbox.xMax = bbox.xMax - bbox.xMin;
+ normbox.yMax = bbox.yMax - bbox.yMin;
+
/* rotate bounding rectangle */
- brect[0] = (int) (bbox.xMin * cos_a - bbox.yMin * sin_a);
- brect[1] = (int) (bbox.xMin * sin_a + bbox.yMin * cos_a);
- brect[2] = (int) (bbox.xMax * cos_a - bbox.yMin * sin_a);
- brect[3] = (int) (bbox.xMax * sin_a + bbox.yMin * cos_a);
- brect[4] = (int) (bbox.xMax * cos_a - bbox.yMax * sin_a);
- brect[5] = (int) (bbox.xMax * sin_a + bbox.yMax * cos_a);
- brect[6] = (int) (bbox.xMin * cos_a - bbox.yMax * sin_a);
- brect[7] = (int) (bbox.xMin * sin_a + bbox.yMax * cos_a);
+ brect[0] = (int) (normbox.xMin * cos_a - normbox.yMin * sin_a);
+ brect[1] = (int) (normbox.xMin * sin_a + normbox.yMin * cos_a);
+ brect[2] = (int) (normbox.xMax * cos_a - normbox.yMin * sin_a);
+ brect[3] = (int) (normbox.xMax * sin_a + normbox.yMin * cos_a);
+ brect[4] = (int) (normbox.xMax * cos_a - normbox.yMax * sin_a);
+ brect[5] = (int) (normbox.xMax * sin_a + normbox.yMax * cos_a);
+ brect[6] = (int) (normbox.xMin * cos_a - normbox.yMax * sin_a);
+ brect[7] = (int) (normbox.xMin * sin_a + normbox.yMax * cos_a);
/* scale, round and offset brect */
brect[0] = x + gdroundupdown(brect[0], d2 0);
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/bug43073.phpt?view=markuprev=1.1
Index: php-src/ext/gd/tests/bug43073.phpt
+++ php-src/ext/gd/tests/bug43073.phpt
--TEST--
Bug #43073 (TrueType bounding box is wrong for angle0)
--SKIPIF--
?php
if(!extension_loaded('gd')){ die('skip gd extension not available'); }
?
--FILE--
?php
$cwd = dirname(__FILE__);
$font = $cwd/test8859.ttf;
$delta_t = 360.0 / 16; # Make 16 steps around
$g = imagecreate(800, 800);
$bgnd = imagecolorallocate($g, 255, 255, 255);
$black = imagecolorallocate($g, 0, 0, 0);
$x = 100;
$y = 0;
$cos_t = cos(deg2rad($delta_t));
$sin_t = sin(deg2rad($delta_t));
for ($angle = 0.0; $angle 360.0; $angle += $delta_t) {
$bbox = imagettftext($g, 24, $angle, 400+$x, 400+$y, $black, $font, 'ABCDEF');
$s = vsprintf((%d, %d), (%d, %d), (%d, %d), (%d, %d)\n, $bbox);
echo $s;
$temp = $cos_t * $x + $sin_t * $y;
$y= $cos_t * $y - $sin_t * $x;
$x= $temp;
}
?
--EXPECTF--
(500, 400), (579, 400), (579, 370), (500, 370)
(492, 361), (575, 327), (564, 301), (480, 335)
(470, 329), (540, 260), (521, 242), (451, 312)
(438, 307), (478, 210), (461, 204), (420, 301)
(400, 300), (400, 193), (383, 193), (383, 300)
(361, 307), (319, 207), (297, 216), (338, 317)
(329, 329), (254, 254), (233, 275), (307, 351)
(307, 361), (215, 323), (203, 354), (294, 392)
(300, 400), (203, 400), (203, 431), (300, 431)
(307, 438), (219, 474), (229, 501), (318, 465)
(329, 470), (263, 535), (281, 553), (347, 489)
(361, 492), (326, 575), (343, 582), (378, 499)
(400, 500), (400, 584), (416, 584), (416, 500)
(438, 492), (468, 567), (490, 559), (460, 483)
(470, 470), (523, 525), (545, 505), (491, 449)
(492, 438), (560, 467), (572, 436), (504, 408)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/filter logical_filters.c
iliaa Wed Mar 25 18:51:45 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/filter logical_filters.c
Log:
Fixed bug #47772 (FILTER_VALIDATE_EMAIL allows f...@bar. addresses)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.1.2.22.2.8r2=1.1.2.22.2.9diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.1.2.22.2.8
php-src/ext/filter/logical_filters.c:1.1.2.22.2.9
--- php-src/ext/filter/logical_filters.c:1.1.2.22.2.8 Sun Mar 8 18:21:15 2009
+++ php-src/ext/filter/logical_filters.cWed Mar 25 18:51:44 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: logical_filters.c,v 1.1.2.22.2.8 2009/03/08 18:21:15 iliaa Exp $ */
+/* $Id: logical_filters.c,v 1.1.2.22.2.9 2009/03/25 18:51:44 iliaa Exp $ */
#include php_filter.h
#include filter_private.h
@@ -469,7 +469,7 @@
void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
{
/* From
http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Email.php?r=1.4 */
- const char regexp[] =
/^((\\\[^\f\\n\\r\\t\\b]+\\\)|([A-Za-z0-9_\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[A-Za-z0-9_\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?\\.?)+[A-Za-z\\-]*))$/D;
+ const char regexp[] =
/^((\\\[^\f\\n\\r\\t\\b]+\\\)|([A-Za-z0-9_\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[A-Za-z0-9_\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?(\\.(?=[A-Za-z\\-]))?)+[A-Za-z\\-]*))$/D;
pcre *re = NULL;
pcre_extra *pcre_extra = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/filter logical_filters.c
iliaa Wed Mar 25 18:52:09 2009 UTC
Modified files:
/php-src/ext/filter logical_filters.c
Log:
MFB: Fixed bug #47772 (FILTER_VALIDATE_EMAIL allows f...@bar. addresses)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.35r2=1.36diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.35
php-src/ext/filter/logical_filters.c:1.36
--- php-src/ext/filter/logical_filters.c:1.35 Tue Mar 10 23:39:17 2009
+++ php-src/ext/filter/logical_filters.cWed Mar 25 18:52:08 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: logical_filters.c,v 1.35 2009/03/10 23:39:17 helly Exp $ */
+/* $Id: logical_filters.c,v 1.36 2009/03/25 18:52:08 iliaa Exp $ */
#include php_filter.h
#include filter_private.h
@@ -473,7 +473,7 @@
void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
{
/* From
http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Email.php?r=1.4 */
- const char regexp[] =
/^((\\\[^\f\\n\\r\\t\\b]+\\\)|([A-Za-z0-9_\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[A-Za-z0-9_\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?\\.?)+[A-Za-z\\-]*))$/D;
+ const char regexp[] =
/^((\\\[^\f\\n\\r\\t\\b]+\\\)|([A-Za-z0-9_\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[A-Za-z0-9_\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?(\\.(?=[A-Za-z\\-]))?)+[A-Za-z\\-]*))$/D;
pcre *re = NULL;
pcre_extra *pcre_extra = NULL;
--
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/filter logical_filters.c
iliaa Wed Mar 25 18:53:05 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter logical_filters.c
/php-srcNEWS
Log:
MFB: Fixed bug #47772 (FILTER_VALIDATE_EMAIL allows f...@bar. addresses)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.1.2.30r2=1.1.2.31diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.1.2.30
php-src/ext/filter/logical_filters.c:1.1.2.31
--- php-src/ext/filter/logical_filters.c:1.1.2.30 Sun Mar 8 18:22:26 2009
+++ php-src/ext/filter/logical_filters.cWed Mar 25 18:53:04 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: logical_filters.c,v 1.1.2.30 2009/03/08 18:22:26 iliaa Exp $ */
+/* $Id: logical_filters.c,v 1.1.2.31 2009/03/25 18:53:04 iliaa Exp $ */
#include php_filter.h
#include filter_private.h
@@ -469,7 +469,7 @@
void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
{
/* From
http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Email.php?r=1.4 */
- const char regexp[] =
/^((\\\[^\f\\n\\r\\t\\b]+\\\)|([A-Za-z0-9_\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[A-Za-z0-9_\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?\\.?)+[A-Za-z\\-]*))$/D;
+ const char regexp[] =
/^((\\\[^\f\\n\\r\\t\\b]+\\\)|([A-Za-z0-9_\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[A-Za-z0-9_\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?(\\.(?=[A-Za-z\\-]))?)+[A-Za-z\\-]*))$/D;
pcre *re = NULL;
pcre_extra *pcre_extra = NULL;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1448r2=1.2027.2.547.2.1449diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1448 php-src/NEWS:1.2027.2.547.2.1449
--- php-src/NEWS:1.2027.2.547.2.1448Fri Mar 20 22:14:45 2009
+++ php-src/NEWSWed Mar 25 18:53:04 2009
@@ -6,6 +6,7 @@
- Fixed memory corruptions while reading properties of zip files. (Ilia)
+- Fixed bug #47772 (FILTER_VALIDATE_EMAIL allows f...@bar. addresses). (Ilia)
- Fixed bug #47721 (Alignment issues in mbstring and sysvshm extension)
(crrodriguez at opensuse dot org, Ilia)
- Fixed bug #47704 (PHP crashes on some bad operations with string offsets).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams userspace.c
bjori Wed Mar 25 19:55:50 2009 UTC
Modified files:
/php-src/main/streams userspace.c
Log:
Add missing proto
http://cvs.php.net/viewvc.cgi/php-src/main/streams/userspace.c?r1=1.53r2=1.54diff_format=u
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.53
php-src/main/streams/userspace.c:1.54
--- php-src/main/streams/userspace.c:1.53 Tue Mar 10 23:40:01 2009
+++ php-src/main/streams/userspace.cWed Mar 25 19:55:50 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: userspace.c,v 1.53 2009/03/10 23:40:01 helly Exp $ */
+/* $Id: userspace.c,v 1.54 2009/03/25 19:55:50 bjori Exp $ */
#include php.h
#include php_globals.h
@@ -250,6 +250,11 @@
{
reset to start of dir list;
}
+
+ function stream_lock($operation)
+ {
+ return true / 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_3) /main/streams userspace.c
bjori Wed Mar 25 19:56:00 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main/streams userspace.c
Log:
Add missing proto
http://cvs.php.net/viewvc.cgi/php-src/main/streams/userspace.c?r1=1.31.2.3.2.7.2.8r2=1.31.2.3.2.7.2.9diff_format=u
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.31.2.3.2.7.2.8
php-src/main/streams/userspace.c:1.31.2.3.2.7.2.9
--- php-src/main/streams/userspace.c:1.31.2.3.2.7.2.8 Wed Dec 31 11:15:48 2008
+++ php-src/main/streams/userspace.cWed Mar 25 19:55:59 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: userspace.c,v 1.31.2.3.2.7.2.8 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: userspace.c,v 1.31.2.3.2.7.2.9 2009/03/25 19:55:59 bjori Exp $ */
#include php.h
#include php_globals.h
@@ -250,6 +250,11 @@
{
reset to start of dir list;
}
+
+ function stream_lock($operation)
+ {
+ return true / false;
+ }
}}} **/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Wed Mar 25 21:31:58 2009 UTC Modified files: /CVSROOTavail Log: - Give Minghui Yang pecl/optimizer access. http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1506r2=1.1507diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1506 CVSROOT/avail:1.1507 --- CVSROOT/avail:1.1506Mon Mar 23 18:33:19 2009 +++ CVSROOT/avail Wed Mar 25 21:31:58 2009 @@ -287,7 +287,7 @@ avail|thierry|pecl/fam avail|hamano|pecl/tcc avail|tetsuya|pear/Services_Yahoo_JP -avail|graham|pecl/optimizer +avail|graham,myang|pecl/optimizer avail|joonas|pecl/llvm avail|indeyets|pecl/spread avail|akshat|pecl/cairo -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pcntl pcntl.c /ext/pcntl/tests 003.phpt
felipe Wed Mar 25 22:49:43 2009 UTC
Added files:
/php-src/ext/pcntl/tests003.phpt
Modified files:
/php-src/ext/pcntl pcntl.c
Log:
- Fixed bug #47779 (Wrong value for SIG_UNBLOCK and SIG_SETMASK constants).
Patch by: mbeccati at php.net
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/pcntl.c?r1=1.73r2=1.74diff_format=u
Index: php-src/ext/pcntl/pcntl.c
diff -u php-src/ext/pcntl/pcntl.c:1.73 php-src/ext/pcntl/pcntl.c:1.74
--- php-src/ext/pcntl/pcntl.c:1.73 Tue Mar 10 23:39:27 2009
+++ php-src/ext/pcntl/pcntl.c Wed Mar 25 22:49:42 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: pcntl.c,v 1.73 2009/03/10 23:39:27 helly Exp $ */
+/* $Id: pcntl.c,v 1.74 2009/03/25 22:49:42 felipe Exp $ */
#define PCNTL_DEBUG 0
@@ -264,8 +264,8 @@
/* {{{ how argument for sigprocmask */
#ifdef HAVE_SIGPROCMASK
REGISTER_LONG_CONSTANT(SIG_BLOCK, SIG_BLOCK, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(SIG_UNBLOCK, SIG_BLOCK, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(SIG_SETMASK, SIG_BLOCK, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(SIG_UNBLOCK, SIG_UNBLOCK, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(SIG_SETMASK, SIG_SETMASK, CONST_CS |
CONST_PERSISTENT);
#endif
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/tests/003.phpt?view=markuprev=1.1
Index: php-src/ext/pcntl/tests/003.phpt
+++ php-src/ext/pcntl/tests/003.phpt
--TEST--
pcntl: SIG_BLOCK, SIG_UNBLOCK, SIG_SETMASK
--SKIPIF--
?php
if (!extension_loaded('pcntl')) die('skip pcntl extension not
available');
elseif (!extension_loaded('posix')) die('skip posix extension not
available');
elseif (!function_exists('pcntl_sigwaitinfo') or
!function_exists('pcntl_sigtimedwait')) die('skip required functionality is not
available');
?
--FILE--
?php
pcntl_sigprocmask(SIG_BLOCK, array(SIGCHLD,SIGTERM), $old);
var_dump(count($old));
pcntl_sigprocmask(SIG_BLOCK, array(SIGINT), $old);
var_dump(count($old));
pcntl_sigprocmask(SIG_UNBLOCK, array(SIGINT), $old);
var_dump(count($old));
pcntl_sigprocmask(SIG_SETMASK, array(SIGINT), $old);
var_dump(count($old));
pcntl_sigprocmask(SIG_SETMASK, array(), $old);
var_dump(count($old));
pcntl_sigprocmask(SIG_SETMASK, array(), $old);
var_dump(count($old));
?
--EXPECT--
int(0)
int(2)
int(3)
int(2)
int(1)
int(0)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/pcntl pcntl.c /ext/pcntl/tests 003.phpt
felipe Wed Mar 25 22:52:30 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/pcntl/tests003.phpt
Modified files:
/php-srcNEWS
/php-src/ext/pcntl pcntl.c
Log:
MFH:
- Fixed bug #47779 (Wrong value for SIG_UNBLOCK and SIG_SETMASK constants).
Patch by: mbeccati at php.net
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.533r2=1.2027.2.547.2.965.2.534diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.533
php-src/NEWS:1.2027.2.547.2.965.2.534
--- php-src/NEWS:1.2027.2.547.2.965.2.533 Wed Mar 25 15:23:55 2009
+++ php-src/NEWSWed Mar 25 22:52:30 2009
@@ -1,11 +1,12 @@
PHPNEWS
|||
?? ??? 200?, PHP 5.3.0 RC 2
+- Fixed bug #47779 (Wrong value for SIG_UNBLOCK and SIG_SETMASK constants).
+ (Matteo)
- Fixed bug #47699 (autoload and late static binding). (Dmitry)
- Fixed bug #47038 (Memory leak in include). (Dmitry)
-- Fixed bug #44409 (PDO::FETCH_SERIALIZE calls __construct()).
- (matteo at beccati dot com)
-- Fixed bug #42362 - (HTTP status codes 204 and 304 should not be gzipped).
+- Fixed bug #44409 (PDO::FETCH_SERIALIZE calls __construct()). (Matteo)
+- Fixed bug #42362 (HTTP status codes 204 and 304 should not be gzipped).
(Scott, Edward Z. Yang)
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/pcntl.c?r1=1.48.2.2.2.4.2.15r2=1.48.2.2.2.4.2.16diff_format=u
Index: php-src/ext/pcntl/pcntl.c
diff -u php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.15
php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.16
--- php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.15 Wed Dec 31 11:15:40 2008
+++ php-src/ext/pcntl/pcntl.c Wed Mar 25 22:52:30 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: pcntl.c,v 1.48.2.2.2.4.2.15 2008/12/31 11:15:40 sebastian Exp $ */
+/* $Id: pcntl.c,v 1.48.2.2.2.4.2.16 2009/03/25 22:52:30 felipe Exp $ */
#define PCNTL_DEBUG 0
@@ -264,8 +264,8 @@
/* {{{ how argument for sigprocmask */
#ifdef HAVE_SIGPROCMASK
REGISTER_LONG_CONSTANT(SIG_BLOCK, SIG_BLOCK, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(SIG_UNBLOCK, SIG_BLOCK, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(SIG_SETMASK, SIG_BLOCK, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(SIG_UNBLOCK, SIG_UNBLOCK, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(SIG_SETMASK, SIG_SETMASK, CONST_CS |
CONST_PERSISTENT);
#endif
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/tests/003.phpt?view=markuprev=1.1
Index: php-src/ext/pcntl/tests/003.phpt
+++ php-src/ext/pcntl/tests/003.phpt
--TEST--
pcntl: SIG_BLOCK, SIG_UNBLOCK, SIG_SETMASK
--SKIPIF--
?php
if (!extension_loaded('pcntl')) die('skip pcntl extension not
available');
elseif (!extension_loaded('posix')) die('skip posix extension not
available');
elseif (!function_exists('pcntl_sigwaitinfo') or
!function_exists('pcntl_sigtimedwait')) die('skip required functionality is not
available');
?
--FILE--
?php
pcntl_sigprocmask(SIG_BLOCK, array(SIGCHLD,SIGTERM), $old);
var_dump(count($old));
pcntl_sigprocmask(SIG_BLOCK, array(SIGINT), $old);
var_dump(count($old));
pcntl_sigprocmask(SIG_UNBLOCK, array(SIGINT), $old);
var_dump(count($old));
pcntl_sigprocmask(SIG_SETMASK, array(SIGINT), $old);
var_dump(count($old));
pcntl_sigprocmask(SIG_SETMASK, array(), $old);
var_dump(count($old));
pcntl_sigprocmask(SIG_SETMASK, array(), $old);
var_dump(count($old));
?
--EXPECT--
int(0)
int(2)
int(3)
int(2)
int(1)
int(0)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pcntl pcntl.c /ext/pcntl/tests 002.phpt
lbarnaudWed Mar 25 23:33:36 2009 UTC Modified files: /php-src/ext/pcntl pcntl.c /php-src/ext/pcntl/tests002.phpt Log: Fix build on FreeBSD 7 (fixes #4) http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/pcntl.c?r1=1.74r2=1.75diff_format=u Index: php-src/ext/pcntl/pcntl.c diff -u php-src/ext/pcntl/pcntl.c:1.74 php-src/ext/pcntl/pcntl.c:1.75 --- php-src/ext/pcntl/pcntl.c:1.74 Wed Mar 25 22:49:42 2009 +++ php-src/ext/pcntl/pcntl.c Wed Mar 25 23:33:35 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: pcntl.c,v 1.74 2009/03/25 22:49:42 felipe Exp $ */ +/* $Id: pcntl.c,v 1.75 2009/03/25 23:33:35 lbarnaud Exp $ */ #define PCNTL_DEBUG 0 @@ -290,50 +290,120 @@ #endif /* si_code for SIGCHILD */ +#ifdef CLD_EXITED REGISTER_LONG_CONSTANT(CLD_EXITED,CLD_EXITED,CONST_CS | CONST_PERSISTENT); +#endif +#ifdef CLD_KILLED REGISTER_LONG_CONSTANT(CLD_KILLED,CLD_KILLED,CONST_CS | CONST_PERSISTENT); +#endif +#ifdef CLD_DUMPED REGISTER_LONG_CONSTANT(CLD_DUMPED,CLD_DUMPED,CONST_CS | CONST_PERSISTENT); +#endif +#ifdef CLD_TRAPPED REGISTER_LONG_CONSTANT(CLD_TRAPPED, CLD_TRAPPED, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef CLD_STOPPED REGISTER_LONG_CONSTANT(CLD_STOPPED, CLD_STOPPED, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef CLD_CONTINUED REGISTER_LONG_CONSTANT(CLD_CONTINUED, CLD_CONTINUED, CONST_CS | CONST_PERSISTENT); +#endif /* si_code for SIGTRAP */ +#ifdef TRAP_BRKPT REGISTER_LONG_CONSTANT(TRAP_BRKPT, TRAP_BRKPT, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef TRAP_TRACE REGISTER_LONG_CONSTANT(TRAP_TRACE, TRAP_TRACE, CONST_CS | CONST_PERSISTENT); +#endif /* si_code for SIGPOLL */ +#ifdef POLL_IN REGISTER_LONG_CONSTANT(POLL_IN, POLL_IN, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef POLL_OUT REGISTER_LONG_CONSTANT(POLL_OUT, POLL_OUT, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef POLL_MSG REGISTER_LONG_CONSTANT(POLL_MSG, POLL_MSG, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef POLL_ERR REGISTER_LONG_CONSTANT(POLL_ERR, POLL_ERR, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef POLL_PRI REGISTER_LONG_CONSTANT(POLL_PRI, POLL_PRI, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef POLL_HUP REGISTER_LONG_CONSTANT(POLL_HUP, POLL_HUP, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef ILL_ILLOPC REGISTER_LONG_CONSTANT(ILL_ILLOPC, ILL_ILLOPC, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef ILL_ILLOPN REGISTER_LONG_CONSTANT(ILL_ILLOPN, ILL_ILLOPN, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef ILL_ILLADR REGISTER_LONG_CONSTANT(ILL_ILLADR, ILL_ILLADR, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef ILL_ILLTRP REGISTER_LONG_CONSTANT(ILL_ILLTRP, ILL_ILLTRP, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef ILL_PRVOPC REGISTER_LONG_CONSTANT(ILL_PRVOPC, ILL_PRVOPC, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef ILL_PRVREG REGISTER_LONG_CONSTANT(ILL_PRVREG, ILL_PRVREG, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef ILL_COPROC REGISTER_LONG_CONSTANT(ILL_COPROC, ILL_COPROC, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef ILL_BADSTK REGISTER_LONG_CONSTANT(ILL_BADSTK, ILL_BADSTK, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef FPE_INTDIV REGISTER_LONG_CONSTANT(FPE_INTDIV, FPE_INTDIV, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef FPE_INTOVF REGISTER_LONG_CONSTANT(FPE_INTOVF, FPE_INTOVF, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef FPE_FLTDIV REGISTER_LONG_CONSTANT(FPE_FLTDIV, FPE_FLTDIV, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef FPE_FLTOVF REGISTER_LONG_CONSTANT(FPE_FLTOVF, FPE_FLTOVF, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef FPE_FLTUND REGISTER_LONG_CONSTANT(FPE_FLTUND, FPE_FLTINV, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef FPE_FLTRES REGISTER_LONG_CONSTANT(FPE_FLTRES, FPE_FLTRES, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef FPE_FLTINV REGISTER_LONG_CONSTANT(FPE_FLTINV, FPE_FLTINV, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef FPE_FLTSUB REGISTER_LONG_CONSTANT(FPE_FLTSUB, FPE_FLTSUB, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef SEGV_MAPERR REGISTER_LONG_CONSTANT(SEGV_MAPERR, SEGV_MAPERR, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef SEGV_ACCERR REGISTER_LONG_CONSTANT(SEGV_ACCERR, SEGV_ACCERR, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef BUS_ADRALN REGISTER_LONG_CONSTANT(BUS_ADRALN, BUS_ADRALN, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef BUS_ADRERR REGISTER_LONG_CONSTANT(BUS_ADRERR, BUS_ADRERR, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef BUS_OBJERR REGISTER_LONG_CONSTANT(BUS_OBJERR, BUS_OBJERR, CONST_CS | CONST_PERSISTENT); #endif +#endif /* HAVE_SIGWAITINFO HAVE_SIGTIMEDWAIT */ /* }}} */ }
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pcntl pcntl.c /ext/pcntl/tests 002.phpt
lbarnaudWed Mar 25 23:34:08 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/pcntl pcntl.c /php-src/ext/pcntl/tests002.phpt Log: MFH: Fix build on FreeBSD 7 (fixes #4) http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/pcntl.c?r1=1.48.2.2.2.4.2.16r2=1.48.2.2.2.4.2.17diff_format=u Index: php-src/ext/pcntl/pcntl.c diff -u php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.16 php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.17 --- php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.16 Wed Mar 25 22:52:30 2009 +++ php-src/ext/pcntl/pcntl.c Wed Mar 25 23:34:08 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: pcntl.c,v 1.48.2.2.2.4.2.16 2009/03/25 22:52:30 felipe Exp $ */ +/* $Id: pcntl.c,v 1.48.2.2.2.4.2.17 2009/03/25 23:34:08 lbarnaud Exp $ */ #define PCNTL_DEBUG 0 @@ -290,50 +290,120 @@ #endif /* si_code for SIGCHILD */ +#ifdef CLD_EXITED REGISTER_LONG_CONSTANT(CLD_EXITED,CLD_EXITED,CONST_CS | CONST_PERSISTENT); +#endif +#ifdef CLD_KILLED REGISTER_LONG_CONSTANT(CLD_KILLED,CLD_KILLED,CONST_CS | CONST_PERSISTENT); +#endif +#ifdef CLD_DUMPED REGISTER_LONG_CONSTANT(CLD_DUMPED,CLD_DUMPED,CONST_CS | CONST_PERSISTENT); +#endif +#ifdef CLD_TRAPPED REGISTER_LONG_CONSTANT(CLD_TRAPPED, CLD_TRAPPED, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef CLD_STOPPED REGISTER_LONG_CONSTANT(CLD_STOPPED, CLD_STOPPED, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef CLD_CONTINUED REGISTER_LONG_CONSTANT(CLD_CONTINUED, CLD_CONTINUED, CONST_CS | CONST_PERSISTENT); +#endif /* si_code for SIGTRAP */ +#ifdef TRAP_BRKPT REGISTER_LONG_CONSTANT(TRAP_BRKPT, TRAP_BRKPT, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef TRAP_TRACE REGISTER_LONG_CONSTANT(TRAP_TRACE, TRAP_TRACE, CONST_CS | CONST_PERSISTENT); +#endif /* si_code for SIGPOLL */ +#ifdef POLL_IN REGISTER_LONG_CONSTANT(POLL_IN, POLL_IN, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef POLL_OUT REGISTER_LONG_CONSTANT(POLL_OUT, POLL_OUT, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef POLL_MSG REGISTER_LONG_CONSTANT(POLL_MSG, POLL_MSG, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef POLL_ERR REGISTER_LONG_CONSTANT(POLL_ERR, POLL_ERR, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef POLL_PRI REGISTER_LONG_CONSTANT(POLL_PRI, POLL_PRI, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef POLL_HUP REGISTER_LONG_CONSTANT(POLL_HUP, POLL_HUP, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef ILL_ILLOPC REGISTER_LONG_CONSTANT(ILL_ILLOPC, ILL_ILLOPC, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef ILL_ILLOPN REGISTER_LONG_CONSTANT(ILL_ILLOPN, ILL_ILLOPN, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef ILL_ILLADR REGISTER_LONG_CONSTANT(ILL_ILLADR, ILL_ILLADR, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef ILL_ILLTRP REGISTER_LONG_CONSTANT(ILL_ILLTRP, ILL_ILLTRP, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef ILL_PRVOPC REGISTER_LONG_CONSTANT(ILL_PRVOPC, ILL_PRVOPC, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef ILL_PRVREG REGISTER_LONG_CONSTANT(ILL_PRVREG, ILL_PRVREG, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef ILL_COPROC REGISTER_LONG_CONSTANT(ILL_COPROC, ILL_COPROC, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef ILL_BADSTK REGISTER_LONG_CONSTANT(ILL_BADSTK, ILL_BADSTK, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef FPE_INTDIV REGISTER_LONG_CONSTANT(FPE_INTDIV, FPE_INTDIV, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef FPE_INTOVF REGISTER_LONG_CONSTANT(FPE_INTOVF, FPE_INTOVF, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef FPE_FLTDIV REGISTER_LONG_CONSTANT(FPE_FLTDIV, FPE_FLTDIV, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef FPE_FLTOVF REGISTER_LONG_CONSTANT(FPE_FLTOVF, FPE_FLTOVF, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef FPE_FLTUND REGISTER_LONG_CONSTANT(FPE_FLTUND, FPE_FLTINV, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef FPE_FLTRES REGISTER_LONG_CONSTANT(FPE_FLTRES, FPE_FLTRES, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef FPE_FLTINV REGISTER_LONG_CONSTANT(FPE_FLTINV, FPE_FLTINV, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef FPE_FLTSUB REGISTER_LONG_CONSTANT(FPE_FLTSUB, FPE_FLTSUB, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef SEGV_MAPERR REGISTER_LONG_CONSTANT(SEGV_MAPERR, SEGV_MAPERR, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef SEGV_ACCERR REGISTER_LONG_CONSTANT(SEGV_ACCERR, SEGV_ACCERR, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef BUS_ADRALN REGISTER_LONG_CONSTANT(BUS_ADRALN, BUS_ADRALN, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef BUS_ADRERR REGISTER_LONG_CONSTANT(BUS_ADRERR, BUS_ADRERR, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef BUS_OBJERR REGISTER_LONG_CONSTANT(BUS_OBJERR, BUS_OBJERR, CONST_CS | CONST_PERSISTENT); #endif
[PHP-CVS] cvs: php-src(PHP_5_3) /main output.c
cseiler Wed Mar 25 23:59:45 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main output.c
Log:
- Fixed memory leak in ob_get_clean/ob_get_flush.
# Not necessary in HEAD because output buffering was completely rewritten
# there.
http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.167.2.3.2.4.2.12r2=1.167.2.3.2.4.2.13diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.167.2.3.2.4.2.12
php-src/main/output.c:1.167.2.3.2.4.2.13
--- php-src/main/output.c:1.167.2.3.2.4.2.12Fri Feb 13 11:48:17 2009
+++ php-src/main/output.c Wed Mar 25 23:59:45 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: output.c,v 1.167.2.3.2.4.2.12 2009/02/13 11:48:17 davidc Exp $ */
+/* $Id: output.c,v 1.167.2.3.2.4.2.13 2009/03/25 23:59:45 cseiler Exp $ */
#include php.h
#include ext/standard/head.h
@@ -867,10 +867,12 @@
/* error checks */
if (!OG(ob_nesting_level)) {
php_error_docref(ref.outcontrol TSRMLS_CC, E_NOTICE, failed
to delete and flush buffer. No buffer to delete or flush.);
+ zval_dtor(return_value);
RETURN_FALSE;
}
if (OG(ob_nesting_level) !OG(active_ob_buffer).status
!OG(active_ob_buffer).erase) {
php_error_docref(ref.outcontrol TSRMLS_CC, E_NOTICE, failed
to delete buffer %s., OG(active_ob_buffer).handler_name);
+ zval_dtor(return_value);
RETURN_FALSE;
}
/* flush */
@@ -892,10 +894,12 @@
/* error checks */
if (!OG(ob_nesting_level)) {
php_error_docref(ref.outcontrol TSRMLS_CC, E_NOTICE, failed
to delete buffer. No buffer to delete.);
+ zval_dtor(return_value);
RETURN_FALSE;
}
if (OG(ob_nesting_level) !OG(active_ob_buffer).status
!OG(active_ob_buffer).erase) {
php_error_docref(ref.outcontrol TSRMLS_CC, E_NOTICE, failed
to delete buffer %s., OG(active_ob_buffer).handler_name);
+ zval_dtor(return_value);
RETURN_FALSE;
}
/* delete buffer */
--
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 /main output.c
cseiler Thu Mar 26 00:00:18 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/main output.c
Log:
MFB: Fixed memory leak in ob_get_clean/ob_get_flush.
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1449r2=1.2027.2.547.2.1450diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1449 php-src/NEWS:1.2027.2.547.2.1450
--- php-src/NEWS:1.2027.2.547.2.1449Wed Mar 25 18:53:04 2009
+++ php-src/NEWSThu Mar 26 00:00:18 2009
@@ -5,6 +5,7 @@
and CURLPROTO_* for redirect fixes in CURL 7.19.4. (Yoram Bar Haim, Stas)
- Fixed memory corruptions while reading properties of zip files. (Ilia)
+- Fixed memory leak in ob_get_clean/ob_get_flush. (Christian)
- Fixed bug #47772 (FILTER_VALIDATE_EMAIL allows f...@bar. addresses). (Ilia)
- Fixed bug #47721 (Alignment issues in mbstring and sysvshm extension)
http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.167.2.3.2.8r2=1.167.2.3.2.9diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.167.2.3.2.8 php-src/main/output.c:1.167.2.3.2.9
--- php-src/main/output.c:1.167.2.3.2.8 Wed Dec 31 11:17:47 2008
+++ php-src/main/output.c Thu Mar 26 00:00:18 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: output.c,v 1.167.2.3.2.8 2008/12/31 11:17:47 sebastian Exp $ */
+/* $Id: output.c,v 1.167.2.3.2.9 2009/03/26 00:00:18 cseiler Exp $ */
#include php.h
#include ext/standard/head.h
@@ -855,10 +855,12 @@
/* error checks */
if (!OG(ob_nesting_level)) {
php_error_docref(ref.outcontrol TSRMLS_CC, E_NOTICE, failed
to delete and flush buffer. No buffer to delete or flush.);
+ zval_dtor(return_value);
RETURN_FALSE;
}
if (OG(ob_nesting_level) !OG(active_ob_buffer).status
!OG(active_ob_buffer).erase) {
php_error_docref(ref.outcontrol TSRMLS_CC, E_NOTICE, failed
to delete buffer %s., OG(active_ob_buffer).handler_name);
+ zval_dtor(return_value);
RETURN_FALSE;
}
/* flush */
@@ -880,10 +882,12 @@
/* error checks */
if (!OG(ob_nesting_level)) {
php_error_docref(ref.outcontrol TSRMLS_CC, E_NOTICE, failed
to delete buffer. No buffer to delete.);
+ zval_dtor(return_value);
RETURN_FALSE;
}
if (OG(ob_nesting_level) !OG(active_ob_buffer).status
!OG(active_ob_buffer).erase) {
php_error_docref(ref.outcontrol TSRMLS_CC, E_NOTICE, failed
to delete buffer %s., OG(active_ob_buffer).handler_name);
+ zval_dtor(return_value);
RETURN_FALSE;
}
/* delete buffer */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
felipe Thu Mar 26 00:43:46 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: - Missing changes related to #47757 for this branch http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.33r2=1.312.2.20.2.32.2.34diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.33 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.34 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.33Tue Mar 24 12:48:52 2009 +++ php-src/ext/gd/gd.c Thu Mar 26 00:43:45 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.33 2009/03/24 12:48:52 pajoye Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.34 2009/03/26 00:43:45 felipe Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1360,9 +1360,9 @@ add_assoc_bool(return_value, GIF Create Support, 0); #endif #ifdef HAVE_GD_JPG - add_assoc_bool(return_value, JPG Support, 1); + add_assoc_bool(return_value, JPEG Support, 1); #else - add_assoc_bool(return_value, JPG Support, 0); + add_assoc_bool(return_value, JPEG Support, 0); #endif #ifdef HAVE_GD_PNG add_assoc_bool(return_value, PNG Support, 1); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-development php.ini-production
ericstewart Thu Mar 26 01:38:53 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-development php.ini-production Log: Corrected missing comment. http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.3r2=1.1.2.4diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.1.2.3 php-src/php.ini-development:1.1.2.4 --- php-src/php.ini-development:1.1.2.3 Mon Mar 23 02:36:34 2009 +++ php-src/php.ini-development Thu Mar 26 01:38:53 2009 @@ -578,7 +578,7 @@ ; Default Value: Off ; Development Value: On ; Production Value: Off -http://www.php.net/manual/en/errorfunc.configuration.php#ini.track-errors +; http://www.php.net/manual/en/errorfunc.configuration.php#ini.track-errors track_errors = On ; Turn off normal error reporting and emit XML-RPC error XML http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.3r2=1.1.2.4diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.1.2.3 php-src/php.ini-production:1.1.2.4 --- php-src/php.ini-production:1.1.2.3 Mon Mar 23 02:36:34 2009 +++ php-src/php.ini-production Thu Mar 26 01:38:53 2009 @@ -578,7 +578,7 @@ ; Default Value: Off ; Development Value: On ; Production Value: Off -http://www.php.net/manual/en/errorfunc.configuration.php#ini.track-errors +; http://www.php.net/manual/en/errorfunc.configuration.php#ini.track-errors track_errors = Off ; Turn off normal error reporting and emit XML-RPC error XML -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-development php.ini-production
ericstewart Thu Mar 26 01:39:10 2009 UTC Modified files: /php-srcphp.ini-development php.ini-production Log: Corrected missing comment. http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.2r2=1.3diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.2 php-src/php.ini-development:1.3 --- php-src/php.ini-development:1.2 Mon Mar 23 02:40:30 2009 +++ php-src/php.ini-development Thu Mar 26 01:39:10 2009 @@ -578,7 +578,7 @@ ; Default Value: Off ; Development Value: On ; Production Value: Off -http://www.php.net/manual/en/errorfunc.configuration.php#ini.track-errors +; http://www.php.net/manual/en/errorfunc.configuration.php#ini.track-errors track_errors = On ; Turn off normal error reporting and emit XML-RPC error XML http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.2r2=1.3diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.2 php-src/php.ini-production:1.3 --- php-src/php.ini-production:1.2 Mon Mar 23 02:40:30 2009 +++ php-src/php.ini-production Thu Mar 26 01:39:10 2009 @@ -578,7 +578,7 @@ ; Default Value: Off ; Development Value: On ; Production Value: Off -http://www.php.net/manual/en/errorfunc.configuration.php#ini.track-errors +; http://www.php.net/manual/en/errorfunc.configuration.php#ini.track-errors track_errors = Off ; Turn off normal error reporting and emit XML-RPC error XML -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
