php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-17 21:11:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
76,901 Commits 547 Branches 1,483 Tags
ba15e8dfd0bbe65fd7022f55cf5bdaca413d96e4
Commit Graph

579 Commits

Author SHA1 Message Date
Stanislav Malyshev
0cb9d75cb6 Merge branch 'PHP-5.4.40' into PHP-5.5.24 
* PHP-5.4.40:
  Additional fix for bug #69324
  More fixes for bug #69152
  Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
  Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  Fixed bug #68901 (use after free)
  Fixed bug #68740 (NULL Pointer Dereference)
  Fix bug #66550 (SQLite prepared statement use-after-free)
  Better fix for #68601 for perf 81e9a993f2
  Fix bug #68601 buffer read overflow in gd_gif_in.c
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
 2015-04-11 16:56:12 -07:00
Stanislav Malyshev
12d3bdee3d Additional fix for bug #69324 
Not so happy about duplication but needed due to bug #69429
 2015-04-11 16:53:22 -07:00
Stanislav Malyshev
9faaee66fa Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) 2015-04-11 16:53:21 -07:00
Xinchen Hui
920a0afbf8 Fixed bug #68901 (use after free) 2015-04-11 16:28:07 -07:00
Michael Wallner
6480725007 Fixed bug #64931 
phar_add_file is too restrive on filename

Check for any of '/', '\\', '\0' after ".phar".
 2015-03-30 16:24:19 +02:00
Michael Wallner
6de25c155e Fixed Bug #65467 
Call to undefined method cli_arg_typ_string

Use cli_arg_typ_filecontent instead.
 2015-03-30 15:39:30 +02:00
Michael Wallner
8f7e378b9f fix bug #67761 
Phar::mapPhar fails for Phars inside a path containing ".tar".

Strengthen the silly .tar file extension check.
 2015-03-30 14:41:30 +02:00
Michael Wallner
f4264ebc64 Fixed bug 64343 
PharData::extractTo fails for tarball created by BSD tar

Phar did not know about PAX style global/file headers.
Skip them, to be able to read the contents of those archives.
 2015-03-30 13:11:06 +02:00
Xinchen Hui
b2cf3f064b Fixed bug #68901 (use after free) 2015-01-29 00:00:09 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Sebastian Brandt
c7248e6359 added missing INSTALL_ROOT 2014-11-23 16:09:24 -08:00
Anatol Belski
37d5a2b18f initialize lineno before calling compile file file in phar 2014-10-20 15:53:32 +02:00
Xinchen Hui
41eb63e78f Fixed tests affect by local ini 2014-07-09 18:34:40 +08:00
Stanislav Malyshev
5312c39cfb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67587: Redirection loop on nginx with FPM
 2014-07-08 12:54:20 -07:00
Christian Weiske
0bf50a8302 Fix bug #67587: Redirection loop on nginx with FPM 
Redirection will work correctly as long as PATH_INFO is available,
e.g. via the following nginx configuration:

    set $path_info $fastcgi_path_info;
    fastcgi_param PATH_INFO $path_info;
 2014-07-08 12:53:45 -07:00
Felipe Pena
b99862e7ae Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
 2014-05-11 09:46:25 -03:00
Felipe Pena
fb3b8de98d - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org) 2014-05-11 09:45:17 -03:00
Stanislav Malyshev
aca526a13b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix accepting ill-formed UTF-8 characters

Conflicts:
	ext/phar/phar_path_check.c
 2014-04-22 16:57:17 -07:00
Jakub Zelenka
61499bf282 Fix accepting ill-formed UTF-8 characters 
Conflicts:
	ext/phar/phar_path_check.c
 2014-04-22 16:55:58 -07:00
Stanislav Malyshev
dafb2af705 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.

Conflicts:
	ext/phar/phar_path_check.c
 2014-04-20 17:22:21 -07:00
Danack
ea4cee93c8 Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives. 2014-04-20 17:19:20 -07:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +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
3d4ef50dd7 Fixed coredump due to abnormal implemention of phar 2013-11-04 14:42:54 +08:00
Xinchen Hui
a3bd4fda09 Merge branch 'PHP-5.4' into PHP-5.5 2013-10-27 16:53:13 +08:00
Xinchen Hui
e18e7a5983 remove "PHP 6" staff 2013-10-27 16:52:43 +08: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
d42fa2a059 Revert "Need a way to check whether this API exists" 
hmm, we can check whether the head file exists instead

This reverts commit 4d7d85640d.
 2013-10-19 22:18:37 +08:00
Xinchen Hui
4d7d85640d Need a way to check whether this API exists 2013-10-19 22:16:31 +08:00
Xinchen Hui
4417421ab6 Retruning SUCCESS/FAILURE instead of int 2013-10-18 10:33:53 +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
Stanislav Malyshev
b8c8a04a85 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents
 2013-07-23 21:45:35 -07:00
Stanislav Malyshev
f8efdc2b4b fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents 2013-07-22 00:57:33 -07:00
Veres Lajos
4749457a49 HASH_KEY_NON_EXISTANT fix 2013-07-21 20:09:53 -07:00
Remi Collet
8f0567581e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #65142 Missing phar man page
  NEWS
  Fixed Bug #65143 Missing php-cgi man page
 2013-07-02 10:47:38 +02:00
Remi Collet
f4ce5e7fb6 Fixed Bug #65142 Missing phar man page 
Simple man page from phar help output.
 2013-07-02 10:46:50 +02: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
Pierre Joye
40d5458eff Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  entry for #64214
  other fix for #64214, unmodified file may not have old fp set, causing other possible crashes
 2013-05-17 11:50:52 +02:00
Pierre Joye
aff65a0346 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  entry for #64214
  other fix for #64214, unmodified file may not have old fp set, causing other possible crashes
 2013-05-17 11:49:33 +02:00
Pierre Joye
3eb1745643 other fix for #64214, unmodified file may not have old fp set, causing other possible crashes 2013-05-17 11:45:13 +02:00
Pierre Joye
42a186e22d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  more check for php_stream_fopen_tmpfile failure
 2013-05-14 16:46:32 +02: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
Pierre Joye
362402d748 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  php_stream_fopen_tmpfile may file, causing any following stream usage to crash
 2013-05-14 09:21:30 +02:00
Pierre Joye
f37c54ab27 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  php_stream_fopen_tmpfile may file, causing any following stream usage to crash
 2013-05-14 09:21:17 +02:00
Pierre Joye
533e636a62 php_stream_fopen_tmpfile may file, causing any following stream usage to crash 2013-05-14 09:20:53 +02:00
Nikita Popov
c2893ab592 Missed two occurances of Revision: 2013-03-23 21:09:20 +01:00