mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-09 20:44:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
116,068 Commits 505 Branches 1,389 Tags 849 MiB
08b7279036
Commit Graph

700 Commits

Author SHA1 Message Date
Gabriel Caruso
5d6e923d46
Remove mention of PHP major version in Copyright headers 
Closes GH-4732.
 2019-09-25 14:51:43 +02:00
Craig Duncan
4836660b90 Convert fileinfo functions arginfo to php stubs 
We also allow the context for finfo to be null.
 2019-08-26 18:13:58 +02:00
Nikita Popov
429378d78d Remove some misleading RETURN_FALSE 
These functions throw, so they can't return false.

This is just a subset...
 2019-08-12 10:05:36 +02:00
Nikita Popov
8d39510af8 Merge branch 'PHP-7.4' 2019-07-25 10:43:50 +02:00
Nikita Popov
1cbcf0f4f1 Throw notice for plain wrapper fread/fwrite errors 
Similar to what is done for socket read/write errors.
 2019-07-25 10:42:10 +02:00
Peter Kokot
fa8a51f140 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Update libmagic patch
 2019-07-08 12:41:15 +02:00
Peter Kokot
f002761e08 Update libmagic patch 
This simplifies the libmagic patch:
- in upstream the HAVE_STRERROR check has been removed
- in upstream library the HAVE_SIGNAL_H has been removed
- indentations syncs with the upstream library
- some irrelevant changes removed from the patch (log comment), upstream
  has this correctly logged already so no need to patch the comment.

Closes GH-4298
 2019-07-08 12:38:47 +02:00
Nikita Popov
9ab5c28c8b Merge branch 'PHP-7.4' 2019-07-01 17:28:01 +02:00
Nikita Popov
7acc828abf Skip perf-sensitive fileinfo tests 2019-07-01 17:27:42 +02:00
Anatol Belski
e0112eb4e3 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Update libmagic.patch [ci skip]
 2019-06-29 17:36:39 +02:00
Anatol Belski
dacf9ecc46 Update libmagic.patch [ci skip] 2019-06-29 17:36:11 +02:00
Anatol Belski
5ea43c38b3 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Set buffer to NULL to prevent double free (Kamil Dudka at redhat)
 2019-06-29 17:19:20 +02:00
Anatol Belski
5ae0a6b784 Set buffer to NULL to prevent double free (Kamil Dudka at redhat) 
Based on the upstream patch d13204e8da43f1d8a98cf3f74591cde02ecdb2f7.
 2019-06-29 17:13:21 +02:00
Anatol Belski
9f9657ff92 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix magic data
 2019-06-29 16:53:10 +02:00
Anatol Belski
02fc2fe8c9 Fix magic data 2019-06-29 16:51:41 +02:00
Anatol Belski
b74d4d2c19 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix typo
  Add tests from fix #78183 from PHP-7.2
  Fix #78183: finfo_file shows wrong mime-type for .tga file
 2019-06-29 13:31:56 +02:00
Anatol Belski
885cb79201 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix typo
  Add tests from fix #78183 from PHP-7.2
  Fix #78183: finfo_file shows wrong mime-type for .tga file
 2019-06-29 13:31:22 +02:00
Anatol Belski
b926690947 Fix typo 2019-06-29 13:30:35 +02:00
Joshua Westerheide
6cdeedb8de Add tests from fix #78183 from PHP-7.2 2019-06-29 13:29:53 +02:00
Nikita Popov
b98c148f78 Merge branch 'PHP-7.4' 2019-06-28 15:05:00 +02:00
Nikita Popov
54dd762f59 Set up asan+ubsan scheduled build on azure 
Also adds an --asan flag to run-tests.php to setup all the necessary
environment variables. Some tests are marked as skipped because they
are incompatible with asan or too slow.

I'm basing this on the DEBUG_ZTS build, which seems to give us the
most mileage.
 2019-06-28 15:00:54 +02:00
Peter Kokot
ce12ecd40f Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix concurrent testing of bug 61964
 2019-06-27 00:27:43 +02:00
