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