[PHP-CVS] com php-src: Fixed bug #60194 for eavl: Zend/zend_language_scanner.c Zend/zend_language_scanner.l Zend/zend_language_scanner_defs.h
Commit:b477a84026a39a58452af9676b4b74607e83e2f8
Author:Xinchen Hui larue...@php.net Sat, 28 Jul 2012 17:00:05
+0800
Parents: ef7286a42f0d85cc359f1d64678f859d6c3f832e
Branches: PHP-5.3
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=b477a84026a39a58452af9676b4b74607e83e2f8
Log:
Fixed bug #60194 for eavl
same reason here
Bugs:
https://bugs.php.net/60194
Changed paths:
M Zend/zend_language_scanner.c
M Zend/zend_language_scanner.l
M Zend/zend_language_scanner_defs.h
Diff:
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index e3fc576..15a48fa 100644
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sat Jul 28 00:45:37 2012 */
+/* Generated by re2c 0.13.5 on Sat Jul 28 16:59:07 2012 */
#line 1 Zend/zend_language_scanner.l
/*
+--+
@@ -445,7 +445,7 @@ ZEND_API int zend_prepare_string_for_scanning(zval *str,
char *filename TSRMLS_D
zend_multibyte_set_filter(CG(internal_encoding) TSRMLS_CC);
if (!SCNG(input_filter)) {
- SCNG(script_filtered) = (unsigned
char*)emalloc(SCNG(script_org_size)+1);
+ SCNG(script_filtered) = (unsigned
char*)emalloc(SCNG(script_org_size)+2);
memcpy(SCNG(script_filtered), SCNG(script_org),
SCNG(script_org_size)+1);
SCNG(script_filtered_size) = SCNG(script_org_size);
} else {
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 2661627..c92bf2b 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -443,7 +443,7 @@ ZEND_API int zend_prepare_string_for_scanning(zval *str,
char *filename TSRMLS_D
zend_multibyte_set_filter(CG(internal_encoding) TSRMLS_CC);
if (!SCNG(input_filter)) {
- SCNG(script_filtered) = (unsigned
char*)emalloc(SCNG(script_org_size)+1);
+ SCNG(script_filtered) = (unsigned
char*)emalloc(SCNG(script_org_size)+2);
memcpy(SCNG(script_filtered), SCNG(script_org),
SCNG(script_org_size)+1);
SCNG(script_filtered_size) = SCNG(script_org_size);
} else {
diff --git a/Zend/zend_language_scanner_defs.h
b/Zend/zend_language_scanner_defs.h
index d1955a8..02a2a39 100644
--- a/Zend/zend_language_scanner_defs.h
+++ b/Zend/zend_language_scanner_defs.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sat Jul 28 00:45:37 2012 */
+/* Generated by re2c 0.13.5 on Sat Jul 28 16:59:07 2012 */
#line 3 Zend/zend_language_scanner_defs.h
enum YYCONDTYPE {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/fileinfo/fileinfo.c
Commit:b26749b4e92cd7f6dd7e4078a933758fad6647d3 Author:Felipe Pena felipe...@gmail.com Sat, 28 Jul 2012 19:05:46 -0300 Parents: b7d76b41e02198d6ca7651cf5bb67cf3cadae877 068fc008c6828c2e045064a831ecb90136c6365b Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b26749b4e92cd7f6dd7e4078a933758fad6647d3 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: - Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky at columbia dot edu Bugs: https://bugs.php.net/57933 Changed paths: MM ext/fileinfo/fileinfo.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: - Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky at columbia dot edu: ext/fileinfo/fileinfo.c
Commit:068fc008c6828c2e045064a831ecb90136c6365b
Author:Felipe Pena felipe...@gmail.com Sat, 28 Jul 2012 19:05:13
-0300
Parents: b477a84026a39a58452af9676b4b74607e83e2f8
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=068fc008c6828c2e045064a831ecb90136c6365b
Log:
- Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky
at columbia dot edu
Bugs:
https://bugs.php.net/57933
Changed paths:
M ext/fileinfo/fileinfo.c
Diff:
diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
index 36c5e39..0c82898 100644
--- a/ext/fileinfo/fileinfo.c
+++ b/ext/fileinfo/fileinfo.c
@@ -271,7 +271,7 @@ ZEND_GET_MODULE(fileinfo)
PHP_MINFO_FUNCTION(fileinfo)
{
php_info_print_table_start();
- php_info_print_table_header(2, fileinfo support, enabled);
+ php_info_print_table_row(2, fileinfo support, enabled);
php_info_print_table_row(2, version, PHP_FILEINFO_VERSION);
php_info_print_table_end();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Skip test while zend_mm is disabled: Zend/tests/bug55509.phpt
Commit:015ee3b2c88d3e7bf984c7414b4de6c2a465b6a9
Author:Xinchen Hui larue...@php.net Sun, 29 Jul 2012 12:17:43
+0800
Parents: b477a84026a39a58452af9676b4b74607e83e2f8
Branches: PHP-5.3
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=015ee3b2c88d3e7bf984c7414b4de6c2a465b6a9
Log:
Skip test while zend_mm is disabled
Changed paths:
M Zend/tests/bug55509.phpt
Diff:
diff --git a/Zend/tests/bug55509.phpt b/Zend/tests/bug55509.phpt
index b78fceb..5268789 100644
--- a/Zend/tests/bug55509.phpt
+++ b/Zend/tests/bug55509.phpt
@@ -5,6 +5,12 @@ Bug #55509 (segfault on x86_64 using more than 2G memory)
if (PHP_INT_SIZE == 4) {
die('skip Not for 32-bits OS');
}
+
+$zend_mm_enabled = getenv(USE_ZEND_ALLOC);
+if ($zend_mm_enabled === 0) {
+die(skip Zend MM disabled);
+}
+
if (getenv(SKIP_SLOW_TESTS)) die(skip slow test);
// check the available memory
if (PHP_OS == 'Linux') {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Skip test while zend mm is disabled: ext/oci8/tests/pecl_bug10194.phpt ext/oci8/tests/pecl_bug10194_blob_64.phpt tests/lang/bug45392.phpt
Commit:880a6cee0068e980fd1eed735675d9b7d37968a0
Author:Xinchen Hui larue...@php.net Sun, 29 Jul 2012 13:25:31
+0800
Parents: 14cebefb058ec4f78d61a5a520da699b121fb306
Branches: PHP-5.3
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=880a6cee0068e980fd1eed735675d9b7d37968a0
Log:
Skip test while zend mm is disabled
Changed paths:
M ext/oci8/tests/pecl_bug10194.phpt
M ext/oci8/tests/pecl_bug10194_blob_64.phpt
M tests/lang/bug45392.phpt
Diff:
diff --git a/ext/oci8/tests/pecl_bug10194.phpt
b/ext/oci8/tests/pecl_bug10194.phpt
index 9947e15..3c1c788 100644
--- a/ext/oci8/tests/pecl_bug10194.phpt
+++ b/ext/oci8/tests/pecl_bug10194.phpt
@@ -5,6 +5,9 @@ PECL Bug #10194 (segfault in Instant Client when memory_limit
is reached inside
$target_dbs = array('oracledb' = true, 'timesten' = false); // test runs on
these DBs
require(dirname(__FILE__).'/skipif.inc');
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
+if (getenv(USE_ZEND_ALLOC) === 0) {
+die(skip Zend MM disabled);
+}
?
--INI--
memory_limit=10M
diff --git a/ext/oci8/tests/pecl_bug10194_blob_64.phpt
b/ext/oci8/tests/pecl_bug10194_blob_64.phpt
index 45788a4..e1a4cc0 100644
--- a/ext/oci8/tests/pecl_bug10194_blob_64.phpt
+++ b/ext/oci8/tests/pecl_bug10194_blob_64.phpt
@@ -6,6 +6,9 @@ $target_dbs = array('oracledb' = true, 'timesten' = false);
// test runs on t
require(dirname(__FILE__).'/skipif.inc');
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
if (PHP_INT_SIZE != 8) die(skip this test is for 64bit platforms only);
+if (getenv(USE_ZEND_ALLOC) === 0) {
+die(skip Zend MM disabled);
+}
?
--INI--
memory_limit=6M
diff --git a/tests/lang/bug45392.phpt b/tests/lang/bug45392.phpt
index ae84cd9..78876c7 100644
--- a/tests/lang/bug45392.phpt
+++ b/tests/lang/bug45392.phpt
@@ -2,6 +2,11 @@
Bug #45392 (ob_start()/ob_end_clean() and memory_limit)
--INI--
display_errors=stderr
+--SKIPIF--
+?php
+if (getenv(USE_ZEND_ALLOC) === 0) {
+die(skip Zend MM disabled);
+}
--FILE--
?php
echo __LINE__ . \n;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