Peter Kokot
4ff44a9161 Fix concurrent testing of bug 61964 
When tests are run concurrently using the -j option there might be a
change of failure and writing to the same directory from both tests.

Use test filenames for generated temp dirs
 2019-06-27 00:27:10 +02:00
Nikita Popov
1df8175b61 Convert fetch_resource warnings into TypeErrors 
More type checks that are not part of zpp and should generate a
TypeError in PHP 8.
 2019-06-03 09:17:12 +02:00
Anatol Belski
1f18a29514 Merge branch 'PHP-7.4' 
* PHP-7.4:
  [ci skip] Update libmagic.patch
 2019-05-30 14:09:48 +02:00
Anatol Belski
2ba9177d4f [ci skip] Update libmagic.patch 2019-05-30 14:09:00 +02:00
Anatol Belski
bd0834434f Merge branch 'PHP-7.4' 
* PHP-7.4:
  Add test for bug #78075, json detection
 2019-05-30 13:33:02 +02:00
Anatol Belski
aed9a64cf6 Add test for bug #78075, json detection 2019-05-30 13:31:48 +02:00
Anatol Belski
a6f50eb317 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Partially reapply ba40f505e5
 2019-05-30 02:48:37 +02:00
Anatol Belski
0c8454c02d Partially reapply ba40f505e5 2019-05-30 02:48:01 +02:00
Anatol Belski
055ed113f7 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix datatype
 2019-05-30 02:35:28 +02:00
Anatol Belski
57c23df142 Fix datatype 2019-05-30 02:34:35 +02:00
Anatol Belski
8f85961326 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Ported limagic 5.37
 2019-05-30 02:23:20 +02:00
Anatol Belski
622b10f06e Ported limagic 5.37 2019-05-30 02:22:40 +02:00
Peter Kokot
2cf90bb2f0 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Normalize comments in *nix build system m4 files
 2019-05-12 18:51:50 +02:00
Peter Kokot
75fb74860d Normalize comments in *nix build system m4 files 
Normalization include:
- Use dnl for everything that can be ommitted when configure is built in
  favor of the shell comment character # which is visible in the output.
- Line length normalized to 80 columns
- Dots for most of the one line sentences
- Macro definitions include similar pattern header comments now
 2019-05-12 18:43:03 +02:00
Peter Kokot
7554d85eac Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove unused example/test fileinfo.php script
 2019-05-08 21:59:02 +02:00
Peter Kokot
71acd7a2f7 Remove unused example/test fileinfo.php script 2019-05-08 21:58:52 +02:00
Nikita Popov
dc42e403a2 Merge branch 'PHP-7.4' 2019-04-15 11:42:55 +02:00
Nikita Popov
908660c1d7 Avoid maybe uninit warning in libmagic 
GCC 5 false positive, gone in newer versions.
 2019-04-15 10:59:45 +02:00
Nikita Popov
785f034e41 Merge branch 'PHP-7.4' 2019-04-12 12:04:11 +02:00
Nikita Popov
ba40f505e5 Fix unused variable warnings in libmagic 
These variables are only used in assertions.
 2019-04-12 12:03:26 +02:00
Nikita Popov
771c64edcc Merge branch 'PHP-7.4' 2019-04-11 15:23:29 +02:00
Nikita Popov
b65cb7e2aa Fix libmagic warnings 2019-04-11 15:20:05 +02:00
Nikita Popov
f6521659ca Add script to generate libmagic.patch 2019-04-11 15:12:20 +02:00
Nikita Popov
e67d872e3e Merge branch 'PHP-7.4' 2019-03-18 12:33:12 +01:00
Nikita Popov
275fa53564 Accept zend_string* instead of char* in php_pcre_match_impl() 2019-03-18 12:32:06 +01:00
Christoph M. Becker
7ad6e1d7de Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove unused variables
 2019-03-17 23:32:53 +01:00
Fabien Villepinte
b6f9ade9f2 Remove unused variables 2019-03-17 23:29:51 +01:00
Peter Kokot
6426420f61 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Replace dirname(__FILE__) by __DIR__ in tests
 2019-03-15 23:36:47 +01:00