Anatol Belski
06a526be3e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:12:33 +01:00
Anatol Belski
bb935ff8dc
Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:10:10 +01:00
Stanislav Malyshev
4c293bfe91
Merge branch 'PHP-5.5'
...
* PHP-5.5:
news for bug #49348
fix tests
fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
2013-02-21 00:57:52 -08:00
Stanislav Malyshev
0c6d903ce7
fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
2013-02-18 20:56:02 -08:00
Joey Smith
c3acefd9ea
Fix a typo in the ZipArchive error messages
2013-01-08 14:18:31 -07: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
Anatoliy Belsky
d304527253
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Added test for bug #51353 . It'll be skipped by default and must be activated manually.
2012-08-21 13:24:54 +02:00
Anatoliy Belsky
92153dcfe3
Added test for bug #51353 . It'll be skipped by default and must be
...
activated manually.
2012-08-21 13:22:00 +02: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
34bd1c941b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
sync zip ext version with pecl
2012-06-19 17:17:11 +02:00
Anatoliy Belsky
e793539678
sync zip ext version with pecl
2012-06-19 17:15:56 +02:00
Anatoliy Belsky
c56ff2bf75
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Reverted the BC fix regarding to #57905 , test adopted
2012-06-17 16:10:56 +02:00
Anatoliy Belsky
d3780f1f90
Reverted the BC fix regarding to #57905 , test adopted
...
New 0.10.1 has a stronger archive integrity check. Restoring
the old behaviour of libzip < 0.10.1 makes no sense at this
place.
2012-06-17 16:04:36 +02:00
Anatoliy Belsky
d24d5b62c1
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
set current versions for libzip and zip ext
2012-06-07 22:37:32 +02:00
Anatoliy Belsky
baacc2cb13
set current versions for libzip and zip ext
2012-06-07 22:32:03 +02:00
Anatoliy Belsky
5ebdc46aa0
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
zip windows fixes
fixed bc break related to #57905
fixed a bit overlooked from the last libzip port
brought the fix for #47667 back
fixed zip entry freeing
rechecked the merged libzip, took also the indents from the original to avoid confusion next time
fixed a double freeing crash
fixed header include
initial libzip upgrade patch to 0.10.1
- BFN
Conflicts:
NEWS
2012-06-07 21:06:31 +02:00
Anatoliy Belsky
bde0e8c2a1
zip windows fixes
2012-06-07 21:01:32 +02:00
Anatoliy Belsky
8ca457f64d
fixed bc break related to #57905
2012-06-07 21:01:32 +02:00
Anatoliy Belsky
e883892664
fixed a bit overlooked from the last libzip port
2012-06-07 21:01:32 +02:00
Anatoliy Belsky
b8cdc731b8
brought the fix for #47667 back
2012-06-07 21:01:32 +02:00
Anatoliy Belsky
a37e84e549
fixed zip entry freeing
2012-06-07 21:01:32 +02:00
Anatoliy Belsky
f4a44f18b8
rechecked the merged libzip, took also the indents from the original to
...
avoid confusion next time
2012-06-07 21:01:31 +02:00
Anatoliy Belsky
a39bcfc5ee
fixed a double freeing crash
2012-06-07 21:01:31 +02:00
Anatoliy Belsky
9a2365412e
fixed header include
2012-06-07 21:01:31 +02:00
Anatoliy Belsky
335a11b14b
initial libzip upgrade patch to 0.10.1
2012-06-07 21:01:31 +02: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
Ilia Alshanetsky
172d037068
Removed unreachable code (stream == NULL check is done already)
2011-09-21 19:08:30 +00:00
Hannes Magnusson
a6c07ae0d3
Fix cleanup routines
2011-09-07 12:05:19 +00:00
Hannes Magnusson
04044dd07e
Fix cleanup routines
2011-09-07 12:05:19 +00:00
Shein Alexey
920fa567bd
Removed old (< 5.3) version of test and cleaned up the actual version.
2011-09-02 17:41:39 +00:00
Shein Alexey
258591bdc6
Removed old (< 5.3) version of test and cleaned up the actual version.
2011-09-02 17:41:39 +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
Felipe Pena
1c24911a46
- Fixed bug #54681 (addGlob() crashes on invalid flags)
2011-05-07 01:58:26 +00:00
Felipe Pena
c11e307ae0
- Fixed bug #54681 (addGlob() crashes on invalid flags)
2011-05-07 01:58:26 +00:00
Pierre Joye
5b521b71a2
- Fixed bug #53893 (Wrong return value for ZipArchive::extractTo())
2011-02-07 16:20:16 +00:00
Pierre Joye
169c5dc2b7
- Fixed bug #53893 (Wrong return value for ZipArchive::extractTo())
2011-02-07 16:20:16 +00:00
Adam Harvey
07fb5ca429
Change the way HAVE_GLOB is dealt with in ext/zip per IRC conversation with
...
Pierre.
2011-02-04 11:51:29 +00:00
Adam Harvey
793cfe1376
Change the way HAVE_GLOB is dealt with in ext/zip per IRC conversation with
...
Pierre.
2011-02-04 11:51:29 +00:00
Adam Harvey
fcc7922ff1
Fix bug #53923 (Zip functions assume HAVE_GLOB is defined).
2011-02-04 10:50:42 +00:00
Adam Harvey
4bf6559ed0
Fix bug #53923 (Zip functions assume HAVE_GLOB is defined).
2011-02-04 10:50:42 +00:00
Gustavo André dos Santos Lopes
5ca051bf38
- Fixed bug #49072 (feof never returns true for damaged file in zip).
2011-02-01 14:44:29 +00:00
Gustavo André dos Santos Lopes
28cd40919d
- Fixed bug #49072 (feof never returns true for damaged file in zip).
2011-02-01 14:43:52 +00:00
Pierre Joye
973ca132a4
- WS
2011-02-01 10:57:51 +00:00
Pierre Joye
fcdc76be21
- WS
2011-02-01 10:57:51 +00:00
Stanislav Malyshev
f0d42e74a9
fix bug 53885 (ZipArchive segfault with FL_UNCHANGED on empty archive)
2011-01-30 22:28:57 +00:00
Stanislav Malyshev
4a2b458835
fix bug 53885 (ZipArchive segfault with FL_UNCHANGED on empty archive)
2011-01-30 22:28:57 +00:00
Felipe Pena
b45066df97
- Fixed bug #53867 (Test failure)
...
patch by: rquadling at php.net
2011-01-28 20:41:54 +00:00
Felipe Pena
0e7c00f3a6
- Fixed bug #53867 (Test failure)
...
patch by: rquadling at php.net
2011-01-28 20:41:54 +00:00
Adam Harvey
c5f06eff15
Fixed bug #53854 (Missing constants for compression type). Patch by Richard
...
Quadling.
2011-01-28 04:19:40 +00:00
Adam Harvey
d56de24ce7
Fixed bug #53854 (Missing constants for compression type). Patch by Richard
...
Quadling.
2011-01-28 04:19:40 +00:00
Adam Harvey
6bf5a8593b
Fix zip test.
2011-01-28 03:55:34 +00:00
Adam Harvey
7ac71b4f7f
Fix zip test.
2011-01-28 03:55:34 +00:00
Pierre Joye
9d568bb4f5
- Fix bug #53166 , missing parameters in reflections/docs
2011-01-27 11:47:24 +00:00
Pierre Joye
36854c3cad
- Fix bug #53166 , missing parameters in reflections/docs
2011-01-27 11:47:24 +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
Hannes Magnusson
ac216eb88c
New test for stream_meta_data($zipstream)
2010-12-30 17:41:36 +00:00
Hannes Magnusson
a0ca628aa3
New test for stream_meta_data($zipstream)
2010-12-30 17:41:36 +00:00
Gustavo André dos Santos Lopes
e7d5c4a8fd
- Fixed bug #53603 (ZipArchive should quiet stat errors).
...
#It is unclear if url_stat handlers should emit a warning in case
#PHP_STREAM_URL_STAT_QUIET is not specified and the resource does
#not exist. Most url_stat handlers never emit messages; the plain
#one does only so in the extraordinary event of an open_basedir
#restriction.
#But in case, php_stat uses PHP_STREAM_URL_STAT_QUIET for the
#FS_EXISTS, which suggests that mere checks on file existence are
#supposed to use this flag (arguably).
#The downside is that important diagnostic messages might be
#omitted.
2010-12-24 22:38:36 +00:00
Gustavo André dos Santos Lopes
44d0082823
- Fixed bug #53603 (ZipArchive should quiet stat errors).
...
#It is unclear if url_stat handlers should emit a warning in case
#PHP_STREAM_URL_STAT_QUIET is not specified and the resource does
#not exist. Most url_stat handlers never emit messages; the plain
#one does only so in the extraordinary event of an open_basedir
#restriction.
#But in case, php_stat uses PHP_STREAM_URL_STAT_QUIET for the
#FS_EXISTS, which suggests that mere checks on file existence are
#supposed to use this flag (arguably).
#The downside is that important diagnostic messages might be
#omitted.
2010-12-24 22:38:36 +00:00
Hannes Magnusson
3ce18aa852
Fixed bug#53579 (stream_get_contents() segfaults on ziparchive streams)
...
Also added the filename being access to the stream_get_meta_data() array
2010-12-20 11:00:27 +00:00
Hannes Magnusson
bbd23afa98
Fixed bug#53579 (stream_get_contents() segfaults on ziparchive streams)
...
Also added the filename being access to the stream_get_meta_data() array
2010-12-20 11:00:27 +00:00
Gustavo André dos Santos Lopes
9a52c2f370
- Fixed bug #53568 (swapped memset arguments in struct initialization).
2010-12-17 23:05:26 +00:00
Gustavo André dos Santos Lopes
2070f153f9
- Fixed bug #53568 (swapped memset arguments in struct initialization).
2010-12-17 23:05:26 +00:00
Pierre Joye
0beae1e558
- that should not have been applied
2010-12-13 18:45:53 +00:00
Pierre Joye
aea6771d19
- add phpize support for windows, need a nmake install for now (nmake devel-pkg version is coming), works exactly the same as on unix, or should :)
2010-12-13 18:43:10 +00:00
Pierre Joye
761c62267f
Fixed crash in zip extract method (possible CWE-170)
2010-11-30 11:04:06 +00:00
Pierre Joye
e8817ab0a6
Fixed crash in zip extract method (possible CWE-170)
2010-11-30 11:04: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
Pierrick Charron
6f7821a82d
Remove unused variables
2010-11-17 17:55:18 +00:00
Pierrick Charron
71dfe80e05
Remove unused variables
2010-11-17 17:55:18 +00:00
Rasmus Lerdorf
d91c4be0d6
ws fix
2010-11-15 09:04:27 +00:00
Pierre Joye
6f1cfe3e7f
- fix type and silent warning
2010-11-03 21:50:03 +00:00
Pierre Joye
e61005f712
- fix type and silent warning
2010-11-03 21:50:03 +00:00
Pierre Joye
3b337020fa
- add stat support for zip://
2010-11-03 21:48:08 +00:00
Pierre Joye
6c3ddc70ed
- add stat support for zip://
2010-11-03 21:48:08 +00:00
Pierre Joye
defd00ab01
- fix Fixed NULL pointer dereference in ZipArchive::getArchiveComment, (CVE-2010-3709), report&patch from Maksymilian Arciemowicz
2010-10-19 09:56:11 +00:00
Pierre Joye
6ab767262c
- fix Fixed NULL pointer dereference in ZipArchive::getArchiveComment, (CVE-2010-3709), report&patch from Maksymilian Arciemowicz
2010-10-19 09:55:36 +00:00
Ilia Alshanetsky
9aafc5d1c6
Fixed a compiler warning
2010-09-20 12:48:27 +00:00
Ilia Alshanetsky
2f9da7fce0
Fixed a compiler warning
2010-09-20 12:48:27 +00:00
Pierre Joye
100228aae1
- use TSRMLS_CC instead of TSRMLS_FETCH in virtual_file_ex
2010-08-30 09:38:47 +00:00
Pierre Joye
05da8ecfad
- Fix #51002 , fix possible memory corruption with very long names
2010-06-15 18:48:33 +00:00
Pierre Joye
2cfb5e4254
- Fix #51002 , fix possible memory corruption with very long names
2010-06-15 18:48:33 +00:00
Felipe Pena
c42d8b3776
- Fix proto and argname
2010-06-03 18:39:21 +00:00
Felipe Pena
d333b79c10
- Fix proto and argname
2010-06-03 18:39:21 +00:00
Felipe Pena
7deae5022d
- Added ZipArchive arginfo
2010-06-03 18:23:14 +00:00
Felipe Pena
651a164eed
- Added ZipArchive arginfo
2010-06-03 18:23:14 +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
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
Dmitry Stogov
94dd83722b
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 10:57:45 +00:00
Rasmus Lerdorf
f370d79067
It's a size_t here, not an unsigned int.
2010-02-09 17:38:36 +00:00
Pierre Joye
a6c3ac1016
- missing patch (update to 0.9.3)
2010-02-01 21:20:07 +00:00
Pierre Joye
3ef47217d7
- update to 0.9.3
2010-02-01 20:56:03 +00:00
Pierre Joye
fa197ab9cc
- fix test
2010-02-01 19:30:32 +00:00
Pierre Joye
a28a91cc0c
- fix leak
2010-02-01 18:58:42 +00:00
Sebastian Bergmann
9ba1e81665
sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php
2010-01-03 09:23:27 +00:00
Zoe Slattery
4cc35aeaaf
The last of the 2009 testfest tests
2009-08-30 18:18:50 +00:00
Pierre Joye
73fbaa9ee0
- remove double include
2009-08-11 17:08:23 +00:00
Pierre Joye
33a93474df
- fixed bug #49072 , feof never returns true for damaged file in zip
2009-08-11 15:12:00 +00:00
Pierre Joye
38bb4c1099
- MFB: Fix #48763 , create corrupt archive
2009-07-19 15:32:09 +00:00
Pierre Joye
f031901b1b
- WS
2009-07-19 15:20:48 +00:00
Mikko Koppanen
5645de756d
Closes bug #47667
2009-03-16 10:19:43 +00:00
Ilia Alshanetsky
4b8064c927
Adjust previous fix
2009-02-24 23:55:14 +00:00
Ilia Alshanetsky
551a2d52e2
Fixed 2 memory corruptions in zip extension idenfied by oo_properties.phpt
...
test
2009-02-22 17:54:50 +00:00
Antony Dovgal
7478ceada3
fix tests
2009-01-08 22:03:32 +00:00
Pierre Joye
206a7cef30
- year++
2009-01-02 00:39:14 +00:00
Pierre Joye
ee86a20296
- fix filename property read
2009-01-02 00:10:20 +00:00
Pierre Joye
d00fb8b360
- MFB: restore overwrite feature (regression introduced in 5.2.8)
2009-01-02 00:07:57 +00:00
Pierre Joye
14f2f4148c
- MFB: restore fix for binary mode on win (regression introduced in 5.2.8)
2009-01-02 00:04:33 +00:00
Sebastian Bergmann
08659c2dcd
MFH: Bump copyright year, 3 of 3.
2008-12-31 11:15:49 +00:00
Pierre Joye
0696223079
- version and WS
2008-12-24 11:08:14 +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
a94cd6d54f
- MFH: Fixed a macro redefinition on BSD for different purpose
2008-11-12 23:38:02 +00:00
Felipe Pena
3c121bf15f
- MFH: Removed unused variables
2008-11-12 17:26:36 +00:00
Felipe Pena
cd0a8efe41
- Fix test
2008-11-12 17:16:51 +00:00
Pierre Joye
b9853c4ff0
- MFH:
...
- #14962 , makes extractTo 2nd argument really optional
- replace ZEND_ENGINE_2_1 by PHP_ZIP_USE_OO
2008-11-12 11:41:21 +00:00
Pierre Joye
7102449f76
- sync tests with pecl
2008-11-04 13:24:39 +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
Pierre Joye
7d5a67a022
- flatten path and make them relative before extraction
...
- remove unnecessary export
2008-10-23 16:12:55 +00:00
Arnaud Le Blanc
1d5ba8bb21
MFH: initialize optional vars
2008-10-21 23:39:15 +00:00
Pierre Joye
10d0029dce
- MFH: file will exist only on error (thx tony for the headup)
2008-08-30 23:55:04 +00:00
Pierre Joye
820c2002e4
- fix tests (clean on exit)
2008-08-30 16:24:33 +00:00
Pierre Joye
6fb114f1d5
- MFH: constify zend_function_entry and update phpinfo
2008-08-08 16:05:38 +00:00
Pierre Joye
ed2abda5df
- MFH: missing openbasedir check
2008-08-08 15:56:44 +00:00
Pierre Joye
f4087a70aa
- MFH: use PHP_ZIP_VERSION_STRING and add add_ascii_assoc_string macro (easy sync)
2008-08-08 15:52:53 +00:00
Pierre Joye
b9d7e8b048
- MFH: fix leak in zif_zip_entry_read and ::ExtractTo on Error
2008-08-08 15:41:25 +00:00
Pierre Joye
5505650cdf
- use OPENBASEDIR_CHECKPATH instead of SAFEMODE_CHECKFILE, easier to keep code synced with HEAD
2008-08-08 15:37:37 +00:00
Antony Dovgal
73ab5175b1
move unused vars into their ifdef
2008-08-08 10:12:27 +00:00
Pierre Joye
70596f7474
- add missing files for 0.9
2008-08-08 09:47:15 +00:00
Pierre Joye
490a342205
- MFH: update to 0.9 (torrentzip support, files open only when necessary), windows fixes
2008-08-07 23:24:11 +00:00
Jani Taskinen
b17dc14f18
MFH: nuketh C++ comments
2008-08-03 12:15:55 +00:00
Antony Dovgal
28a22396d4
MFH: invert the logics - FLAG_FCLOSE -> FLAG_NO_FCLOSE
2008-07-23 11:25:14 +00:00
Antony Dovgal
af00eedf4a
MFH: add PHP_STREAM_FLAG_FCLOSE to zip streams
2008-07-23 09:09:10 +00:00
Jani Taskinen
d23342397c
No dots
2008-07-14 09:03:48 +00:00
Jani Taskinen
1e2b2bbeae
- Some config*.m4 file cleanups: NO tabs in these!
2008-07-14 09:02:26 +00:00
Rob Richards
e83274cd16
fix zlib detection and linking
2008-07-09 16:09:35 +00:00
Felipe Pena
543f015d52
- Moved protos to .c (sync with HEAD)
2008-07-04 14:50:07 +00:00
Felipe Pena
c757089335
- Reverted previous commit
...
- Moved protos to .c (sync with HEAD)
2008-07-04 14:43:53 +00:00
Felipe Pena
12a4c54dcf
- Fixed compile warnings
2008-07-03 12:53:12 +00:00
Felipe Pena
bedd323878
- Added arginfo (functions)
2008-07-03 01:55:48 +00:00
Pierre Joye
8b75c07bf1
- should not be called butlet remove it as well
2008-06-08 11:40:49 +00:00
Pierre Joye
9ffc103c5a
- not exported
2008-05-30 19:46:56 +00:00
Pierre Joye
b734bf4b97
- sync with PECL HEAD
2008-05-21 09:27:41 +00:00