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

119541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov
e59efb3740 Put debug function behind ifdef 2020-07-13 17:24:31 +02:00
Nikita Popov
2edc5e00ac Add user upgrading note for no_separation change 
I added this to UPGRADING.INTERNALS, but it should also be
mentioned in UPGRADING, as it affects user-visible behavior.

[ci skip]
 2020-07-13 14:50:25 +02:00
Nikita Popov
0cab3fa10e Add upgrading note for crypt change 
[ci skip]
 2020-07-13 14:44:17 +02:00
Nikita Popov
2d98f0cad2 Restore warning 2020-07-13 14:40:19 +02:00
George Peter Banyard
4f3eccfd4d Use consistent types 
uint32_t type for argument count
size_t for length of char*
zend_bool for a zval bool arg

Closes GH-5845
 2020-07-13 13:30:54 +02:00
Dmitry Stogov
48963378c1 Improved reference-counting inference 2020-07-13 13:08:32 +03:00
Nikita Popov
0280c64a2e Add upgrading note 
[ci skip]
 2020-07-13 11:47:25 +02:00
Remi Collet
4884f1be85 define COMPILER and ARCHITECTURE from environment 2020-07-13 11:14:02 +02:00
Rowan Tommins
55a15f32ce Improve output of tokens in Parse Errors 
Currently, unexpected tokens in the parser are shown as the text
found, plus the internal token name, including the notorious
"unexpected '::' (T_PAAMAYIM_NEKUDOTAYIM)".

This commit replaces that with a more user-friendly format, with
two main types of token:

* Tokens which always represent the same text are shown like
  'unexpected token "::"' and 'expected "::"'
* Tokens which have variable text are given a user-friendly
  name, and show like 'unexpected identifier "foo"', and
  'expected identifer'.

A few tokens have special cases:

