clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
89,518 Commits 494 Branches 1,367 Tags 800 MiB
a4d5a78f89
Commit Graph

182 Commits

Author SHA1 Message Date
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
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
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
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
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
a37e84e549 fixed zip entry freeing 2012-06-07 21:01:32 +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
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
Pierre Joye
973ca132a4 - WS 2011-02-01 10:57:51 +00:00
Pierre Joye
fcdc76be21 - WS 2011-02-01 10:57:51 +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
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
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
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
Rasmus Lerdorf
d91c4be0d6 ws fix 2010-11-15 09:04:27 +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
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +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
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
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Felipe Pena
3c121bf15f - MFH: Removed unused variables 2008-11-12 17:26:36 +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
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
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
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
b734bf4b97 - sync with PECL HEAD 2008-05-21 09:27:41 +00:00
Pierre Joye
da5b986a72 - MFB: reflect the correct version 2008-01-18 01:11:26 +00:00
Greg Beaver
0d074e23d3 update module version number 2008-01-18 00:20:56 +00:00
Greg Beaver
ccc0d6e32b a few fixes: overwrite all my careful work in zipint_alias.h with zipint.h, so had to restore that. 
PHP_RAW_NAMED_FE() won't work, have to use ZEND_RAW_FENTRY
 2008-01-13 06:22:27 +00:00
Greg Beaver
c896933b7c MFH: alias all zip identifiers to avoid potential name conflicts with other apache libs that may export zip symbols 2008-01-13 06:02:30 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Hannes Magnusson
2027a1f16a MFB5.2: Fix protos 2007-12-15 12:52:55 +00:00
Yiduo (David) Wang
4b4d634cb9 MFH: Added macros for managing zval refcounts and is_ref statuses 2007-10-07 05:22:07 +00:00
Dmitry Stogov
6c810b0d4c Improved memory usage by movig constants to read only memory. (Dmitry, Pierre) 2007-09-27 18:00:48 +00:00
Hannes Magnusson
42e003cd6c MFH: - Fix isset/empty($ZipArchive->property) 
MFH: - Add test
 2007-08-06 22:02:32 +00:00
Antony Dovgal
61d697d100 fix ws 2007-06-04 06:38:22 +00:00
Pierre Joye
c76e5dd0bd - fix logic (goto is a gift, I should use it :) 2007-06-03 21:34:21 +00:00
Pierre Joye
d5d2d6e30e - pecl bug #11216, better fix, leak removed and improved test 
- typo in news, better late than never (-d)
 2007-06-03 21:21:57 +00:00
Pierre Joye
ef952b0383 - PECL #11216, addEmptyDir crashes if the directory already exists 2007-06-03 19:47:17 +00:00
Pierre Joye
b65cdd0793 - use the same checks for zip_stat 2007-05-19 22:25:11 +00:00
Ilia Alshanetsky
c009fc8915 CS fixes 
Fixed a possible crash in the event directory cannot be created, due to a
double free.
 2007-05-19 19:29:37 +00:00