php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-23 16:08:35 +02:00
Code Issues Packages Projects Releases Wiki Activity
143,661 Commits 549 Branches 1,485 Tags
6291f97c149677ce9a9bb249ca16e5ffec00cafe
Commit Graph

538 Commits

Author SHA1 Message Date
Niels Dossche 4191b99672 Merge branch 'PHP-8.5' 
* PHP-8.5:
  Wrap the normally lazy-initialized components in ZTS
 2025-10-14 22:15:15 +02:00
Niels Dossche f601910eca Merge branch 'PHP-8.4' into PHP-8.5 
* PHP-8.4:
  Wrap the normally lazy-initialized components in ZTS
 2025-10-14 22:15:10 +02:00
Niels Dossche 6dcabd9ac1 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Wrap the normally lazy-initialized components in ZTS
 2025-10-14 22:15:01 +02:00
Niels Dossche f3cb9a81fb Wrap the normally lazy-initialized components in ZTS 2025-10-14 22:14:54 +02:00
Niels Dossche 13505acadf Merge branch 'PHP-8.5' 
* PHP-8.5:
  Fix not thread safe RelaxNG invocations in ZTS builds
  Fix not thread safe xmlSchemaParse calls in ZTS builds
 2025-10-14 22:01:09 +02:00
Niels Dossche 5a2084bc16 Merge branch 'PHP-8.4' into PHP-8.5 
* PHP-8.4:
  Fix not thread safe RelaxNG invocations in ZTS builds
  Fix not thread safe xmlSchemaParse calls in ZTS builds
 2025-10-14 22:01:04 +02:00
Niels Dossche 595b746c2c Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix not thread safe RelaxNG invocations in ZTS builds
  Fix not thread safe xmlSchemaParse calls in ZTS builds
 2025-10-14 22:00:57 +02:00
Niels Dossche 75d8449d1f Fix not thread safe RelaxNG invocations in ZTS builds 2025-10-14 22:00:24 +02:00
SpencerMalone f14e5fcfbd Fix not thread safe xmlSchemaParse calls in ZTS builds 
By calling xmlSchemaInitTypes during MINIT.
See: https://gitlab.gnome.org/GNOME/libxml2/-/issues/930

Closes GH-20150.
 2025-10-14 21:59:46 +02:00
