clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,498 Commits 494 Branches 1,367 Tags 801 MiB
f804a3614e
Commit Graph

555 Commits

Author SHA1 Message Date
Michael Wallner
1e06c73192 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix integer overflow in {stream,file}_{get,put}_contents()
 2014-07-02 09:55:15 +02:00
Michael Wallner
34e686c556 fix integer overflow in {stream,file}_{get,put}_contents() 2014-07-02 09:53:03 +02:00
Stanislav Malyshev
5addf223d5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #65701: Do not use cache for file file copy
 2014-04-20 15:25:03 -07:00
Boro Sitnikovski
a18cec1b86 Fix bug #65701: Do not use cache for file file copy 2014-04-20 15:22:44 -07:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Joey Smith
2139d2702d Expose fputcsv's escape_char to userland 
Allows users to assert that something other than the backslash
should be considered an escape char; also follows the RFC 4180
recommendation that fields containing a " be enclosed.
 2013-08-24 20:45:14 -07:00
Stanislav Malyshev
748b37654d complete zts fix 2013-01-29 12:12:34 -08:00
Jille Timmermans
dba22c0864 Dereferencing process-handles no longer waits on those processes. 
Implements FR #46487
 2013-01-15 21:50:35 +01:00
Andrey Hristov
22ba2b95ce Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-01-15 11:06:59 +01:00
Adam Harvey
b1bf524140 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Revert "Update fputcsv() to escape all characters equally."
 2013-01-15 17:35:34 +08:00
Adam Harvey
c077074c13 Revert "Update fputcsv() to escape all characters equally." 
On second thoughts, while the behaviour _is_ broken, this isn't the right fix.

This reverts commit 9b5cb0e805.
 2013-01-15 17:33:54 +08:00
Adam Harvey
ba32970710 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update fputcsv() to escape all characters equally.
 2013-01-15 15:26:25 +08:00
Adam Harvey
a4191b0aad Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Update fputcsv() to escape all characters equally.
 2013-01-15 15:24:21 +08:00
Adam Harvey
9b5cb0e805 Update fputcsv() to escape all characters equally. 
At present, backslashes have special case handling within fputcsv(): when one
is encountered within a field that's being escaped, escaping stops until the
next instance of the enclosure character is hit.  This can result in malformed
CSV.

Fixes bug #43225 (fputcsv incorrectly handles cells ending in \ followed by ").
 2013-01-15 15:17:45 +08:00
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