[PHP-CVS] svn: /php/php-src/trunk/main/ php_variables.c
jani Wed, 17 Nov 2010 11:55:37 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=305452
Log:
- Cleanup
Changed paths:
U php/php-src/trunk/main/php_variables.c
Modified: php/php-src/trunk/main/php_variables.c
===
--- php/php-src/trunk/main/php_variables.c 2010-11-17 09:58:43 UTC (rev
305451)
+++ php/php-src/trunk/main/php_variables.c 2010-11-17 11:55:37 UTC (rev
305452)
@@ -816,7 +816,7 @@
array_init(form_variables);
INIT_PZVAL(form_variables);
- if(PG(request_order) != NULL) {
+ if (PG(request_order) != NULL) {
p = PG(request_order);
} else {
p = PG(variables_order);
@@ -854,13 +854,13 @@
void php_startup_auto_globals(TSRMLS_D)
{
- zend_register_auto_global(_GET, sizeof(_GET)-1, 0,
php_auto_globals_create_get TSRMLS_CC);
- zend_register_auto_global(_POST, sizeof(_POST)-1, 0,
php_auto_globals_create_post TSRMLS_CC);
- zend_register_auto_global(_COOKIE, sizeof(_COOKIE)-1, 0,
php_auto_globals_create_cookie TSRMLS_CC);
- zend_register_auto_global(_SERVER, sizeof(_SERVER)-1,
PG(auto_globals_jit), php_auto_globals_create_server TSRMLS_CC);
- zend_register_auto_global(_ENV, sizeof(_ENV)-1,
PG(auto_globals_jit), php_auto_globals_create_env TSRMLS_CC);
- zend_register_auto_global(_REQUEST, sizeof(_REQUEST)-1,
PG(auto_globals_jit), php_auto_globals_create_request TSRMLS_CC);
- zend_register_auto_global(_FILES, sizeof(_FILES)-1, 0,
php_auto_globals_create_files TSRMLS_CC);
+ zend_register_auto_global(ZEND_STRL(_GET), 0,
php_auto_globals_create_get TSRMLS_CC);
+ zend_register_auto_global(ZEND_STRL(_POST), 0,
php_auto_globals_create_post TSRMLS_CC);
+ zend_register_auto_global(ZEND_STRL(_COOKIE), 0,
php_auto_globals_create_cookie TSRMLS_CC);
+ zend_register_auto_global(ZEND_STRL(_SERVER), PG(auto_globals_jit),
php_auto_globals_create_server TSRMLS_CC);
+ zend_register_auto_global(ZEND_STRL(_ENV), PG(auto_globals_jit),
php_auto_globals_create_env TSRMLS_CC);
+ zend_register_auto_global(ZEND_STRL(_REQUEST), PG(auto_globals_jit),
php_auto_globals_create_request TSRMLS_CC);
+ zend_register_auto_global(ZEND_STRL(_FILES), 0,
php_auto_globals_create_files TSRMLS_CC);
}
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ info.c
jani Wed, 17 Nov 2010 11:56:48 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=305453
Log:
- Fixed wrong type causing crash (in php-cgi -i and phpinfo(); when doing HTML
output)
Changed paths:
U php/php-src/trunk/ext/standard/info.c
Modified: php/php-src/trunk/ext/standard/info.c
===
--- php/php-src/trunk/ext/standard/info.c 2010-11-17 11:55:37 UTC (rev
305452)
+++ php/php-src/trunk/ext/standard/info.c 2010-11-17 11:56:48 UTC (rev
305453)
@@ -73,7 +73,8 @@
static int php_info_print_html_esc(const char *str, int len) /* {{{ */
{
- int new_len, written;
+ size_t new_len;
+ int written;
char *new_str;
TSRMLS_FETCH();
@@ -299,7 +300,7 @@
*/
PHPAPI char *php_info_html_esc(char *string TSRMLS_DC)
{
- int new_len;
+ size_t new_len;
return php_escape_html_entities(string, strlen(string), new_len, 0,
ENT_QUOTES, NULL TSRMLS_CC);
}
/* }}} */
@@ -880,13 +881,13 @@
if (zend_hash_find(EG(symbol_table), PHP_AUTH_PW,
sizeof(PHP_AUTH_PW), (void **) data) != FAILURE) {
php_info_print_table_row(2, PHP_AUTH_PW,
Z_STRVAL_PP(data));
}
- php_print_gpcse_array(_REQUEST, sizeof(_REQUEST)-1
TSRMLS_CC);
- php_print_gpcse_array(_GET, sizeof(_GET)-1 TSRMLS_CC);
- php_print_gpcse_array(_POST, sizeof(_POST)-1 TSRMLS_CC);
- php_print_gpcse_array(_FILES, sizeof(_FILES)-1 TSRMLS_CC);
- php_print_gpcse_array(_COOKIE, sizeof(_COOKIE)-1 TSRMLS_CC);
- php_print_gpcse_array(_SERVER, sizeof(_SERVER)-1 TSRMLS_CC);
- php_print_gpcse_array(_ENV, sizeof(_ENV)-1 TSRMLS_CC);
+ php_print_gpcse_array(ZEND_STRL(_REQUEST) TSRMLS_CC);
+ php_print_gpcse_array(ZEND_STRL(_GET) TSRMLS_CC);
+ php_print_gpcse_array(ZEND_STRL(_POST) TSRMLS_CC);
+ php_print_gpcse_array(ZEND_STRL(_FILES) TSRMLS_CC);
+ php_print_gpcse_array(ZEND_STRL(_COOKIE) TSRMLS_CC);
+ php_print_gpcse_array(ZEND_STRL(_SERVER) TSRMLS_CC);
+ php_print_gpcse_array(ZEND_STRL(_ENV) TSRMLS_CC);
php_info_print_table_end();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ acinclude.m4
jani Wed, 17 Nov 2010 13:01:53 + Revision: http://svn.php.net/viewvc?view=revisionrevision=305455 Log: - Fix building SAPI module Changed paths: U php/php-src/trunk/acinclude.m4 Modified: php/php-src/trunk/acinclude.m4 === --- php/php-src/trunk/acinclude.m4 2010-11-17 12:13:06 UTC (rev 305454) +++ php/php-src/trunk/acinclude.m4 2010-11-17 13:01:53 UTC (rev 305455) @@ -830,8 +830,6 @@ shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting shared_cxx_post= shared_lo=lo - - php_sapi_module=program ]) dnl @@ -901,19 +899,18 @@ PHP_INSTALLED_SAPIS=$PHP_INSTALLED_SAPIS $1 - case $2 in - static[)] PHP_BUILD_STATIC;; - shared[)] PHP_BUILD_SHARED;; - bundle[)] PHP_BUILD_BUNDLE;; - program[)] PHP_BUILD_PROGRAM;; - esac - ifelse($2,program,[ +PHP_BUILD_PROGRAM install_binaries=install-binaries install_binary_targets=$install_binary_targets install-$1 PHP_SUBST(PHP_[]translit($1,a-z0-9-,A-Z0-9_)[]_OBJS) ifelse($3,,,[PHP_ADD_SOURCES_X([sapi/$1],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_)[]_OBJS)]) ],[ +case $2 in +static[)] PHP_BUILD_STATIC;; +shared[)] PHP_BUILD_SHARED;; +bundle[)] PHP_BUILD_BUNDLE;; +esac install_sapi=install-sapi ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])]) ]) @@ -2937,14 +2934,14 @@ done; case [$]php_sapi_module in - program|static) -dtrace_objs='$(PHP_DTRACE_OBJS:.lo=.o)' -;; - *) + shared[)] for ac_lo in $PHP_DTRACE_OBJS; do dtrace_objs=[$]dtrace_objs `echo $ac_lo | $SED -e 's,\.lo$,.o,' -e 's#\(.*\)\/#\1\/.libs\/#'` done; ;; + *[)] +dtrace_objs='$(PHP_DTRACE_OBJS:.lo=.o)' +;; esac dnl Generate Makefile.objects entries -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ UPGRADING
jani Wed, 17 Nov 2010 14:07:54 + Revision: http://svn.php.net/viewvc?view=revisionrevision=305456 Log: - Added comment about binary SAPIs Changed paths: U php/php-src/trunk/UPGRADING Modified: php/php-src/trunk/UPGRADING === --- php/php-src/trunk/UPGRADING 2010-11-17 13:01:53 UTC (rev 305455) +++ php/php-src/trunk/UPGRADING 2010-11-17 14:07:54 UTC (rev 305456) @@ -224,6 +224,10 @@ 9. Changes in SAPI support == +- When adding new binary SAPI (executable, like CLI/CGI/FPM) use CLI + config.m4 and Makefile.frag files as templates and replace CLI/cli with + your SAPI name. + - The REQUEST_TIME value inside server now returns a floating point number indicating the time with microsecond precision. All SAPIs provinding this value should be returning float and not time_t. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ UPGRADING
jani Wed, 17 Nov 2010 14:08:39 + Revision: http://svn.php.net/viewvc?view=revisionrevision=305457 Log: typo Changed paths: U php/php-src/trunk/UPGRADING Modified: php/php-src/trunk/UPGRADING === --- php/php-src/trunk/UPGRADING 2010-11-17 14:07:54 UTC (rev 305456) +++ php/php-src/trunk/UPGRADING 2010-11-17 14:08:39 UTC (rev 305457) @@ -228,8 +228,8 @@ config.m4 and Makefile.frag files as templates and replace CLI/cli with your SAPI name. -- The REQUEST_TIME value inside server now returns a floating point number - indicating the time with microsecond precision. All SAPIs provinding this +- The REQUEST_TIME value inside server now returns a floating point number + indicating the time with microsecond precision. All SAPIs providing this value should be returning float and not time_t. = -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/main/ main.c
jani Wed, 17 Nov 2010 14:09:46 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=305458
Log:
- Fix possible crashes in 64bit builds caused by usage of int instead of size_t
Changed paths:
U php/php-src/trunk/main/main.c
Modified: php/php-src/trunk/main/main.c
===
--- php/php-src/trunk/main/main.c 2010-11-17 14:08:39 UTC (rev 305457)
+++ php/php-src/trunk/main/main.c 2010-11-17 14:09:46 UTC (rev 305458)
@@ -623,8 +623,9 @@
/* get error text into buffer and escape for html if necessary */
buffer_len = vspprintf(buffer, 0, format, args);
+
if (PG(html_errors)) {
- int len;
+ size_t len;
char *replace = php_escape_html_entities(buffer, buffer_len,
len, 0, ENT_COMPAT, NULL TSRMLS_CC);
efree(buffer);
buffer = replace;
@@ -682,7 +683,7 @@
}
if (PG(html_errors)) {
- int len;
+ size_t len;
char *replace = php_escape_html_entities(origin, origin_len,
len, 0, ENT_COMPAT, NULL TSRMLS_CC);
efree(origin);
origin = replace;
@@ -981,7 +982,7 @@
if (PG(html_errors)) {
if (type == E_ERROR) {
- int len;
+ size_t len;
char *buf =
php_escape_html_entities(buffer, buffer_len, len, 0, ENT_COMPAT, NULL
TSRMLS_CC);
php_printf(%sbr
/\nb%s/b: %s in b%s/b on line b%d/bbr /\n%s,
STR_PRINT(prepend_string), error_type_str, buf, error_filename, error_lineno,
STR_PRINT(append_string));
efree(buf);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ext/pdo_firebird/ firebird_driver.c
felipe Wed, 17 Nov 2010 14:15:57 + Revision: http://svn.php.net/viewvc?view=revisionrevision=305459 Log: - Revert bad changes Changed paths: U php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c Modified: php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c === --- php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c 2010-11-17 14:09:46 UTC (rev 305458) +++ php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c 2010-11-17 14:15:57 UTC (rev 305459) @@ -551,10 +551,6 @@ ZVAL_STRING(val,tmp,1); return 1; } - - case PDO_ATTR_FETCH_TABLE_NAMES: - ZVAL_BOOL(val, H-fetch_table_names); - return 1; } return 0; } -- 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/NEWS branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c trunk/ext/pdo_fireb
2010/11/17 Pierre Joye pierre@gmail.com hi Felipe, The 5.2 builds are broken after this commit: do_firebird.c firebird_driver.c ext\pdo_firebird\firebird_driver.c(556) : error C2039: 'fetch_table_names' : is not a member of 'pdo_firebird_db_handle' ext\pdo_firebird\php_pdo_firebird_int.h(62) : see declaration of 'pdo_firebird_db_handle' firebird_statement.c pdo_firebird.c NMAKE : fatal error U1077: 'cl.exe' : return code '0x2' Stop. Fixed, thanks. -- Regards, Felipe Pena
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/tests/basic/021.phpt branches/PHP_5_3/tests/basic/021.phpt trunk/tests/basic/021.phpt
felipe Wed, 17 Nov 2010 14:49:26 + Revision: http://svn.php.net/viewvc?view=revisionrevision=305461 Log: - Fixed typo (reported by eyal.t at zend dot com) Changed paths: U php/php-src/branches/PHP_5_2/tests/basic/021.phpt U php/php-src/branches/PHP_5_3/tests/basic/021.phpt U php/php-src/trunk/tests/basic/021.phpt Modified: php/php-src/branches/PHP_5_2/tests/basic/021.phpt === --- php/php-src/branches/PHP_5_2/tests/basic/021.phpt 2010-11-17 14:41:29 UTC (rev 305460) +++ php/php-src/branches/PHP_5_2/tests/basic/021.phpt 2010-11-17 14:49:26 UTC (rev 305461) @@ -1,7 +1,7 @@ --TEST-- Bug #37276 (problems witch $_POST array) --INI-- -file_upload=1 +file_uploads=1 --POST_RAW-- Content-Type: multipart/form-data; boundary=---20896060251896012921717172737 -20896060251896012921717172737 Modified: php/php-src/branches/PHP_5_3/tests/basic/021.phpt === --- php/php-src/branches/PHP_5_3/tests/basic/021.phpt 2010-11-17 14:41:29 UTC (rev 305460) +++ php/php-src/branches/PHP_5_3/tests/basic/021.phpt 2010-11-17 14:49:26 UTC (rev 305461) @@ -1,7 +1,7 @@ --TEST-- Bug #37276 (problems witch $_POST array) --INI-- -file_upload=1 +file_uploads=1 --POST_RAW-- Content-Type: multipart/form-data; boundary=---20896060251896012921717172737 -20896060251896012921717172737 Modified: php/php-src/trunk/tests/basic/021.phpt === --- php/php-src/trunk/tests/basic/021.phpt 2010-11-17 14:41:29 UTC (rev 305460) +++ php/php-src/trunk/tests/basic/021.phpt 2010-11-17 14:49:26 UTC (rev 305461) @@ -1,7 +1,7 @@ --TEST-- Bug #37276 (problems witch $_POST array) --INI-- -file_upload=1 +file_uploads=1 --POST_RAW-- Content-Type: multipart/form-data; boundary=---20896060251896012921717172737 -20896060251896012921717172737 -- 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/spl/tests/spl_fileinfo_getlinktarget_basic.phpt trunk/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt
jani Wed, 17 Nov 2010 14:54:37 + Revision: http://svn.php.net/viewvc?view=revisionrevision=305462 Log: - Fix test Changed paths: U php/php-src/branches/PHP_5_3/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt U php/php-src/trunk/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt === --- php/php-src/branches/PHP_5_3/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt 2010-11-17 14:49:26 UTC (rev 305461) +++ php/php-src/branches/PHP_5_3/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt 2010-11-17 14:54:37 UTC (rev 305462) @@ -8,7 +8,7 @@ ? --FILE-- ?php -$link = 'test_link'; +$link = __DIR__ . '/test_link'; symlink(__FILE__, $link ); $fileInfo = new SplFileInfo($link); Modified: php/php-src/trunk/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt === --- php/php-src/trunk/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt 2010-11-17 14:49:26 UTC (rev 305461) +++ php/php-src/trunk/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt 2010-11-17 14:54:37 UTC (rev 305462) @@ -8,7 +8,7 @@ ? --FILE-- ?php -$link = 'test_link'; +$link = __DIR__ . '/test_link'; symlink(__FILE__, $link ); $fileInfo = new SplFileInfo($link); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/tests/basic/ bug46313.phpt
jani Wed, 17 Nov 2010 15:00:51 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=305463
Log:
- Fix test: register_globals is gone
Changed paths:
U php/php-src/trunk/tests/basic/bug46313.phpt
Modified: php/php-src/trunk/tests/basic/bug46313.phpt
===
--- php/php-src/trunk/tests/basic/bug46313.phpt 2010-11-17 14:54:37 UTC (rev
305462)
+++ php/php-src/trunk/tests/basic/bug46313.phpt 2010-11-17 15:00:51 UTC (rev
305463)
@@ -22,10 +22,6 @@
--FILE--
?php
var_dump($_FILES);
-var_dump($GLOBALS[o1\'file_name]);
-var_dump($GLOBALS[o1\'file_name] === $_FILES[o1\'file][name]);
-var_dump($GLOBALS[o1\'file]);
-var_dump($GLOBALS[o1\'file] === $_FILES[o1\'file][tmp_name]);
?
--EXPECTF--
array(2) {
@@ -56,7 +52,3 @@
int(1)
}
}
-string(12) o1\'file.png
-bool(true)
-string(%d) %s
-bool(true)
--
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/Zend/zend_language_scanner.l trunk/Zend/zend_language_scanner.l
pajoye Wed, 17 Nov 2010 16:46:19 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=305464
Log:
- NULL deref fix, patch by Gustavo
Changed paths:
U php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.l
U php/php-src/trunk/Zend/zend_language_scanner.l
Modified: php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.l
===
--- php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.l 2010-11-17
15:00:51 UTC (rev 305463)
+++ php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.l 2010-11-17
16:46:19 UTC (rev 305464)
@@ -284,6 +284,10 @@
SCNG(script_filtered_size) = SCNG(script_org_size);
} else {
SCNG(input_filter)(SCNG(script_filtered),
SCNG(script_filtered_size), SCNG(script_org), SCNG(script_org_size) TSRMLS_CC);
+ if (SCNG(script_filtered) == NULL) {
+ zend_error_noreturn(E_COMPILE_ERROR, Could not
convert the script from the detected
+ encoding \%s\ to a
compatible encoding, LANG_SCNG(script_encoding)-name);
+ }
}
SCNG(yy_start) = SCNG(script_filtered) - offset;
yy_scan_buffer((char *)SCNG(script_filtered),
SCNG(script_filtered_size) TSRMLS_CC);
Modified: php/php-src/trunk/Zend/zend_language_scanner.l
===
--- php/php-src/trunk/Zend/zend_language_scanner.l 2010-11-17 15:00:51 UTC
(rev 305463)
+++ php/php-src/trunk/Zend/zend_language_scanner.l 2010-11-17 16:46:19 UTC
(rev 305464)
@@ -284,6 +284,10 @@
SCNG(script_filtered_size) = SCNG(script_org_size);
} else {
SCNG(input_filter)(SCNG(script_filtered),
SCNG(script_filtered_size), SCNG(script_org), SCNG(script_org_size) TSRMLS_CC);
+ if (SCNG(script_filtered) == NULL) {
+ zend_error_noreturn(E_COMPILE_ERROR, Could not
convert the script from the detected
+ encoding \%s\ to a
compatible encoding, LANG_SCNG(script_encoding)-name);
+ }
}
SCNG(yy_start) = SCNG(script_filtered) - offset;
yy_scan_buffer((char *)SCNG(script_filtered),
SCNG(script_filtered_size) TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ NEWS
jani Wed, 17 Nov 2010 16:56:21 + Revision: http://svn.php.net/viewvc?view=revisionrevision=305465 Log: - NEWS cleanup, please do not mess it anymore :) Changed paths: U php/php-src/trunk/NEWS diffs exceeded maximum size -- 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/Zend/tests/multibyte/multibyte_encoding_006.phpt trunk/Zend/tests/multibyte/multibyte_encoding_006.phpt
pajoye Wed, 17 Nov 2010 17:26:33 + Revision: http://svn.php.net/viewvc?view=revisionrevision=305466 Log: - test for NULL deref fix Changed paths: A php/php-src/branches/PHP_5_3/Zend/tests/multibyte/multibyte_encoding_006.phpt A php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_006.phpt Added: php/php-src/branches/PHP_5_3/Zend/tests/multibyte/multibyte_encoding_006.phpt === (Binary files differ) Property changes on: php/php-src/branches/PHP_5_3/Zend/tests/multibyte/multibyte_encoding_006.phpt ___ Added: svn:mime-type + application/octet-stream Added: php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_006.phpt === (Binary files differ) Property changes on: php/php-src/trunk/Zend/tests/multibyte/multibyte_encoding_006.phpt ___ Added: svn:mime-type + application/octet-stream -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/zip/zip_stream.c trunk/ext/standard/html.c trunk/ext/zip/zip_stream.c
pierrick Wed, 17 Nov 2010 17:55:18 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=305467
Log:
Remove unused variables
Changed paths:
U php/php-src/branches/PHP_5_3/ext/zip/zip_stream.c
U php/php-src/trunk/ext/standard/html.c
U php/php-src/trunk/ext/zip/zip_stream.c
Modified: php/php-src/branches/PHP_5_3/ext/zip/zip_stream.c
===
--- php/php-src/branches/PHP_5_3/ext/zip/zip_stream.c 2010-11-17 17:26:33 UTC
(rev 305466)
+++ php/php-src/branches/PHP_5_3/ext/zip/zip_stream.c 2010-11-17 17:55:18 UTC
(rev 305467)
@@ -104,7 +104,6 @@
size_t file_basename_len;
char file_dirname[MAXPATHLEN];
struct zip *za;
- struct zip_file *zf = NULL;
char *fragment;
int fragment_len;
int err;
Modified: php/php-src/trunk/ext/standard/html.c
===
--- php/php-src/trunk/ext/standard/html.c 2010-11-17 17:26:33 UTC (rev
305466)
+++ php/php-src/trunk/ext/standard/html.c 2010-11-17 17:55:18 UTC (rev
305467)
@@ -1360,7 +1360,6 @@
matches_map = 0;
if (this_char != '') { /* no entity on this position */
- int found = 0;
const unsigned char *rep= NULL;
size_t rep_len = 0;
Modified: php/php-src/trunk/ext/zip/zip_stream.c
===
--- php/php-src/trunk/ext/zip/zip_stream.c 2010-11-17 17:26:33 UTC (rev
305466)
+++ php/php-src/trunk/ext/zip/zip_stream.c 2010-11-17 17:55:18 UTC (rev
305467)
@@ -104,7 +104,6 @@
size_t file_basename_len;
char file_dirname[MAXPATHLEN];
struct zip *za;
- struct zip_file *zf = NULL;
char *fragment;
int fragment_len;
int err;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ NEWS
sixd Wed, 17 Nov 2010 17:59:41 + Revision: http://svn.php.net/viewvc?view=revisionrevision=305468 Log: Some grammar tweaks Changed paths: U php/php-src/trunk/NEWS Modified: php/php-src/trunk/NEWS === --- php/php-src/trunk/NEWS 2010-11-17 17:55:18 UTC (rev 305467) +++ php/php-src/trunk/NEWS 2010-11-17 17:59:41 UTC (rev 305468) @@ -45,7 +45,7 @@ . Replaced zend_function.return_reference by ZEND_ACC_RETURN_REFERENCE in zend_function.fn_flags. . Removed zend_arg_info.required_num_args as it was only needed for internal -functions. Now the first arg_info for internal function (which has special +functions. Now the first arg_info for internal functions (which has special meaning) is represented by zend_internal_function_info structure. . Moved zend_op_array.size, size_var, size_literal, current_brk_cont, backpatch_count into CG(context) as they are used only during compilation. @@ -79,22 +79,21 @@ . ZEND_RECV now always has IS_CV as its result. . ZEND_CATCH now has to be used only with constant class names. . ZEND_FETCH_DIM_? may fetch array and dimension operands in different order. - . ZEND_FETCH_*_R operations simplified and can't be used with EXT_TYPE_UNUSED -flag any more. This is very rare and useless case. ZEND_FREE might be -required after them instead. - . ZEND_RETURN is splitted into two new instructions ZEND_RETURN and + . Simplified ZEND_FETCH_*_R operations. They can't be used with the +EXT_TYPE_UNUSED flag any more. This is a very rare and useless case. +ZEND_FREE might be required after them instead. + . Split ZEND_RETURN into two new instructions ZEND_RETURN and ZEND_RETURN_BY_REF. . Optimized access to global constants using values with pre-calculated -hash_values from literals table. +hash_values from the literals table. . Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS. - . zend_stack and zend_ptr_stack allocation is delayed before the actual -usage. + . zend_stack and zend_ptr_stack allocation is delayed until actual usage. - Improved CLI SAPI: (Johannes) - . Added command line option --rz name which shows information of named -Zend extension. + . Added command line option --rz name which shows information of the +named Zend extension. . Interactive readline shell improvements: . Added cli.pager php.ini setting to set a pager for output. . Added cli.prompt php.ini setting to configure the shell prompt. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_exceptions.c
felipe Wed, 17 Nov 2010 21:41:30 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=305472
Log:
- Fixed bug #53306 (php crashes with segfault when DTrace exception-thrown
probe fires)
patch by: mike at harschsystems dot com
Bug: http://bugs.php.net/53306 (Assigned) php crashes with segfault when DTrace
exception-thrown probe fires
Changed paths:
U php/php-src/trunk/Zend/zend_exceptions.c
Modified: php/php-src/trunk/Zend/zend_exceptions.c
===
--- php/php-src/trunk/Zend/zend_exceptions.c2010-11-17 20:46:44 UTC (rev
305471)
+++ php/php-src/trunk/Zend/zend_exceptions.c2010-11-17 21:41:30 UTC (rev
305472)
@@ -87,8 +87,13 @@
if (DTRACE_EXCEPTION_THROWN_ENABLED()) {
char *classname;
int name_len;
- zend_get_object_classname(exception, classname, name_len);
- DTRACE_EXCEPTION_THROWN(classname);
+
+ if (exception != NULL) {
+ zend_get_object_classname(exception, classname,
name_len);
+ DTRACE_EXCEPTION_THROWN(classname);
+ } else {
+ DTRACE_EXCEPTION_THROWN(NULL);
+ }
}
#endif /* HAVE_DTRACE */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/Zend/tests/traits/ static_001.phpt static_002.phpt static_003.phpt static_004.phpt static_forward_static_call.phpt static_get_called_class.phpt
gron Wed, 17 Nov 2010 23:05:20 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=305473
Log:
Added tests to for static support of traits.
# This was not tested and documented yet.
# Updated documentation in the RFC http://wiki.php.net/rfc/horizontalreuse
Changed paths:
A php/php-src/trunk/Zend/tests/traits/static_001.phpt
A php/php-src/trunk/Zend/tests/traits/static_002.phpt
A php/php-src/trunk/Zend/tests/traits/static_003.phpt
A php/php-src/trunk/Zend/tests/traits/static_004.phpt
A php/php-src/trunk/Zend/tests/traits/static_forward_static_call.phpt
A php/php-src/trunk/Zend/tests/traits/static_get_called_class.phpt
Added: php/php-src/trunk/Zend/tests/traits/static_001.phpt
===
--- php/php-src/trunk/Zend/tests/traits/static_001.phpt
(rev 0)
+++ php/php-src/trunk/Zend/tests/traits/static_001.phpt 2010-11-17 23:05:20 UTC
(rev 305473)
@@ -0,0 +1,22 @@
+--TEST--
+Traits with static methods.
+--CREDITS--
+Simas Toleikis sim...@gmail.com
+--FILE--
+?php
+
+ trait TestTrait {
+ public static function test() {
+ return 'Test';
+ }
+ }
+
+ class A {
+ use TestTrait;
+ }
+
+ echo A::test();
+
+?
+--EXPECT--
+Test
\ No newline at end of file
Added: php/php-src/trunk/Zend/tests/traits/static_002.phpt
===
--- php/php-src/trunk/Zend/tests/traits/static_002.phpt
(rev 0)
+++ php/php-src/trunk/Zend/tests/traits/static_002.phpt 2010-11-17 23:05:20 UTC
(rev 305473)
@@ -0,0 +1,23 @@
+--TEST--
+Traits with static methods referenced using variable.
+--CREDITS--
+Simas Toleikis sim...@gmail.com
+--FILE--
+?php
+
+ trait TestTrait {
+ public static function test() {
+ return 'Test';
+ }
+ }
+
+ class A {
+ use TestTrait;
+ }
+
+ $class = A;
+ echo $class::test();
+
+?
+--EXPECT--
+Test
\ No newline at end of file
Added: php/php-src/trunk/Zend/tests/traits/static_003.phpt
===
--- php/php-src/trunk/Zend/tests/traits/static_003.phpt
(rev 0)
+++ php/php-src/trunk/Zend/tests/traits/static_003.phpt 2010-11-17 23:05:20 UTC
(rev 305473)
@@ -0,0 +1,27 @@
+--TEST--
+Traits with late static bindings.
+--CREDITS--
+Simas Toleikis sim...@gmail.com
+--FILE--
+?php
+
+ trait TestTrait {
+ public static function test() {
+ return static::$test;
+ }
+ }
+
+ class A {
+ use TestTrait;
+ protected static $test = Test A;
+ }
+
+ class B extends A {
+ protected static $test = Test B;
+ }
+
+ echo B::test();
+
+?
+--EXPECT--
+Test B
\ No newline at end of file
Added: php/php-src/trunk/Zend/tests/traits/static_004.phpt
===
--- php/php-src/trunk/Zend/tests/traits/static_004.phpt
(rev 0)
+++ php/php-src/trunk/Zend/tests/traits/static_004.phpt 2010-11-17 23:05:20 UTC
(rev 305473)
@@ -0,0 +1,22 @@
+--TEST--
+Traits with __callStatic magic method.
+--CREDITS--
+Simas Toleikis sim...@gmail.com
+--FILE--
+?php
+
+ trait TestTrait {
+ public static function __callStatic($name, $arguments) {
+ return $name;
+ }
+ }
+
+ class A {
+ use TestTrait;
+ }
+
+ echo A::Test();
+
+?
+--EXPECT--
+Test
\ No newline at end of file
Added: php/php-src/trunk/Zend/tests/traits/static_forward_static_call.phpt
===
--- php/php-src/trunk/Zend/tests/traits/static_forward_static_call.phpt
(rev 0)
+++ php/php-src/trunk/Zend/tests/traits/static_forward_static_call.phpt
2010-11-17 23:05:20 UTC (rev 305473)
@@ -0,0 +1,28 @@
+--TEST--
+Traits and forward_static_call().
+--CREDITS--
+Simas Toleikis sim...@gmail.com
+--FILE--
+?php
+
+ trait TestTrait {
+ public static function test() {
+ return 'Forwarded '.forward_static_call(array('A',
'test'));
+ }
+ }
+
+ class A {
+ public static function test() {
+ return Test A;
+ }
+ }
+
+ class B extends A {
+ use TestTrait;
+ }
+
+ echo B::test();
+
+?
+--EXPECT--
+Forwarded Test A
\ No newline at end of file
Added: php/php-src/trunk/Zend/tests/traits/static_get_called_class.phpt
===
--- php/php-src/trunk/Zend/tests/traits/static_get_called_class.phpt
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo_firebird/firebird_statement.c branches/PHP_5_3/ext/pdo_firebird/tests/rowCount.phpt trunk/ext/pdo_firebird/firebird_statemen
felipe Thu, 18 Nov 2010 01:24:00 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=305476
Log:
- Fixed bug #53335 (pdo_firebird did not implement rowCount())
patch by: preeves at ibphoenix dot com
Bug: http://bugs.php.net/53335 (Open) pdo_firebird did not implement rowCount()
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_statement.c
A php/php-src/branches/PHP_5_3/ext/pdo_firebird/tests/rowCount.phpt
U php/php-src/trunk/ext/pdo_firebird/firebird_statement.c
A php/php-src/trunk/ext/pdo_firebird/tests/rowCount.phpt
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-11-17 23:57:47 UTC (rev 305475)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-11-18 01:24:00 UTC (rev 305476)
@@ -64,6 +64,8 @@
- Fixed the filter extension accepting IPv4 octets with a leading 0 as that
belongs to the unsupported dotted octal representation. (Gustavo)
+- Fixed bug #53335 (pdo_firebird did not implement rowCount()).
+ (preeves at ibphoenix dot com)
- Fixed bug #53323 (pdo_firebird getAttribute() crash).
(preeves at ibphoenix dot com)
- Fixed Bug #53319 (strip_tags() may strip 'br /' incorrectly). (Felipe)
Modified: php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_statement.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_statement.c
2010-11-17 23:57:47 UTC (rev 305475)
+++ php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_statement.c
2010-11-18 01:24:00 UTC (rev 305476)
@@ -90,6 +90,9 @@
{
pdo_firebird_stmt *S = (pdo_firebird_stmt*)stmt-driver_data;
pdo_firebird_db_handle *H = S-H;
+ unsigned long affected_rows = 0;
+ static char info_count[] = {isc_info_sql_records};
+ char result[64];
do {
/* named or open cursors should be closed first */
@@ -103,6 +106,35 @@
break;
}
+ /* Determine how many rows have changed. In this case we are
+* only interested in rows changed, not rows retrieved. That
+* should be handled by the client when fetching. */
+ stmt-row_count = affected_rows;
+
+ switch (S-statement_type) {
+ case isc_info_sql_stmt_insert:
+ case isc_info_sql_stmt_update:
+ case isc_info_sql_stmt_delete:
+ case isc_info_sql_stmt_exec_procedure:
+ if (isc_dsql_sql_info(H-isc_status, S-stmt,
sizeof ( info_count),
+ info_count, sizeof(result), result)) {
+ break;
+ }
+ if (result[0] == isc_info_sql_records) {
+ unsigned i = 3, result_size =
isc_vax_integer(result[1], 2);
+ while (result[i] != isc_info_end i
result_size) {
+ short len = (short)
isc_vax_integer(result[i + 1], 2);
+ if (result[i] !=
isc_info_req_select_count) {
+ affected_rows +=
isc_vax_integer(result[i + 3], len);
+ }
+ i += len + 3;
+ }
+ stmt-row_count = affected_rows;
+ }
+ default:
+ ;
+ }
+
/* commit? */
if (stmt-dbh-auto_commit
isc_commit_retaining(H-isc_status, H-tr)) {
break;
@@ -142,6 +174,7 @@
if (S-statement_type == isc_info_sql_stmt_exec_procedure) {
S-exhausted = 1;
}
+ stmt-row_count++;
return 1;
}
return 0;
Added: php/php-src/branches/PHP_5_3/ext/pdo_firebird/tests/rowCount.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pdo_firebird/tests/rowCount.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/pdo_firebird/tests/rowCount.phpt
2010-11-18 01:24:00 UTC (rev 305476)
@@ -0,0 +1,48 @@
+--TEST--
+PDO_Firebird: rowCount
+--SKIPIF--
+?php extension_loaded(pdo_firebird) or die(skip); ?
+--FILE--
+?php /* $Id$ */
+
+require(testdb.inc);
+
+$dbh = new PDO(firebird:dbname=$test_base,$user,$password) or die;
+
+...@$dbh-exec('DROP TABLE testz');
+$dbh-exec('CREATE TABLE testz (A VARCHAR(10))');
+$dbh-exec(INSERT INTO testz VALUES ('A'));
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS main/SAPI.c tests/basic/req44164.phpt
cataphract Thu, 18 Nov 2010 04:09:02 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=305481
Log:
- Reversed implementation of FR #44164, pending further consideration.
See rev #304903.
Bugs: http://bugs.php.net/44164 (Assigned) Handle Content-Length HTTP header
when zlib.output_compression active
http://bugs.php.net/304903 (error getting bug information)
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/main/SAPI.c
D php/php-src/branches/PHP_5_3/tests/basic/req44164.phpt
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-11-18 02:58:05 UTC (rev 305480)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-11-18 04:09:02 UTC (rev 305481)
@@ -32,8 +32,6 @@
for empty uploads and, in debug mode, 0-length uploads. (Gustavo)
- Added a 3rd parameter to get_html_translation_table. It now takes a charset
hint, like htmlentities et al. (Gustavo)
-- Implemented FR #44164, setting the header Content-length implicitly
- disables zlib.output_compression.
- Fixed a possible double free in imap extension (Identified by Mateusz
Kocielski). (CVE-2010-4150). (Ilia)
Modified: php/php-src/branches/PHP_5_3/main/SAPI.c
===
--- php/php-src/branches/PHP_5_3/main/SAPI.c2010-11-18 02:58:05 UTC (rev
305480)
+++ php/php-src/branches/PHP_5_3/main/SAPI.c2010-11-18 04:09:02 UTC (rev
305481)
@@ -657,14 +657,6 @@
}
efree(mimetype);
SG(sapi_headers).send_default_content_type = 0;
- } else if (!STRCASECMP(header_line, Content-Length)) {
- /* Script is setting Content-length. The script
cannot reasonably
-* know the size of the message body after
compression, so it's best
-* do disable compression altogether. This
contributes to making scripts
-* portable between setups that have and don't
have zlib compression
-* enabled globally. See req #44164 */
- zend_alter_ini_entry(zlib.output_compression,
sizeof(zlib.output_compression),
- 0, sizeof(0) - 1, PHP_INI_USER,
PHP_INI_STAGE_RUNTIME);
} else if (!STRCASECMP(header_line, Location)) {
if ((SG(sapi_headers).http_response_code 300
||
SG(sapi_headers).http_response_code
307)
Deleted: php/php-src/branches/PHP_5_3/tests/basic/req44164.phpt
===
--- php/php-src/branches/PHP_5_3/tests/basic/req44164.phpt 2010-11-18
02:58:05 UTC (rev 305480)
+++ php/php-src/branches/PHP_5_3/tests/basic/req44164.phpt 2010-11-18
04:09:02 UTC (rev 305481)
@@ -1,17 +0,0 @@
---TEST--
-Req #44164 (Handle Content-Length HTTP header when zlib.output_compression
active)
---SKIPIF--
-?php
-if (!function_exists('gzdeflate'))
-die(skip zlib extension required);
-?
---INI--
-zlib.output_compression=On
---ENV--
-HTTP_ACCEPT_ENCODING=gzip
---FILE--
-?php
-header(Content-length: 200);
-echo str_repeat(a, 200);
---EXPECT--
-
--
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
cataphract Thu, 18 Nov 2010 04:14:49 + Revision: http://svn.php.net/viewvc?view=revisionrevision=305482 Log: - Fixed NULL dereference in lex_scan on zend multibyte builds where the script had a flex incompatible encoding and there was no converter. #see rev #305464 and rev #305466. Bugs: http://bugs.php.net/305464 (error getting bug information) http://bugs.php.net/305466 (error getting bug information) 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-11-18 04:09:02 UTC (rev 305481) +++ php/php-src/branches/PHP_5_3/NEWS 2010-11-18 04:14:49 UTC (rev 305482) @@ -61,6 +61,8 @@ - Fixed covariance of return-by-ref constraints. (Etienne) - Fixed the filter extension accepting IPv4 octets with a leading 0 as that belongs to the unsupported dotted octal representation. (Gustavo) +- Fixed NULL dereference in lex_scan on zend multibyte builds where the script + had a flex incompatible encoding and there was no converter. (Gustavo) - Fixed bug #53335 (pdo_firebird did not implement rowCount()). (preeves at ibphoenix dot com) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