Niels Dossche 57ce245e1e Reduce code bloat in arginfo by using specialised string releases (#20016) 
* Reduce code bloat in arginfo by using specialised string releases

Comparing this patch to master (c7da728574),
with a plain configure command without any options:

```
   text	   data	    bss	    dec	    hex	filename
20683738	1592400	 137712	22413850	156021a	sapi/cli/php
20688522	1592400	 137712	22418634	15614ca	sapi/cli/php_old
```

We see a minor reduction of 0.023% in code size.

* Also use true for the other initialization line

* Also use specialized code for consts
 2025-10-02 22:00:20 +02:00
Daniel Scherzer 4de2ec3895 [RFC] Deprecate xml_parser_free() (#19449) 
https://wiki.php.net/rfc/deprecations_php_8_5
 2025-08-12 05:44:32 -07:00
DanielEScherzer 1eadf553f1 Arginfo: avoid using temporary zvals for initializing attribute values (#19141) 
Instead of
* adding a zval on the stack
* initializing it
* copying the value to the attribute

Just initialize the value directly in the zend_attribute_arg
 2025-07-21 13:33:51 -07:00
Niels Dossche 541620cf78 Merge branch 'PHP-8.4' 
* PHP-8.4:
  Fix GH-19098: libxml<2.13 segmentation fault caused by php_libxml_node_free
 2025-07-20 17:20:53 +02:00
Niels Dossche cb73155945 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix GH-19098: libxml<2.13 segmentation fault caused by php_libxml_node_free
 2025-07-20 17:20:47 +02:00
Niels Dossche 312869381a Fix GH-19098: libxml<2.13 segmentation fault caused by php_libxml_node_free 
This implements a workaround for reconciliation not being performed for
document-less nodes in libxml<2.13.

Closes GH-19186.
 2025-07-20 17:19:43 +02:00
Niels Dossche 0962c325fa Implement SVG image handler 
This implements an SVG handler using the libxml reader API. This does
not parse the entire document but instead uses a pull parser to locate
the root element, check whether it's an svg root, do some extra sanity
checks on the attribute, and fill in the php_gfxinfo structure.
 2025-07-20 12:53:57 +02:00
Daniel Scherzer 142e378618 Arginfo: add and use known strings for attribute values 2025-07-14 17:31:22 -07:00
Niels Dossche 3cb7d1bd8a Remove custom UTF-8 check function from ext/libxml 
This was originally introduced as a workaround for a libxml2 bug [1].
This bug has been fixed for more than a decade [2], and we can use the
libxml2 API again. We bumped our version requirement for libxml2 beyond
that in 7.4 [3].

[1] 7e53511ec8
[2] https://github.com/GNOME/libxml2/commit/3ffe90ea1cbd4fd8eb2eb162d7940a445f1455d6
[3] https://github.com/php/php-src/commit/74235ca5f3fae3325175cf0e68cd7e28c86e1378

Closes GH-18706.
 2025-05-30 10:40:23 +02:00
Niels Dossche efaae93e48 Merge branch 'PHP-8.4' 
* PHP-8.4:
  Fix GH-18597: Heap-buffer-overflow in zend_alloc.c when assigning string with UTF-8 bytes
 2025-05-20 21:32:27 +02:00
Niels Dossche 40e667280b Fix GH-18597: Heap-buffer-overflow in zend_alloc.c when assigning string with UTF-8 bytes 
xmlSave() also can flush in some cases. When the encoding is not
available this can fail for short inputs, resulting in an empty string
which is interned but then wrongly tagged by RETURN_NEW_STR.
Fix this by checking the error condition and switching to RETURN_STR for
defense-in-depth.

This issue also exists on 8.3, but does not crash; however, due to the
different API usage internally I cannot easily fix it on 8.3. There it
gives a partial output.

Closes GH-18606.
 2025-05-20 21:32:17 +02:00
Gina Peter Banyard 3932d9b660 ext/libxml: Get rid of useless php_libxml_func_handler abstraction 2025-04-26 13:57:17 +01:00
Gina Peter Banyard dc036016a3 ext/libxml: Minor code nits 2025-04-26 13:57:17 +01:00
Gina Peter Banyard d1917c918e ext/libxml: libxml_set_external_entity_loader() always returns true 2025-04-26 13:57:17 +01:00
Gina Peter Banyard c5aa03c8b9 ext/libxml: Use bool type instead of int type 2025-04-26 13:57:17 +01:00
Gina Peter Banyard 1f1cd5c4bc ext/libxml: Add some const qualifiers 2025-04-26 13:57:17 +01:00
Gina Peter Banyard e59c7f887b ext/libxml: Reduce scope of variables 2025-04-26 13:57:17 +01:00
Gina Peter Banyard 213949dc34 Merge branch 'PHP-8.4' 
* PHP-8.4:
  ext/libxml: Fixed custom external entity loader returning an invalid resource leading to a confusing TypeError message
 2025-04-07 13:01:52 +01:00
Gina Peter Banyard 1e9e397122 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  ext/libxml: Fixed custom external entity loader returning an invalid resource leading to a confusing TypeError message
 2025-04-07 12:59:57 +01:00
Gina Peter Banyard 61f704f269 ext/libxml: Fixed custom external entity loader returning an invalid resource leading to a confusing TypeError message 
Closes GH-18096
 2025-04-07 12:58:52 +01:00
Niels Dossche 3d6f4c8bbe Merge branch 'PHP-8.4' 
* PHP-8.4:
  Fix GHSA-p3x9-6h7p-cgfc: libxml streams wrong `content-type` on redirect
 2025-03-11 23:00:43 +01:00
Tim Düsterhus a8d3a80067 Fix GHSA-p3x9-6h7p-cgfc: libxml streams wrong content-type on redirect 
libxml streams use wrong content-type header when requesting a
redirected resource.
 2025-03-11 22:58:39 +01:00
Jakub Zelenka acf2f4988a Merge branch 'PHP-8.2' into PHP-8.3 2025-03-11 22:09:00 +01:00
Jakub Zelenka 4af1830356 Merge branch 'PHP-8.1' into PHP-8.2 2025-03-11 21:57:33 +01:00
Tim Düsterhus b6004a043c Fix GHSA-p3x9-6h7p-cgfc: libxml streams wrong content-type on redirect 
libxml streams use wrong content-type header when requesting a
redirected resource.
 2025-03-11 21:50:17 +01:00
Christoph M. Becker aa76127d01 Address more Clang warnings (GH-17506) 
We prefer clean solutions (such as declaring the proper type in the
first place, or introducing a portable format specifier) where easily
possible, but resort to casts otherwise.

We also port https://github.com/libgd/libgd/commit/f1480ab14bd5e2e4b4d83d8f3e64e786aa810637.
 2025-01-21 20:05:29 +01:00
Niels Dossche 466c8b0e03 Merge branch 'PHP-8.4' 
* PHP-8.4:
  Fix GH-17257: UBSAN warning in ext/opcache/jit/zend_jit_vm_helpers.c
  Fix GH-17223: Memory leak in libxml encoding handling
 2024-12-26 12:26:59 +01:00
Niels Dossche 956576b0b4 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix GH-17223: Memory leak in libxml encoding handling
 2024-12-26 12:25:08 +01:00
Niels Dossche 7be950f3f6 Fix GH-17223: Memory leak in libxml encoding handling 
This was a bug in both libxml and PHP.
We follow up with the same change as done in GNOME/libxml@b3871dd138.

Changing away from `xmlOutputBufferCreateFilenameDefault` is not
possible yet because this is a stable branch and would break BC.

Closes GH-17254.
 2024-12-26 12:24:06 +01:00
Christoph M. Becker 0de8e401db Drop bogus ext/libxml dependency on ext/iconv (GH-16801) 
There is no such dependency; only libxml2 depends on libiconv.  So when
php_libxml.dll is built, it needs to be linked against libiconv, or,
when ext/iconv has been configured as static extension, against
php8.dll.
 2024-11-15 21:25:00 +01:00
Niels Dossche bc4fa01de7 Get rid of reserved name usage in ext/libxml (#16707) 
Names starting with an _ are reserved in C.
 2024-11-06 17:47:48 +01:00
Niels Dossche 6366da48ec Use unsigned int for the reference count APIs in ext/libxml (#16706) 
Also removes impossible conditions.
 2024-11-06 17:47:35 +01:00
Christoph M. Becker 6dd67bbb76 Merge branch 'PHP-8.4' 
* PHP-8.4:
  Updates for libxml2 >= 2.13.0
 2024-10-22 00:17:44 +02:00
Christoph M. Becker 30dd291628 Updates for libxml2 >= 2.13.0 
libxml2 2.13.0 introduced some relevant changes regarding the treatment
of file paths on Windows[1].  Thus we un-xfail bug69753.phpt and its
companion, and we adjust dom004.phpt.  And we also disable the
workaround for erroneous file:/ URIs on Windows.

[1] <https://gitlab.gnome.org/GNOME/libxml2/-/commit/8ab1b122c47bfced2b59f52351507ebc1eb50218>

Closes GH-16536.
 2024-10-22 00:17:12 +02:00
Niels Dossche 6199289b6e Backport 3ec5919e: Update error message for libxml 2.13 
External entity loading got its error level decreased in upstream,
which means they now map to E_NOTICE. Also the error message format has
changed.
 2024-10-12 15:12:40 +02:00
Niels Dossche b78618750f Backport f74f9b07: Update libxml test for the directory field behaviour change 
See https://gitlab.gnome.org/GNOME/libxml2/-/issues/753.
The base directory for the entity is no longer set, follow the upstream
behaviour.
 2024-10-12 15:12:40 +02:00
Niels Dossche bb46b4b799 Backport 4fe82131: Backport libxml2 2.13.2 fixes (#14816) 
Backproted from https://github.com/php/php-src/pull/14789
 2024-10-12 15:12:40 +02:00
Niels Dossche dbde99d875 Backport e2d97314: Backport deprecation warning ignores to unbreak CI 
In master I use ZEND_DIAGNOSTIC_IGNORED_START, but that doesn't exist on
8.2 or 8.3 (8.3 has a similar macro though).
So to unbreak CI I just made a variation of this directly in the
php_libxml.h header.

See https://github.com/php/php-src/commit/683e78786070ab77d33f7787598ac1b90d68390a#commitcomment-134301083
 2024-10-12 15:12:40 +02:00
Niels Dossche fa6a0f80f6 Backport 0a39890c: Fix libxml2 2.12 build due to API breaks 
See https://github.com/php/php-src/actions/runs/7062192818/job/19225478601
 2024-10-12 15:12:40 +02:00
DanielEScherzer 7a8b1f683b Generated arginfo header files: use known strings for prop names when… (#15751) 
Instead of allocating, using, and then releasing a zend_string for every
property name unconditionally, only do so when the minimum supported version of
PHP does not have that string in its known strings (ZEND_KNOWN_STRINGS). If the
string is already known, just use the known version directly. This is already
done for some non-generated class registrations, e.g. in
`zend_enum_register_props()`.
 2024-09-30 13:22:34 +02:00
Niels Dossche d5d06be3e3 Merge branch 'PHP-8.3' 
* PHP-8.3:
  Update error message for libxml 2.13
  Update libxml test for the directory field behaviour change
 2024-09-12 23:07:22 +02:00