Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Felipe Pena
b26749b4e9
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky at columbia dot edu
2012-07-28 19:05:46 -03:00
Felipe Pena
068fc008c6
- Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky at columbia dot edu
2012-07-28 19:05:13 -03:00
Johannes Schlüter
b025b9d0cf
Fix #62432 ReflectionMethod random corrupt memory on high concurrent
...
This fixes the same issue in multiple extensions. This isn't needed
in later branches as 5.4 introduced object_properties_init()
2012-06-27 23:26:33 +02:00
Anatoliy Belsky
374646c36b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
updated the libmagic.patch
Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails
Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails
- update to openssl 0.9.8u
Conflicts:
ext/fileinfo/tests/finfo_open_001.phpt
ext/fileinfo/tests/finfo_open_error.phpt
win32/build/libs_version.txt
2012-04-02 17:36:50 +02:00
Anatoliy Belsky
0cdba53aae
Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails
2012-04-02 17:19:09 +02:00
Stanislav Malyshev
5e80c05deb
MFH: Fixed bug #61173 (Unable to detect error from finfo constructor).
2012-03-07 07:38:57 +00:00
Gustavo André dos Santos Lopes
48666d9ffc
- Fixed bug #61173 (Unable to detect error from finfo constructor).
...
- Tidied up NEWS
2012-02-24 10:01:39 +00:00
Felipe Pena
e4ca0ed09f
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
90cd6482b3
- Fixed memory leak when calling the Finfo constructor twice
2011-11-23 01:20:49 +00:00
Felipe Pena
b6137f4cb1
- Fixed memory leak when calling the Finfo constructor twice
2011-11-23 01:20:49 +00:00
Xinchen Hui
d09d0c83cb
Eliminated compiler's warnings and make static analyzer silent
2011-08-09 05:11:19 +00:00
Xinchen Hui
a60513240f
Eliminated compiler's warnings and make static analyzer silent
2011-08-09 05:11:19 +00:00
Pierre Joye
15383e046e
- do safemode/open basedir checks 1st, and use only expand not realpath (it is done by the safemode/openbasedir check already)
2011-07-27 14:58:30 +00:00
Felipe Pena
23e438594d
- Make usage of new PHP_FE_END macro
2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50
- Make usage of new PHP_FE_END macro
2011-07-25 11:35:02 +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
Hannes Magnusson
d1d61ce612
Bug#54016 (finfo_file() Cannot determine filetype in archives)
2011-02-14 15:32:02 +00:00
Hannes Magnusson
7c1a9e37ca
Bug#54016 (finfo_file() Cannot determine filetype in archives)
2011-02-14 15:32:02 +00:00
Felipe Pena
914152d6d8
- Year++
2011-01-01 02:51:27 +00:00
Felipe Pena
7ae96bcf35
- Year++
2011-01-01 02:51:18 +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
Dmitry Stogov
c5237d82bf
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 14:11:39 +00:00
Pierre Joye
cdadeed834
- Fixed bug #51732 , Fileinfo __construct or open does not work with NULL
2010-05-04 08:48:58 +00:00
Pierre Joye
fdf0395e49
- Fixed bug #51732 , Fileinfo __construct or open does not work with NULL
2010-05-04 08:48:58 +00:00
Kalle Sommer Nielsen
cb30330800
Merge safe_mode changes into extensions that are in sync in both branches
2010-04-26 23:55:03 +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
Johannes Schlüter
26b08f9857
Remove main/php3_compat.h, for that a few references to function_entry
have
...
to be replaced by `zend_function_entry`.
2010-03-30 23:03:02 +00:00
Scott MacVicar
a090cd733a
Fix BC break in mime_content_type()
2009-08-11 23:05:13 +00:00
Scott MacVicar
7a29c8f386
MFH Update fileinfo to libmagic 5.00 and remove dependency on dirent.h on Windows
2009-03-15 23:04:19 +00:00
Scott MacVicar
372256b002
MFH Remove all of the stuff we have in here for pre PHP 5.2 support and memset the fileinfo struct.
2008-12-22 16:45:07 +00:00
Felipe Pena
fc2fb50d09
- MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro
2008-11-17 11:28:01 +00:00
Felipe Pena
7a37fa2d6b
- Revert ZEND_BEGIN_ARG_INFO change
2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563
- MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro
2008-10-24 14:35:40 +00:00
Antony Dovgal
02022c766c
MFH: fix compile warning
2008-09-16 09:48:17 +00:00
Scott MacVicar
3940782c25
MFH: Fix memory leak in a few cases
2008-09-16 09:46:24 +00:00
Scott MacVicar
b845244370
Missed variable declaration.
2008-09-15 22:16:25 +00:00
Scott MacVicar
db907e5bc3
Fixed bug #46086 (Segfault when accessing fileinfo class property)
2008-09-15 22:13:25 +00:00
Antony Dovgal
8209f891a4
MFH
2008-09-13 21:32:21 +00:00
Pierre Joye
c8a0c3b0f5
- don't close caller streams in libmagic (prevent leak and zombie stream)
...
- string returned by magic_* are freed on magic_close, duplicate before
calling magic_close (set return value)
- if stat failed, don't try to call magic_* (when FILEINFO_MODE_FILE)
2008-09-02 10:15:54 +00:00
Felipe Pena
d13b704d25
- Fixed mime_content_type() behavior when a string is given
...
- Fixed check for "empty file name"
- MFH: New test
2008-09-01 23:44:00 +00:00
Pierre Joye
99041160df
- use php's stream in libmagic
...
- remove duplicate code (like mime_content_type() compatibility function
now use the same base as finfo_file())
- make it portable (works now on windows too, belongs other OSes)
- ([20:28] <lsmith> Pierre: ok please commit)
2008-09-01 18:56:06 +00:00
Antony Dovgal
fa978e8595
MFH: check for \0 to be consistent with other functions
2008-08-29 13:48:38 +00:00
Derick Rethans
057b2401bf
- Disable COMPRESS support for now, as it requires forking.
...
# @DOC [DOC] "DOC"
2008-08-29 13:39:01 +00:00
Derick Rethans
4ca7e129a7
- MFH: Adding back in mime_content_type().
2008-08-29 13:29:42 +00:00
Antony Dovgal
3bd40d9000
fix file check and avoid segfault
2008-08-27 07:40:44 +00:00
Felipe Pena
7208556ca4
- MFH: Fixed check for empty file name
2008-08-27 01:04:23 +00:00
Felipe Pena
d8c43bde79
- MFH: Improved fix
2008-08-26 16:22:27 +00:00
Felipe Pena
727990f432
- MFH: Added check for empty file name
2008-08-26 15:06:28 +00:00