1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Commit Graph

158 Commits

Author SHA1 Message Date
Dmitry Stogov f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
Xinchen Hui c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui 6c8ff0031c Merge branch 'PHP-5.5'
Conflicts:
	ext/phar/phar_internal.h
	ext/phar/stream.c
	ext/phar/util.c
2013-11-05 19:29:13 +08:00
Xinchen Hui 63dba7ec9d Remove outdate codes, make it clearer, although just a bit.. 2013-11-05 18:47:12 +08:00
Xinchen Hui 15eabbb436 Merge branch 'PHP-5.5' 2013-11-04 14:43:30 +08:00
Xinchen Hui 3d4ef50dd7 Fixed coredump due to abnormal implemention of phar 2013-11-04 14:42:54 +08:00
Felipe Pena d23f089fb9 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed possible NULL ptr dereference
2013-10-20 09:04:36 -02:00
Felipe Pena 5b0560efc3 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed possible NULL ptr dereference
2013-10-20 09:04:27 -02:00
Felipe Pena 52555a7894 - Fixed possible NULL ptr dereference 2013-10-20 09:04:24 -02:00
Xinchen Hui 065bbeb83f Merge branch 'PHP-5.5' 2013-10-18 10:34:59 +08:00
Xinchen Hui 4417421ab6 Retruning SUCCESS/FAILURE instead of int 2013-10-18 10:33:53 +08:00
Xinchen Hui a1a7522105 Merge branch 'PHP-5.5' 2013-10-17 12:25:01 +08:00
Xinchen Hui 06994a419d Add ability of alias resolving (it cause problem while work with opcache) 2013-10-17 12:23:09 +08:00
Nikita Popov db6d93feca Remove some more unnecessary macros from phar 2013-09-13 21:49:09 +02:00
Nikita Popov e6b228332f Remove PHAR_(Z)STR* usages 2013-09-13 21:49:09 +02:00
Nikita Popov 39bd738fbf Remove version checks in phar
No need to keep around compatability code for PHP 5.0 and PHP 6.
2013-09-13 21:47:59 +02: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
Veres Lajos 4749457a49 HASH_KEY_NON_EXISTANT fix 2013-07-21 20:09:53 -07:00
Pierre Joye 7ec2e5314e Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  more check for php_stream_fopen_tmpfile failure
2013-05-14 16:45:56 +02:00
Pierre Joye ba1af29805 more check for php_stream_fopen_tmpfile failure 2013-05-14 16:45:11 +02:00
Xinchen Hui c2f8e90504 Merge branch 'PHP-5.3' into PHP-5.4 2013-01-06 10:20:00 +08:00
Xinchen Hui bc11e6fdbb bump year 2013-01-06 10:19:09 +08:00
Anatoliy Belsky f962260081 merged changes for bug #63297 from 5.3 2012-10-25 09:40:21 +02:00
Anatoliy Belsky 6e23cfeba4 fixed a typo in the error message 2012-10-25 09:26:44 +02:00
Anatoliy Belsky a88379e03d Fixed bug #63297 Phar fails to write an openssl based signature
Unitialized values warnings seem to be everyday life
when working with openssl. For more read
http://www.openssl.org/support/faq.html#PROG13
So just fixing so the bug, no care about those
warnings.
2012-10-24 13:38:44 +02:00
Felipe Pena 13768f8650 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Value stored to var is never used
2012-08-19 15:09:18 -03:00
Felipe Pena f4054afe40 - Value stored to var is never used 2012-08-19 15:09:14 -03: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
Dmitry Stogov 4a25a7740d Fixed ZE specific compile warnings (Bug #55629) 2011-09-13 13:29:35 +00:00
Hannes Magnusson e723c7631c Fixed bug#53872 (internal corruption of phar) 2011-08-29 16:05:45 +00:00
Hannes Magnusson 25352ba350 Fixed bug#53872 (internal corruption of phar) 2011-08-29 16:05:45 +00:00
Xinchen Hui 4c2e6c1cf6 Initialize variable with fixed value for avoiding compile warnings 2011-08-07 11:13:27 +00:00
Xinchen Hui cc42ac9d9b Initialize variable with fixed value for avoiding compile warnings 2011-08-07 11:13:27 +00:00
Felipe Pena 12d2104277 - Year++ 2011-01-01 02:48:19 +00:00
Felipe Pena d90a33d51c - Year++ 2011-01-01 02:46:03 +00:00
Kalle Sommer Nielsen 1fed0e5a84 Kill some more constness warnings in com_dotnet/phar/standard 2010-11-19 16:03:00 +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
Greg Beaver d39fda5ff7 begin work on making phar php6-ready 2009-07-24 23:53:24 +00:00
Greg Beaver e8756a3c3c begin work on making phar php6-ready 2009-07-24 23:53:24 +00:00
Greg Beaver c92396a82c merge unmerged changes between branches, remove unnecessary test for zip signature failure in badparameters.phpt 2009-07-24 17:07:05 +00:00
Greg Beaver 2a0668d57b fix signature generation/validation for zip archives by phar extension, fix a few edge cases where memory was leaked on error conditions by missing efree() 2009-07-24 15:42:17 +00:00
Greg Beaver 42e0e5dfb7 fix signature generation/validation for zip archives by phar extension, fix a few edge cases where memory was leaked on error conditions by missing efree() 2009-07-24 15:42:17 +00:00
Greg Beaver f21744809e MFPECL: fix PECL bug #16338, php_stream_copy_to_stream{,_ex}() 2009-04-29 03:24:27 +00:00
Greg Beaver 31f3c2ad47 MFPECL: fix PECL bug #16338, php_stream_copy_to_stream{,_ex}() 2009-04-29 03:24:09 +00:00
Sebastian Bergmann 08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Sebastian Bergmann 7f4dc8702a Bump copyright year, 3 of 3. 2008-12-31 11:12:40 +00:00
Marcus Boerger e2ab5164ce - MFH Fix dependency from Phar to hash 2008-11-04 01:27:52 +00:00
Greg Beaver 329229071f MFB: fix several errors found by valgrind
1 - entry metadata not properly processed or retrieved from cached phars
2 - copy on write was using a void return value instead of int, a dangerous oversight in phar_update_cached_entry
3 - metadata creation in entries for cached phars was causing an invalid read
2008-10-26 05:49:24 +00:00