php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-19 14:01:01 +02:00
Code Issues Packages Projects Releases Wiki Activity
116,963 Commits 547 Branches 1,483 Tags
bc04d5e9fc9db90f5c1978ba6612a7aadfd4e8de
Commit Graph

695 Commits

Author SHA1 Message Date
Máté Kocsis
bbcfa66e06 Use RETURN_THROWS() after zend_fetch_resource*() 2020-01-03 19:20:56 +01:00
Nikita Popov
f23378d84a Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove unnecessary strncpy in zip
 2020-01-03 12:03:31 +01:00
Nikita Popov
3e5675d730 Remove unnecessary strncpy in zip 
This causes a warning on GCC 9 and is unnecessary to boot: We
only use "cwd" for the open_basedir check, so we can just as well
pass in the original string.
 2020-01-03 11:53:03 +01:00
Máté Kocsis
12ce73a5bb Use RETURN_THROWS() after zend_value_error() 2019-12-31 16:58:15 +01:00
Máté Kocsis
345703724c Use RETURN_THROWS() during ZPP in most of the extensions 
Except for some bigger ones: reflection, sodium, spl
 2019-12-31 11:46:11 +01:00
Máté Kocsis
27e83d0fb8 Add union return types for function stubs 2019-11-11 14:54:55 +01:00
Fabien Villepinte
a555cc0b3d Clean DONE tags from tests 
Remove most of the `===DONE===` tags and its variations.
Keep `===DONE===` if the test output otherwise becomes empty.

Closes GH-4872.
 2019-11-07 21:31:47 +01:00
Christoph M. Becker
f65d42d56c Merge branch 'PHP-7.4' 
* PHP-7.4:
  Added missing call to ZipArchive::close()
 2019-10-23 10:47:59 +02:00
Florian Engelhardt
1eae77221e Added missing call to ZipArchive::close() 2019-10-23 10:44:26 +02:00
Christoph M. Becker
e9be4622c8 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #78641: addGlob can modify given remove_path value
 2019-10-08 09:50:43 +02:00
Christoph M. Becker
88e0d88897 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78641: addGlob can modify given remove_path value
 2019-10-08 09:49:46 +02:00
Christoph M. Becker
11654fdfa6 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78641: addGlob can modify given remove_path value
 2019-10-08 09:48:59 +02:00
Christoph M. Becker
fd3118ffb0 Fix #78641: addGlob can modify given remove_path value 
`remove_path` points to the given string, so we must not modify it.
Instead we use a duplicate, if we need the modification.

We may want to switch to `zend_string`s in master.
 2019-10-08 09:45:05 +02:00
tyage
4d6f88e215 Fix #72374: remove_path strips first char of filename 2019-10-02 15:33:28 +02:00
Nikita Popov
2f92957fd3 Convert some notices to warnings 
Part of https://wiki.php.net/rfc/engine_warnings.
 2019-10-02 10:34:08 +02:00
Christoph M. Becker
ecb1e312a0 Fix default value 2019-09-29 18:22:36 +02:00
Christoph M. Becker
3c16606d46 Elevate warning to ValueError for invalid ZipArchive object 2019-09-29 14:28:39 +02:00
Christoph M. Becker
6902d14b81 Properly clean up files created by test cases 2019-09-29 14:28:39 +02:00
Christoph M. Becker
61a4ae90d7 Add missing zend_parse_parameters_none() 2019-09-29 14:28:38 +02:00
Christoph M. Becker
1858b00d00 Add ZipArchive arginfo stubs 2019-09-29 14:28:37 +02:00
Christoph M. Becker
31e8ce6604 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix build for libzip < 0.11.2
 2019-09-29 13:39:15 +02:00
Christoph M. Becker
ce769a94a8 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix build for libzip < 0.11.2
 2019-09-29 13:38:28 +02:00
Christoph M. Becker
466f91bb3b Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix build for libzip < 0.11.2
 2019-09-29 13:34:16 +02:00
Christoph M. Becker
f6bfbe9553 Fix build for libzip < 0.11.2 
We must not define method entries, if the actual method definitions or
the arginfo structures are not defined.
 2019-09-29 13:33:18 +02:00
Gabriel Caruso
5d6e923d46 Remove mention of PHP major version in Copyright headers 
Closes GH-4732.
 2019-09-25 14:51:43 +02:00
Remi Collet
8aab32ff5f Merge branch 'PHP-7.4' 
* PHP-7.4:
  zip edxtension is now 1.15.5
  fix type consistency after 8f897f1040
 2019-09-09 14:22:24 +02:00
