[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/standard/mail.c branches/PHP_5_2/ext/standard/tests/mail/bug51604.phpt branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/mail.
aharvey Thu, 22 Apr 2010 02:22:49 +
Revision: http://svn.php.net/viewvc?view=revision&revision=298291
Log:
Fix for bug #51604 (newline in end of header is shown in start of message).
Patch by Daniel Egeberg.
Bug: http://bugs.php.net/51604 (Assigned) newline in end of header is shown in
start of message
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/standard/mail.c
A php/php-src/branches/PHP_5_2/ext/standard/tests/mail/bug51604.phpt
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/standard/mail.c
A php/php-src/branches/PHP_5_3/ext/standard/tests/mail/bug51604.phpt
U php/php-src/trunk/ext/standard/mail.c
A php/php-src/trunk/ext/standard/tests/mail/bug51604.phpt
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2010-04-22 01:07:48 UTC (rev 298290)
+++ php/php-src/branches/PHP_5_2/NEWS 2010-04-22 02:22:49 UTC (rev 298291)
@@ -21,6 +21,8 @@
literal). (cbandy at jbandy dot com)
- Fixed bug #51607 (pg_copy_from does not allow schema in the tablename
argument). (cbandy at jbandy dot com)
+- Fixed bug #51604 (newline in end of header is shown in start of message).
+ (Daniel Egeberg)
- Fixed bug #51562 (query timeout in mssql can not be changed per query).
(ejsmont dot artur at gmail dot com)
- Fixed bug #51445 (var_dump() invalid/slow *RECURSION* detection). (Felipe)
Modified: php/php-src/branches/PHP_5_2/ext/standard/mail.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/mail.c 2010-04-22 01:07:48 UTC (rev 298290)
+++ php/php-src/branches/PHP_5_2/ext/standard/mail.c 2010-04-22 02:22:49 UTC (rev 298291)
@@ -95,7 +95,7 @@
Send an email message */
PHP_FUNCTION(mail)
{
- char *to=NULL, *message=NULL, *headers=NULL;
+ char *to=NULL, *message=NULL, *headers=NULL, *headers_trimmed=NULL;
char *subject=NULL, *extra_cmd=NULL;
int to_len, message_len, headers_len;
int subject_len, extra_cmd_len, i;
@@ -124,6 +124,7 @@
MAIL_ASCIIZ_CHECK(message, message_len);
if (headers) {
MAIL_ASCIIZ_CHECK(headers, headers_len);
+ headers_trimmed = php_trim(headers, headers_len, NULL, 0, NULL, 2 TSRMLS_CC);
}
if (extra_cmd) {
MAIL_ASCIIZ_CHECK(extra_cmd, extra_cmd_len);
@@ -176,12 +177,16 @@
extra_cmd = php_escape_shell_cmd(extra_cmd);
}
- if (php_mail(to_r, subject_r, message, headers, extra_cmd TSRMLS_CC)) {
+ if (php_mail(to_r, subject_r, message, headers_trimmed, extra_cmd TSRMLS_CC)) {
RETVAL_TRUE;
} else {
RETVAL_FALSE;
}
+ if (headers_trimmed) {
+ efree(headers_trimmed);
+ }
+
if (extra_cmd) {
efree (extra_cmd);
}
Added: php/php-src/branches/PHP_5_2/ext/standard/tests/mail/bug51604.phpt
===
--- php/php-src/branches/PHP_5_2/ext/standard/tests/mail/bug51604.phpt (rev 0)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/mail/bug51604.phpt 2010-04-22 02:22:49 UTC (rev 298291)
@@ -0,0 +1,35 @@
+--TEST--
+Bug #51604 (newline in end of header is shown in start of message)
+--INI--
+sendmail_path=tee mail_bug51604.out >/dev/null
+mail.add_x_header = Off
+--SKIPIF--
+
+--FILE--
+
+===DONE===
+--EXPECT--
+bool(true)
+To: u...@company.com
+Subject: Test Subject
+KHeaders
+
+A Message
+===DONE===
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-04-22 01:07:48 UTC (rev 298290)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-04-22 02:22:49 UTC (rev 298291)
@@ -30,6 +30,8 @@
literal). (cbandy at jbandy dot com)
- Fixed bug #51607 (pg_copy_from does not allow schema in the tablename
argument). (cbandy at jbandy dot com)
+- Fixed bug #51604 (newline in end of header is shown in start of message).
+ (Daniel Egeberg)
- Fixed bug #51590 (JSON_ERROR_UTF8 is undefined). (Felipe)
- Fixed bug #51562 (query timeout in mssql can not be changed per query).
(ejsmont dot artur at gmail dot com)
Modified: php/php-src/branches/PHP_5_3/ext/standard/mail.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/mail.c 2010-04-22 01:07:48 UTC (rev 298290)
+++ php/php-src/branches/PHP_5_3/ext/standard/mail.c 2010-04-22 02:22:49 UTC (rev 298291)
@@ -97,7 +97,7 @@
Send an email message */
PHP_FUNCTION(mail)
{
- char *to=NULL, *message=NULL, *headers=NULL;
+ char *to=NULL, *message=NULL, *headers=NULL, *headers_trimmed=NULL;
char *subject=NULL, *extra_cmd=NULL;
int to_len, message_len, headers_len = 0;
int subject_len, extra_cmd_len = 0, i;
@@ -122,6 +122,7 @@
MAIL_ASCIIZ_CHECK(message, message_len);
if (headers) {
MAIL_ASCIIZ_CHECK(headers, headers_len);
+ headers_trimmed = php_trim(headers, headers_len, NUL
[PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/session/php_session.h ext/session/session.c ext/session/tests/007.phpt ext/session/tests/009.phpt ext/session/tests/010.phpt ext/session/tests/011.phpt ext/
kalleThu, 22 Apr 2010 01:07:48 +
Revision: http://svn.php.net/viewvc?view=revision&revision=298290
Log:
Removed the session 4.2 bug compatibility mode
Changed paths:
U php/php-src/trunk/NEWS
U php/php-src/trunk/ext/session/php_session.h
U php/php-src/trunk/ext/session/session.c
U php/php-src/trunk/ext/session/tests/007.phpt
U php/php-src/trunk/ext/session/tests/009.phpt
U php/php-src/trunk/ext/session/tests/010.phpt
U php/php-src/trunk/ext/session/tests/011.phpt
U php/php-src/trunk/ext/session/tests/012.phpt
U php/php-src/trunk/ext/session/tests/013.phpt
U php/php-src/trunk/ext/session/tests/014.phpt
Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS 2010-04-21 23:41:51 UTC (rev 298289)
+++ php/php-src/trunk/NEWS 2010-04-22 01:07:48 UTC (rev 298290)
@@ -35,6 +35,8 @@
. import_request_variables().
. register_globals.
. register_long_arrays ini option.
+ . Session bug compatibility mode (session.bug_compat42 and
+session.bug_compat_warn ini options).
. session_is_registered(), session_register() and session_unregister()
functions.
. y2k_compliance ini option.
Modified: php/php-src/trunk/ext/session/php_session.h
===
--- php/php-src/trunk/ext/session/php_session.h 2010-04-21 23:41:51 UTC (rev
298289)
+++ php/php-src/trunk/ext/session/php_session.h 2010-04-22 01:07:48 UTC (rev
298290)
@@ -127,8 +127,6 @@
zval *ps_gc;
} name;
} mod_user_names;
- zend_bool bug_compat; /* Whether to behave like PHP 4.2 and earlier */
- zend_bool bug_compat_warn; /* Whether to warn about it */
const struct ps_serializer_struct *serializer;
zval *http_session_vars;
zend_bool auto_start;
Modified: php/php-src/trunk/ext/session/session.c
===
--- php/php-src/trunk/ext/session/session.c 2010-04-21 23:41:51 UTC (rev
298289)
+++ php/php-src/trunk/ext/session/session.c 2010-04-22 01:07:48 UTC (rev
298290)
@@ -439,63 +439,11 @@
}
/* }}} */
-static int migrate_global(HashTable *ht, HashPosition *pos TSRMLS_DC) /* {{{ */
-{
- char *str;
- uint str_len;
- ulong num_key;
- int n;
- zval **val;
- int ret = 0;
-
- n = zend_hash_get_current_key_ex(ht, &str, &str_len, &num_key, 0, pos);
-
- switch (n) {
- case HASH_KEY_IS_STRING:
- if (zend_hash_find(&EG(symbol_table), str, str_len,
(void **) &val) == SUCCESS &&
- val && Z_TYPE_PP(val) != IS_NULL
- ) {
- ZEND_SET_SYMBOL_WITH_LENGTH(ht, str, str_len,
*val, Z_REFCOUNT_PP(val) + 1, 1);
- ret = 1;
- }
- break;
- case HASH_KEY_IS_LONG:
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The session
bug compatibility code will not "
- "try to locate the global variable $%lu
due to its "
- "numeric nature", num_key);
- break;
- }
- return ret;
-}
-/* }}} */
-
static void php_session_save_current_state(TSRMLS_D) /* {{{ */
{
int ret = FAILURE;
IF_SESSION_VARS() {
- if (PS(bug_compat)) {
- HashTable *ht = Z_ARRVAL_P(PS(http_session_vars));
- HashPosition pos;
- zval **val;
- int do_warn = 0;
-
- zend_hash_internal_pointer_reset_ex(ht, &pos);
-
- while (zend_hash_get_current_data_ex(ht, (void **)
&val, &pos) != FAILURE) {
- if (Z_TYPE_PP(val) == IS_NULL) {
- if (migrate_global(ht, &pos TSRMLS_CC))
{
- do_warn = 1;
- }
- }
- zend_hash_move_forward_ex(ht, &pos);
- }
-
- if (do_warn && PS(bug_compat_warn)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Your script possibly relies on a session side-effect which existed until PHP
4.2.3. Please be advised that the session extension does not consider global
variables as a source of data. You can disable this functionality and this
warning by setting session.bug_compat_42 or session.bug_compat_warn to off,
respectively");
- }
- }
-
if (PS(mod_data)) {
char *val;
int vallen;
@@ -684,8 +632,6 @@
/* {{{ PH
[PHP-CVS] svn: /php/php-src/trunk/sapi/fpm/fpm/ fpm_conf.c fpm_php.c
felipe Wed, 21 Apr 2010 23:22:20 +
Revision: http://svn.php.net/viewvc?view=revision&revision=298286
Log:
- Fix ZTS build
Changed paths:
U php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
U php/php-src/trunk/sapi/fpm/fpm/fpm_php.c
Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
===
--- php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c 2010-04-21 23:19:39 UTC (rev
298285)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c 2010-04-21 23:22:20 UTC (rev
298286)
@@ -43,7 +43,7 @@
#include "fpm_status.h"
#include "zlog.h"
-static int fpm_conf_load_ini_file(char *filename);
+static int fpm_conf_load_ini_file(char *filename TSRMLS_DC);
static char *fpm_conf_set_integer(zval *value, void **config, intptr_t offset);
static char *fpm_conf_set_time(zval *value, void **config, intptr_t offset);
static char *fpm_conf_set_boolean(zval *value, void **config, intptr_t offset);
@@ -673,7 +673,7 @@
int len = strlen(g.gl_pathv[i]);
if (len < 1) continue;
if (g.gl_pathv[i][len - 1] == '/') continue; /* don't
parse directories */
- if (0 > fpm_conf_load_ini_file(g.gl_pathv[i])) {
+ if (0 > fpm_conf_load_ini_file(g.gl_pathv[i]
TSRMLS_CC)) {
zlog(ZLOG_STUFF, ZLOG_ERROR, "Unable to include
%s from %s at line %d", g.gl_pathv[i], filename, ini_lineno);
*error = 1;
return;
@@ -682,7 +682,7 @@
globfree(&g);
}
#else /* HAVE_GLOB */
- if (0 > fpm_conf_load_ini_file(inc)) {
+ if (0 > fpm_conf_load_ini_file(inc TSRMLS_CC)) {
zlog(ZLOG_STUFF, ZLOG_ERROR, "Unable to include %s from %s at
line %d", inc, filename, ini_lineno);
*error = 1;
return;
@@ -848,13 +848,13 @@
switch(callback_type) {
case ZEND_INI_PARSER_ENTRY:
- fpm_conf_ini_parser_entry(arg1, arg2, error);
+ fpm_conf_ini_parser_entry(arg1, arg2, error TSRMLS_CC);
break;;
case ZEND_INI_PARSER_SECTION:
- fpm_conf_ini_parser_section(arg1, error);
+ fpm_conf_ini_parser_section(arg1, error TSRMLS_CC);
break;;
case ZEND_INI_PARSER_POP_ENTRY:
- fpm_conf_ini_parser_array(arg1, arg3, arg2, error);
+ fpm_conf_ini_parser_array(arg1, arg3, arg2, error
TSRMLS_CC);
break;;
default:
zlog(ZLOG_STUFF, ZLOG_ERROR, "[%s:%d] Unknown INI
syntax", ini_filename, ini_lineno);
@@ -864,7 +864,7 @@
}
/* }}} */
-int fpm_conf_load_ini_file(char *filename) /* {{{ */
+int fpm_conf_load_ini_file(char *filename TSRMLS_DC) /* {{{ */
{
int error = 0;
char buf[1024+1];
@@ -936,13 +936,14 @@
char *filename = fpm_globals.config;
int free = 0;
int ret;
+ TSRMLS_FETCH();
if (filename == NULL) {
spprintf(&filename, 0, "%s/php-fpm.conf", PHP_SYSCONFDIR);
free = 1;
}
- ret = fpm_conf_load_ini_file(filename);
+ ret = fpm_conf_load_ini_file(filename TSRMLS_CC);
if (0 > ret) {
zlog(ZLOG_STUFF, ZLOG_ERROR, "failed to load configuration file
'%s'", filename);
Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_php.c
===
--- php/php-src/trunk/sapi/fpm/fpm/fpm_php.c2010-04-21 23:19:39 UTC (rev
298285)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_php.c2010-04-21 23:22:20 UTC (rev
298286)
@@ -113,7 +113,6 @@
static int fpm_php_apply_defines(struct fpm_worker_pool_s *wp) /* {{{ */
{
- TSRMLS_FETCH();
struct key_value_s *kv;
for (kv = wp->config->php_values; kv; kv = kv->next) {
--
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/interbase/ interbase.rc
kalleWed, 21 Apr 2010 23:19:39 + Revision: http://svn.php.net/viewvc?view=revision&revision=298285 Log: Updated copyright year Changed paths: U php/php-src/trunk/ext/interbase/interbase.rc Modified: php/php-src/trunk/ext/interbase/interbase.rc === --- php/php-src/trunk/ext/interbase/interbase.rc2010-04-21 23:16:56 UTC (rev 298284) +++ php/php-src/trunk/ext/interbase/interbase.rc2010-04-21 23:19:39 UTC (rev 298285) @@ -2,7 +2,7 @@ +--+ | PHP Version 5| +--+ - | Copyright (c) 1997-2007 The PHP Group| + | Copyright (c) 1997-2010 The PHP Group| +--+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is| @@ -66,10 +66,10 @@ BEGIN VALUE "FileDescription", "PHP Interbase module\0" VALUE "FileVersion", PHP_VERSION "\0" -VALUE "LegalCopyright", "Copyright � 2003 The PHP Group\0" +VALUE "LegalCopyright", "Copyright � 2010 The PHP Group\0" VALUE "Build Type", BUILD_TYPE "\0" VALUE "Client Library", CLIENT_LIB "\0" - VALUE "URL", "http://www.php.net\0"; + VALUE "URL", "http://www.php.net/\0"; END END BLOCK "VarFileInfo" -- 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/session/ session.c
kalleWed, 21 Apr 2010 23:16:56 +
Revision: http://svn.php.net/viewvc?view=revision&revision=298284
Log:
Drop php_register_var(), Thanks Felipe
Changed paths:
U php/php-src/trunk/ext/session/session.c
Modified: php/php-src/trunk/ext/session/session.c
===
--- php/php-src/trunk/ext/session/session.c 2010-04-21 23:07:54 UTC (rev
298283)
+++ php/php-src/trunk/ext/session/session.c 2010-04-21 23:16:56 UTC (rev
298284)
@@ -1713,35 +1713,6 @@
}
/* }}} */
-/* {{{ static void php_register_var(zval** entry TSRMLS_DC) */
-static void php_register_var(zval** entry TSRMLS_DC)
-{
- zval **value;
-
- if (Z_TYPE_PP(entry) == IS_ARRAY) {
- if (Z_ARRVAL_PP(entry)->nApplyCount > 1) {
- return;
- }
-
- zend_hash_internal_pointer_reset(Z_ARRVAL_PP(entry));
- Z_ARRVAL_PP(entry)->nApplyCount++;
-
- while (zend_hash_get_current_data(Z_ARRVAL_PP(entry),
(void**)&value) == SUCCESS) {
- php_register_var(value TSRMLS_CC);
- zend_hash_move_forward(Z_ARRVAL_PP(entry));
- }
-
- Z_ARRVAL_PP(entry)->nApplyCount--;
- } else {
- convert_to_string_ex(entry);
-
- if (strcmp(Z_STRVAL_PP(entry), "_SESSION") != 0) {
- PS_ADD_VARL(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry));
- }
- }
-}
-/* }}} */
-
/* {{{ proto string session_encode(void)
Serializes the current setup and returns the serialized representation */
static PHP_FUNCTION(session_encode)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/win32/build/ template.rc
kalleWed, 21 Apr 2010 23:07:54 + Revision: http://svn.php.net/viewvc?view=revision&revision=298283 Log: Updated copyright year Changed paths: U php/php-src/trunk/win32/build/template.rc Modified: php/php-src/trunk/win32/build/template.rc === --- php/php-src/trunk/win32/build/template.rc 2010-04-21 23:03:16 UTC (rev 298282) +++ php/php-src/trunk/win32/build/template.rc 2010-04-21 23:07:54 UTC (rev 298283) @@ -65,7 +65,7 @@ #endif VALUE "FileVersion", EXT_VERSION VALUE "InternalName", INTERNAL_NAME -VALUE "LegalCopyright", "Copyright � 1997-2009 The PHP Group" +VALUE "LegalCopyright", "Copyright � 1997-2010 The PHP Group" VALUE "LegalTrademarks", "PHP" VALUE "OriginalFilename", FILE_NAME VALUE "ProductName", "PHP" -- 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 ext/session/session.c ext/session/tests/019.phpt ext/session/tests/session_is_registered_basic.phpt ext/session/tests/session_is_registered_variation1.phpt ext/
kalleWed, 21 Apr 2010 23:03:16 +
Revision: http://svn.php.net/viewvc?view=revision&revision=298282
Log:
Removed session_is_registered(), session_register() and session_unregister().
-- They are no longer needed without register_globals
Changed paths:
U php/php-src/trunk/NEWS
U php/php-src/trunk/ext/session/session.c
U php/php-src/trunk/ext/session/tests/019.phpt
U php/php-src/trunk/ext/session/tests/session_is_registered_basic.phpt
U
php/php-src/trunk/ext/session/tests/session_is_registered_variation1.phpt
U
php/php-src/trunk/ext/session/tests/session_is_registered_variation2.phpt
U
php/php-src/trunk/ext/session/tests/session_is_registered_variation3.phpt
U php/php-src/trunk/ext/session/tests/session_register_basic.phpt
U php/php-src/trunk/ext/session/tests/session_register_variation1.phpt
U php/php-src/trunk/ext/session/tests/session_register_variation2.phpt
U php/php-src/trunk/ext/session/tests/session_register_variation3.phpt
U php/php-src/trunk/ext/session/tests/session_register_variation4.phpt
U php/php-src/trunk/ext/session/tests/session_unregister_basic.phpt
U php/php-src/trunk/ext/session/tests/session_unregister_variation1.phpt
U php/php-src/trunk/ext/session/tests/session_unregister_variation2.phpt
U php/php-src/trunk/ext/session/tests/session_unregister_variation3.phpt
Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS 2010-04-21 22:56:33 UTC (rev 298281)
+++ php/php-src/trunk/NEWS 2010-04-21 23:03:16 UTC (rev 298282)
@@ -35,6 +35,8 @@
. import_request_variables().
. register_globals.
. register_long_arrays ini option.
+ . session_is_registered(), session_register() and session_unregister()
+functions.
. y2k_compliance ini option.
?? ??? 20??, PHP 5.3.3
Modified: php/php-src/trunk/ext/session/session.c
===
--- php/php-src/trunk/ext/session/session.c 2010-04-21 22:56:33 UTC (rev 298281)
+++ php/php-src/trunk/ext/session/session.c 2010-04-21 23:03:16 UTC (rev 298282)
@@ -1837,88 +1837,6 @@
}
/* }}} */
-/* {{{ proto bool session_register(mixed var_names [, mixed ...])
- Adds varname(s) to the list of variables which are freezed at the session end */
-static PHP_FUNCTION(session_register)
-{
- zval ***args = NULL;
- int num_args, i;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &num_args) == FAILURE) {
- return;
- }
-
- if (PS(session_status) == php_session_none || PS(session_status) == php_session_disabled) {
- php_session_start(TSRMLS_C);
- }
-
- if (PS(session_status) == php_session_disabled) {
- if (args) {
- efree(args);
- }
- RETURN_FALSE;
- }
-
- for (i = 0; i < num_args; i++) {
- if (Z_TYPE_PP(args[i]) == IS_ARRAY) {
- SEPARATE_ZVAL(args[i]);
- }
- php_register_var(args[i] TSRMLS_CC);
- }
-
- if (args) {
- efree(args);
- }
-
- RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto bool session_unregister(string varname)
- Removes varname from the list of variables which are freezed at the session end */
-static PHP_FUNCTION(session_unregister)
-{
- char *p_name;
- int p_name_len;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &p_name, &p_name_len) == FAILURE) {
- return;
- }
-
- IF_SESSION_VARS() {
- SEPARATE_ZVAL_IF_NOT_REF(&PS(http_session_vars));
- PS_DEL_VARL(p_name, p_name_len);
- }
-
- RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto bool session_is_registered(string varname)
- Checks if a variable is registered in session */
-static PHP_FUNCTION(session_is_registered)
-{
- zval *p_var;
- char *p_name;
- int p_name_len;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &p_name, &p_name_len) == FAILURE) {
- return;
- }
-
- if (PS(session_status) == php_session_none) {
- RETURN_FALSE;
- }
-
- IF_SESSION_VARS() {
- if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), p_name, p_name_len+1, (void **)&p_var) == SUCCESS) {
- RETURN_TRUE;
- }
- }
- RETURN_FALSE;
-}
-/* }}} */
-
/* {{{ arginfo */
ZEND_BEGIN_ARG_INFO_EX(arginfo_session_name, 0, 0, 0)
ZEND_ARG_INFO(0, name)
@@ -1944,19 +1862,6 @@
ZEND_ARG_INFO(0, data)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO_EX(arginfo_session_register, 0, 0, 1)
- ZEND_ARG_INFO(0, name)
- ZEND_ARG_INFO(0, ...)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_session_unregister, 0, 0, 1)
- ZEND_ARG_INFO(0, name)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_session_is_registered, 0, 0, 1)
- ZEND_ARG_INFO(0, name)
-ZEND_END_ARG_INFO()
-
ZEND_BEGIN_ARG_INFO(arginfo_session_void, 0)
ZEND_END_ARG_INFO()
@@ -1995,9 +1900,6 @@
PHP_FE(session_id,arginfo_session_id)
PHP_FE(session_regenerate_id, arginfo_session_regenerate_id)
PHP_FE(session_decode,arginfo_session_decode)
- PHP_DEP_FE(session_register, arginfo_session_register)
- PHP_DEP_FE(s
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
felipe Wed, 21 Apr 2010 22:30:06 + Revision: http://svn.php.net/viewvc?view=revision&revision=298279 Log: - Changed order to FR 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-04-21 22:23:55 UTC (rev 298278) +++ php/php-src/branches/PHP_5_3/NEWS 2010-04-21 22:30:06 UTC (rev 298279) @@ -14,6 +14,9 @@ __construct now. (Stas) - Reset error state in PDO::beginTransaction() reset error state. (Ilia) +- Implemented FR#35638 (Adding udate to imap_fetch_overview results). + (Charles_Duffy at dell dot com ) + - Fixed a NULL pointer dereference when processing invalid XML-RPC requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert) - Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas) @@ -89,8 +92,6 @@ - Fixed bug #48781 (Cyclical garbage collector memory leak). (Dmitry) - Fixed bug #46111 (Some timezone identifiers can not be parsed). (Derick) - Fixed bug #35673 (formatOutput does not work with saveHTML). (Rob) -- Implement feature request #35638 (Adding udate to imap_fetch_overview results). - (Charles_Duffy at dell dot com ) ?? ??? 20??, PHP 5.3.2 -- 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 Zend/tests/unset_cv07.phpt ext/standard/basic_functions.c ext/standard/basic_functions.h ext/standard/tests/general_functions/import_request.phpt ext/standard/t
kalleWed, 21 Apr 2010 22:23:55 +
Revision: http://svn.php.net/viewvc?view=revision&revision=298278
Log:
Removed import_request_variables(), this is not needed anymore without
register_globals
Changed paths:
U php/php-src/trunk/NEWS
U php/php-src/trunk/Zend/tests/unset_cv07.phpt
U php/php-src/trunk/ext/standard/basic_functions.c
U php/php-src/trunk/ext/standard/basic_functions.h
U
php/php-src/trunk/ext/standard/tests/general_functions/import_request.phpt
U
php/php-src/trunk/ext/standard/tests/general_functions/import_request1.phpt
U
php/php-src/trunk/ext/standard/tests/general_functions/import_request2.phpt
U
php/php-src/trunk/ext/standard/tests/general_functions/import_request3.phpt
Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS 2010-04-21 22:22:31 UTC (rev 298277)
+++ php/php-src/trunk/NEWS 2010-04-21 22:23:55 UTC (rev 298278)
@@ -32,6 +32,7 @@
- Removed legacy features: (Kalle)
. define_syslog_variables ini option and its associated function.
. highlight.bg ini option.
+ . import_request_variables().
. register_globals.
. register_long_arrays ini option.
. y2k_compliance ini option.
Modified: php/php-src/trunk/Zend/tests/unset_cv07.phpt
===
--- php/php-src/trunk/Zend/tests/unset_cv07.phpt2010-04-21 22:22:31 UTC
(rev 298277)
+++ php/php-src/trunk/Zend/tests/unset_cv07.phpt2010-04-21 22:23:55 UTC
(rev 298278)
@@ -1,5 +1,7 @@
--TEST--
unset() CV 7 (indirect unset() of global variable in
import_request_variables())
+--SKIPIF--
+
--GET--
x=2
--FILE--
Modified: php/php-src/trunk/ext/standard/basic_functions.c
===
--- php/php-src/trunk/ext/standard/basic_functions.c2010-04-21 22:22:31 UTC
(rev 298277)
+++ php/php-src/trunk/ext/standard/basic_functions.c2010-04-21 22:23:55 UTC
(rev 298278)
@@ -855,11 +855,6 @@
ZEND_BEGIN_ARG_INFO(arginfo_config_get_hash, 0)
ZEND_END_ARG_INFO()
#endif
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_import_request_variables, 0, 0, 1)
- ZEND_ARG_INFO(0, types)
- ZEND_ARG_INFO(0, prefix)
-ZEND_END_ARG_INFO()
#ifdef HAVE_GETLOADAVG
ZEND_BEGIN_ARG_INFO(arginfo_sys_getloadavg, 0)
@@ -2946,7 +2941,6 @@
PHP_FE(get_magic_quotes_gpc,
arginfo_get_magic_quotes_gpc)
PHP_FE(get_magic_quotes_runtime,
arginfo_get_magic_quotes_runtime)
- PHP_FE(import_request_variables,
arginfo_import_request_variables)
PHP_FE(error_log,
arginfo_error_log)
PHP_FE(error_get_last,
arginfo_error_get_last)
PHP_FE(call_user_func,
arginfo_call_user_func)
@@ -6026,104 +6020,6 @@
/* }}} */
#endif
-static int copy_request_variable(void *pDest TSRMLS_DC, int num_args, va_list
args, zend_hash_key *hash_key) /* {{{ */
-{
- zval *prefix, new_key;
- int prefix_len;
- zval **var = (zval **) pDest;
-
- if (num_args != 1) {
- return 0;
- }
-
- prefix = va_arg(args, zval *);
- prefix_len = Z_STRLEN_P(prefix);
-
- if (!prefix_len && !hash_key->nKeyLength) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Numeric key
detected - possible security hazard");
- return 0;
- }
-
- if (hash_key->nKeyLength) {
- php_prefix_varname(&new_key, prefix, hash_key->arKey,
hash_key->nKeyLength - 1, 0 TSRMLS_CC);
- } else {
- zval num;
-
- ZVAL_LONG(&num, hash_key->h);
- convert_to_string(&num);
- php_prefix_varname(&new_key, prefix, Z_STRVAL(num),
Z_STRLEN(num), 0 TSRMLS_CC);
- zval_dtor(&num);
- }
-
- if (php_varname_check(Z_STRVAL(new_key), Z_STRLEN(new_key), 0
TSRMLS_CC) == FAILURE) {
- zval_dtor(&new_key);
- return 0;
- }
-
- zend_delete_global_variable(Z_STRVAL(new_key), Z_STRLEN(new_key)
TSRMLS_CC);
- ZEND_SET_SYMBOL_WITH_LENGTH(&EG(symbol_table), Z_STRVAL(new_key),
Z_STRLEN(new_key) + 1, *var, Z_REFCOUNT_PP(var) + 1, 0);
-
- zval_dtor(&new_key);
- return 0;
-}
-/* }}} */
-
-/* {{{ proto bool import_request_variables(string types [, string prefix])
- Import GET/POST/Cookie variables into the global scope */
-PHP_FUNCTION(i
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/main/fopen_wrappers.c trunk/main/fopen_wrappers.c
felipe Wed, 21 Apr 2010 22:22:31 +
Revision: http://svn.php.net/viewvc?view=revision&revision=298277
Log:
- Fixed bug #51627 (script path not correctly evaluated)
Patch by: russell dot tempero at rightnow dot com
Bug: http://bugs.php.net/51627 (Open) script path not correctly evaluated
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/main/fopen_wrappers.c
U php/php-src/trunk/main/fopen_wrappers.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-04-21 22:06:18 UTC (rev 298276)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-04-21 22:22:31 UTC (rev 298277)
@@ -18,6 +18,8 @@
requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
- Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas)
+- Fixed bug #51627 (script path not correctly evaluated).
+ (russell dot tempero at rightnow dot com)
- Fixed bug #51615 (PHP crash with wrong HTML in SimpleXML). (Felipe)
- Fixed bug #51609 (pg_copy_to: Invalid results when using fourth parameter).
(Felipe)
Modified: php/php-src/branches/PHP_5_3/main/fopen_wrappers.c
===
--- php/php-src/branches/PHP_5_3/main/fopen_wrappers.c 2010-04-21 22:06:18 UTC
(rev 298276)
+++ php/php-src/branches/PHP_5_3/main/fopen_wrappers.c 2010-04-21 22:22:31 UTC
(rev 298277)
@@ -435,8 +435,8 @@
}
} else
#endif
- if (PG(doc_root) && path_info && (length = strlen(PG(doc_root)) &&
- IS_ABSOLUTE_PATH(PG(doc_root), length))) {
+ if (PG(doc_root) && path_info && (length = strlen(PG(doc_root))) &&
+ IS_ABSOLUTE_PATH(PG(doc_root), length)) {
filename = emalloc(length + strlen(path_info) + 2);
if (filename) {
memcpy(filename, PG(doc_root), length);
Modified: php/php-src/trunk/main/fopen_wrappers.c
===
--- php/php-src/trunk/main/fopen_wrappers.c 2010-04-21 22:06:18 UTC (rev
298276)
+++ php/php-src/trunk/main/fopen_wrappers.c 2010-04-21 22:22:31 UTC (rev
298277)
@@ -435,8 +435,8 @@
}
} else
#endif
- if (PG(doc_root) && path_info && (length = strlen(PG(doc_root)) &&
- IS_ABSOLUTE_PATH(PG(doc_root), length))) {
+ if (PG(doc_root) && path_info && (length = strlen(PG(doc_root))) &&
+ IS_ABSOLUTE_PATH(PG(doc_root), length)) {
filename = emalloc(length + strlen(path_info) + 2);
if (filename) {
memcpy(filename, PG(doc_root), length);
--
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_highlight.h
felipe Wed, 21 Apr 2010 22:06:18 + Revision: http://svn.php.net/viewvc?view=revision&revision=298276 Log: - Dropped unused HL_BG_COLOR (Kalle) Changed paths: U php/php-src/trunk/Zend/zend_highlight.h Modified: php/php-src/trunk/Zend/zend_highlight.h === --- php/php-src/trunk/Zend/zend_highlight.h 2010-04-21 22:04:19 UTC (rev 298275) +++ php/php-src/trunk/Zend/zend_highlight.h 2010-04-21 22:06:18 UTC (rev 298276) @@ -26,7 +26,6 @@ #define HL_DEFAULT_COLOR "#BB"/* blue */ #define HL_HTML_COLOR"#00"/* black */ #define HL_STRING_COLOR "#DD"/* red */ -#define HL_BG_COLOR "#FF"/* white */ #define HL_KEYWORD_COLOR "#007700"/* green */ -- 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/ basic_functions.c
kalleWed, 21 Apr 2010 22:04:19 +
Revision: http://svn.php.net/viewvc?view=revision&revision=298275
Log:
Added missing zend_parse_parameters_none() call to sys_getloadavg()
Changed paths:
U php/php-src/trunk/ext/standard/basic_functions.c
Modified: php/php-src/trunk/ext/standard/basic_functions.c
===
--- php/php-src/trunk/ext/standard/basic_functions.c2010-04-21 21:56:24 UTC
(rev 298274)
+++ php/php-src/trunk/ext/standard/basic_functions.c2010-04-21 22:04:19 UTC
(rev 298275)
@@ -6131,6 +6131,10 @@
{
double load[3];
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
+
if (getloadavg(load, 3) == -1) {
RETURN_FALSE;
} else {
--
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 Zend/tests/bug35655.phpt Zend/tests/bug42767.phpt Zend/tests/nowdoc_013.phpt Zend/tests/nowdoc_014.phpt ext/standard/tests/strings/highlight_file.phpt main/main
kalleWed, 21 Apr 2010 21:56:24 +
Revision: http://svn.php.net/viewvc?view=revision&revision=298274
Log:
Remove highlight.bg, it was removed in the old trunk and its not referenced in
zend_highlight.c, meaning its not even implemented correctly in 5.3.
Changed paths:
U php/php-src/trunk/NEWS
U php/php-src/trunk/Zend/tests/bug35655.phpt
U php/php-src/trunk/Zend/tests/bug42767.phpt
U php/php-src/trunk/Zend/tests/nowdoc_013.phpt
U php/php-src/trunk/Zend/tests/nowdoc_014.phpt
U php/php-src/trunk/ext/standard/tests/strings/highlight_file.phpt
U php/php-src/trunk/main/main.c
U php/php-src/trunk/php.ini-development
U php/php-src/trunk/php.ini-production
U php/php-src/trunk/tests/strings/004.phpt
U php/php-src/trunk/tests/strings/bug26703.phpt
Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS 2010-04-21 20:18:32 UTC (rev 298273)
+++ php/php-src/trunk/NEWS 2010-04-21 21:56:24 UTC (rev 298274)
@@ -31,6 +31,7 @@
- Removed legacy features: (Kalle)
. define_syslog_variables ini option and its associated function.
+ . highlight.bg ini option.
. register_globals.
. register_long_arrays ini option.
. y2k_compliance ini option.
Modified: php/php-src/trunk/Zend/tests/bug35655.phpt
===
--- php/php-src/trunk/Zend/tests/bug35655.phpt 2010-04-21 20:18:32 UTC (rev
298273)
+++ php/php-src/trunk/Zend/tests/bug35655.phpt 2010-04-21 21:56:24 UTC (rev
298274)
@@ -4,7 +4,6 @@
highlight.string = #DD
highlight.comment = #FF8000
highlight.keyword = #007700
-highlight.bg = #FF
highlight.default = #BB
highlight.html= #00
--FILE--
Modified: php/php-src/trunk/Zend/tests/bug42767.phpt
===
--- php/php-src/trunk/Zend/tests/bug42767.phpt 2010-04-21 20:18:32 UTC (rev
298273)
+++ php/php-src/trunk/Zend/tests/bug42767.phpt 2010-04-21 21:56:24 UTC (rev
298274)
@@ -4,7 +4,6 @@
highlight.string = #DD
highlight.comment = #FF8000
highlight.keyword = #007700
-highlight.bg = #FF
highlight.default = #BB
highlight.html= #00
--FILE--
Modified: php/php-src/trunk/Zend/tests/nowdoc_013.phpt
===
--- php/php-src/trunk/Zend/tests/nowdoc_013.phpt2010-04-21 20:18:32 UTC
(rev 298273)
+++ php/php-src/trunk/Zend/tests/nowdoc_013.phpt2010-04-21 21:56:24 UTC
(rev 298274)
@@ -4,7 +4,6 @@
highlight.string = #DD
highlight.comment = #FF8000
highlight.keyword = #007700
-highlight.bg = #FF
highlight.default = #BB
highlight.html= #00
--FILE--
Modified: php/php-src/trunk/Zend/tests/nowdoc_014.phpt
===
--- php/php-src/trunk/Zend/tests/nowdoc_014.phpt2010-04-21 20:18:32 UTC
(rev 298273)
+++ php/php-src/trunk/Zend/tests/nowdoc_014.phpt2010-04-21 21:56:24 UTC
(rev 298274)
@@ -4,7 +4,6 @@
highlight.string = #DD
highlight.comment = #FF8000
highlight.keyword = #007700
-highlight.bg = #FF
highlight.default = #BB
highlight.html= #00
--FILE--
Modified: php/php-src/trunk/ext/standard/tests/strings/highlight_file.phpt
===
--- php/php-src/trunk/ext/standard/tests/strings/highlight_file.phpt
2010-04-21 20:18:32 UTC (rev 298273)
+++ php/php-src/trunk/ext/standard/tests/strings/highlight_file.phpt
2010-04-21 21:56:24 UTC (rev 298274)
@@ -4,7 +4,6 @@
highlight.string=#DD
highlight.comment=#FF9900
highlight.keyword=#007700
-highlight.bg=#FF
highlight.default=#BB
highlight.html=#00
allow_url_include=1
Modified: php/php-src/trunk/main/main.c
===
--- php/php-src/trunk/main/main.c 2010-04-21 20:18:32 UTC (rev 298273)
+++ php/php-src/trunk/main/main.c 2010-04-21 21:56:24 UTC (rev 298274)
@@ -425,7 +425,6 @@
/* {{{ PHP_INI
*/
PHP_INI_BEGIN()
- PHP_INI_ENTRY_EX("highlight.bg",HL_BG_COLOR,
PHP_INI_ALL,NULL, php_ini_color_displayer_cb)
PHP_INI_ENTRY_EX("highlight.comment", HL_COMMENT_COLOR,
PHP_INI_ALL,NULL, php_ini_color_displayer_cb)
PHP_INI_ENTRY_EX("highlight.default", HL_DEFAULT_COLOR,
PHP_INI_ALL,NULL, php_ini_color_displayer_cb)
PHP_INI_ENTRY_EX("highlight.html", HL_HTML_COLOR,
PHP_INI_ALL,NULL, php_ini_color_displayer_cb)
@@ -2058,7 +2057,7 @@
struct {
const long error_level;
const char *phrase;
-
[PHP-CVS] svn: /SVNROOT/ global_avail
philip Wed, 21 Apr 2010 19:09:10 + Revision: http://svn.php.net/viewvc?view=revision&revision=298267 Log: - phpdoc/es karma for Jesus Rafael Cova Huerta (jesus_cova) Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2010-04-21 18:16:46 UTC (rev 298266) +++ SVNROOT/global_avail2010-04-21 19:09:10 UTC (rev 298267) @@ -73,7 +73,7 @@ avail|mkoula|phpdoc/cs avail|penguin,tkxs|phpdoc/da avail|kore,thorstenr,lapistano|phpdoc/de -avail|mgonzalezle,ianasa,gustavo,soywiz,ladderalice,ideados,fcaroberga,dulasoft,benjamin,argosback,tatai,jesusruiz,jpberdejo,lduran,sabathorn,julionc,jorgeeolayap,x1v4nx|phpdoc/es +avail|mgonzalezle,ianasa,gustavo,soywiz,ladderalice,ideados,fcaroberga,dulasoft,benjamin,argosback,tatai,jesusruiz,jpberdejo,lduran,sabathorn,julionc,jorgeeolayap,x1v4nx,jesus_cova|phpdoc/es avail|parstic|phpdoc/fa avail|magidev,mikaelkael,jpauli|phpdoc/fr avail|xdanger,jiania,haohappy|phpdoc/zh,phpdoc/hk,phpdoc/tw -- 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/mbstring/ mb_gpc.c
pierrick Wed, 21 Apr 2010 16:00:46 + Revision: http://svn.php.net/viewvc?view=revision&revision=298260 Log: Remove unused variable Changed paths: U php/php-src/trunk/ext/mbstring/mb_gpc.c Modified: php/php-src/trunk/ext/mbstring/mb_gpc.c === --- php/php-src/trunk/ext/mbstring/mb_gpc.c 2010-04-21 15:54:33 UTC (rev 298259) +++ php/php-src/trunk/ext/mbstring/mb_gpc.c 2010-04-21 16:00:46 UTC (rev 298260) @@ -203,7 +203,6 @@ enum mbfl_no_encoding from_encoding = mbfl_no_encoding_invalid; mbfl_encoding_detector *identd = NULL; mbfl_buffer_converter *convd = NULL; - int prev_rg_state = 0; mbfl_string_init_set(&string, info->to_language, info->to_encoding); mbfl_string_init_set(&resvar, info->to_language, info->to_encoding); -- 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_compile.c
felipe Wed, 21 Apr 2010 15:08:10 +
Revision: http://svn.php.net/viewvc?view=revision&revision=298257
Log:
- Fix ZTS build
Changed paths:
U php/php-src/trunk/Zend/zend_compile.c
Modified: php/php-src/trunk/Zend/zend_compile.c
===
--- php/php-src/trunk/Zend/zend_compile.c 2010-04-21 14:58:33 UTC (rev
298256)
+++ php/php-src/trunk/Zend/zend_compile.c 2010-04-21 15:08:10 UTC (rev
298257)
@@ -364,7 +364,7 @@
}
/* }}} */
-int zend_add_func_name_literal(zend_op_array *op_array, const zval *zv) /* {{{
*/
+int zend_add_func_name_literal(zend_op_array *op_array, const zval *zv
TSRMLS_DC) /* {{{ */
{
int ret;
char *lc_name;
@@ -389,7 +389,7 @@
/* }}} */
-int zend_add_class_name_literal(zend_op_array *op_array, const zval *zv) /*
{{{ */
+int zend_add_class_name_literal(zend_op_array *op_array, const zval *zv
TSRMLS_DC) /* {{{ */
{
int ret;
char *lc_name;
@@ -1774,7 +1774,7 @@
if (last_op->opcode == ZEND_FETCH_OBJ_R) {
if (last_op->op2_type == IS_CONST) {
last_op->op2.constant =
- zend_add_func_name_literal(CG(active_op_array),
&CONSTANT(last_op->op2.constant));
+ zend_add_func_name_literal(CG(active_op_array),
&CONSTANT(last_op->op2.constant) TSRMLS_CC);
}
last_op->opcode = ZEND_INIT_METHOD_CALL;
SET_UNUSED(last_op->result);
@@ -2019,7 +2019,7 @@
zend_resolve_class_name(class_name,
&opline->extended_value, 0 TSRMLS_CC);
opline->op2_type = IS_CONST;
opline->op2.constant =
-
zend_add_class_name_literal(CG(active_op_array), &class_name->u.constant);
+
zend_add_class_name_literal(CG(active_op_array), &class_name->u.constant
TSRMLS_CC);
break;
}
} else {
@@ -2204,14 +2204,14 @@
if (class_node.op_type == IS_CONST) {
opline->op1_type = IS_CONST;
opline->op1.constant =
- zend_add_class_name_literal(CG(active_op_array),
&class_node.u.constant);
+ zend_add_class_name_literal(CG(active_op_array),
&class_node.u.constant TSRMLS_CC);
} else {
SET_NODE(opline->op1, &class_node);
}
if (method_name->op_type == IS_CONST) {
opline->op2_type = IS_CONST;
opline->op2.constant =
- zend_add_func_name_literal(CG(active_op_array),
&method_name->u.constant);
+ zend_add_func_name_literal(CG(active_op_array),
&method_name->u.constant TSRMLS_CC);
} else {
SET_NODE(opline->op2, method_name);
}
@@ -2545,7 +2545,7 @@
opline = get_next_op(CG(active_op_array) TSRMLS_CC);
opline->opcode = ZEND_CATCH;
opline->op1_type = IS_CONST;
- opline->op1.constant = zend_add_class_name_literal(CG(active_op_array),
&catch_class.u.constant);
+ opline->op1.constant = zend_add_class_name_literal(CG(active_op_array),
&catch_class.u.constant TSRMLS_CC);
opline->op2_type = IS_CV;
opline->op2.var = lookup_cv(CG(active_op_array),
catch_var->u.constant.value.str.val, catch_var->u.constant.value.str.len
TSRMLS_CC);
catch_var->u.constant.value.str.val =
CG(active_op_array)->vars[opline->op2.var].name;
@@ -3756,7 +3756,7 @@
zend_resolve_class_name(interface_name, &opline->extended_value, 0
TSRMLS_CC);
opline->extended_value = (opline->extended_value &
~ZEND_FETCH_CLASS_MASK) | ZEND_FETCH_CLASS_INTERFACE;
opline->op2_type = IS_CONST;
- opline->op2.constant = zend_add_class_name_literal(CG(active_op_array),
&interface_name->u.constant);
+ opline->op2.constant = zend_add_class_name_literal(CG(active_op_array),
&interface_name->u.constant TSRMLS_CC);
CG(active_class_entry)->num_interfaces++;
}
/* }}} */
@@ -4103,7 +4103,7 @@
opline->result.var =
get_temporary_variable(CG(active_op_array));
if (constant_container->op_type == IS_CONST) {
opline->op1_type = IS_CONST;
- opline->op1.constant =
zend_add_class_name_literal(CG(active_op_array),
&constant_container->u.constant);
+ opline->op1.constant =
zend_add_class_name_literal(CG(active_op_array),
&constant_container->u.constant TSRMLS_CC);
} else {
SET_NODE(opline->op1,
constant_container);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, vis
[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_compile.c
dmitry Wed, 21 Apr 2010 14:58:33 +
Revision: http://svn.php.net/viewvc?view=revision&revision=298256
Log:
Eliminated unnecessary compile-time hash_value recalculation for interned
strings
Changed paths:
U php/php-src/trunk/Zend/zend_compile.c
Modified: php/php-src/trunk/Zend/zend_compile.c
===
--- php/php-src/trunk/Zend/zend_compile.c 2010-04-21 14:19:27 UTC (rev 298255)
+++ php/php-src/trunk/Zend/zend_compile.c 2010-04-21 14:58:33 UTC (rev 298256)
@@ -62,6 +62,13 @@
target = src; \
} while (0)
+#define CALCULATE_LITERAL_HASH(num) do { \
+ if (IS_INTERNED(Z_STRVAL(CONSTANT(num { \
+ Z_HASH_P(&CONSTANT(num)) = INTERNED_HASH(Z_STRVAL(CONSTANT(num))); \
+ } else { \
+ Z_HASH_P(&CONSTANT(num)) = zend_hash_func(Z_STRVAL(CONSTANT(num)), Z_STRLEN(CONSTANT(num))+1); \
+ } \
+} while (0)
ZEND_API zend_op_array *(*zend_compile_file)(zend_file_handle *file_handle, int type TSRMLS_DC);
ZEND_API zend_op_array *(*zend_compile_string)(zval *source_string, char *filename TSRMLS_DC);
@@ -357,6 +364,62 @@
}
/* }}} */
+int zend_add_func_name_literal(zend_op_array *op_array, const zval *zv) /* {{{ */
+{
+ int ret;
+ char *lc_name;
+ zval c;
+ int lc_literal;
+
+ if (op_array->last_literal > 0 &&
+ &op_array->literals[op_array->last_literal - 1].constant == zv) {
+ /* we already have function name as last literal (do nothing) */
+ ret = op_array->last_literal - 1;
+ } else {
+ ret = zend_add_literal(op_array, zv);
+ }
+
+ lc_name = zend_str_tolower_dup(Z_STRVAL_P(zv), Z_STRLEN_P(zv));
+ ZVAL_STRINGL(&c, lc_name, Z_STRLEN_P(zv), 0);
+ lc_literal = zend_add_literal(CG(active_op_array), &c);
+ CALCULATE_LITERAL_HASH(lc_literal);
+
+ return ret;
+}
+/* }}} */
+
+
+int zend_add_class_name_literal(zend_op_array *op_array, const zval *zv) /* {{{ */
+{
+ int ret;
+ char *lc_name;
+ int lc_len;
+ zval c;
+ int lc_literal;
+
+ if (op_array->last_literal > 0 &&
+ &op_array->literals[op_array->last_literal - 1].constant == zv) {
+ /* we already have function name as last literal (do nothing) */
+ ret = op_array->last_literal - 1;
+ } else {
+ ret = zend_add_literal(op_array, zv);
+ }
+
+ if (Z_STRVAL_P(zv)[0] == '\\') {
+ lc_len = Z_STRLEN_P(zv) - 1;
+ lc_name = zend_str_tolower_dup(Z_STRVAL_P(zv) + 1, lc_len);
+ } else {
+ lc_len = Z_STRLEN_P(zv);
+ lc_name = zend_str_tolower_dup(Z_STRVAL_P(zv), lc_len);
+ }
+ ZVAL_STRINGL(&c, lc_name, lc_len, 0);
+ lc_literal = zend_add_literal(CG(active_op_array), &c);
+ CALCULATE_LITERAL_HASH(lc_literal);
+
+ return ret;
+}
+/* }}} */
+
#define LITERAL_STRINGL(op, str, len, copy) do { \
zval _c; \
ZVAL_STRINGL(&_c, str, len, copy); \
@@ -380,7 +443,7 @@
INIT_ZVAL( _c); \
op.constant = zend_add_literal(CG(active_op_array), &_c); \
} while (0)
-
+
void zend_do_binary_op(zend_uchar op, znode *result, const znode *op1, const znode *op2 TSRMLS_DC) /* {{{ */
{
zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
@@ -498,7 +561,7 @@
opline_ptr->extended_value = ZEND_FETCH_LOCAL;
if (varname->op_type == IS_CONST) {
- Z_HASH_P(&CONSTANT(opline_ptr->op1.constant)) = zend_hash_func(Z_STRVAL(CONSTANT(opline_ptr->op1.constant)), Z_STRLEN(CONSTANT(opline_ptr->op1.constant))+1);
+ CALCULATE_LITERAL_HASH(opline_ptr->op1.constant);
if (zend_is_auto_global(varname->u.constant.value.str.val, varname->u.constant.value.str.len TSRMLS_CC)) {
opline_ptr->extended_value = ZEND_FETCH_GLOBAL;
}
@@ -536,7 +599,7 @@
opline.result.var = get_temporary_variable(CG(active_op_array));
opline.op1_type = IS_CONST;
LITERAL_STRINGL(opline.op1, estrdup(CG(active_op_array)->vars[result->u.op.var].name), CG(active_op_array)->vars[result->u.op.var].name_len, 0);
- Z_HASH_P(&CONSTANT(opline.op1.constant)) = zend_hash_func(Z_STRVAL(CONSTANT(opline.op1.constant)), Z_STRLEN(CONSTANT(opline.op1.constant))+1);
+ CALCULATE_LITERAL_HASH(opline.op1.constant);
SET_UNUSED(opline.op2);
SET_NODE(opline.op2, &class_node);
GET_NODE(result,opline.result);
@@ -555,7 +618,7 @@
opline.result.var = get_temporary_variable(CG(active_op_array));
opline.op1_type = IS_CONST;
LITERAL_STRINGL(opline.op1, estrdup(CG(active_op_array)->vars[opline_ptr->op1.var].name), CG(active_op_array)->vars[opline_ptr->op1.var].name_len, 0);
- Z_HASH_P(&CONSTANT(opline.op1.constant)) = zend_hash_func(Z_STRVAL(CONSTANT(opline.op1.constant)), Z_STRLEN(CONSTANT(opline.op1.constant))+1);
+ CALCULATE_LITERAL_HASH(opline.op1.constant);
SET_UNUSED(opline.op2);
SET_NODE(opline.op2, &class_node);
opline.extended_value |= ZEND_FETCH_STATIC_MEMBER;
@@ -598,7 +661,7 @@
zval_dtor(&CONSTANT(opline.op2.constant));
ZVAL_LONG(&CONSTANT(opline.op2.constant), index);
} else {
- Z_HASH_P(&CONSTANT(opline.op2.constant)) = zend_hash_func(Z_STRVAL(CONSTANT(opline.op2.constant)), Z_STRLEN(CONSTANT(opline.op2.constant))+1);
+ CALCULATE_LITERAL_HASH
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/mssql/php_mssql.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mssql/php_mssql.c trunk/ext/mssql/php_mssql.c
felipe Wed, 21 Apr 2010 14:19:27 +
Revision: http://svn.php.net/viewvc?view=revision&revision=298255
Log:
- Fixed bug #51562 (query timeout in mssql can not be changed per query)
Patch by: ejsmont dot artur at gmail dot com
Bug: http://bugs.php.net/51562 (Open) query timeout in mssql can not be changed
per query
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/mssql/php_mssql.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.c
U php/php-src/trunk/ext/mssql/php_mssql.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2010-04-21 14:13:43 UTC (rev 298254)
+++ php/php-src/branches/PHP_5_2/NEWS 2010-04-21 14:19:27 UTC (rev 298255)
@@ -21,6 +21,8 @@
literal). (cbandy at jbandy dot com)
- Fixed bug #51607 (pg_copy_from does not allow schema in the tablename
argument). (cbandy at jbandy dot com)
+- Fixed bug #51562 (query timeout in mssql can not be changed per query).
+ (ejsmont dot artur at gmail dot com)
- Fixed bug #51445 (var_dump() invalid/slow *RECURSION* detection). (Felipe)
- Fixed bug #51393 (DateTime::createFromFormat() fails if format string
contains
timezone). (Adam)
Modified: php/php-src/branches/PHP_5_2/ext/mssql/php_mssql.c
===
--- php/php-src/branches/PHP_5_2/ext/mssql/php_mssql.c 2010-04-21 14:13:43 UTC
(rev 298254)
+++ php/php-src/branches/PHP_5_2/ext/mssql/php_mssql.c 2010-04-21 14:19:27 UTC
(rev 298255)
@@ -1221,7 +1221,9 @@
int id, num_fields;
int batchsize;
+ dbsettime(MS_SQL_G(timeout));
batchsize = MS_SQL_G(batchsize);
+
switch(ZEND_NUM_ARGS()) {
case 1:
if (zend_get_parameters_ex(1, &query)==FAILURE) {
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-04-21 14:13:43 UTC (rev 298254)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-04-21 14:19:27 UTC (rev 298255)
@@ -26,6 +26,8 @@
- Fixed bug #51607 (pg_copy_from does not allow schema in the tablename
argument). (cbandy at jbandy dot com)
- Fixed bug #51590 (JSON_ERROR_UTF8 is undefined). (Felipe)
+- Fixed bug #51562 (query timeout in mssql can not be changed per query).
+ (ejsmont dot artur at gmail dot com)
- Fixed bug #51577 (Uninitialized memory reference with oci_bind_array_by_name)
(Oracle Corp.)
- Fixed bug #51445 (var_dump() invalid/slow *RECURSION* detection). (Felipe)
Modified: php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.c
===
--- php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.c 2010-04-21 14:13:43 UTC
(rev 298254)
+++ php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.c 2010-04-21 14:19:27 UTC
(rev 298255)
@@ -1311,6 +1311,7 @@
mssql_result *result;
int id = -1;
+ dbsettime(MS_SQL_G(timeout));
batchsize = MS_SQL_G(batchsize);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|rl", &query,
&query_len, &mssql_link_index, &zbatchsize) == FAILURE) {
Modified: php/php-src/trunk/ext/mssql/php_mssql.c
===
--- php/php-src/trunk/ext/mssql/php_mssql.c 2010-04-21 14:13:43 UTC (rev
298254)
+++ php/php-src/trunk/ext/mssql/php_mssql.c 2010-04-21 14:19:27 UTC (rev
298255)
@@ -1311,6 +1311,7 @@
mssql_result *result;
int id = -1;
+ dbsettime(MS_SQL_G(timeout));
batchsize = MS_SQL_G(batchsize);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|rl", &query,
&query_len, &mssql_link_index, &zbatchsize) == FAILURE) {
--
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/mysqli/mysqli_api.c branches/PHP_5_3/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c
felipe Wed, 21 Apr 2010 12:52:24 +
Revision: http://svn.php.net/viewvc?view=revision&revision=298253
Log:
- Fix mem. leak
Changed paths:
U php/php-src/branches/PHP_5_2/ext/mysqli/mysqli_api.c
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
U php/php-src/trunk/ext/mysqli/mysqli_api.c
Modified: php/php-src/branches/PHP_5_2/ext/mysqli/mysqli_api.c
===
--- php/php-src/branches/PHP_5_2/ext/mysqli/mysqli_api.c2010-04-21
12:13:49 UTC (rev 298252)
+++ php/php-src/branches/PHP_5_2/ext/mysqli/mysqli_api.c2010-04-21
12:52:24 UTC (rev 298253)
@@ -1302,12 +1302,12 @@
{
MY_MYSQL*mysql;
zval*mysql_link = NULL;
- zval*mysql_value;
+ zval**mysql_value;
longmysql_option;
unsigned intl_value;
longret;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"Olz", &mysql_link, mysqli_link_class_entry, &mysql_option, &mysql_value) ==
FAILURE) {
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"OlZ", &mysql_link, mysqli_link_class_entry, &mysql_option, &mysql_value) ==
FAILURE) {
return;
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_INITIALIZED);
@@ -1318,13 +1318,13 @@
}
}
- switch (Z_TYPE_PP(&mysql_value)) {
+ switch (Z_TYPE_PP(mysql_value)) {
case IS_STRING:
- ret = mysql_options(mysql->mysql, mysql_option,
Z_STRVAL_PP(&mysql_value));
+ ret = mysql_options(mysql->mysql, mysql_option,
Z_STRVAL_PP(mysql_value));
break;
default:
- convert_to_long_ex(&mysql_value);
- l_value = Z_LVAL_PP(&mysql_value);
+ convert_to_long_ex(mysql_value);
+ l_value = Z_LVAL_PP(mysql_value);
ret = mysql_options(mysql->mysql, mysql_option, (char
*)&l_value);
break;
}
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c2010-04-21
12:13:49 UTC (rev 298252)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c2010-04-21
12:52:24 UTC (rev 298253)
@@ -1663,13 +1663,13 @@
{
MY_MYSQL*mysql;
zval*mysql_link = NULL;
- zval*mysql_value;
+ zval**mysql_value;
longmysql_option;
unsigned intl_value;
longret;
int expected_type;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"Olz", &mysql_link, mysqli_link_class_entry, &mysql_option, &mysql_value) ==
FAILURE) {
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"OlZ", &mysql_link, mysqli_link_class_entry, &mysql_option, &mysql_value) ==
FAILURE) {
return;
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_INITIALIZED);
@@ -1680,13 +1680,13 @@
}
}
expected_type = mysqli_options_get_option_zval_type(mysql_option);
- if (expected_type != Z_TYPE_P(mysql_value)) {
+ if (expected_type != Z_TYPE_PP(mysql_value)) {
switch (expected_type) {
case IS_STRING:
- convert_to_string_ex(&mysql_value);
+ convert_to_string_ex(mysql_value);
break;
case IS_LONG:
- convert_to_long_ex(&mysql_value);
+ convert_to_long_ex(mysql_value);
break;
default:
break;
@@ -1694,10 +1694,10 @@
}
switch (expected_type) {
case IS_STRING:
- ret = mysql_options(mysql->mysql, mysql_option,
Z_STRVAL_PP(&mysql_value));
+ ret = mysql_options(mysql->mysql, mysql_option,
Z_STRVAL_PP(mysql_value));
break;
case IS_LONG:
- l_value = Z_LVAL_PP(&mysql_value);
+ l_value = Z_LVAL_PP(mysql_value);
ret = mysql_options(mysql->mysql, mysql_option, (char
*)&l_value);
break;
default:
Modified: php/php-src/trunk/ext/mysqli/mysqli_api.c
==
Re: [PHP-CVS] svn: /php/php-src/trunk/ INSTALL NEWS README.input_filter Zend/tests/unset_cv06.phpt ext/filter/filter.c ext/mbstring/mb_gpc.c ext/mbstring/mb_gpc.h ext/mbstring/mbstring.c ext/mbstring/
Hi,
On Wed, 2010-04-21 at 01:27 +, Kalle Sommer Nielsen wrote:
> Modified: php/php-src/trunk/ext/session/session.c
> ===
> --- php/php-src/trunk/ext/session/session.c 2010-04-21 01:18:19
> UTC (rev 298240)
> +++ php/php-src/trunk/ext/session/session.c 2010-04-21 01:27:22
> UTC (rev 298241)
> @@ -131,76 +131,18 @@
[...]
> IF_SESSION_VARS() {
> - if (PS(bug_compat) && !PG(register_globals)) {
> + if (PS(bug_compat)) {
> HashTable *ht =
> Z_ARRVAL_P(PS(http_session_vars));
> HashPosition pos;
> zval **val;
> @@ -564,7 +492,7 @@
> }
>
> if (do_warn && PS(bug_compat_warn)) {
I think this compat thing can be completely drop along with r_g.
Additionally: I think one might refactor the serialization logic.
Currently each variable is serialized individually. Might be nicer to
serialize($_SESSION) as one. This breaks the session files, which should
be acceptable, but gives a bit cleaner code.
johannes
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