* unexpected token """ -> unexpected double-quote mark
* unexpected quoted string "'foo'" -> unexpected single-quoted
  string "foo"
* unexpected quoted string ""foo"" -> unexpected double-quoted
  string "foo"
* unexpected illegal character "_" -> unexpected character 0xNN
  (where _ is almost certainly a control character, and NN is the
   hexadecimal value of the byte)

The \ token has a special case in the implementation just to stop
bison making a mess of escaping it and it coming out as \\
 2020-07-13 11:07:40 +02:00
Dmitry Stogov
d4fdf79add JIT for array merging 2020-07-13 12:04:08 +03:00
Nat Wyatt
6f48ccf51c Fix compilation errors when EXIF_DEBUG is defined 
Fix warnings and error when compiling with EXIF_DEBUG defined.

Closes GH-5838.
 2020-07-13 11:00:02 +02:00
Christoph M. Becker
99c78963c8 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix test for x86 Windows
 2020-07-13 10:53:55 +02:00
Christoph M. Becker
e2c17cef4b Fix test for x86 Windows 
`st_dev` deliberately overflows on such systems, cf.
<http://svn.php.net/viewvc?view=revision&revision=350100>.
 2020-07-13 10:52:26 +02:00
Nikita Popov
000f609c26 Add another doctrine workaround 
This has been fixed a few months ago, but apparently Doctrine
doesn't do releases.
 2020-07-13 10:27:44 +02:00
Nikita Popov
1c5f0b8a16 Check for undef var in verify return jit 2020-07-13 10:05:39 +02:00
Nikita Popov
213852de78 Fixed bug #79828 2020-07-13 09:55:13 +02:00
Nikita Popov
86e2b7bb70 Fixed bug #79841 2020-07-13 09:41:05 +02:00
Christoph M. Becker
c9639cffdb Fix PDO_Firebird numeric to string conversion on Windows 
Commit aaa1f90[1] dropped support for the `snprinf()` `I` modifier, so
we use the standard `ll` modifier which is suitable for 32bit and 64bit
Windows.  We also replace the deprecated `I64` suffix[2] with the `LL`
suffix.

This fixes ext/pdo_firebird/tests/bug_64037.phpt.

[1] <http://git.php.net/?p=php-src.git;a=commit;h=aaa1f90e3f90c24098fa55a7b868fdca0b89ee25>
[2] <https://docs.microsoft.com/en-us/cpp/cpp/numeric-boolean-and-pointer-literals-cpp?view=vs-2019#integer-literals>
 2020-07-12 23:52:22 +02:00
Christoph M. Becker
b6e70e14bd Fix PDO_Firebird tests which assume ERRMODE_SILENT 
These have apparently been missed when PR 5388[1] had been merged.

[1] <https://github.com/php/php-src/pull/5388>
 2020-07-12 18:15:56 +02:00
Christoph M. Becker
6c7b5c0760 Unbork tests for PDO_Firebird 
PDO_Firebird raises a warning regarding the unknown SQL syntax, which
we have to silence to avoid run-tests.php to mark the test as borked.
 2020-07-12 17:51:29 +02:00
Ilija Tovilo
1c967df5a0 Fix free of uninitialized memory in MATCH_ERROR 
As suggested by Tyson Andre:
https://github.com/php/php-src/pull/5371#issuecomment-657081464

Also fix line number of unhandled match error

Closes GH-5841.
 2020-07-12 13:33:36 +02:00
twosee
c0172aa2bd debug_zval_dump(): Don't skip recursion detection on first level 
A complement to ae6f45ad45

Closes GH-5843.
 2020-07-12 03:08:42 +08:00
Máté Kocsis
6cf22529b9 Addd upgrading notes about OCI8 2020-07-11 20:04:40 +02:00
Jens de Nies
11f4a5e563 Removed the "oci_internal_debug" function and its alias. Also deprecated the "ocifetchinto" function. 
Closes GH-5810
 2020-07-11 19:57:30 +02:00
Chuck Adams
f06a6b4697 (ffi) fix ifdefs for non-windows systems without long double 
Closes GH-5840
 2020-07-11 19:50:15 +02:00
Christoph M. Becker
340e2ead77 Export php_gd_libgdimageptr_from_zval_p() 
Some extension may need to retrieve the `gdImagePtr` from an `GdImage`
object; thus, we export the respective function.  To not being forced
to include gd.h in php_gd.h, we use the opaque `struct gdImageStruct *`
as return type.

We also rename php_gd2.dll to php_gd.dll, since there's not really much
point in giving the DLL a version number, since there is no php_gd.dll
for years (if there ever has been).  Renaming, on the other hand,
matches the name on other systems (gd.so), and allows to actually use
`ADD_EXTENSION_DEP()`.
 2020-07-11 19:33:20 +02:00
Ilija Tovilo
d5a0370828 [skip ci] Consistent match test closing tags 2020-07-11 16:50:51 +02:00
twosee
614b2191bd Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed BC break of php_debug_zval_dump
 2020-07-11 18:32:18 +08:00
twosee
7a39e174aa Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed BC break of php_debug_zval_dump
 2020-07-11 18:31:30 +08:00
twosee
f0b2c2cb98 Fixed BC break of php_debug_zval_dump 
It introduced by fixing bug #79830
 2020-07-11 18:30:28 +08:00
twosee
40efb7ad61 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed bug #79830 introduced by fixing bug #79821

# Conflicts:
#	ext/standard/var.c
 2020-07-11 14:40:17 +08:00
twosee
6ef08b1903 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed bug #79830 introduced by fixing bug #79821
 2020-07-11 14:38:27 +08:00
twosee
56dec3cc73 Fixed bug #79830 introduced by fixing bug #79821 
This also fixes memory error in debug_zval_dump and var_export.
 2020-07-11 14:37:25 +08:00
twosee
342fe094b5 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed bug #79821
 2020-07-11 06:19:41 +08:00
twosee
8db2ae8ffb Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed bug #79821
 2020-07-11 06:15:28 +08:00
twosee
150504e6b1 Fixed bug #79821 
HashTable was reallocated (zend_hash_packed_grow) during php_var_dump, so we should call GC_ADDREF to make SEPARATE_ARRAY work.

Closes GH-5837.
 2020-07-11 06:14:22 +08:00
codinghuang
7817ff8ce1 Don't generate JSON scanner and parser during configure 2020-07-10 23:32:01 +02:00
Máté Kocsis
95cff3ebf2 Retain the original formatting character in test 2020-07-10 23:15:08 +02:00
Máté Kocsis
d30cd7d7e7 Review the usage of apostrophes in error messages 
Closes GH-5590
 2020-07-10 21:05:28 +02:00
Christoph M. Becker
2ad75ba784 Fix test cases 
These tests are not supposed to check the result of `fclose(false)`.
 2020-07-10 18:27:18 +02:00
George Peter Banyard
2297a6d364 Use dedicated function for illegal offset type error 2020-07-10 16:49:52 +02:00
Nikita Popov
5fc70243d7 Add missing addref for MATCH_ERROR operand 2020-07-10 15:58:42 +02:00
George Peter Banyard
3f286fa89a Promote Notice to Warning in libmagic 
The current behaviour makes little to no sense, having a notice which starts with 'Warning:' should just be a warning

Closes GH-5824
 2020-07-10 14:43:43 +02:00
Nikita Popov
6556846754 Fixed bug #79818 
Only destroy the variable directly before reassigning it. The
value could be read in the meantime.
 2020-07-10 14:36:50 +02:00
Máté Kocsis
f328594072 Add stubs for SAPIs 
Closes GH-5295.
 2020-07-10 14:20:18 +02:00
Nikita Popov
db43a93fc2 Fix warning in embed sapi 2020-07-10 14:10:02 +02:00
Nikita Popov
12214e1d46 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed bug #79817
 2020-07-10 14:07:59 +02:00
Nikita Popov
3f8d71d37f Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed bug #79817
 2020-07-10 14:07:17 +02:00
Nikita Popov
a72c53a070 Fixed bug #79817 
Use *_IND macros in a few places in string.c.
 2020-07-10 14:06:41 +02:00
Christoph M. Becker
9a5695bfc3 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Enable further ext/standard/tests/file tests on Windows
 2020-07-10 13:42:13 +02:00