Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332
Happy New Year~
2013-01-01 16:02:16 +08:00
Xinchen Hui
8848778a59
Merge fix e7535e06e6
to 5.3
...
thanks for reeze.xia@gmail.com notice this
2012-08-15 01:06:10 +08:00
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
Andrei Zmievski
3220f15ca2
Fix a few problems with large (2G-4G) file uploads. Added
...
--enable-large-uploads-fix switch because one change was in SAPI.h structure.
2010-03-18 21:07:38 +00:00
Ilia Alshanetsky
ad9bbf26ab
Fixed safe_mode validation inside tempnam() when the directory path does not end with a /).
2010-02-11 12:32:21 +00:00
Sebastian Bergmann
9ba1e81665
sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php
2010-01-03 09:23:27 +00:00
Guenter Knauf
824692fab8
removed now obsolete NetWare hack since I fixed this
...
with Novell some longer time ago in their SDK header.
2009-11-03 21:21:34 +00:00
Rasmus Lerdorf
80bdbc8f66
Fixed a safe_mode bypass in tempnam() identified by Grzegorz Stachowiak.
2009-09-29 14:14:02 +00:00
Felipe Pena
20c5df8cce
- Fixed mem leak
2009-09-25 01:46:58 +00:00
Ilia Alshanetsky
eb2d54822b
Make tempnam() return FALSE on error as documented
2009-09-24 18:59:28 +00:00
Felipe Pena
56d7a43f00
- Fixed bug #48641 (tmpfile() uses old parameter parsing)
2009-06-22 11:37:30 +00:00
Ilia Alshanetsky
529bcf35c2
MFB: Improve fix for bug #48313
2009-05-24 16:01:48 +00:00
Jani Taskinen
2e61607c8a
MFH: ws
2009-05-21 02:15:03 +00:00
Ilia Alshanetsky
e99d4e9adc
Fixed bug #48313 (fgetcsv() does not return null for empty rows)
2009-05-18 18:45:30 +00:00
Arnaud Le Blanc
1d13e22f41
Fix invalid read
2009-05-08 09:44:17 +00:00
Arnaud Le Blanc
8ea9eb8560
MFH: Better fix for #47997
2009-04-19 17:10:35 +00:00
Arnaud Le Blanc
14c717f449
Fixed bug #47997 (stream_copy_to_stream returns 1 on empty streams)
2009-04-19 13:46:47 +00:00
Pierre Joye
d0c201d3f4
- [DOC] add support for fnmatch() on Windows
...
- enable tests (pass)
2009-01-20 01:40:06 +00:00
Sebastian Bergmann
08659c2dcd
MFH: Bump copyright year, 3 of 3.
2008-12-31 11:15:49 +00:00
Lars Strojny
dda00318d9
One len variable is enough here, we can reuse it
2008-12-13 15:06:20 +00:00
Hannes Magnusson
e5c13558e8
MFH: Fixed bug#46681 (mkdir() fails silently on PHP 5.3)
2008-12-12 12:44:48 +00:00
Arnaud Le Blanc
dffdb48c3b
MFH: Fixed bug #46673 (stream_lock call with wrong paramater)
2008-11-26 04:19:20 +00:00
Felipe Pena
8f12025b21
- MFH: Added str_getcsv()
2008-11-02 18:24:34 +00:00
Arnaud Le Blanc
d69dfa4b9f
MFH: initialize optional vars
2008-10-21 22:08:38 +00:00
Felipe Pena
b861898fc7
- MFH: Fixed unexpected zval changes
2008-09-12 01:14:14 +00:00
Felipe Pena
318efa7f10
- New parameter parsing API (for fscanf)
2008-08-12 19:38:54 +00:00
Pierre Joye
7023ed85d7
- [DOC] MFH: detect if dest is a dir (if the given stream layer supports stat)
...
and fails
. remove win32 specific test. The errors are not the same
2008-08-11 13:11:31 +00:00
Antony Dovgal
28a22396d4
MFH: invert the logics - FLAG_FCLOSE -> FLAG_NO_FCLOSE
2008-07-23 11:25:14 +00:00
Felipe Pena
fdfbfb96a1
- MFH: Fixed bug #44246 (closedir() accepts a file resource opened by fopen())
2008-07-22 14:09:24 +00:00
Jani Taskinen
89935d6f7e
- Forward compatibility.
...
# @DOC@, [DOC], *DOC*: Added FILE_TEXT and FILE_BINARY constants for forward compatibility.
2008-07-21 11:46:18 +00:00
Antony Dovgal
cf7e15c3a0
MFH: manage references of stream context properly
2008-07-11 10:25:15 +00:00
Olivier Hill
e360ff7476
New parameter parsing API
2008-07-03 20:19:26 +00:00
Felipe Pena
04a87d9f63
- Changed 'Z' to 's' (parameter parsing), the code didn't check if the parameter is a string.
2008-05-16 12:44:11 +00:00
Etienne Kneuss
94697acff9
MFH: Fix protos
2008-05-04 21:17:33 +00:00
Ilia Alshanetsky
753529325e
MFB: Fixed bug #44034 (FILE_IGNORE_NEW_LINES in file() does not work as
...
expected when lines end in \r\n)
2008-04-15 15:48:20 +00:00
Ilia Alshanetsky
f704d2d37d
Added a warning message
2008-03-30 15:05:48 +00:00
Ilia Alshanetsky
17d22a50d9
Fixed bug #44501 (LOCK_EX mode in file_put_contents() is impropertly
...
handled in combination with url wrappers)
2008-03-26 23:06:47 +00:00
Felipe Pena
e947263bda
Removed internal warning
2008-02-24 11:45:55 +00:00
Marcus Boerger
d3e5026564
- MFH Add E_DEPRECATED (Lars Strojny, Felipe Pena, Marcus)
...
[DOC] Finally added deprecation messages
2008-02-23 17:06:22 +00:00
Sebastian Bergmann
d1dded8751
MFH: Bump copyright year, 2 of 2.
2007-12-31 07:17:19 +00:00
Antony Dovgal
afc76bc71f
fix typo (nice catch, Nuno!)
2007-11-13 10:31:24 +00:00
Ilia Alshanetsky
6a792bed75
Fixed bug #43182 (file_put_contents() LOCK_EX does not work properly on file
...
truncation).
2007-11-12 18:44:18 +00:00
Dmitry Stogov
f95ac18b82
Conditions optimization
2007-11-09 11:08:22 +00:00
Jani Taskinen
77d2a15a97
MFH: sync
2007-11-06 17:11:57 +00:00
Jani Taskinen
43e73a56ab
MFH: Sync
...
[DOC]: note
[DOC] -/* {{{ proto bool copy(string source_file, string destination_file)
[DOC] +/* {{{ proto bool copy(string source_file, string destination_file [, resource context])
[DOC]
[DOC] Apparently this was undocumented so far anyway..
2007-11-05 17:43:04 +00:00
David Soria Parra
d4e8fa62c6
MFH: Add an escape parameter to fgetcsv to satisfy rfc4180 and bug #40501 .
...
[DOC] 5th parameter available since PHP 5.3+
2007-10-03 10:44:32 +00:00
Ilia Alshanetsky
72f910c012
Fixed possible buffer overflows inside the fnmatch() and glob() functions
2007-09-04 12:51:49 +00:00
Ilia Alshanetsky
09cad322fa
Fixed bug #42468 (Write lock on file_get_contents fails when using a
...
compression stream).
2007-09-03 02:53:56 +00:00
Ilia Alshanetsky
fb8e3abe88
Fixed copy test as well as the directory check inside copy() function
2007-08-12 17:09:59 +00:00