Dmitry Stogov
c1965f58d4
Use reference counting instead of zval duplication
2014-06-05 16:04:11 +04:00
Dmitry Stogov
9dd66e4d53
Merge branch 'master' into phpng
...
* master:
Fixed issue #183 (TMP_VAR is not only used once)
Fix broken Junit output with --disable-cgi
Added folder mark
Further test fixes for the fdb2709
breakage.
Fix broken test caused by fdb2709
.
Added tests for ZipArchive::addGlob() and ZipArchive::addPattern()
Fix run-tests.php with Valgrind >= 3.10.0.
Add microseconds to the serialised form of DateTime objects.
Improved test for bug #62479
fix typo in ODBC code
gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
5.5.14 now
Fix bug #67060 : use default mode of 660
Conflicts:
ext/date/php_date.c
2014-05-26 10:52:43 +04:00
Xinchen Hui
9b730bf4bf
Merge branch 'new-tests' of https://github.com/SammyK/php-src
2014-05-24 15:43:37 +08:00
Sammy Kaye Powers
e2bbe95310
Added tests for ZipArchive::addGlob() and ZipArchive::addPattern()
2014-05-23 05:51:13 +00:00
Nikita Popov
4d22be992c
Fix ZTS
2014-05-05 17:28:22 +02:00
Xinchen Hui
c73c6526ef
clean up
2014-05-05 18:09:15 +08:00
Xinchen Hui
39c521c056
Finish Zip (all tests pass)
2014-05-05 17:48:49 +08:00
Xinchen Hui
356824df4c
Romove unnecessary proxy macro
2014-05-05 17:44:07 +08:00
Xinchen Hui
7e3989f301
Fixed memory leak in prop_handlers registering
2014-05-05 14:04:52 +08:00
Xinchen Hui
ea33fbd833
Don't use this (keyword)
2014-05-05 10:56:18 +08:00
Xinchen Hui
bea30846bb
Refactor Zip (1 test failed)
2014-05-05 10:49:27 +08:00
Dmitry Stogov
f9927a6c97
Merge mainstream 'master' branch into refactoring
...
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patches related to constant expression handling (we need to review them carefully)
I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)
Conflicts:
Zend/zend.h
Zend/zend_API.c
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_variables.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/dom/documenttype.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/mbstring/tests/zend_multibyte-10.phpt
ext/mbstring/tests/zend_multibyte-11.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_pgsql/pgsql_driver.c
ext/pgsql/pgsql.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/html.c
ext/standard/mail.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_variables.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_frame.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_print.c
sapi/phpdbg/phpdbg_prompt.c
2014-04-26 00:32:51 +04:00
Dmitry Stogov
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
Remi Collet
7946c5a235
add OPSYS_Z_CPM missing constant
2014-03-07 14:10:16 +01:00
Xinchen Hui
c0aba2c641
Refactor basename using zend_string
2014-02-23 18:08:35 +08:00
Remi Collet
f06f4c9254
zip extension version 1.12.4
2014-01-29 14:00:50 +01:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Remi Collet
33ef788abd
missing file from libzip 0.11.2
2013-12-30 10:00:02 +01:00
Remi Collet
3a492cf686
fix compat for PHP ABI changes
2013-12-30 08:47:16 +01:00
Remi Collet
0a950a0500
Sync with pecl/zip 1.12.4dev
...
- update bunled libzip to 0.11.2
- expose zip_file_set_external_attributes + zip_file_get_external_attributes
with new methods:
ZipArchive::setExternalAttributesName
ZipArchive::setExternalAttributesIndex
ZipArchive::getExternalAttributesName
ZipArchive::getExternalAttributesIndex
2013-12-30 07:35:30 +01:00
Christopher Jones
794df91c35
Align 'configure --help' columns
2013-12-20 10:02:46 -08:00
Remi Collet
f6ffecbd2d
save a few memory
2013-12-19 10:55:26 +01:00
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