Remi Collet
99b91f98b1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
2013-12-19 10:54:06 +01:00
Remi Collet
32d1d5fb59
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
2013-12-19 10:53:50 +01:00
Remi Collet
20eb8e4d11
Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
2013-12-19 10:53:38 +01:00
Remi Collet
6997b8793d
missing 'config.h' in 5dc37b3
2013-11-10 07:10:36 +01:00
Anatol Belski
c675980046
Merge branch 'pull-request/500'
...
* pull-request/500:
limit virtual_cwd_activate() duplicated call to ZTS only
reverted the previous commit, both calls are needed in TS mode
virtual_cwd_activate() should be called only in one place
back to do_alloca()
removed unnecessary call
simplify the state free macros
compact the code to preserve the error info after state freeing
back to do_alloca(), reverted the wrong replacement
enabled windows to use stack in both ts/nts mode, some more fixes
moved to do_alloca() usage where appropriate
fixed invalid free
fixed virtual cwd header in phar
updated NEWS
fixed all the places where last error could be lost
preserve the error code
applied and fixed the original patch
initial move on renaming files and fixing includes
Conflicts:
ext/opcache/ZendAccelerator.c
2013-11-05 19:23:23 +01:00
Remi Collet
5dc37b3510
Sync ext/zip with pecl/zip version 1.3.2
...
- update libzip to version 1.11.1. We don't use any private symbol anymore
- new method ZipArchive::setPassword($password)
- add --with-libzip option to build with system libzip
2013-11-04 13:23:36 +01:00
Remi Collet
141b77d97d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add bundled libzip LICENSE, as required by BSD License terms
2013-10-29 09:02:58 +01:00
Remi Collet
a7fc8eecb0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add bundled libzip LICENSE, as required by BSD License terms
2013-10-29 09:02:44 +01:00
Remi Collet
e2c9f3983a
add bundled libzip LICENSE, as required by BSD License terms
2013-10-29 09:02:24 +01:00
Rasmus Lerdorf
ec2e6951b8
Merge branch 'PHP-5.5'
...
* PHP-5.5:
When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
2013-10-20 22:18:33 -07:00
Rasmus Lerdorf
910d4751e3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
2013-10-20 22:18:15 -07:00
Rasmus Lerdorf
2186e1583d
When src->src is null this doesn't get initialized
...
but it is still used, so the passed in *ze will point
to unitialized memory. Hopefully src->src is never
null, but just in case this initialization doesn't hurt.
2013-10-20 22:15:35 -07:00
Felipe Pena
048923b3c6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Moved NULL check before dereferencing
2013-10-20 09:50:17 -02:00
Felipe Pena
8aa19c9fd8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Moved NULL check before dereferencing
2013-10-20 09:50:13 -02:00
Felipe Pena
9976b5cd7f
- Moved NULL check before dereferencing
2013-10-20 09:50:11 -02:00
Felipe Pena
84011f7c32
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fix possible memory leak
2013-10-20 01:05:06 -02:00
Felipe Pena
8d22c23161
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fix possible memory leak
2013-10-20 01:05:00 -02:00
Felipe Pena
420068c6e1
- Fix possible memory leak
2013-10-20 01:04:55 -02:00
Anatol Belski
cf6ab0e915
applied and fixed the original patch
...
initial work on the patch import done
2013-10-17 10:40:43 +02:00
Christopher Jones
3c166c4758
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/gmp/gmp.c
2013-08-14 20:47:00 -07:00
Christopher Jones
39612afc72
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/dba/libinifile/inifile.c
2013-08-14 20:43:25 -07:00
Christopher Jones
9ad97cd489
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
2013-08-14 20:36:50 -07:00
Michael Wallner
611122c22e
Merge branch '2Guploads'
...
* 2Guploads:
add NEWS entry; add simple test
more precise condition
make this work in vc11 too
Use int64_t and atoll() after discussion with johannes
ws
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
unify stdint type usage
2013-08-09 11:47:25 +02:00
Michael Wallner
14caf174ff
unify stdint type usage
...
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
Christopher Jones
4c3c9d1fe5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
2013-08-06 11:09:12 -07:00
Christopher Jones
c6d977dd39
Fix long-standing visual pain point: the misalignment of './configure help' text.
...
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
Andrey Hristov
92d27ccb05
Constify streams API and a few other calls down the rabbit hole.
...
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
2013-07-30 12:49:36 +02:00
Stanislav Malyshev
8ac131503d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
2013-06-10 14:31:57 -07:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
Anatol Belski
9386ba9e97
Merge branch 'PHP-5.5'
...
* PHP-5.5:
update NEWS
updated NEWS
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:47:55 +02:00
Anatol Belski
0655ab7c26
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:45:28 +02:00
Anatol Belski
ceb5b684e0
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:40:28 +02:00
Anatol Belski
968ae4a56a
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:39:17 +02:00
Anatol Belski
93c4ce4eed
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Reworked the changes for bug #64452
2013-03-23 21:01:05 +01:00
Anatol Belski
ec25e99193
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Reworked the changes for bug #64452
2013-03-23 21:00:46 +01:00
Anatol Belski
04b492a5fe
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Reworked the changes for bug #64452
2013-03-23 20:59:47 +01:00
Anatol Belski
638c4b89b7
Reworked the changes for bug #64452
2013-03-23 20:57:59 +01:00
Anatol Belski
7daabc42a2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
updated NEWS
Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:15:46 +01:00
Anatol Belski
0125ec77d2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:14:13 +01:00
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