php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
135,957 Commits 545 Branches 1,479 Tags
php-8.3.27
Commit Graph

45 Commits

Author SHA1 Message Date
Ilija Tovilo
8756ee034d Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Change master branch check to 8.6
 2025-09-28 11:56:11 +02:00
Ilija Tovilo
5dd764b1b3 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Change master branch check to 8.6
 2025-09-28 11:56:01 +02:00
Shivam Mathur
107075605d Change master branch check to 8.6 2025-09-28 09:54:13 +05:30
Shivam Mathur
f08ac4f1c9 Merge branch 'PHP-8.2' into PHP-8.3 2025-08-06 00:04:58 +00:00
Shivam Mathur
871de14ceb Merge branch 'PHP-8.1' into PHP-8.2 2025-08-06 00:03:49 +00:00
Shivam Mathur
8199cad99f Fix master branch check in find-target-branch.bat (#19385) 2025-08-06 05:32:36 +05:30
Jakub Zelenka
eade5c17ea Fix GH-18529: additional inheriting of TLS int options 
This is for LDAP_OPT_X_TLS_PROTOCOL_MIN and LDAP_OPT_X_TLS_PROTOCOL_MAX

It also adds a test that uses LDAPCONF with TLS max version lower than
the minimum TLS server version so it should always fail. However it
does not fial for the second case without this change which confirms
that the change works as expected.

Closes GH-18676
 2025-07-16 17:29:42 +02:00
Shivam Mathur
dc79f4c8c6 Merge branch 'PHP-8.2' into PHP-8.3 2025-06-25 02:01:24 +05:30
Shivam Mathur
91f2458020 Merge branch 'PHP-8.1' into PHP-8.2 2025-06-25 02:00:11 +05:30
Shivam Mathur
6233dc6210 Switch to windows-2022 in CI (#18927) 
* Switch to windows-2022 in CI

windows-2019 runner will be dropped by GitHub on 2025-06-30.

* xfail test cases that fail on windows-2022
 2025-06-25 01:57:07 +05:30
Ilija Tovilo
1009ff65cc Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Upgrade security branches to Ubuntu 22.04
 2025-03-06 15:24:35 +01:00
Ilija Tovilo
5fcc8d4cd1 Upgrade security branches to Ubuntu 22.04 
20.04 goes out of security support in 2 months. Backporting various
commits.

See d98963a071
See af721c9c36
See 378b79b90c

Closes GH-17963
 2025-03-06 15:24:15 +01:00
Christoph M. Becker
c7bc14dd6b Prevent using system DLLs when running the tests 
The search order for DLLs on Windows is (simplified):

* the application folder
* the system folder
* all folders in the `PATH`

(The full details are documented on Microsoft Learn[1].)

As is, we're adding `deps\bin` to the `PATH` when running the tests,
but any DLLs in the system folder take precedence, so these would be
used instead of our intended dependencies.  To mitigate that, we copy
over all DLLs from `deps\bin` to our application folder (i.e. where
php.exe, php-cgi.exe and phpdbg.exe are placed).

Since we're doing this, there is no more need to attempt to remove the
OpenSSL DLLs in the system folder (what seems to be a bad idea anyway).

[1] <https://learn.microsoft.com/en-us/windows/win32/dlls/dynamic-link-library-search-order>

Closes GH-17805.
 2025-02-16 23:06:04 +01:00
Jakub Zelenka
3606701f48 Merge branch 'PHP-8.2' into PHP-8.3 2025-01-06 12:19:36 +01:00
Jakub Zelenka
5be673d29e Merge branch 'PHP-8.1' into PHP-8.2 2025-01-06 12:18:54 +01:00
Jakub Zelenka
9e1b58274e Test stream_context_tcp_nodelay_server on Windows 
Closes GH-17308
 2025-01-05 14:44:22 +01:00
Christoph M. Becker
5dba6aebaa Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Download enchant dict from downloads.php.net
 2024-10-17 00:55:20 +02:00
Christoph M. Becker
5ef3fe218c Download enchant dict from downloads.php.net 
Since windows.php.net is in the progress to be migrated to
downloads.php.net anyway, we may as well fetch the dictionary from the
new site right away.

Closes GH-16310.
 2024-10-17 00:55:04 +02:00
Christoph M. Becker
424fb2c3fc Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Install 32bit Firebird server on x86
 2024-10-07 01:35:29 +02:00
Christoph M. Becker
c3434091de Install 32bit Firebird server on x86 
php_pdo_firebird.dll depends on fbclient.dll, which is shipped with the
server.  However, a 64bit Firebird server ships a 64bit fbclient.dll,
which is not compatible with a 32bit php_pdo_firebird.dll.

Closes GH-16223.
 2024-10-07 01:34:54 +02:00
Christoph M. Becker
ad11cbc491 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Run snmp tests in Windows CI, again
 2024-09-15 23:14:15 +02:00
Christoph M. Becker
b26e610777 Run snmp tests in Windows CI, again 
That was broken when CI was moved to GH, since `APPVEYOR_BUILD_FOLDER`
is no longer set; instead we use `GITHUB_WORKSPACE` which has the same
meaning.

Closes GH-15896.
 2024-09-15 23:13:54 +02:00
Ilija Tovilo
9cec164f76 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Remove GitHub actions junit artifacts
 2024-06-13 14:07:43 +02:00
Ilija Tovilo
f598b58790 Remove GitHub actions junit artifacts 
Nobody looks at those, and nightly regularly fails due to uploading them.

Closes GH-14555
 2024-06-13 14:05:50 +02:00
Niels Dossche
032fe011df Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix Windows CI
 2023-10-07 15:50:51 +02:00
Niels Dossche
4268b0cdf8 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix Windows CI
 2023-10-07 15:50:41 +02:00
Niels Dossche
ae52f1958d Fix Windows CI 
The path to mysql.exe changed. Fortunately, chocolately puts the folder
containing the exe in the PATH environment variable, so we don't even
need to provide an absolute path.
 2023-10-07 15:49:46 +02:00
Ilija Tovilo
9ce9c11ee8 Fix master branch check in find-target-branch.bat 2023-09-03 14:18:41 +02:00
Ilija Tovilo
dde1d9e102 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Retire AppVeyor
 2023-07-05 15:17:11 +02:00
Ilija Tovilo
80153c9c2b Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Retire AppVeyor
 2023-07-05 15:16:01 +02:00
Ilija Tovilo
f47dc259aa Retire AppVeyor 
Closes GH-11566
 2023-07-05 15:14:20 +02:00
Ilija Tovilo
61a49ae841 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Attempt to improve setup-slapd.sh stability
 2023-07-05 15:08:30 +02:00
Ilija Tovilo
463e20b510 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Attempt to improve setup-slapd.sh stability
 2023-07-05 15:08:22 +02:00
Ilija Tovilo
4cc800fcb4 Attempt to improve setup-slapd.sh stability 
Don't restart multiple times, restart at the end where we already have a retry
loop with a small delay.

Closes GH-11590
 2023-07-05 15:07:41 +02:00
Ilija Tovilo
ef6bbaa1ec Downgrade to Ubuntu 20.04 for ASAN nightly for now 
See https://github.com/actions/runner-images/issues/6709.
 2023-05-03 19:13:32 +02:00
Ilija Tovilo
cd0c6bc74b Merge branch 'PHP-8.2' 
* PHP-8.2:
  Windows CI log verbosity, CI bat file guard
 2023-03-16 00:05:36 +01:00
Ilija Tovilo
40ae629462 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Windows CI log verbosity, CI bat file guard
 2023-03-16 00:05:21 +01:00
Michael Voříšek
f42e56286a Windows CI log verbosity, CI bat file guard 
Closes GH-10817
 2023-03-16 00:04:53 +01:00
Ilija Tovilo
d98963a071 Switch to Ubuntu 22.04 for GitHub actions jobs 
Closes GH-10814
 2023-03-10 00:17:23 +01:00
Ilija Tovilo
603367946b Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Add Windows GitHub actions build
 2023-03-01 23:05:17 +01:00
Michael Voříšek
916b132ea0 Add Windows GitHub actions build 
Closes GH-10664
 2023-03-01 23:02:03 +01:00
Ilija Tovilo
182c8acf43 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Prepare for Windows CI with Github Actions
 2022-10-09 18:48:07 +02:00
Ilija Tovilo
296a09549b Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Prepare for Windows CI with Github Actions
 2022-10-09 18:45:29 +02:00
Michael Voříšek
b43e49437c Prepare for Windows CI with Github Actions 2022-10-09 18:44:59 +02:00
Ilija Tovilo
41461cf812 Migrate CI to GitHub actions 2022-02-23 14:32:50 +01:00