archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
130029 commits 526 branches 1434 tags 877 MiB
Commit graph

786 commits

Author SHA1 Message Date
Xinchen Hui
e7535e06e6 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build)
 2012-07-18 20:17:42 +08:00
Xinchen Hui
2d9d2cadad Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build) 2012-07-18 20:16:27 +08:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
1f81004be2 - Fixed bug #52624 (tempnam() by-pass open_basedir with inexistent directory) 2011-11-15 16:59:59 +00:00
Felipe Pena
5f0e6a74ba - Fixed bug #52624 (tempnam() by-pass open_basedir with inexistent directory) 2011-11-15 16:59:59 +00:00
Felipe Pena
fb37f3b20d - Fixed bug #52624 (tempnam() by-pass open_basedir with inexistent directory) 2011-11-15 16:59:59 +00:00
Xinchen Hui
84c94e29c9 Fixed Bug #55674 (fgetcsv & str_getcsv skip empty fields in some tab-separated records) which was introduced by r311543 2011-09-13 12:44:13 +00:00
Xinchen Hui
54d48bb31f Fixed Bug #55674 (fgetcsv & str_getcsv skip empty fields in some tab-separated records) which was introduced by r311543 2011-09-13 12:44:13 +00:00
Xinchen Hui
1bbda643f2 Fixed Bug #55674 (fgetcsv & str_getcsv skip empty fields in some tab-separated records) which was introduced by r311543 2011-09-13 12:44:13 +00:00
Pierre Joye
9805e1674a - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Pierre Joye
cc1c7af037 - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
David Soria Parra
cad2e53064 Fix #55212. Only declare STREAM_PF_INET6 if PHP is compiled with IPv6 support 2011-07-15 15:25:24 +00:00
David Soria Parra
fa79f2f46b Fix #55212. Only declare STREAM_PF_INET6 if PHP is compiled with IPv6 support 2011-07-15 15:25:24 +00:00
Felipe Pena
8d6e997315 - Opss, restore old behavior 2011-06-19 14:50:44 +00:00
Felipe Pena
3276cc4f7a - Opss, restore old behavior 2011-06-19 14:50:44 +00:00
Felipe Pena
868b808f4c - Opss, restore old behavior 2011-06-19 14:50:44 +00:00
Felipe Pena
0806f78f77 - Added missing void param check in sys_get_temp_dir 
- Fixed param check of umask()
 2011-06-19 14:27:33 +00:00
Felipe Pena
54d5662919 - Added missing void param check in sys_get_temp_dir 
- Fixed param check of umask()
 2011-06-19 14:27:33 +00:00
Felipe Pena
d8782ddaeb - Added missing void param check in sys_get_temp_dir 
- Fixed param check of umask()
 2011-06-19 14:27:33 +00:00
Felipe Pena
e98eafeedf - Missing usage of 'p' parameter specifier 2011-06-19 13:20:12 +00:00
Felipe Pena
b9746b0ba6 - Missing usage of 'p' parameter specifier 2011-06-19 13:20:12 +00:00
Felipe Pena
32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle)) 
# The tests will be fixed in the next commits
 2011-06-06 21:28:16 +00:00
Felipe Pena
4737910b69 - Added new parameter parsing option (p - for valid path (string without null byte in the middle)) 
# The tests will be fixed in the next commits
 2011-06-06 21:28:16 +00:00
Ilia Alshanetsky
34de2c30c5 Fixed bug #53848 (fgetcsv() ignores spaces at beginnings of fields). 2011-05-29 10:23:06 +00:00
Ilia Alshanetsky
69a12bfb3f Fixed bug #53848 (fgetcsv() ignores spaces at beginnings of fields). 2011-05-29 10:23:06 +00:00
Ilia Alshanetsky
57674f784f Fixed bug #53848 (fgetcsv() ignores spaces at beginnings of fields). 2011-05-29 10:23:06 +00:00
Rasmus Lerdorf
a5eeecb13f Suppress a dozen unused return value warnings in places where the return 
value is really not useful to us.
 2011-05-16 17:22:41 +00:00
Rasmus Lerdorf
575ea1ef0b Suppress a dozen unused return value warnings in places where the return 
value is really not useful to us.
 2011-05-16 17:22:41 +00:00
Gustavo André dos Santos Lopes
7f2937223d - Make fclose() actually close stream, even when the resource refcount is > 1. 
This reverts the fix for bug #24557.
- Make php_stream_free delete the stream from the resources list, not merely
  decrease its refcount, as a single call to zend_list_delete does.           
