Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: devnexen/php-src
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: php/php-src
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 14 commits
  • 14 files changed
  • 8 contributors

Commits on May 14, 2025

  1. Snapshotted poly_func / poly_this may be spilled

    Polymorphic calls pass this and the function to side traces via snapshotting.
    However, we assume that this/func are in registers, when in fact they may be
    spilled.
    
    Here I update snapshotting of poly_func/poly_this to support spilling:
    
     - In zend_jit_snapshot_handler, keep track of the C stack offset
       of the spilled register, in a way similar to how stack variables.
     - In zend_jit_start, do not pre-load the registers if they were spilled.
     - In zend_jit_trace_exit / zend_jit_trace_deoptimization, load from the
       stack if the register was spilled.
     - Store a reference to poly_func/poly_this in zend_jit_ctx so we can use that
       directly in the side trace.
    
    Closes phpGH-18408
    arnaud-lb committed May 14, 2025
    Configuration menu
    Copy the full SHA
    18276a8 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'PHP-8.4'

    * PHP-8.4:
      Snapshotted poly_func / poly_this may be spilled
    arnaud-lb committed May 14, 2025
    Configuration menu
    Copy the full SHA
    1de16c7 View commit details
    Browse the repository at this point in the history
  3. cli: Fix swapped output in php --ini (php#18557)

    In php#18527, I accidentally swapped the values. This is before my modification:
    
    ```
    zend_printf("Configuration File (php.ini) Path: %s\n", PHP_CONFIG_FILE_PATH);
    zend_printf("Loaded Configuration File:         %s\n", php_ini_opened_path ? php_ini_opened_path : "(none)");
    zend_printf("Scan for additional .ini files in: %s\n", php_ini_scanned_path  ? php_ini_scanned_path : "(none)");
    ```
    
    - "Loaded Configuration File" should be `php_ini_opened_path`
    - "Scan for additional .ini files in" shoudl be `php_ini_scanned_path`
    schneems authored May 14, 2025
    Configuration menu
    Copy the full SHA
    89dc8d7 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2025

  1. Fix phpGH-18529: ldap no longer respects TLS_CACERT from ldaprc in ld…

    …ap_start_tls() Regresion introduced in fix for phpGH-17776
    
    - ensure TLS string options are properly inherited
      workaround to openldap issue https://bugs.openldap.org/show_bug.cgi?id=10337
    
    - fix ldaps/start_tls tests using LDAPNOINIT in ldaps/tls tests
    remicollet committed May 15, 2025
    Configuration menu
    Copy the full SHA
    2760a3e View commit details
    Browse the repository at this point in the history
  2. NEWS

    remicollet committed May 15, 2025
    Configuration menu
    Copy the full SHA
    8da9530 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'PHP-8.3' into PHP-8.4

    * PHP-8.3:
      NEWS
      Fix phpGH-18529: ldap no longer respects TLS_CACERT from ldaprc in ldap_start_tls() Regresion introduced in fix for phpGH-17776
    remicollet committed May 15, 2025
    Configuration menu
    Copy the full SHA
    8647624 View commit details
    Browse the repository at this point in the history
  4. NEWS

    remicollet committed May 15, 2025
    Configuration menu
    Copy the full SHA
    73321e2 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'PHP-8.4'

    * PHP-8.4:
      NEWS
      NEWS
      Fix phpGH-18529: ldap no longer respects TLS_CACERT from ldaprc in ldap_start_tls() Regresion introduced in fix for phpGH-17776
    remicollet committed May 15, 2025
    Configuration menu
    Copy the full SHA
    2e70a89 View commit details
    Browse the repository at this point in the history
  6. Address compiler warnings.

    gwanglst committed May 15, 2025
    Configuration menu
    Copy the full SHA
    8e5b312 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    72efe6d View commit details
    Browse the repository at this point in the history
  8. Merge branch 'PHP-8.4'

    gwanglst committed May 15, 2025
    Configuration menu
    Copy the full SHA
    3367f17 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2025

  1. Configuration menu
    Copy the full SHA
    47354a7 View commit details
    Browse the repository at this point in the history
  2. Backport lexbor/lexbor@814e0bc (php#18574)

    Co-authored-by: Alexander Borisov <lex.borisov@gmail.com>
    nielsdos and lexborisov authored May 16, 2025
    Configuration menu
    Copy the full SHA
    dbc7c5f View commit details
    Browse the repository at this point in the history
  3. Merge branch 'PHP-8.4'

    * PHP-8.4:
      Backport lexbor/lexbor@814e0bc (php#18574)
    nielsdos committed May 16, 2025
    Configuration menu
    Copy the full SHA
    05618e7 View commit details
    Browse the repository at this point in the history
Loading