Skip to content

[pull] master from php:master #466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 11, 2024
Merged

[pull] master from php:master #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
75e7234
Drop redundant macro definitions from mbfl_defs.h
ndossche Dec 10, 2024
754aa77
Resolve GH-17112 for lower branches
ndossche Dec 11, 2024
ab47c18
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Dec 11, 2024
44a2a5d
Merge branch 'PHP-8.4'
ndossche Dec 11, 2024
901ebd1
Update HTML5 serializer comments
ndossche Dec 11, 2024
4ef1c5f
Merge branch 'PHP-8.4'
ndossche Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ext/dom/html5_serializer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <lexbor/encoding/encoding.h>

/* This file implements the HTML 5 serialization algorithm.
* https://html.spec.whatwg.org/multipage/parsing.html#serialising-html-fragments (Date 2023-12-14)
* https://html.spec.whatwg.org/multipage/parsing.html#serialising-html-fragments (Date 2024-12-11)
*/

#define TRY(x) do { if (UNEXPECTED((x) != SUCCESS)) { return FAILURE; } } while (0)
Expand Down Expand Up @@ -371,7 +371,9 @@ zend_result dom_html5_serialize(dom_html5_serialize_context *ctx, const xmlNode
children = node->children;
}

/* Step 4 */
/* Step 4 concerns shadow roots, but we don't have these, so skip. */

/* Step 5 */
return dom_html5_serialize_node(ctx, children, node);
}

Expand Down
12 changes: 0 additions & 12 deletions ext/mbstring/libmbfl/mbfl/mbfl_defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,6 @@
#ifndef MBFL_DEFS_H
#define MBFL_DEFS_H

#ifndef NULL
#ifdef __cplusplus
#define NULL (0L)
#else
#define NULL (void *)(0L)
#endif
#endif

#ifndef SIZE_MAX
#define SIZE_MAX ((size_t)~0)
#endif

#ifdef _WIN32
#ifdef MBFL_DLL_EXPORT
#define MBFLAPI __declspec(dllexport)
Expand Down
2 changes: 1 addition & 1 deletion ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
#ifndef MBFL_ENCODING_H
#define MBFL_ENCODING_H

#include "zend.h"
#include "mbfl_defs.h"
#include "mbfl_consts.h"
#include "zend.h"

enum mbfl_no_encoding {
mbfl_no_encoding_invalid = -1,
Expand Down
Loading