#Not worth the risk merging to 5.3. While change #2 may prevent some segfaults,
#a quick and dirty survey to the codebase only showed calls to php_stream_close
#or php_stream_free on streams allocated in the same function, which would have
#refcount == 1. May be reconsidered.
 2011-03-21 02:58:54 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Pierre Joye
ce96fd6b07 - fix #39863, do not accept paths with NULL in them. See http://news.php.net/php.internals/50191, trunk will have the patch later (adding a macro and/or changing (some) APIs. Patch by Rasmus 2010-11-18 15:22:22 +00:00
Gustavo André dos Santos Lopes
75631ab8ac - Implemented alternative strategy for change in rev #304985 so as to 
not to break binary compatibility in the 5.3 branch.
 2010-11-18 12:10:17 +00:00
Adam Harvey
6cb7ea4089 Implemented FR #53264 (Add fputcsv method to SplFileObject). 2010-11-09 15:07:50 +00:00
Gustavo André dos Santos Lopes
231da1a5cb - Fixed bug #53198 (changing INI setting "from" with ini_set did not have any 
effect)
#Made "from" a proper INI setting and bound it to a global variable.
#Previously, it was simply read from the hash table with the parsed ini file
#by using cfg_get_string (I wonder why this mechanism still exists...)
 2010-10-29 15:29:15 +00:00
Gustavo André dos Santos Lopes
5c09767d4b - Fixed bug #53198 (changing INI setting "from" with ini_set did not have any 
effect)
#Made "from" a proper INI setting and bound it to a global variable.
#Previously, it was simply read from the hash table with the parsed ini file
#by using cfg_get_string (I wonder why this mechanism still exists...)
 2010-10-29 15:29:15 +00:00
Pierre Joye
aa0ed267a2 - use TSRMLS_*C instead of TSRMLS_FETCH in zend_list_insert 2010-09-16 09:13:19 +00:00
Adam Harvey
6e06a45f24 Fix bug #52802 (Out-of-date comment for 
file_get_contents/php_stream_copy_to_mem) by updating the relevant comments.
 2010-09-10 03:08:05 +00:00
Adam Harvey
2441ddf10e Fix bug #52802 (Out-of-date comment for 
file_get_contents/php_stream_copy_to_mem) by updating the relevant comments.
 2010-09-10 03:08:05 +00:00
Kalle Sommer Nielsen
5a3624221b Fixed the $context parameter on copy() to have an effect (approved for 5.3 by Johannes) 
# To not change a PHPAPI in a point release, a new function have been added to support contexts:
# php_copy_file_ctx(), php_copy_file_ex() now simply wraps to that
 2010-08-17 12:17:28 +00:00
Kalle Sommer Nielsen
a12f6d9312 Fixed the $context parameter on copy() to have an effect (approved for 5.3 by Johannes) 
# To not change a PHPAPI in a point release, a new function have been added to support contexts:
# php_copy_file_ctx(), php_copy_file_ex() now simply wraps to that
 2010-08-17 12:17:28 +00:00
Kalle Sommer Nielsen
ac73c9d8b4 Fixed the context parameter on copy() to actually have an effect 
# After looking at the logs, Jani did a bad merge into 5.3, so that 
# the context parameter sent to copy() actually isn't used at all. This 
# relatively simple patch fixes that for trunk.
#
# See FR #42965

# internals:
# This changes the php_copy_*() decls to contain an additional parameter for stream contexts
 2010-08-16 21:56:35 +00:00
Felipe Pena
151fc3b7c0 - Revert accidental changes 2010-05-02 20:11:22 +00:00
Ilia Alshanetsky
74d4ddea3d - Fixed a possible stack exaustion inside fnmatch(). Reporeted by Stefan Esser 2010-05-02 19:34:21 +00:00
Ilia Alshanetsky
90c336026e - Fixed a possible stack exaustion inside fnmatch(). Reporeted by Stefan Esser 2010-05-02 19:34:21 +00:00
Pierrick Charron
91ee07814e Remove unused variables 2010-04-27 00:09:55 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode 
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
 2010-04-26 23:53:30 +00:00
Andrei Zmievski
f92fae2f66 I am sorry I tried fixing PHP without extensive discussion on the mailing list. 
I am sorry I tried fixing PHP without extensive discussion on the mailing list.
I am sorry I tried fixing PHP without extensive discussion on the mailing list.

Hope all the relevant parties are satisfied.
 2010-03-18 22:37:25 +00:00