diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2014-05-13 06:51:45 +0200 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2014-05-13 06:51:45 +0200 |
| commit | bc0161b72063f79bd80af3cfefe28a4f20115610 (patch) | |
| tree | 16abc6bc60533d2e39b4a6d418351191050cabb5 /ext/session/mod_files.c | |
| parent | d24c5de1732d44937ee33ba4a198d13af8f69fc9 (diff) | |
| parent | 618de55485965f3ca6e1fecafd9414da3afa6d5c (diff) | |
| download | php-git-bc0161b72063f79bd80af3cfefe28a4f20115610.tar.gz | |
Merge branch 'phpng' of git.php.net:php-src into phpng
# By Dmitry Stogov (5) and others
# Via Xinchen Hui (3) and Dmitry Stogov (1)
* 'phpng' of git.php.net:php-src:
restore unexpected commit
Convert to unpacked before deleting elements
- Fixed ZTS build
Fix memory error in spl_directory.c
Fix spl_directory cast_object, reenable error
Support for ext/phar (all tests passed)
ext/phar support (incomplete)
Fixed double free (xmlrpc is done, 1 test failed due to knew issue)
Fixed typo
Refactoring ext/xmlrpc (incompleted)
Removed error message that breaks phar
ext/phar support (incomplete)
Refactor ext/gd (all tests passes)
Fixed wrong buffer length (added place for terminating zero)
Diffstat (limited to 'ext/session/mod_files.c')
| -rw-r--r-- | ext/session/mod_files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index 3e577bc28a..dd9361b34e 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -475,7 +475,7 @@ PS_CREATE_SID_FUNC(files) PS_FILES_DATA; do { - sid = php_session_create_id((void**)&data TSRMLS_C); + sid = php_session_create_id((void**)&data TSRMLS_CC); /* Check collision */ if (data && ps_files_key_exists(data, sid? sid->val : NULL TSRMLS_CC) == SUCCESS) { if (sid) { |