archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Added TSRMLS macros into php_get_current_user()

Browse source
This commit is contained in:
Kalle Sommer Nielsen 2010-09-23 04:13:36 +00:00
parent 68b1905702
commit 1ac15b2f8e
7 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
UPGRADING.INTERNALS
View file

@ -96,3 +96,7 @@ Use emalloc, emalloc_rel, efree or efree_rel instead.
. popen_ex (win32)
TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env TSRMLS_DC);
. php_get_current_user
PHPAPI php_get_current_user(TSRMLS_D)
Call: char *user = php_get_current_user(TSRMLS_C);

2
ext/mysql/php_mysql.c
View file

@ -735,7 +735,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "SQL safe mode in effect - ignoring host/user/password information");
}
host_and_port=passwd=NULL;
user=php_get_current_user();
user=php_get_current_user(TSRMLS_C);
hashed_details_length = spprintf(&hashed_details, 0, "mysql__%s_", user);
client_flags = CLIENT_INTERACTIVE;
} else {

2
ext/mysqlnd/mysqlnd.c
View file

@ -27,8 +27,6 @@
#include "mysqlnd_statistics.h"
#include "mysqlnd_charset.h"
#include "mysqlnd_debug.h"
/* for php_get_current_user() */
#include "ext/standard/basic_functions.h"
/*
TODO :

2
ext/soap/php_sdl.c
View file

@ -3192,7 +3192,7 @@ sdlPtr get_sdl(zval *this_ptr, char *uri, long cache_wsdl TSRMLS_DC)
unsigned char digest[16];
int len = strlen(SOAP_GLOBAL(cache_dir));
time_t cached;
char *user = php_get_current_user();
char *user = php_get_current_user(TSRMLS_C);
int user_len = user ? strlen(user) + 1 : 0;
md5str[0] = '\0';

2
ext/standard/basic_functions.c
View file

@ -4471,7 +4471,7 @@ PHP_FUNCTION(get_current_user)
return;
}
RETURN_STRING(php_get_current_user(), 1);
RETURN_STRING(php_get_current_user(TSRMLS_C), 1);
}
/* }}} */

3
main/main.c
View file

@ -1087,10 +1087,9 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
/* {{{ php_get_current_user
*/
PHPAPI char *php_get_current_user(void)
PHPAPI char *php_get_current_user(TSRMLS_D)
{
struct stat *pstat;
TSRMLS_FETCH();
if (SG(request_info).current_user) {
return SG(request_info).current_user;

2
main/php.h
View file

@ -329,7 +329,7 @@ PHPAPI int php_register_internal_extensions(TSRMLS_D);
PHPAPI int php_mergesort(void *base, size_t nmemb, register size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC);
PHPAPI void php_register_pre_request_shutdown(void (*func)(void *), void *userdata);
PHPAPI void php_com_initialize(TSRMLS_D);
PHPAPI char *php_get_current_user(void);
PHPAPI char *php_get_current_user(TSRMLS_D);
END_EXTERN_C()
/* PHP-named Zend macro wrappers */