Remi Collet
a7b00f8787 zip edxtension is now 1.15.5 2019-09-09 14:22:12 +02:00
Remi Collet
766d5ff32f fix type consistency after 
8f897f1040
 2019-09-09 14:20:57 +02:00
Christoph M. Becker
99c57b33cf Merge branch 'PHP-7.4' 
* PHP-7.4:
  Replace deprecated libzip functions
 2019-08-26 14:06:08 +02:00
Christoph M. Becker
8f897f1040 Replace deprecated libzip functions 
We replace all deprecated libzip functions with their recommended
substitutes, and add proper comment length checks including a test
case.
 2019-08-26 14:05:28 +02:00
Christoph M. Becker
e7ac9428d8 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove dead code
 2019-08-13 13:29:35 +02:00
Christoph M. Becker
eb25176ab3 Remove dead code 2019-08-13 13:29:11 +02:00
Stephen Reay
d4e5e63b6c Added zip arginfo stubs 2019-08-13 13:01:51 +02:00
Nikita Popov
d37d418927 Merge branch 'PHP-7.4' 2019-07-23 11:28:10 +02:00
George Peter Banyard
6d6d954d0d Cleanup of remaining E_STRICT in tests 2019-07-23 11:27:23 +02:00
Nikita Popov
a1e2c8870e Merge branch 'PHP-7.4' 2019-07-22 17:26:01 +02:00
Nikita Popov
d59aac58b3 Report errors from stream read and write operations 
The php_stream_read() and php_stream_write() functions now return
an ssize_t value, with negative results indicating failure. Functions
like fread() and fwrite() will return false in that case.

As a special case, EWOULDBLOCK and EAGAIN on non-blocking streams
should not be regarded as error conditions, and be reported as
successful zero-length reads/writes instead. The handling of EINTR
remains unclear and is internally inconsistent (e.g. some code-paths
will automatically retry on EINTR, while some won't).

I'm landing this now to make sure the stream wrapper ops API changes
make it into 7.4 -- however, if the user-facing changes turn out to
be problematic we have the option of clamping negative returns to
zero in php_stream_read() and php_stream_write() to restore the
old behavior in a relatively non-intrusive manner.
 2019-07-22 17:17:28 +02:00
Peter Kokot
00821b807c Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove HAVE_LIBZIP
 2019-07-21 11:32:53 +02:00
Peter Kokot
15782b27b8 Remove HAVE_LIBZIP 
The libzip library is now always used from the system.

Closes GH-4450
 2019-07-21 11:32:13 +02:00
Nikita Popov
bd38129fa4 Merge branch 'PHP-7.4' 2019-07-16 10:25:14 +02:00
Nikita Popov
e2e3ddac7d Canonicalize file-names in zip tests 
There were a number of name collisions in there.
 2019-07-16 10:25:06 +02:00
twosee
63171d88f2 Add do...while(0) for RETURN_* and ZVAL_* APIs 
Closes GH-4255.
 2019-06-12 16:17:16 +02:00
Joe Watkins
3926fa44a6 Merge branch 'PHP-7.4' 
* PHP-7.4:
  fix flaky zip tests, order is OS dependent
 2019-06-12 09:48:09 +02:00
Joe Watkins
e2eb1ee1e3 fix flaky zip tests, order is OS dependent 2019-06-12 09:47:47 +02:00
Nikita Popov
3820296c42 Merge branch 'PHP-7.4' 2019-06-06 11:48:54 +02:00
Nikita Popov
3372f2cf2c php_zip_pcre: Match pattern before stating for directories 
For two reasons: First, it's generally cheaper to match a regex than
perform a stat (especially on Windows). Second, it will not fail on
concurrent modification of a directory in parts that are not matched
by the pattern, such as the spurious failure in ext/zip/tests/bug72660.phpt.
 2019-06-06 11:46:23 +02:00
Dmitry Stogov
457392fa64 Cheaper checks for exceptions thrown from __toString() 2019-06-06 01:47:22 +03:00
Nikita Popov
a31f46421d Allow exceptions in __toString() 
RFC: https://wiki.php.net/rfc/tostring_exceptions

And convert some object to string conversion related recoverable
fatal errors into Error exceptions.

Improve exception safety of internal code performing string
conversions.
 2019-06-05 14:25:07 +02:00
Nikita Popov
623eedbbd5 Merge branch 'PHP-7.4' 2019-06-04 16:14:46 +02:00
Hugh McMaster
c9830f1c2c ext/zip: Replace $LIBZIP_LIBDIR with $LIBZIP_LIBS 
Closes GH-4220.
 2019-06-04 15:31:35 +02:00