Version in base suite: 8.4.24-1~deb13u1 Version in overlay suite: 8.4.27-1~deb13u1 Base version: php8.4_8.4.27-1~deb13u1 Target version: php8.4_8.4.28-1~deb13u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/p/php8.4/php8.4_8.4.27-1~deb13u1.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/p/php8.4/php8.4_8.4.28-1~deb13u1.dsc .gitattributes | 3 .github/CODEOWNERS | 1 .github/actions/brew/action.yml | 2 .github/actions/freebsd/action.yml | 2 .github/matrix.php | 5 .github/scripts/windows/test_task.bat | 8 .github/workflows/docs.yml | 2 .github/workflows/test-suite.yml | 38 .github/workflows/test.yml | 2 .gitignore | 1 EXTENSIONS | 4 NEWS | 409 Zend/Optimizer/block_pass.c | 12 Zend/Optimizer/dfa_pass.c | 6 Zend/Optimizer/escape_analysis.c | 31 Zend/Optimizer/optimize_func_calls.c | 5 Zend/Optimizer/zend_inference.c | 35 Zend/Optimizer/zend_optimizer.c | 2 Zend/tests/assert/expect_final_abstract_modifiers.phpt | 36 Zend/tests/assert/expect_readonly_anon_class.phpt | 22 Zend/tests/constexpr/new_named_params_duplicate_leak.phpt | 21 Zend/tests/enum/unserialize-autoload-nested.phpt | 36 Zend/tests/exception_previous_already_in_chain_destructor.phpt | 29 Zend/tests/fibers/destroy-suspended-fiber-during-unwinding.phpt | 95 Zend/tests/fibers/destructors_012.phpt | 63 Zend/tests/fibers/fiber-callable-object-outlives-caller.phpt | 85 Zend/tests/fibers/gc-destructor-throw-previous-already-in-chain.phpt | 41 Zend/tests/fibers/gh24265-001.phpt | 24 Zend/tests/fibers/gh24265-002.phpt | 30 Zend/tests/fibers/unfinished-fiber-with-throw-previous-already-in-chain.phpt | 28 Zend/tests/generators/finally/yield_throw_previous_already_in_chain.phpt | 30 Zend/tests/gh24989.phpt | 29 Zend/tests/gh24989_uncaught.phpt | 16 Zend/tests/nullsafe_operator/gh23979.phpt | 16 Zend/tests/shift_left_overflow_range.phpt | 51 Zend/tests/try/finally_interrupt_after_return.phpt | 42 Zend/tests/try/finally_interrupt_after_return_generator.phpt | 43 Zend/tests/try/finally_interrupt_after_return_nested.phpt | 47 Zend/tests/try/try_finally_previous_already_in_chain.phpt | 38 Zend/tests/vm_interrupt_rearm.phpt | 26 Zend/tests/zend_alloc_realloc_shrink_boundary.phpt | 40 Zend/tests/zend_mm_chunk_alloc_mmap_failure.phpt | 32 Zend/zend.c | 4 Zend/zend.h | 2 Zend/zend_API.c | 8 Zend/zend_alloc.c | 8 Zend/zend_ast.c | 42 Zend/zend_atomic.h | 13 Zend/zend_call_stack.c | 3 Zend/zend_compile.c | 20 Zend/zend_exceptions.c | 2 Zend/zend_execute.c | 10 Zend/zend_execute_API.c | 7 Zend/zend_fibers.c | 50 Zend/zend_gc.c | 2 Zend/zend_inheritance.c | 2 Zend/zend_range_check.h | 2 Zend/zend_system_id.c | 16 Zend/zend_types.h | 9 Zend/zend_vm_def.h | 28 Zend/zend_vm_execute.h | 30 configure | 9884 +++++----- configure.ac | 2 debian/changelog | 30 ext/com_dotnet/com_typeinfo.c | 45 ext/com_dotnet/tests/gh25008.phpt | 58 ext/curl/config.w32 | 4 ext/curl/interface.c | 14 ext/curl/tests/curl_copy_handle_progress_null_uaf.phpt | 27 ext/curl/tests/curl_copy_handle_stderr_uaf.phpt | 38 ext/date/lib/timezonedb.h | 2632 +- ext/date/php_date.c | 12 ext/date/tests/GHSA-gr4f-wgx5-jpfv.phpt | 22 ext/date/tests/bug-gh20503.phpt | 33 ext/date/tests/unserialize-test.phpt | 3 ext/dba/dba_ndbm.c | 3 ext/dba/tests/gh24641.phpt | 30 ext/dl_test/dl_test.stub.php | 1 ext/dl_test/dl_test_arginfo.h | 8 ext/dl_test/tests/opcache_temporary_strings.inc | 16 ext/dl_test/tests/opcache_temporary_strings.phpt | 22 ext/dom/document.c | 27 ext/dom/element.c | 8 ext/dom/html5_parser.c | 19 ext/dom/html5_parser.h | 1 ext/dom/inner_html_mixin.c | 9 ext/dom/parentnode/css_selectors.c | 2 ext/dom/php_dom.c | 9 ext/dom/php_dom.h | 1 ext/dom/tests/DOMDocument_adoptNode_sibling_subtree.phpt | 22 ext/dom/tests/gh22077.phpt | 20 ext/dom/tests/gh22554.phpt | 38 ext/dom/tests/gh23352.phpt | 21 ext/dom/tests/modern/css_selectors/gh24260.phpt | 29 ext/dom/tests/modern/html/interactions/gh23334.phpt | 26 ext/dom/tests/modern/spec/gh23352.phpt | 21 ext/dom/tests/modern/xml/GHSA-x8r7-mg3g-74hg.phpt | 23 ext/dom/tests/modern/xml/serialize_document_write_failure.phpt | 39 ext/dom/tests/modern/xml/serialize_document_write_mutation.phpt | 40 ext/dom/tests/reflected_attribute_write_live_child.phpt | 63 ext/dom/tests/xpath_php_function_foreign_doc.phpt | 40 ext/dom/tests/xpath_php_function_foreign_doc_namespace_axis.phpt | 36 ext/dom/token_list.c | 4 ext/dom/xml_serializer.c | 16 ext/dom/xpath.c | 45 ext/ffi/ffi.c | 39 ext/ffi/ffi.g | 12 ext/ffi/ffi_parser.c | 12 ext/ffi/php_ffi.h | 1 ext/ffi/tests/finalize_type_bailout_leak.phpt | 64 ext/fileinfo/create_data_file.php | 2 ext/fileinfo/data_file.c | 2 ext/fileinfo/fileinfo.c | 4 ext/fileinfo/tests/gh24289.phpt | 23 ext/filter/tests/oom_filter_default_encoded.phpt | 2 ext/filter/tests/oom_filter_input.phpt | 2 ext/filter/tests/oom_filter_input_array.phpt | 2 ext/ftp/ftp.c | 2 ext/ftp/tests/ftp_get_data_accept_timeout.phpt | 39 ext/ftp/tests/server.inc | 16 ext/gd/config.w32 | 4 ext/gd/gd.c | 2 ext/gd/tests/bug72697.phpt | 2 ext/gd/tests/imagetruecolortopalette_error3.phpt | 2 ext/gd/tests/imagetruecolortopalette_error4.phpt | 4 ext/hash/hash_gost.c | 13 ext/hash/hash_snefru.c | 13 ext/hash/hash_xxhash.c | 12 ext/hash/murmur/PMurHash.c | 5 ext/hash/tests/gost_snefru_512mib.phpt | 30 ext/hash/tests/xxhash_options_without_seed.phpt | 15 ext/iconv/tests/gh7980.phpt | 6 ext/intl/dateformat/dateformat_parse.c | 6 ext/intl/grapheme/grapheme_string.c | 7 ext/intl/tests/dateformat_formatObject_calendar_variant_icu72-1.phpt | 1 ext/intl/tests/dateformat_formatObject_calendar_variant_icu79-1.phpt | 37 ext/intl/tests/dateformat_formatObject_datetime_variant_icu72-1.phpt | 1 ext/intl/tests/dateformat_formatObject_datetime_variant_icu79-1.phpt | 30 ext/intl/tests/dateformat_parse_offset_out_of_range.phpt | 33 ext/intl/tests/grapheme_extract_next_offset.phpt | 39 ext/intl/tests/timezone_IDforWindowsID_basic_icu76_1.phpt | 1 ext/intl/tests/timezone_IDforWindowsID_basic_icu79_1.phpt | 40 ext/json/json.c | 5 ext/json/json_encoder.c | 11 ext/json/tests/json_encode_depth.phpt | 19 ext/json/tests/json_encode_invalid_key_aborts.phpt | 55 ext/json/tests/json_encode_oom_hooked_property_recursion_guard.phpt | 28 ext/ldap/ldap.c | 6 ext/ldap/tests/ldap_exop_sync_without_response_data.phpt | 22 ext/mbstring/libmbfl/mbfl/mbfl_encoding.c | 2 ext/mbstring/mbstring.c | 15 ext/mbstring/tests/gh15824.phpt | 4 ext/mbstring/tests/gh23958.phpt | 35 ext/mbstring/tests/mb_rfc1867_getword_overread.phpt | 22 ext/mbstring/tests/oom_mb_strcut_filter.phpt | 6 ext/mbstring/tests/retry_limit_negative.phpt | 25 ext/mysqli/tests/fake_server.inc | 17 ext/mysqli/tests/gh24293.phpt | 32 ext/mysqlnd/config.w32 | 4 ext/mysqlnd/mysqlnd_auth.c | 4 ext/mysqlnd/mysqlnd_wireprotocol.c | 2 ext/odbc/php_odbc.c | 6 ext/odbc/tests/gh24736.phpt | 20 ext/odbc/tests/gh25036.phpt | 39 ext/opcache/ZendAccelerator.c | 53 ext/opcache/jit/ir/dynasm/dasm_arm64.h | 64 ext/opcache/jit/ir/ir_aarch64.dasc | 4 ext/opcache/jit/ir/ir_x86.dasc | 4 ext/opcache/jit/zend_jit.c | 22 ext/opcache/jit/zend_jit.h | 1 ext/opcache/jit/zend_jit_ir.c | 82 ext/opcache/jit/zend_jit_trace.c | 56 ext/opcache/tests/bug66338.phpt | 12 ext/opcache/tests/gh17733.phpt | 110 ext/opcache/tests/gh23626.phpt | 59 ext/opcache/tests/gh24218.phpt | 17 ext/opcache/tests/gh24534.phpt | 95 ext/opcache/tests/gh24577.phpt | 150 ext/opcache/tests/is_identical_nothrow_recursive_array.phpt | 39 ext/opcache/tests/issue0149.phpt | 2 ext/opcache/tests/jit/add_array_unpack_packed.phpt | 24 ext/opcache/tests/jit/and_003.phpt | 19 ext/opcache/tests/jit/and_004.phpt | 19 ext/opcache/tests/jit/assign_dim_op_008.phpt | 21 ext/opcache/tests/jit/assign_dim_op_009.phpt | 19 ext/opcache/tests/jit/assign_dim_op_010.phpt | 26 ext/opcache/tests/jit/assign_dim_op_011.phpt | 28 ext/opcache/tests/jit/assign_dim_op_012.phpt | 26 ext/opcache/tests/jit/assign_dim_packed_string_key_001.phpt | 31 ext/opcache/tests/jit/assign_dim_packed_string_key_002.phpt | 22 ext/opcache/tests/jit/assign_dim_packed_string_key_003.phpt | 29 ext/opcache/tests/jit/cmp_010.phpt | 57 ext/opcache/tests/jit/gh16821.phpt | 63 ext/opcache/tests/jit/gh17626.inc | 2 ext/opcache/tests/jit/gh17626.phpt | 41 ext/opcache/tests/jit/gh17626_002.inc | 2 ext/opcache/tests/jit/gh17626_002.phpt | 47 ext/opcache/tests/jit/gh20890.phpt | 37 ext/opcache/tests/jit/gh24206.phpt | 65 ext/opcache/tests/jit/gh24337.phpt | 105 ext/opcache/tests/jit/gh24386.phpt | 34 ext/opcache/tests/jit/gh24388.phpt | 31 ext/opcache/tests/jit/gh24389.phpt | 30 ext/opcache/tests/jit/gh24391.phpt | 37 ext/opcache/tests/jit/gh24396.phpt | 22 ext/opcache/tests/jit/gh24397.phpt | 23 ext/opcache/tests/jit/gh24398.phpt | 36 ext/opcache/tests/jit/gh24398_002.phpt | 44 ext/opcache/tests/jit/gh24436.phpt | 38 ext/opcache/tests/jit/gh24437.phpt | 50 ext/opcache/tests/jit/gh24438.phpt | 40 ext/opcache/tests/jit/gh24988.phpt | 47 ext/opcache/tests/jit/loop_vm_interrupt_001.phpt | 38 ext/opcache/tests/jit/mod_002.phpt | 2 ext/opcache/tests/jit/or_001.phpt | 19 ext/opcache/tests/jit/or_002.phpt | 19 ext/opcache/tests/jit/preload_restart_function_jit.phpt | 83 ext/opcache/tests/jit/preload_restart_hot_counters.phpt | 77 ext/opcache/tests/jit/switch_002.phpt | 27 ext/opcache/tests/jit/switch_003.phpt | 26 ext/opcache/tests/jit/xor_004.phpt | 19 ext/opcache/tests/jit/xor_005.phpt | 19 ext/opcache/tests/opt/assign_dim_op_result_type.phpt | 82 ext/opcache/tests/opt/block_pass_fast_call_op2.phpt | 45 ext/opcache/tests/opt/escape_analysis_array_access.phpt | 76 ext/opcache/tests/opt/fetch_dim_func_arg_unused_chain.phpt | 29 ext/opcache/tests/opt/gh25061.phpt | 43 ext/opcache/zend_accelerator_module.c | 7 ext/opcache/zend_file_cache.c | 21 ext/opcache/zend_persist.c | 1 ext/openssl/openssl.c | 82 ext/openssl/php_openssl.h | 13 ext/openssl/tests/bug28382.phpt | 8 ext/openssl/tests/ecc_custom_params.phpt | 24 ext/openssl/tests/gh24784.phpt | 57 ext/openssl/tests/openssl_spki_export_challenge_binary.phpt | 19 ext/openssl/tests/openssl_x509_parse_basic_openssl32.phpt | 20 ext/openssl/xp_ssl.c | 55 ext/pdo/pdo_dbh.c | 14 ext/pdo/pdo_stmt.c | 31 ext/pdo/php_pdo_driver.h | 3 ext/pdo/tests/pdo_oracle_nulls_invalid.phpt | 49 ext/pdo/tests/pdo_persistent_statement_class.phpt | 32 ext/pdo_firebird/firebird_statement.c | 10 ext/pdo_firebird/tests/gh25006.phpt | 73 ext/pdo_pgsql/pgsql_driver.c | 11 ext/pdo_pgsql/tests/pdopgsql_setNoticeCallback_persistent.phpt | 49 ext/pdo_sqlite/sqlite_driver.c | 8 ext/pdo_sqlite/sqlite_statement.c | 5 ext/pdo_sqlite/tests/gh24990.phpt | 33 ext/pdo_sqlite/tests/gh25021-udf.phpt | 28 ext/phar/phar_object.c | 65 ext/phar/stream.c | 6 ext/phar/tar.c | 2 ext/phar/tests/gh25090.phpt | 25 ext/phar/tests/gh25091.phpt | 24 ext/phar/tests/gh25092.phpt | 62 ext/phar/tests/gh25093.phpt | 47 ext/phar/tests/gh8469.phpt | 59 ext/phar/tests/ghsa-68fq-fh7h-f8gr.phpt | 122 ext/phar/tests/tar/gh24740.phpt | 44 ext/phar/tests/zip/gh24531.phpt | 32 ext/phar/tests/zip/gh25089.phpt | 35 ext/phar/util.c | 17 ext/phar/zip.c | 5 ext/random/tests/03_randomizer/methods/shuffleArray_engine_throws_with_holes.phpt | 61 ext/readline/readline.c | 2 ext/readline/tests/readline_info_completion_append_character.phpt | 27 ext/session/mod_files.c | 8 ext/session/php_session.h | 1 ext/session/session.c | 71 ext/session/tests/session_id_nul_byte.phpt | 27 ext/session/tests/session_ini_set_upload_progress_enabled.phpt | 128 ext/session/tests/user_session_module/session_regenerate_id_handler_closes_session.phpt | 65 ext/session/tests/user_session_module/session_regenerate_id_handler_destroys_session.phpt | 35 ext/simplexml/simplexml.c | 2 ext/simplexml/tests/gh24488.phpt | 24 ext/soap/php_encoding.c | 2 ext/soap/php_xml.c | 3 ext/soap/soap.c | 1 ext/soap/tests/GHSA-4646-p932-gw34.phpt | 35 ext/soap/tests/GHSA-q23r-hr55-xmpg-wsdl.phpt | 80 ext/soap/tests/GHSA-q23r-hr55-xmpg-wsdl.wsdl | 67 ext/soap/tests/GHSA-q23r-hr55-xmpg.phpt | 65 ext/soap/tests/gh22585.phpt | 39 ext/sockets/sockets.c | 24 ext/sockets/tests/gh24748.phpt | 64 ext/sockets/tests/socket_sentto_recvfrom_unix.phpt | 5 ext/sockets/tests/socket_tcp_congestion.phpt | 11 ext/spl/spl_iterators.c | 25 ext/spl/tests/gh24264_1.phpt | 24 ext/spl/tests/gh24264_2.phpt | 23 ext/spl/tests/gh24264_3.phpt | 24 ext/spl/tests/gh24264_4.phpt | 23 ext/spl/tests/gh24264_5.phpt | 35 ext/sqlite3/sqlite3.c | 10 ext/sqlite3/tests/gh25021-udf.phpt | 27 ext/standard/array.c | 12 ext/standard/basic_functions.c | 19 ext/standard/dns_win32.c | 2 ext/standard/filestat.c | 2 ext/standard/ftp_fopen_wrapper.c | 30 ext/standard/http_fopen_wrapper.c | 74 ext/standard/password.c | 32 ext/standard/proc_open.c | 2 ext/standard/string.c | 2 ext/standard/syslog.c | 7 ext/standard/tests/file/bug60120.phpt | 4 ext/standard/tests/file/chown_user_name.phpt | 25 ext/standard/tests/file/lstat_stat_variation18.phpt | 4 ext/standard/tests/file/lstat_stat_variation19.phpt | 8 ext/standard/tests/file/lstat_stat_variation20.phpt | 8 ext/standard/tests/general_functions/gh24605_var_export_stack_guard.phpt | 57 ext/standard/tests/general_functions/header_over_4gib.phpt | 29 ext/standard/tests/general_functions/proc_open_descriptor_0_setup_failure.phpt | 4 ext/standard/tests/general_functions/proc_open_null.phpt | 3 ext/standard/tests/general_functions/proc_open_redirect.phpt | 11 ext/standard/tests/general_functions/proc_open_socket_descriptor_0_setup_failure.phpt | 4 ext/standard/tests/general_functions/proc_open_sockets1.phpt | 7 ext/standard/tests/general_functions/proc_open_sockets2.phpt | 7 ext/standard/tests/general_functions/proc_open_sockets3.phpt | 7 ext/standard/tests/general_functions/sleep_alertable_win32.phpt | 78 ext/standard/tests/http/gh24508.phpt | 20 ext/standard/tests/http/gh24509.phpt | 21 ext/standard/tests/http/ghsa-f6gg-rchx-xw8j.phpt | 61 ext/standard/tests/http/http_response_header_nested_request.phpt | 41 ext/standard/tests/ini_info/php_ini_loaded_file.phpt | 7 ext/standard/tests/network/gh24308.phpt | 44 ext/standard/tests/network/gh24616.phpt | 37 ext/standard/tests/password/password_get_info.phpt | 27 ext/standard/tests/password/password_needs_rehash.phpt | 21 ext/standard/tests/serialize/__unserialize_malformed.phpt | 38 ext/standard/tests/serialize/__unserialize_malformed_nested_destructor.phpt | 27 ext/standard/tests/serialize/__wakeup_malformed.phpt | 38 ext/standard/tests/serialize/gh24373.phpt | 40 ext/standard/tests/serialize/gh24373_unserialize.phpt | 14 ext/standard/tests/streams/bug69521.phpt | 4 ext/standard/tests/streams/ftp_fopen_do_pasv_reply_bounds.phpt | 20 ext/standard/tests/streams/ftp_url_stat_mdtm_no_digits.phpt | 20 ext/standard/tests/streams/ghsa-f6gg-rchx-xw8j.phpt | 34 ext/standard/tests/strings/gh24552.phpt | 38 ext/standard/tests/strings/sapi_windows_cp_negative_codepage.phpt | 37 ext/standard/tests/strings/setlocale_variation2.phpt | 3 ext/standard/var.c | 21 ext/standard/var_unserializer.c | 26 ext/standard/var_unserializer.re | 26 ext/tidy/tests/tidy_repair_encoding_null.phpt | 28 ext/tidy/tidy.c | 4 ext/zend_test/object_handlers.c | 45 ext/zend_test/object_handlers.stub.php | 5 ext/zend_test/object_handlers_arginfo.h | 26 ext/zend_test/observer.c | 14 ext/zend_test/php_test.h | 4 ext/zend_test/test.c | 119 ext/zend_test/test.stub.php | 6 ext/zend_test/test_arginfo.h | 20 ext/zend_test/tests/compile_to_ast/namespace.phpt | 68 ext/zend_test/tests/gh24668.phpt | 33 ext/zend_test/tests/system_id_reinitialization.phpt | 42 ext/zip/config.m4 | 2 ext/zip/config.w32 | 12 ext/zip/php_zip.c | 149 ext/zip/tests/gh23747_close_error.phpt | 48 ext/zip/tests/gh23747_dtor.phpt | 58 ext/zip/tests/oo_torrentzip.phpt | 1 ext/zip/tests/zip_close_mutator_reentry.phpt | 145 ext/zip/tests/zip_close_mutator_reentry_cancel.phpt | 57 ext/zip/tests/zip_close_mutator_reentry_open.phpt | 69 ext/zlib/config.w32 | 2 ext/zlib/tests/zlib_filter_inflate_error_handler_removes_filter.phpt | 30 ext/zlib/zlib_filter.c | 3 main/SAPI.c | 5 main/fastcgi.c | 8 main/main.c | 10 main/network.c | 10 main/php_config.h.in | 4 main/php_ini.c | 8 main/php_odbc_utils.c | 9 main/php_version.h | 6 main/streams/xp_socket.c | 25 pear/Makefile.frag | 15 pear/fetch.php | 74 pear/install-pear.txt | 4 sapi/cgi/cgi_main.c | 4 sapi/cgi/tests/ghsa-5j3f-64r7-f564.phpt | 60 sapi/cli/php_cli.c | 2 sapi/cli/php_cli_server.c | 9 sapi/cli/php_http_parser.c | 2 sapi/cli/php_http_parser.h | 6 sapi/cli/ps_title.c | 2 sapi/cli/tests/016.phpt | 3 sapi/cli/tests/023.phpt | 13 sapi/cli/tests/bug65275.phpt | 3 sapi/cli/tests/bug74600.phpt | 3 sapi/cli/tests/bug78323.phpt | 9 sapi/cli/tests/gh16137_duplicate_headers.phpt | 36 sapi/cli/tests/gh24139.phpt | 30 sapi/cli/tests/gh9670.phpt | 21 sapi/fpm/fpm/fpm_children.c | 8 sapi/fpm/fpm/fpm_status.c | 106 sapi/fpm/fpm/zlog.c | 17 sapi/fpm/tests/bug77023-pm-dynamic-blocking-sigquit.phpt | 24 sapi/fpm/tests/gh24046-stdio-pipe-double-close.phpt | 57 sapi/fpm/tests/ghsa-3mg3-cr28-46gc-status-xss.phpt | 70 sapi/fpm/tests/ghsa-g3vh-838c-65v7.phpt | 94 sapi/fpm/tests/log-bwd-long-pool-name.phpt | 45 sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt | 5 sapi/fpm/tests/log-dwd-long-pool-name-limit-512.phpt | 47 sapi/fpm/tests/status-head.phpt | 40 sapi/fpm/tests/tester.inc | 3 sapi/fpm/tests/unread-body-keep-conn.phpt | 125 sapi/fpm/tests/unread-body-partial-record.phpt | 127 sapi/phpdbg/phpdbg.c | 11 sapi/phpdbg/phpdbg_break.c | 2 sapi/phpdbg/phpdbg_btree.c | 13 sapi/phpdbg/phpdbg_info.c | 2 sapi/phpdbg/phpdbg_list.c | 2 sapi/phpdbg/phpdbg_print.c | 2 sapi/phpdbg/phpdbg_set.c | 2 sapi/phpdbg/phpdbg_watch.c | 294 sapi/phpdbg/phpdbg_watch.h | 2 sapi/phpdbg/tests/gh22480.phpt | 34 sapi/phpdbg/tests/gh22480_2.phpt | 30 sapi/phpdbg/tests/subcommand_parent_name.phpt | 16 sapi/phpdbg/tests/watch_005.phpt | 9 sapi/phpdbg/tests/watch_006.phpt | 15 scripts/dev/makedist | 15 win32/build/Makefile | 2 win32/build/config.w32.h.in | 5 win32/time.c | 57 430 files changed, 17589 insertions(+), 6984 deletions(-) dpkg-source: warning: cannot verify inline signature for /srv/release.debian.org/tmp/tmphz8aka8g/php8.4_8.4.27-1~deb13u1.dsc: no acceptable signature found dpkg-source: warning: cannot verify inline signature for /srv/release.debian.org/tmp/tmphz8aka8g/php8.4_8.4.28-1~deb13u1.dsc: no acceptable signature found diff -Nru php8.4-8.4.27/.gitattributes php8.4-8.4.28/.gitattributes --- php8.4-8.4.27/.gitattributes 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/.gitattributes 2026-11-17 20:29:32.000000000 +0000 @@ -31,3 +31,6 @@ # Vendored libraries /ext/dom/lexbor/lexbor linguist-vendored + +# The phar has some binary +/pear/install-pear-nozlib.phar binary diff -Nru php8.4-8.4.27/.github/CODEOWNERS php8.4-8.4.28/.github/CODEOWNERS --- php8.4-8.4.27/.github/CODEOWNERS 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/.github/CODEOWNERS 2026-11-17 20:29:32.000000000 +0000 @@ -45,6 +45,7 @@ /ext/pgsql @devnexen /ext/phar @LamentXU123 /ext/random @TimWolla @zeriyoshi +/ext/readline @LamentXU123 /ext/reflection @DanielEScherzer /ext/session @Girgias @jorgsowa /ext/simplexml @devnexen diff -Nru php8.4-8.4.27/.github/actions/brew/action.yml php8.4-8.4.28/.github/actions/brew/action.yml --- php8.4-8.4.27/.github/actions/brew/action.yml 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/.github/actions/brew/action.yml 2026-11-17 20:29:32.000000000 +0000 @@ -6,6 +6,8 @@ run: | set -x + brew update + # Patch brew to overwrite always formula_installer="$(brew --repo)"/Library/Homebrew/formula_installer.rb code=" keg.link\(verbose: verbose\?" diff -Nru php8.4-8.4.27/.github/actions/freebsd/action.yml php8.4-8.4.28/.github/actions/freebsd/action.yml --- php8.4-8.4.27/.github/actions/freebsd/action.yml 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/.github/actions/freebsd/action.yml 2026-11-17 20:29:32.000000000 +0000 @@ -12,7 +12,7 @@ - name: FreeBSD uses: vmactions/freebsd-vm@v1 with: - release: '13.5' + release: '14.4' usesh: true copyback: false disable-cache: true diff -Nru php8.4-8.4.27/.github/matrix.php php8.4-8.4.28/.github/matrix.php --- php8.4-8.4.27/.github/matrix.php 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/.github/matrix.php 2026-11-17 20:29:32.000000000 +0000 @@ -125,10 +125,9 @@ : ['debug' => [true], 'zts' => [true]]; } if ($all_jobs || !$no_jobs || $test_macos) { - $test_arm = version_compare($php_version, '8.4', '>='); $jobs['MACOS']['matrix'] = $all_variations - ? ['arch' => $test_arm ? ['X64', 'ARM64'] : ['X64'], 'debug' => [true, false], 'zts' => [true, false]] - : ['include' => [['arch' => $test_arm ? 'ARM64' : 'X64', 'debug' => true, 'zts' => false]]]; + ? ['arch' => ['ARM64'], 'debug' => [true, false], 'zts' => [true, false]] + : ['include' => [['arch' => 'ARM64', 'debug' => true, 'zts' => false]]]; $jobs['MACOS']['config']['version'] = version_compare($php_version, '8.4', '>=') ? '26' : '15'; } if ($all_jobs || $test_msan) { diff -Nru php8.4-8.4.27/.github/scripts/windows/test_task.bat php8.4-8.4.28/.github/scripts/windows/test_task.bat --- php8.4-8.4.27/.github/scripts/windows/test_task.bat 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/.github/scripts/windows/test_task.bat 2026-11-17 20:29:32.000000000 +0000 @@ -90,9 +90,12 @@ rem set SSLEAY_CONF= rem prepare for OPcache +set PHP_BUILD_DIR=%PHP_BUILD_OBJ_DIR%\Release +if "%THREAD_SAFE%" equ "1" set PHP_BUILD_DIR=%PHP_BUILD_DIR%_TS + if "%OPCACHE%" equ "1" set OPCACHE_OPTS=-d opcache.enable=1 -d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=64M -d opcache.jit=tracing rem work-around for failing to dl(mysqli) with OPcache (https://github.com/php/php-src/issues/8508) -if "%OPCACHE%" equ "1" set OPCACHE_OPTS=%OPCACHE_OPTS% -d extension=mysqli +if "%OPCACHE%" equ "1" set OPCACHE_OPTS=%OPCACHE_OPTS% -d extension=mysqli -d extension_dir=%PHP_BUILD_DIR% rem prepare for enchant mkdir %~d0\usr\local\lib\enchant-2 @@ -113,9 +116,6 @@ sed -i "s/exec HexTest .*/exec HexTest cscript\.exe \/nologo %GITHUB_WORKSPACE:\=\/%\/ext\/snmp\/tests\/bigtest\.js/g" %GITHUB_WORKSPACE%\ext\snmp\tests\snmpd.conf start %DEPS_DIR%\bin\snmpd.exe -C -c %GITHUB_WORKSPACE%\ext\snmp\tests\snmpd.conf -Ln -set PHP_BUILD_DIR=%PHP_BUILD_OBJ_DIR%\Release -if "%THREAD_SAFE%" equ "1" set PHP_BUILD_DIR=%PHP_BUILD_DIR%_TS - rem prepare for mail curl -sLo hMailServer.zip https://downloads.php.net/~windows/php-sdk/deps/vs18/x64/hmailserver-5.7.0-vs18-x64.zip unzip -q hMailServer.zip -d hMailServer diff -Nru php8.4-8.4.27/.github/workflows/docs.yml php8.4-8.4.28/.github/workflows/docs.yml --- php8.4-8.4.27/.github/workflows/docs.yml 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/.github/workflows/docs.yml 2026-11-17 20:29:32.000000000 +0000 @@ -17,7 +17,7 @@ if: github.repository == 'php/php-src' steps: - name: git checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Install dependencies run: pip install sphinx-design sphinxawesome-theme rstfmt - name: Check formatting diff -Nru php8.4-8.4.27/.github/workflows/test-suite.yml php8.4-8.4.28/.github/workflows/test-suite.yml --- php8.4-8.4.27/.github/workflows/test-suite.yml 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/.github/workflows/test-suite.yml 2026-11-17 20:29:32.000000000 +0000 @@ -19,7 +19,7 @@ timeout-minutes: 180 steps: - name: git checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: ref: ${{ fromJson(inputs.branch).ref }} - name: System info @@ -61,7 +61,7 @@ image: 'alpine:3.22' steps: - name: git checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: ref: ${{ fromJson(inputs.branch).ref }} - name: apk @@ -135,7 +135,7 @@ timeout-minutes: 180 steps: - name: git checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: ref: ${{ fromJson(inputs.branch).ref }} - name: Create MSSQL container @@ -230,7 +230,7 @@ fail-fast: false matrix: ${{ fromJson(inputs.branch).jobs.LINUX_X32.matrix }} name: "LINUX_X32_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}" - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 timeout-minutes: 180 container: image: ubuntu:${{ fromJson(inputs.branch).config.ubuntu_version }} @@ -258,7 +258,7 @@ FIREBIRD_PASSWORD: test steps: - name: git checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: ref: ${{ fromJson(inputs.branch).ref }} - name: apt @@ -312,11 +312,11 @@ fail-fast: false matrix: ${{ fromJson(inputs.branch).jobs.MACOS.matrix }} name: "MACOS_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}" - runs-on: macos-${{ fromJson(inputs.branch).jobs.MACOS.config.version }}${{ matrix.arch == 'X64' && '-intel' || '' }} + runs-on: macos-${{ fromJson(inputs.branch).jobs.MACOS.config.version }} timeout-minutes: 180 steps: - name: git checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: ref: ${{ fromJson(inputs.branch).ref }} - name: Update clang @@ -345,18 +345,18 @@ if: ${{ inputs.all_variations }} uses: ./.github/actions/test-macos - name: Test Tracing JIT - if: ${{ matrix.arch == 'X64' || !matrix.zts }} + if: ${{ !matrix.zts }} uses: ./.github/actions/test-macos with: enableOpcache: true jitType: tracing - name: Test OpCache - if: ${{ inputs.all_variations || (matrix.arch == 'ARM64' && matrix.zts) }} + if: ${{ inputs.all_variations || matrix.zts }} uses: ./.github/actions/test-macos with: enableOpcache: true - name: Test Function JIT - if: ${{ inputs.all_variations && (matrix.arch == 'X64' || !matrix.zts) }} + if: ${{ inputs.all_variations && !matrix.zts }} uses: ./.github/actions/test-macos with: enableOpcache: true @@ -394,7 +394,7 @@ timeout-minutes: 180 steps: - name: git checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: ref: ${{ fromJson(inputs.branch).ref }} - name: Create MSSQL container @@ -444,7 +444,7 @@ USE_TRACKED_ALLOC: 1 steps: - name: git checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: ref: ${{ fromJson(inputs.branch).ref }} - name: apt @@ -656,7 +656,7 @@ timeout-minutes: 180 steps: - name: git checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: ref: ${{ fromJson(inputs.branch).ref }} - name: Create MSSQL container @@ -720,7 +720,7 @@ timeout-minutes: 180 steps: - name: git checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: ref: ${{ fromJson(inputs.branch).ref }} - name: apt @@ -812,7 +812,7 @@ timeout-minutes: 180 steps: - name: git checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: ref: ${{ fromJson(inputs.branch).ref }} - name: apt @@ -866,7 +866,7 @@ - name: git config run: git config --global core.autocrlf false && git config --global core.eol lf - name: git checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: ref: ${{ fromJson(inputs.branch).ref }} - name: Setup @@ -885,7 +885,7 @@ timeout-minutes: 50 steps: - name: git checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: ref: ${{ fromJson(inputs.branch).ref }} - name: FreeBSD @@ -916,7 +916,7 @@ timeout-minutes: 50 steps: - name: git checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: ref: ${{ fromJson(inputs.branch).ref }} fetch-depth: 0 @@ -979,7 +979,7 @@ mysql -uroot -proot -e "CREATE USER 'wordpress'@'localhost' IDENTIFIED BY 'wordpress'; FLUSH PRIVILEGES;" mysql -uroot -proot -e "GRANT ALL PRIVILEGES ON *.* TO 'wordpress'@'localhost' WITH GRANT OPTION;" - name: git checkout benchmarking-data - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: repository: php/benchmarking-data ssh-key: ${{ secrets.BENCHMARKING_DATA_DEPLOY_KEY }} diff -Nru php8.4-8.4.27/.github/workflows/test.yml php8.4-8.4.28/.github/workflows/test.yml --- php8.4-8.4.27/.github/workflows/test.yml 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/.github/workflows/test.yml 2026-11-17 20:29:32.000000000 +0000 @@ -41,7 +41,7 @@ all_variations: ${{ steps.set-matrix.outputs.all_variations }} branches: ${{ steps.set-matrix.outputs.branches }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 with: # When running nightly, set fetch-depth to 0 to clone the full # repository including all branches. This is required to find the diff -Nru php8.4-8.4.27/.gitignore php8.4-8.4.28/.gitignore --- php8.4-8.4.27/.gitignore 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/.gitignore 2026-11-17 20:29:32.000000000 +0000 @@ -127,7 +127,6 @@ # ------------------------------------------------------------------------------ /ext/phar/phar.phar /ext/phar/phar.php -/pear/install-pear-nozlib.phar /sapi/cgi/php-cgi /sapi/fpm/php-fpm /sapi/phpdbg/phpdbg diff -Nru php8.4-8.4.27/EXTENSIONS php8.4-8.4.28/EXTENSIONS --- php8.4-8.4.27/EXTENSIONS 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/EXTENSIONS 2026-11-17 20:29:32.000000000 +0000 @@ -420,8 +420,8 @@ SINCE: 8.2.0 ------------------------------------------------------------------------------- EXTENSION: readline -PRIMARY MAINTAINER: Unknown -MAINTENANCE: Unknown +PRIMARY MAINTAINER: Weilin Du (2026 - 2026) +MAINTENANCE: Maintained STATUS: Working ------------------------------------------------------------------------------- EXTENSION: reflection diff -Nru php8.4-8.4.27/NEWS php8.4-8.4.28/NEWS --- php8.4-8.4.27/NEWS 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/NEWS 2026-11-17 20:29:32.000000000 +0000 @@ -1,5 +1,405 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +19 Nov 2026, PHP 8.4.28 + +- Core: + . Fixed bug GH-24184 (System ID not being reinitialized after an Apache + graceful restart, potentially causing incompatible OPcache file cache + entries to be reused). (Levi Morrison) + . Fixed memory leak when an exception already contains the pending exception + in its previous chain. (Edmond) + . Fixed bug GH-23979 (Nullsafe operator must not flush delayed oplines of an + enclosing function). (ndossche) + . Fixed memory manager keeping a block reallocated to exactly the size of + the next smaller bin in its larger bin, which efree_size() then freed + into the wrong one. (Marc Bennewitz) + . Fixed bug GH-24218 (Invalid opcode for count() of a literal array + without SCCP). (lazerg) + . Fix throwing behaviour with recursive arrays in VM. (ndossche) + . Fixed skipped catch block when switching fibers during exception unwinding + (Nicolas Grekas) + . Fix escape analysis for objects implementing ArrayAccess. (ndossche, Arnaud) + . Fix UAF for resolved callable zval. (EdmondDantes) + . Fix memory leak for nested HTTP calls. (EdmondDantes) + . Fixed pthread attribute leak in zend_call_stack_get_netbsd_pthread(). + (David Carlier) + . Fixed bug GH-24321 (ZTS: global_map_ptr_last survives zend_shutdown(), + so an in-process engine restart keeps growing the map_ptr table). + (David Carlier) + . Fix function and constant imports in compile_to_ast and add support + for grouping. (Klaas Skelte van der Werf) + . Fixed bug GH-24265 (Unwind/GracefulExit discarded in + zend_fiber_execute()). (David Carlier) + . Fixed bug GH-24668 (zend_set_local_var() leaks the previous value of an + existing CV). (yasu20200121web-prog, lazerg) + . Fixed unmapping of an unrelated range when the aligned chunk mmap fails + (Marti2203). + . Fixed bug GH-24989 (Use-after-free in GC when an exception is thrown). + (David Carlier) + . Fixed bug GH-24534 (Segfault in zend_try_early_bind when a parent class + autoloads its cached child during linking). (David Carlier) + . Fixed AST printing dropping final on class constants and properties, and + abstract on properties. (Jorg Sowa) + . Fixed AST export of readonly anonymous classes dropping the readonly + modifier. (Jorg Sowa) + . Fixed memory leak of a duplicate named argument in new in initializer. + (Jorg Sowa) + . Fixed bug GH-25061 ($x = $x - 1 on null is optimized to PRE_DEC). + (Lazizbek Ergashev) + . Fixed bug GH-24480 (Finally block running a second time when a VM interrupt + throws as the finally block returns to a "return" in its try block). + (C. Scott Ananian) + +- CGI: + . Fixed GHSA-5j3f-64r7-f564 (PHP-CGI out-of-bounds read and write during + PATH_INFO correction). (CVE-2026-129538) (Jakub Zelenka) + +- CLI: + . Fixed bug GH-24697 (PHP_HTTP_PARSER_STRICT build option doesn't work). + (ndossche, devnexen) + . Fixed bug GH-9670 (List -C and -q in the CLI help). (Juan Versolato Lopes) + . Fixed crash and leak in the built-in server on repeated request headers. + (David Carlier) + +- COM: + . Fixed bug GH-25008 (com_event_sink() and com_print_typeinfo() crash + resolving an event source with no loaded typelib). (Ilia Alshanetsky) + +- Curl: + . Fix use-after-free of CURLOPT_STDERR stream on cloned curl handle. + (lacatoire) + . Fix UAF on clone due to callback data pointer mismatch. (ndossche) + +- Date: + . Fixed bug GH-20503 (Assertion failure with ext/date DateInterval property + hash construction). (heathdutton) + . Fixed bug GH-24350 (MINIT reads a stale external tz database after an + in-process module restart). (Lazizbek Ergashev) + . Fixed GHSA-gr4f-wgx5-jpfv (Timezone cache use-after-free can lead to remote + code execution). (CVE-2026-129496) (Ilija Tovilo) + +- DBA: + . Fixed bug GH-24641 (ndbm backend never checks dbm_open() return value, + NULL deref on first use after a failed open). (Girgias) + +- DOM: + . Fixed a use-after-free when reflected attribute setters replace an + attribute whose child still has a live wrapper. (Jakub Zelenka) + . Fixed bug GH-23352 (UAF reading an attribute value node retained across + DOMDocument::adoptNode()). (David Carlier) + . Fixed bug GH-24260 (querySelectorAll() returns duplicate elements for + selector lists). (fivefilters) + . Fixed bug GH-23334 (Use-after-free in php_dom_free_templated_content()). + (David Carlier, ndossche) + . Fixed bug GH-22077 (UAF in custom XPath function). (Joe Afflerbach) + . Fixed bug GH-22554 (use-after-free with XPath callback returning a node + from a foreign document). (David Carlier) + . Fixed DOMXPath crash wrapping a foreign node after a nodeset callback. + (Ilia Alshanetsky) + . Fix error paths in dom_xml_serializing_a_document_node(). (ndossche) + . Fixed use-after-free on namespace axis results with a foreign-document + XPath callback node. (David Carlier) + . Fixed GHSA-x8r7-mg3g-74hg (Double free during DOM XML serialization). + (CVE-2026-129501) (ndossche) + +- FFI: + . Fixed bug GH-24582 (Memory leaks in ext/ffi parser when finalize_type() + bails out). (matyapiro31, David Carlier) + +- FPM: + . Fixed bug GH-24229 (fcgi_close() passes shutdown() a literal 1, which is + SHUT_RD in WASI). (Ryosuke Ishibashi) + . Fixed crash and stack memory disclosure in the worker output logging with + a pool name longer than the message prefix buffer or log_limit. + (Martin Mirchev) + . Fixed GHSA-jm4m-qfqx-967m (PHP-FPM epoll use-after-free can lead to local + privilege escalation). (CVE-2026-129291) (Ian P. Christian, ndossche) + . Fixed memory leaks of the _GET string on the status page error and HEAD + request paths. (Marcel Hernandez) + . Fixed use-after-free of the scoreboard copy when logging invalid status + values. (Marcel Hernandez) + . Fixed null pointer dereference in fpm_get_status() when the scoreboard + copy fails. (Marcel Hernandez) + . Fixed GHSA-qc49-hpvq-g2w6 (PHP-FPM request smuggling through an unread HTTP + request body). (CVE-2026-129289) (Jakub Zelenka) + . Fixed GHSA-3mg3-cr28-46gc (PHP-FPM status endpoint XSS via unescaped user + and script fields). (CVE-2026-129292) (Jakub Zelenka) + +- Fileinfo: + . Fixed bug GH-24289 (finfo::file() reports the wrong argument number for + an invalid $filename). (Lazizbek Ergashev) + +- FTP: + . Fix double free in ext/ftp data_accept() on accept failure. (alepacheco) + +- GD: + . Fixed imagetruecolortopalette() error message. (Marc Bennewitz) + +- Hash: + . Fix GOST and Snefru digests of 512 MiB or more. (Martin Mirchev) + +- Intl: + . Fixed IntlDateFormatter parse functions truncating an $offset below + INT_MIN. (Marc Bennewitz) + +- JSON: + . Fixed json_encode() leaving the recursion guard set on objects with hooked + properties after running out of memory while escaping a property name. + (adapik) + . Fixed json_encode() silently narrowing $depth values outside the int range, + which wrapped to an unrelated depth. (cuishuang) + . Fixed json_encode() continuing to encode after an array or object key + failed to encode. (Ilia Alshanetsky) + +- LDAP: + . Fix crash in ldap_exop_sync() when $response_data is omitted. (lacatoire) + +- MBString: + . Fixed bug GH-23958 (truncated encoding names resolving to full names). (Kamil Tekiela) + . Fixed out-of-bounds read in php_mb_rfc1867_getword() on a multibyte lead + byte at the end of a multipart field name. (Jorg Sowa) + . Fixed negative mbstring.regex_stack_limit and mbstring.regex_retry_limit + on 32bit platforms. (Marc Bennewitz) + +- MySQLnd: + . Fixed bug GH-24293 (Segfault on connect with an empty password to a + MariaDB PAM account). (lazerg) + . Fixed bug GH-24609 (OK packets without an info message rejected on x32 + builds). (lazerg) + +- ODBC: + . Fixed bug GH-24736 (php_odbc_connstr_is_quoted() treats a value with no + closing brace as quoted). (lazerg) + . Fixed bug GH-25036 (odbc_prepare() corrupts the heap when the driver + cannot describe a parameter). (Ilia Alshanetsky) + +- Opcache: + . Fixed bug GH-24397 (Assertion failure when dumping JIT IR). + (Ilia Alshanetsky) + . Fixed tracing JIT returning a wrapped integer instead of a float on + integer overflow after an integer was compared with a float or + numeric-string literal. (Ilia Alshanetsky) + . Fixed bug GH-20890 (Segfault in zval_undefined_cv with non-simple property + hook with minimal tracing JIT). (ndossche) + . Fixed bug GH-17626 (JIT corrupts an opline handler when blacklisting a + root trace at the opcache.jit_max_root_traces limit, causing spurious + "Too few arguments" errors and crashes). (RV7PR) + . Fix type inference of ADD_ARRAY_UNPACK with integer keys. (ndossche) + . Fix too wide type inference for ASSIGN_DIM_OP. (ndossche) + . Fix OSS-Fuzz #568005340 (FETCH_DIM_FUNC_ARG partial conversion). (ndossche) + . Fixed bug GH-24218 (Invalid opcode for count() of a literal array when + SCCP is disabled). (Lazizbek Ergashev) + . Fixed bug GH-24337 (JIT: segfault when decrementing a non-numeric string + property). (Lazizbek Ergashev) + . Fix SIGFPE on LONG_MIN % -1 with a constant divisor. (waroad) + . Fixed bug GH-24388 (Tracing JIT: segfault when a trace runs out of side + exits). (Lazizbek Ergashev) + . Fixed bug GH-24391 (JIT switch on constant null takes default instead of + case 0). (ndossche) + . Fixed bug GH-24206 (Tracing JIT loses loop-carried CV when its loop PHI + is reloaded from memory). (ndossche) + . Fixed bug GH-24386 (JIT: register operand must be loaded before the typed + reference check). (ndossche) + . Fixed bug GH-24437 (JIT: Fix OP_DATA read from an unwritten slot in + zend_jit_assign_dim_op()). (waroad) + . Fixed bug GH-24398 (JIT: minimal JIT segfault when a hooked property is + passed to a run-time-resolved function). (waroad) + . Fixed bug GH-24389 (Tracing JIT: type guard on entry of an inlined call + exits with an uninitialized opline). (waroad) + . Fixed use-after-free in JIT ASSIGN_DIM_OP when concatenating into an + empty array element. (jorgsowa) + . Fixed bug GH-24396 (Assertion failure in zend_jit_def_reg() "reg forwarding" + with chained Pi nodes). (ndossche) + . Fixed JIT treating an array as packed after a string key write turned it + into a hash. (jorgsowa) + . Fixed bug GH-24436 (Tracing JIT: keep the SEND_VAL type guard after + assigning to a reference). (waroad) + . Fixed bug GH-17733 (System entropy does not take into account function + order, resulting in wrong functions possibly called + in different configurations). (ndossche) + . Fixed bug GH-24438 (Preserve indirect types in JIT side traces). (aasul) + . Fixed bug GH-24577 (CE-cache flag on interned class name visible before + map_ptr offset). (prateekbhujel) + . Fixed tracing JIT losing register-allocated CVs when an interrupt is + handled at the end of a loop trace. (Levi Morrison) + . Fixed bug GH-24675 (function with >~1.7 MB of machine code corrupts JIT + buffer accounting). (ndossche) + . Call orig_post_shutdown_cb(). (ndossche) + . Fixed JIT segfault on switch over a string reference holding a + non-string value. (jorgsowa) + . Fixed AArch64 JIT encoding of invalid logical immediates. (jorgsowa) + . Fixed unsound shift_left_overflows range when shift wraps. (mkrishna793) + . Fix block pass dropping ZEND_FAST_CALL OP2 definition. (Mrmaxmeier) + . Fixed bug GH-23626 (orphaned temporaries cause leaks and assertions). + (ndossche, khaledalam) + . Fix preloaded functions JIT-compiled on load being overwritten + after restart. (Pavel Gushcha) + . Fix opcache.interned_strings_buffer being 0 in threads started later (ZTS). + (Pavel Gushcha) + . Fixed potential infinite recursion/hang (HYBRID/TAILCALL respectively) + when zend_interrupt_function resets EG(vm_interrupt). (Levi Morrison) + . Fixed preloaded functions not JIT-compiled again after OPcache restart. + (Jorg Sowa) + . Fixed bug GH-24988 (Incorrect opcode range check causes bugs with exceptions in + function JIT). (ndossche, Jorg Sowa) + . Fix opcache phar check. (ndossche) + +- OpenSSL: + . Fixed build and test compatibility with OpenSSL 4.0 and 4.1. + (Sam James, Weilin Du, Shivam Mathur) + . Fixed bug GH-24784 (openssl_pkcs7_read() and openssl_cms_read() overwrite + certificates with CRLs). (Alexander Danilov) + +- PDO: + . Fixed invalid ATTR_ORACLE_NULLS values being accepted and truncated. + (Ilia Alshanetsky) + . Fixed a duplicate warning when ATTR_STATEMENT_CLASS is rejected on a + persistent connection. (Ilia Alshanetsky) + +- PDO_Firebird: + . Fixed bug GH-25006 (getColumnMeta() reads out of bounds for an + out-of-range column index). (Ilia Alshanetsky) + +- PDO_PGSQL: + . Fixed a use-after-free when a persistent connection receives a notice + after the request that called Pdo\Pgsql::setNoticeCallback() has ended. + (Ilia Alshanetsky) + +- PDO_SQLite: + . Fixed bug GH-24990 (Statement unusable after a failed execute()). (lazerg) + . Fixed bug GH-25021 (SQLite createFunction corrupts large integers). + (mvorisek) + +- Phar: + . Fixed bug GH-25093 (Phar::webPhar() redirect reads past the request URI). + (lazerg) + . Fixed bug GH-25089 (Heap buffer over-read via crafted alias size in + zip-based phar). (Lazizbek Ergashev) + . Fixed bug GH-8469 (Phar::decompressFiles() and Phar::compressFiles() retain + compressed contents after changing compression). (Raphael Paez) + . Fixed bug GH-24740 (Oversized tar metadata exhausts the memory limit). + (Lazizbek Ergashev) + . Fixed bug GH-25090 (UAF in phar rename() of an entry with metadata). + (Lazizbek Ergashev) + . Fixed bug GH-25091 (UAF in phar rename() when source and destination + are equal). (Lazizbek Ergashev) + . Fixed bug GH-25092 (Double free in Phar::copy() on link and + mounted entries). (Lazizbek Ergashev) + . Fixed bug GH-24531 (Crash when modifying a zip-based phar whose file was + renamed). (Ilia Alshanetsky) + . Fixed GHSA-68fq-fh7h-f8gr (PHAR OpenSSL signature bypass via algorithm + downgrade). (CVE-2026-128090) (Alexandre Daubois) + +- Phpdbg: + . Fix wrong command names. (ndossche, Weilin Du) + . Fixed bug GH-22480 (Use-after-free when re-watching an already-watched + variable). (Ilia Alshanetsky) + . Fixed over-read when watching a packed array element. (Ilia Alshanetsky) + . Fixed double free of watch element chains. (Arnaud) + +- Readline: + . Fixed a crash in readline_info() when completion_append_character + contains a non-ASCII byte. (Weilin Du) + +- SAPI: + . Fixed infinite loop in sapi_header_op() for headers of 4 GiB or more. + (Martin Mirchev) + +- SOAP: + . Fixed use of uninitialized func in do_request() on OOM bailout. + (David Carlier) + . Fixed GHSA-q23r-hr55-xmpg (SOAP information disclosure through malformed + array dimensions). (CVE-2026-15353) (Alexandre Daubois) + . Fixed GHSA-4646-p932-gw34 (SOAP use-after-free when processing DTD entity + references). (CVE-2026-129506) (Jakub Zelenka) + +- Session: + . Validate whole session ID instead of stopping at the first NUL byte. + (Sjoerd Langkemper) + . Fixed GHSA-fm2m-fjf5-v3cp (Partially overwritten session files can lead to + remote code execution). (CVE-2026-126714) (Ilija Tovilo) + . Fixed GHSA-658j-r8rw-q6mx (Session serializer mismatch can lead to remote + code execution). (CVE-2026-115560) (Arnaud Le Blanc) + . Fixed GHSA-g3vh-838c-65v7 (Use-after-free after interrupted session + shutdown). (CVE-2026-129481) (Arnaud Le Blanc, Jakub Zelenka) + +- SimpleXML: + . Fixed bug GH-24488 (GC double-frees the SimpleXMLElement properties + table). (evankford) + +- SPL: + . Fixed bug GH-24264 (Unwind/GracefulExit discarded in spl_iterators.c). + (Lazizbek Ergashev) + +- Sockets: + . Fixed bug GH-24748 (socket_set_option() crashes with declared object + properties). (Lazizbek Ergashev) + +- Standard: + . Fixed memory leaks in checkdnsrr() and dns_check_record() on Windows. + (Ilia Alshanetsky) + . Fixed __unserialize() and __wakeup() being called for objects with a missing + closing brace. (Ilia Alshanetsky) + . Fixed bug GH-24308 (Request shutdown calls closelog() even when syslog + was not opened by PHP). (lazerg) + . Fixed bug GH-24399 (usleep() and time_nanosleep() ignore queued APCs on + Windows). (Nicolas Grekas) + . Fixed chown() and lchown() failing to resolve user names in ZTS builds + when getpwnam_r() needs a larger buffer. (Ilia Alshanetsky) + . Fixed password_get_info() and password_needs_rehash() accepting malformed + bcrypt costs. (Ilia Alshanetsky) + . Fixed proc_open() null descriptor not being inheritable on Windows. + (Jorg Sowa) + . Don't share the unserialize() context with enum autoloaders. + (Nicolas Grekas) + . Fixed bug GH-24373 (serialize() called from a destructor during var_hash + destruction reuses the outer var_hash). (David Carlier) + . Fixed bug GH-24552 (Case-insensitive substr_compare(), ksort() and + krsort() are still locale-dependent). (Lazizbek Ergashev, Jon Surrell) + . Fixed bug GH-24605 (var_export() crashes on deeply nested arrays and + objects). (Labish Bardiya) + . Fix use-after-free in Randomizer::shuffleArray() when the engine throws. + (Marti2203) + . Fixed GHSA-f6gg-rchx-xw8j (Mixed-case HTTPS and FTPS URLs can expose data + in plaintext). (CVE-2026-128064) (Jakub Zelenka) + . Fixed GHSA-mmf9-xm3v-hg2x (Denial of service through folded HTTP response + headers). (CVE-2026-127960) (Jakub Zelenka) + +- Streams: + . Fixed bug GH-24508 (HTTP wrapper leaks the dechunk filter when header + parsing fails after Transfer-Encoding). (bercedev) + . Fixed bug GH-24509 (HTTP wrapper leaks Location buffer on empty + Location header). (bercedev) + . Fix out-of-bounds reads parsing ftp:// wrapper server replies. + (Alejandro Pacheco) + +- Tidy: + . Fixed tidy_repair_string(), tidy_repair_file(), tidy::repairString() and + tidy::repairFile() rejecting null for $encoding. (lacatoire) + +- Windows: + . Fixed sapi_windows_cp_set() and sapi_windows_cp_conv() accepting a negative + codepage on 32bit platforms. (Marc Bennewitz) + . Fixed bug GH-25009 (GetConsoleTitleW() buffer size passed in bytes). + (Lazizbek Ergashev) + +- Zip: + . Reject broken libzip versions 1.3.1, 1.7.0 and 1.12.0 during Windows + configuration. (Weilin Du) + . Excluded libzip 1.12.0 due to a regression preventing additions and + replacements in torrentzip archives. (Weilin Du) + . Fixed use-after-free when re-entering ZipArchive during destruction or + a close warning, and rejected opening streams while closing. (jvoisin) + . Fixed a use-after-free when a ZipArchive method that modifies the archive + is called from a progress or cancel callback during close(). + (Ilia Alshanetsky) + +- Zlib: + . Fixed use-after-free when an error handler removes a failing zlib.inflate + filter (GH-24176). (Edmond) + . Fixed bug GH-24533 (zlib.lib could not be found because zlib 1.3.2 + CMake build does not emit it). (Lazizbek Ergashev) + 22 Oct 2026, PHP 8.4.27 - Core: @@ -21,8 +421,13 @@ the end of their mapping. (Ilia Alshanetsky) . Fixed bug GH-24050 (GC frees an object still held by a resurrected closure when (object) and use share an array). (David Carlier) + . Fixed use-after-free when a Fiber callable resolves to $this of the method + creating the Fiber ([A::class, 'm'] or "A::m") and that object dies before + the Fiber runs. (Edmond Dantes) . Fixed exception thrown by destructor during GC in a Fiber not being rethrown into the frame that triggered the GC. (Nicolas Grekas) + . Fixed bug GH-24139 (NULL pointer dereference in php_ini.c when + expand_filepath() fails). (lazerg) - BCMath: . Fixed BcMath\Number results that truncate to zero keeping a negative sign @@ -91,6 +496,8 @@ haystacks. (Weilin Du) . Fixed grapheme_strrpos() and grapheme_strripos() skipping overlapping matches when using a negative offset. (Weilin Du) + . Fixed grapheme_extract() returning an incorrect next offset when starting + inside a multibyte UTF-8 character. (Weilin Du, David Carlier) - Lexbor: . Merge patches lexbor/lexbor@8a14bc0 and lexbor/lexbor@f67ce4b, fixing a @@ -232,6 +639,8 @@ (Nicolas Grekas) . Fixed convert.quoted-printable-decode decoding lowercase hex digits to the wrong byte. (Ilia Alshanetsky) + . Fixed unserialize() of enums sharing its state with the unserialize() + calls made by autoloaders. (nicolas-grekas) - Tidy: . Fixed a use-after-free when a tidyNode is used after its document is diff -Nru php8.4-8.4.27/Zend/Optimizer/block_pass.c php8.4-8.4.28/Zend/Optimizer/block_pass.c --- php8.4-8.4.27/Zend/Optimizer/block_pass.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/Optimizer/block_pass.c 2026-11-17 20:29:32.000000000 +0000 @@ -398,6 +398,18 @@ } break; + case ZEND_FAST_CALL: + if (opline->op2_type & (IS_TMP_VAR|IS_VAR)) { + /* OP2 holds the pending return value. A TMP normally has a single + * consumer, but FAST_CALL does not consume it: + * the RETURN behind it is the consumer, and + * zend_dispatch_try_catch_finally_helper() destroys the value + * through OP2 if the finally block throws. Propagating the source + * into the RETURN therefore must not remove it. */ + Tsource[VAR_NUM(opline->op2.var)] = NULL; + } + break; + case ZEND_SWITCH_LONG: case ZEND_SWITCH_STRING: case ZEND_MATCH: diff -Nru php8.4-8.4.27/Zend/Optimizer/dfa_pass.c php8.4-8.4.28/Zend/Optimizer/dfa_pass.c --- php8.4-8.4.27/Zend/Optimizer/dfa_pass.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/Optimizer/dfa_pass.c 2026-11-17 20:29:32.000000000 +0000 @@ -1359,7 +1359,8 @@ && Z_TYPE_P(CT_CONSTANT_EX(op_array, op_array->opcodes[op_2].op2.constant)) == IS_LONG && Z_LVAL_P(CT_CONSTANT_EX(op_array, op_array->opcodes[op_2].op2.constant)) == 1 && ssa->ops[op_2].op1_use >= 0 - && !(ssa->var_info[ssa->ops[op_2].op1_use].type & (MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_REF))) { + /* MAY_BE_UNDEF|MAY_BE_NULL is excluded because of the currently inconsistent behaviour, revisit in PHP 9 once it is fixed */ + && !(ssa->var_info[ssa->ops[op_2].op1_use].type & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_REF))) { op_array->opcodes[op_2].opcode = ZEND_PRE_DEC; SET_UNUSED(op_array->opcodes[op_2].op2); @@ -1513,7 +1514,8 @@ && Z_TYPE_P(CT_CONSTANT_EX(op_array, op_array->opcodes[op_2].op2.constant)) == IS_LONG && Z_LVAL_P(CT_CONSTANT_EX(op_array, op_array->opcodes[op_2].op2.constant)) == 1 && ssa->ops[op_2].op1_use >= 0 - && !(ssa->var_info[ssa->ops[op_2].op1_use].type & (MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_REF))) { + /* MAY_BE_UNDEF|MAY_BE_NULL is excluded because of the currently inconsistent behaviour, revisit in PHP 9 once it is fixed */ + && !(ssa->var_info[ssa->ops[op_2].op1_use].type & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_REF))) { op_array->opcodes[op_2].opcode = ZEND_PRE_DEC; SET_UNUSED(op_array->opcodes[op_2].op2); diff -Nru php8.4-8.4.27/Zend/Optimizer/escape_analysis.c php8.4-8.4.28/Zend/Optimizer/escape_analysis.c --- php8.4-8.4.27/Zend/Optimizer/escape_analysis.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/Optimizer/escape_analysis.c 2026-11-17 20:29:32.000000000 +0000 @@ -272,6 +272,25 @@ } /* }}} */ +/* ArrayAccess methods receive the object, so dimension accesses on it let it escape. */ +static bool may_be_array_access(const zend_ssa_var_info *info) /* {{{ */ +{ + if (!(info->type & MAY_BE_OBJECT)) { + return 0; + } + + const zend_class_entry *ce = info->ce; + if (!ce || info->is_instanceof) { + return 1; + } + if (ce->ce_flags & ZEND_ACC_LINKED) { + return ce->arrayaccess_funcs_ptr != NULL; + } + /* The interfaces of unlinked classes are not known yet. */ + return ce->num_interfaces || ce->parent_name; +} +/* }}} */ + static bool is_escape_use(zend_op_array *op_array, zend_ssa *ssa, int use, int var) /* {{{ */ { zend_ssa_op *ssa_op = ssa->ops + use; @@ -291,18 +310,22 @@ } break; case ZEND_ISSET_ISEMPTY_DIM_OBJ: - case ZEND_ISSET_ISEMPTY_PROP_OBJ: case ZEND_FETCH_DIM_R: - case ZEND_FETCH_OBJ_R: case ZEND_FETCH_DIM_IS: + case ZEND_ASSIGN_DIM_OP: + case ZEND_ASSIGN_DIM: + if (may_be_array_access(&ssa->var_info[ssa_op->op1_use])) { + return 1; + } + break; + case ZEND_ISSET_ISEMPTY_PROP_OBJ: + case ZEND_FETCH_OBJ_R: case ZEND_FETCH_OBJ_IS: break; case ZEND_ASSIGN_OP: return 1; - case ZEND_ASSIGN_DIM_OP: case ZEND_ASSIGN_OBJ_OP: case ZEND_ASSIGN_STATIC_PROP_OP: - case ZEND_ASSIGN_DIM: case ZEND_ASSIGN_OBJ: break; case ZEND_ASSIGN_OBJ_REF: diff -Nru php8.4-8.4.27/Zend/Optimizer/optimize_func_calls.c php8.4-8.4.28/Zend/Optimizer/optimize_func_calls.c --- php8.4-8.4.27/Zend/Optimizer/optimize_func_calls.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/Optimizer/optimize_func_calls.c 2026-11-17 20:29:32.000000000 +0000 @@ -240,12 +240,13 @@ case ZEND_FETCH_OBJ_FUNC_ARG: case ZEND_FETCH_DIM_FUNC_ARG: if (call_stack[call - 1].func_arg_num != (uint32_t)-1 + && call_stack[call - 1].last_check_func_arg_opline != NULL && has_known_send_mode(&call_stack[call - 1], call_stack[call - 1].func_arg_num)) { if (ARG_SHOULD_BE_SENT_BY_REF(call_stack[call - 1].func, call_stack[call - 1].func_arg_num)) { /* There's no TMP specialization for FETCH_OBJ_W/FETCH_DIM_W. Avoid * converting it and error at runtime in the FUNC_ARG variant. */ if ((opline->opcode == ZEND_FETCH_OBJ_FUNC_ARG || opline->opcode == ZEND_FETCH_DIM_FUNC_ARG) - && (opline->op1_type == IS_TMP_VAR || call_stack[call - 1].last_check_func_arg_opline == NULL)) { + && opline->op1_type == IS_TMP_VAR) { /* Don't remove the associated CHECK_FUNC_ARG opcode. */ call_stack[call - 1].last_check_func_arg_opline = NULL; break; @@ -261,6 +262,8 @@ /* FETCH_DIM_FUNC_ARG supports UNUSED op2, while FETCH_DIM_R does not. * Performing the replacement would create an invalid opcode. */ call_stack[call - 1].try_inline = 0; + /* Don't remove the associated CHECK_FUNC_ARG opcode. */ + call_stack[call - 1].last_check_func_arg_opline = NULL; break; } diff -Nru php8.4-8.4.27/Zend/Optimizer/zend_inference.c php8.4-8.4.28/Zend/Optimizer/zend_inference.c --- php8.4-8.4.27/Zend/Optimizer/zend_inference.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/Optimizer/zend_inference.c 2026-11-17 20:29:32.000000000 +0000 @@ -762,12 +762,14 @@ } static inline bool shift_left_overflows(zend_long n, zend_long s) { - /* This considers shifts that shift in the sign bit to be overflowing as well */ - if (n >= 0) { - return s >= SIZEOF_ZEND_LONG * 8 - 1 || safe_shift_left(n, s) < n; - } else { - return s >= SIZEOF_ZEND_LONG * 8 || safe_shift_left(n, s) > n; + if (UNEXPECTED((zend_ulong)s >= SIZEOF_ZEND_LONG * 8)) { + return true; + } + if (UNEXPECTED(s == SIZEOF_ZEND_LONG * 8 - 1)) { + return n != 0 && n != -1; } + zend_long shifted = (zend_long)((zend_ulong)n << (zend_ulong)s); + return (shifted >> s) != n; } /* If b does not divide a exactly, return the two adjacent values between which the real result @@ -2224,6 +2226,9 @@ if (dim_type & (MAY_BE_UNDEF|MAY_BE_NULL)) { tmp |= MAY_BE_ARRAY_KEY_STRING; } + if ((tmp & MAY_BE_ARRAY_KEY_STRING) && MAY_BE_PACKED(arr_type)) { + tmp |= MAY_BE_ARRAY_NUMERIC_HASH; + } } } /* Only add value type if we have a key type. It might be that the key type is illegal @@ -2809,11 +2814,11 @@ * null will be returned. */ tmp |= MAY_BE_NULL; } - if (t2 & (MAY_BE_ARRAY | MAY_BE_OBJECT)) { + if (OP2_INFO() & (MAY_BE_ARRAY | MAY_BE_OBJECT)) { /* Arrays and objects cannot be used as keys. */ tmp |= MAY_BE_NULL; } - if (t1 & (MAY_BE_ANY - (MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY))) { + if (OP1_INFO() & (MAY_BE_ANY - (MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY))) { /* null and false are implicitly converted to array, anything else * results in a null return value. */ tmp |= MAY_BE_NULL; @@ -3454,7 +3459,11 @@ case ZEND_ADD_ARRAY_UNPACK: tmp = ssa_var_info[ssa_op->result_use].type; ZEND_ASSERT(tmp & MAY_BE_ARRAY); - tmp |= t1 & (MAY_BE_ARRAY_KEY_ANY|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF); + if (t1 & MAY_BE_ARRAY_KEY_LONG) { + /* Integer keys are appended without copying the hash/packed layout of the source array. */ + tmp |= MAY_BE_HASH_ONLY(tmp) ? MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG; + } + tmp |= t1 & (MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF); if (t1 & MAY_BE_OBJECT) { tmp |= MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY; } @@ -3615,6 +3624,9 @@ if (t2 & (MAY_BE_UNDEF | MAY_BE_NULL)) { key_type |= MAY_BE_ARRAY_KEY_STRING; } + if ((key_type & MAY_BE_ARRAY_KEY_STRING) && MAY_BE_PACKED(t1)) { + key_type |= MAY_BE_ARRAY_NUMERIC_HASH; + } } } else if (opline->opcode == ZEND_FETCH_DIM_UNSET) { if (t1 & MAY_BE_ARRAY) { @@ -5026,7 +5038,6 @@ case ZEND_SWITCH_STRING: case ZEND_MATCH: case ZEND_ISSET_ISEMPTY_VAR: - case ZEND_ISSET_ISEMPTY_CV: case ZEND_FUNC_NUM_ARGS: case ZEND_FUNC_GET_ARGS: case ZEND_COPY_TMP: @@ -5117,6 +5128,12 @@ case ZEND_BOOL: case ZEND_JMP_SET: return (t1 & MAY_BE_OBJECT); + case ZEND_ISSET_ISEMPTY_CV: + if (!(opline->extended_value & ZEND_ISEMPTY)) { + return 0; + } + /* empty() casts to bool: objects may have a cast handler */ + return (t1 & MAY_BE_OBJECT); case ZEND_BOOL_XOR: return (t1 & MAY_BE_OBJECT) || (t2 & MAY_BE_OBJECT); case ZEND_IS_EQUAL: diff -Nru php8.4-8.4.27/Zend/Optimizer/zend_optimizer.c php8.4-8.4.28/Zend/Optimizer/zend_optimizer.c --- php8.4-8.4.27/Zend/Optimizer/zend_optimizer.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/Optimizer/zend_optimizer.c 2026-11-17 20:29:32.000000000 +0000 @@ -1359,7 +1359,7 @@ while (opline < end) { zend_ssa_op *ssa_op = &ssa->ops[opline - op_array->opcodes]; uint32_t op1_info = opline->op1_type == IS_UNUSED ? 0 : (OP1_INFO() & (MAY_BE_UNDEF|MAY_BE_ANY|MAY_BE_REF|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_KEY_ANY)); - uint32_t op2_info = opline->op1_type == IS_UNUSED ? 0 : (OP2_INFO() & (MAY_BE_UNDEF|MAY_BE_ANY|MAY_BE_REF|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_KEY_ANY)); + uint32_t op2_info = opline->op2_type == IS_UNUSED ? 0 : (OP2_INFO() & (MAY_BE_UNDEF|MAY_BE_ANY|MAY_BE_REF|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_KEY_ANY)); uint32_t res_info = (opline->opcode == ZEND_PRE_INC || opline->opcode == ZEND_PRE_DEC || diff -Nru php8.4-8.4.27/Zend/tests/assert/expect_final_abstract_modifiers.phpt php8.4-8.4.28/Zend/tests/assert/expect_final_abstract_modifiers.phpt --- php8.4-8.4.27/Zend/tests/assert/expect_final_abstract_modifiers.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/assert/expect_final_abstract_modifiers.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,36 @@ +--TEST-- +AST printing of final and abstract modifiers on class constants and properties +--INI-- +zend.assertions=1 +--FILE-- +getMessage(), "\n"; +} + +?> +--EXPECT-- +assert(false && new class { + public final const A = 1; + protected final const int B = 2; + public final $a; + public static final $b; + public final readonly int $c; + public abstract $d { + get; + } + protected private(set) abstract int $e { + set; + } +}) diff -Nru php8.4-8.4.27/Zend/tests/assert/expect_readonly_anon_class.phpt php8.4-8.4.28/Zend/tests/assert/expect_readonly_anon_class.phpt --- php8.4-8.4.27/Zend/tests/assert/expect_readonly_anon_class.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/assert/expect_readonly_anon_class.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,22 @@ +--TEST-- +AST export of readonly anonymous class +--INI-- +zend.assertions=1 +--FILE-- +getMessage(), "\n"; +} +try { + assert(false && new #[A] readonly class(1) {}); +} catch (AssertionError $e) { + echo $e::class, ': ', $e->getMessage(), "\n"; +} +?> +--EXPECT-- +AssertionError: assert(false && new readonly class { +}) +AssertionError: assert(false && new #[A] readonly class(1) { +}) diff -Nru php8.4-8.4.27/Zend/tests/constexpr/new_named_params_duplicate_leak.phpt php8.4-8.4.28/Zend/tests/constexpr/new_named_params_duplicate_leak.phpt --- php8.4-8.4.27/Zend/tests/constexpr/new_named_params_duplicate_leak.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/constexpr/new_named_params_duplicate_leak.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,21 @@ +--TEST-- +Duplicate named param in new in const expr does not leak the argument +--FILE-- +getMessage(), "\n"; +} + +?> +--EXPECT-- +Error: Named parameter $a overwrites previous argument diff -Nru php8.4-8.4.27/Zend/tests/enum/unserialize-autoload-nested.phpt php8.4-8.4.28/Zend/tests/enum/unserialize-autoload-nested.phpt --- php8.4-8.4.27/Zend/tests/enum/unserialize-autoload-nested.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/enum/unserialize-autoload-nested.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,36 @@ +--TEST-- +Enum unserialize runs the autoloader outside of the current unserialize() context +--FILE-- +ready = true; + } +} + +enum Backed: string { + case Foo = Value::FOO; +} + +spl_autoload_register(function ($class) { + var_dump(unserialize('O:4:"Init":0:{}')->ready); + eval(match ($class) { + 'Pure' => 'enum Pure { case Foo; }', + 'Value' => 'class Value { const FOO = "foo"; }', + }); +}); + +foreach (['E:8:"Pure:Foo";', 'E:10:"Backed:Foo";'] as $enum) { + $data = unserialize('a:3:{i:0;' . $enum . 'i:1;O:8:"stdClass":0:{}i:2;r:3;}'); + var_dump($data[1] === $data[2]); +} + +?> +--EXPECT-- +bool(true) +bool(true) +bool(true) +bool(true) diff -Nru php8.4-8.4.27/Zend/tests/exception_previous_already_in_chain_destructor.phpt php8.4-8.4.28/Zend/tests/exception_previous_already_in_chain_destructor.phpt --- php8.4-8.4.27/Zend/tests/exception_previous_already_in_chain_destructor.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/exception_previous_already_in_chain_destructor.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,29 @@ +--TEST-- +Exception thrown in a destructor during unwinding that already has the pending exception in its previous chain +--FILE-- +pending); + } +} + +function f() { + $pending = new RuntimeException("pending"); + $object = new ThrowsInDestructor($pending); + throw $pending; +} + +try { + f(); +} catch (Throwable $t) { + for (; $t !== null; $t = $t->getPrevious()) { + echo $t->getMessage(), "\n"; + } +} +?> +--EXPECT-- +thrown +pending diff -Nru php8.4-8.4.27/Zend/tests/fibers/destroy-suspended-fiber-during-unwinding.phpt php8.4-8.4.28/Zend/tests/fibers/destroy-suspended-fiber-during-unwinding.phpt --- php8.4-8.4.27/Zend/tests/fibers/destroy-suspended-fiber-during-unwinding.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/fibers/destroy-suspended-fiber-during-unwinding.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,95 @@ +--TEST-- +Destroying a suspended fiber during exception unwinding does not skip the enclosing catch block +--FILE-- +start(); + + return $fiber; +} + +function destructor_first() { + $d = new D(); + $fiber = suspended_fiber(); + throw new Exception('destructor_first'); +} + +function fiber_first() { + $fiber = suspended_fiber(); + $d = new D(); + throw new Exception('fiber_first'); +} + +function throw_in_fiber_finally() { + $d = new D(); + $fiber = new Fiber(static function () { + try { + Fiber::suspend(); + } finally { + throw new Exception('fiber finally'); + } + }); + $fiber->start(); + throw new Exception('throw_in_fiber_finally'); +} + +function catches(callable $f) { + try { + $f(); + } catch (Exception $e) { + echo 'caught: ', $e->getMessage(), $e->getPrevious() ? ', previous: '.$e->getPrevious()->getMessage() : '', "\n"; + } +} + +function catches_after_finally(callable $f) { + try { + try { + $f(); + } finally { + echo "finally\n"; + } + } catch (Exception $e) { + echo 'caught: ', $e->getMessage(), "\n"; + } +} + +foreach (['destructor_first', 'fiber_first', 'throw_in_fiber_finally'] as $f) { + echo "-- $f\n"; + try { + catches($f); + catches_after_finally($f); + } catch (Throwable $e) { + echo 'escaped: ', $e->getMessage(), "\n"; + } +} + +?> +--EXPECT-- +-- destructor_first +D::__destruct +caught: destructor_first +D::__destruct +finally +caught: destructor_first +-- fiber_first +D::__destruct +caught: fiber_first +D::__destruct +finally +caught: fiber_first +-- throw_in_fiber_finally +D::__destruct +caught: fiber finally, previous: throw_in_fiber_finally +D::__destruct +finally +caught: fiber finally diff -Nru php8.4-8.4.27/Zend/tests/fibers/destructors_012.phpt php8.4-8.4.28/Zend/tests/fibers/destructors_012.phpt --- php8.4-8.4.27/Zend/tests/fibers/destructors_012.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/fibers/destructors_012.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,63 @@ +--TEST-- +Fibers in destructors 012: GC destructor fiber running during exception unwinding does not skip the enclosing catch block +--INI-- +zend.enable_gc=1 +--FILE-- +self = $this; + } + public function __destruct() { + try { + throw new Exception('Cycle::__destruct'); + } catch (Exception) { + echo "Cycle::__destruct\n"; + } + } +} + +$objects = []; +for ($i = 0; $i < 50000; $i++) { + $objects[] = new stdClass(); +} + +function f() { + global $objects; + $d = new D(); + // Releasing these copies during unwinding fills the GC root buffer + $copies = [...$objects]; + new Cycle(); + throw new Exception('f'); +} + +function c() { + try { + f(); + } catch (Exception $e) { + echo 'caught: ', $e->getMessage(), "\n"; + } +} + +$fiber = new Fiber(function () { + try { + c(); + } catch (Throwable $e) { + echo 'escaped: ', $e->getMessage(), "\n"; + } +}); +$fiber->start(); + +?> +--EXPECT-- +D::__destruct +Cycle::__destruct +caught: f diff -Nru php8.4-8.4.27/Zend/tests/fibers/fiber-callable-object-outlives-caller.phpt php8.4-8.4.28/Zend/tests/fibers/fiber-callable-object-outlives-caller.phpt --- php8.4-8.4.27/Zend/tests/fibers/fiber-callable-object-outlives-caller.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/fibers/fiber-callable-object-outlives-caller.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,85 @@ +--TEST-- +Fiber holds the object a callable resolved to in the creating method ($this for [A::class, 'm'] or "A::m") +--FILE-- +name}\n"; + } + + public function waits() { + Fiber::suspend(); + echo "resumed on {$this->name}\n"; + } + + public function make(string $method) { + return new Fiber([A::class, $method]); + } + + public function makeFromString() { + return new Fiber("A::m"); + } + + public function keep() { + $this->fiber = new Fiber([A::class, 'm']); + } + + public function __destruct() { + echo "released {$this->name}\n"; + } +} + +echo "-- started after its creator's last reference went\n"; +$fiber = (new A("a1"))->make('m'); +$fiber->start(); +echo "after start\n"; + +echo "-- a string callable\n"; +$fiber = (new A("a2"))->makeFromString(); +$fiber->start(); +echo "after start\n"; + +echo "-- never started, released with the fiber\n"; +$fiber = (new A("a3"))->make('m'); +unset($fiber); +echo "after unset\n"; + +echo "-- suspended while its object has no other reference\n"; +$a = new A("a4"); +$fiber = $a->make('waits'); +$fiber->start(); +unset($a); +$fiber->resume(); +echo "after resume\n"; + +echo "-- a cycle through the fiber is collected\n"; +$a = new A("a5"); +$a->keep(); +unset($a); +var_dump(gc_collect_cycles()); +echo "end\n"; +?> +--EXPECT-- +-- started after its creator's last reference went +m on a1 +released a1 +after start +-- a string callable +m on a2 +released a2 +after start +-- never started, released with the fiber +released a3 +after unset +-- suspended while its object has no other reference +resumed on a4 +released a4 +after resume +-- a cycle through the fiber is collected +released a5 +int(2) +end diff -Nru php8.4-8.4.27/Zend/tests/fibers/gc-destructor-throw-previous-already-in-chain.phpt php8.4-8.4.28/Zend/tests/fibers/gc-destructor-throw-previous-already-in-chain.phpt --- php8.4-8.4.27/Zend/tests/fibers/gc-destructor-throw-previous-already-in-chain.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/fibers/gc-destructor-throw-previous-already-in-chain.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,41 @@ +--TEST-- +Exception thrown by a GC destructor that already has the exception of a previous, suspended destructor in its previous chain +--FILE-- +self = $this; + } + + public function __destruct() { + if (self::$pending === null) { + try { + Fiber::suspend(); + } finally { + self::$pending = new RuntimeException("pending"); + throw self::$pending; + } + } + throw new LogicException("thrown", 0, self::$pending); + } +} + +$fiber = new Fiber(function () { + new Cycle; + new Cycle; + try { + gc_collect_cycles(); + } catch (Throwable $t) { + for (; $t !== null; $t = $t->getPrevious()) { + echo $t->getMessage(), "\n"; + } + } +}); +$fiber->start(); +?> +--EXPECT-- +thrown +pending diff -Nru php8.4-8.4.27/Zend/tests/fibers/gh24265-001.phpt php8.4-8.4.28/Zend/tests/fibers/gh24265-001.phpt --- php8.4-8.4.27/Zend/tests/fibers/gh24265-001.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/fibers/gh24265-001.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,24 @@ +--TEST-- +GH-24265 (exit() in a finally block of a destroyed fiber is discarded) +--CREDITS-- +iluuu1994 +--FILE-- +start(); +echo "Before destroy", PHP_EOL; +unset($fiber); + +echo "Not reached", PHP_EOL; + +?> +--EXPECT-- +Before destroy diff -Nru php8.4-8.4.27/Zend/tests/fibers/gh24265-002.phpt php8.4-8.4.28/Zend/tests/fibers/gh24265-002.phpt --- php8.4-8.4.27/Zend/tests/fibers/gh24265-002.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/fibers/gh24265-002.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,30 @@ +--TEST-- +GH-24265 (exit() in a destroyed fiber is discarded while an exception is pending) +--FILE-- +start(); + echo "Before destroy", PHP_EOL; + throw new Exception("pending"); +} + +try { + test(); +} catch (Exception $e) { + echo $e::class, ': ', $e->getMessage(), PHP_EOL; +} + +echo "Not reached", PHP_EOL; + +?> +--EXPECT-- +Before destroy diff -Nru php8.4-8.4.27/Zend/tests/fibers/unfinished-fiber-with-throw-previous-already-in-chain.phpt php8.4-8.4.28/Zend/tests/fibers/unfinished-fiber-with-throw-previous-already-in-chain.phpt --- php8.4-8.4.27/Zend/tests/fibers/unfinished-fiber-with-throw-previous-already-in-chain.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/fibers/unfinished-fiber-with-throw-previous-already-in-chain.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,28 @@ +--TEST-- +Exception thrown in finally of a fiber destroyed during unwinding that already has the pending exception in its previous chain +--FILE-- +start(); + throw $pending; +} + +try { + f(); +} catch (Throwable $t) { + for (; $t !== null; $t = $t->getPrevious()) { + echo $t->getMessage(), "\n"; + } +} +?> +--EXPECT-- +thrown +pending diff -Nru php8.4-8.4.27/Zend/tests/generators/finally/yield_throw_previous_already_in_chain.phpt php8.4-8.4.28/Zend/tests/generators/finally/yield_throw_previous_already_in_chain.phpt --- php8.4-8.4.27/Zend/tests/generators/finally/yield_throw_previous_already_in_chain.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/generators/finally/yield_throw_previous_already_in_chain.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,30 @@ +--TEST-- +Exception thrown in finally of a generator destroyed during unwinding that already has the pending exception in its previous chain +--FILE-- +current(); + throw $pending; +} + +try { + f(); +} catch (Throwable $t) { + for (; $t !== null; $t = $t->getPrevious()) { + echo $t->getMessage(), "\n"; + } +} +?> +--EXPECT-- +thrown +pending diff -Nru php8.4-8.4.27/Zend/tests/gh24989.phpt php8.4-8.4.28/Zend/tests/gh24989.phpt --- php8.4-8.4.27/Zend/tests/gh24989.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/gh24989.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,29 @@ +--TEST-- +GH-24989 (Use-after-free in GC when an exception is thrown) +--CREDITS-- +vi3tL0u1s +--FILE-- +getMessage(), PHP_EOL; + } +} +?> +--EXPECT-- +Exception: loop +Exception: tmp diff -Nru php8.4-8.4.27/Zend/tests/gh24989_uncaught.phpt php8.4-8.4.28/Zend/tests/gh24989_uncaught.phpt --- php8.4-8.4.27/Zend/tests/gh24989_uncaught.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/gh24989_uncaught.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,16 @@ +--TEST-- +GH-24989 (Use-after-free in GC when an exception is thrown, uncaught) +--CREDITS-- +vi3tL0u1s +--FILE-- + +--EXPECTF-- +Fatal error: Uncaught Exception in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff -Nru php8.4-8.4.27/Zend/tests/nullsafe_operator/gh23979.phpt php8.4-8.4.28/Zend/tests/nullsafe_operator/gh23979.phpt --- php8.4-8.4.27/Zend/tests/nullsafe_operator/gh23979.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/nullsafe_operator/gh23979.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,16 @@ +--TEST-- +GH-23979 (Nullsafe operator must not flush delayed oplines of an enclosing function) +--FILE-- + 'bar']; + return ${$name}[(function () { + return A . B?->prop; + })()]; +} +const A = 'foo'; +const B = null; +var_dump(test('arr')); +?> +--EXPECT-- +string(3) "bar" diff -Nru php8.4-8.4.27/Zend/tests/shift_left_overflow_range.phpt php8.4-8.4.28/Zend/tests/shift_left_overflow_range.phpt --- php8.4-8.4.27/Zend/tests/shift_left_overflow_range.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/shift_left_overflow_range.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,51 @@ +--TEST-- +Too narrow range inferred for SL when the shift wraps +--SKIPIF-- + +--FILE-- += 2, + * so the result range may not be derived from the two endpoints: both of them + * happen to yield 1 << 62, while the values in between do not. */ +function shift_positive(): array { + $out = []; + for ($i = 1; $i <= 5; $i++) { + $out[] = $i << 62; + } + return $out; +} + +/* Likewise for RANGE[-3..-1] shifted by 63: both endpoints yield LONG_MIN, + * but -2 << 63 is 0. */ +function shift_negative(): array { + $out = []; + for ($i = -1; $i >= -3; $i--) { + $out[] = $i << 63; + } + return $out; +} + +var_dump(shift_positive()); +var_dump(shift_negative()); +?> +--EXPECT-- +array(5) { + [0]=> + int(4611686018427387904) + [1]=> + int(-9223372036854775808) + [2]=> + int(-4611686018427387904) + [3]=> + int(0) + [4]=> + int(4611686018427387904) +} +array(3) { + [0]=> + int(-9223372036854775808) + [1]=> + int(0) + [2]=> + int(-9223372036854775808) +} diff -Nru php8.4-8.4.27/Zend/tests/try/finally_interrupt_after_return.phpt php8.4-8.4.28/Zend/tests/try/finally_interrupt_after_return.phpt --- php8.4-8.4.27/Zend/tests/try/finally_interrupt_after_return.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/try/finally_interrupt_after_return.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,42 @@ +--TEST-- +VM interrupt throwing at the end of a finally block after "return" in the try block +--DESCRIPTION-- +"return" inside a try block runs the finally block with FAST_CALL, and FAST_RET +then jumps back to the RETURN, which is inside the try block. An interrupt that +throws as the finally block ends belongs to the finally block: it must not run +the finally block again, and it discards the pending return value. +--EXTENSIONS-- +zend_test +--INI-- +zend_test.observer.enabled=1 +zend_test.observer.show_output=0 +zend_test.observer.observe_function_names=release +zend_test.observer.set_vm_interrupt_on_end=1 +--FILE-- +getMessage(), "\n"; +} +echo "finally ran $runs time(s)\n"; +?> +--EXPECT-- +Exception: VM interrupt +finally ran 1 time(s) diff -Nru php8.4-8.4.27/Zend/tests/try/finally_interrupt_after_return_generator.phpt php8.4-8.4.28/Zend/tests/try/finally_interrupt_after_return_generator.phpt --- php8.4-8.4.27/Zend/tests/try/finally_interrupt_after_return_generator.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/try/finally_interrupt_after_return_generator.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,43 @@ +--TEST-- +VM interrupt throwing at the end of a generator's finally block after "return" in the try block +--EXTENSIONS-- +zend_test +--INI-- +zend_test.observer.enabled=1 +zend_test.observer.show_output=0 +zend_test.observer.observe_function_names=release +zend_test.observer.set_vm_interrupt_on_end=1 +--FILE-- +current(), "\n"; + $gen->next(); + echo "gen() returned ", $gen->getReturn(), "\n"; +} catch (Exception $e) { + echo get_class($e), ': ', $e->getMessage(), "\n"; +} +var_dump($gen->valid()); +echo "finally ran $runs time(s)\n"; +?> +--EXPECT-- +yielded 1 +Exception: VM interrupt +bool(false) +finally ran 1 time(s) diff -Nru php8.4-8.4.27/Zend/tests/try/finally_interrupt_after_return_nested.phpt php8.4-8.4.28/Zend/tests/try/finally_interrupt_after_return_nested.phpt --- php8.4-8.4.27/Zend/tests/try/finally_interrupt_after_return_nested.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/try/finally_interrupt_after_return_nested.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,47 @@ +--TEST-- +VM interrupt throwing at the end of nested finally blocks after "return" in the try block +--DESCRIPTION-- +The inner finally block's FAST_RET jumps to the outer FAST_CALL, which is inside +the inner try block. An interrupt that throws there must not run the inner +finally block again, but the outer finally block still runs. +--EXTENSIONS-- +zend_test +--INI-- +zend_test.observer.enabled=1 +zend_test.observer.show_output=0 +zend_test.observer.observe_function_names=release +zend_test.observer.set_vm_interrupt_on_end=1 +--FILE-- +getMessage(), "\n"; + echo 'previous: ', get_class($e->getPrevious()), ': ', $e->getPrevious()->getMessage(), "\n"; +} +echo implode(', ', $runs), "\n"; +?> +--EXPECT-- +Exception: VM interrupt +previous: Exception: VM interrupt +inner, outer diff -Nru php8.4-8.4.27/Zend/tests/try/try_finally_previous_already_in_chain.phpt php8.4-8.4.28/Zend/tests/try/try_finally_previous_already_in_chain.phpt --- php8.4-8.4.27/Zend/tests/try/try_finally_previous_already_in_chain.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/try/try_finally_previous_already_in_chain.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,38 @@ +--TEST-- +Exception thrown in finally that already has the pending exception in its previous chain +--FILE-- +getPrevious()) { + echo $t->getMessage(), "\n"; + } + } +} +?> +--EXPECT-- +thrown +pending +thrown +middle +pending diff -Nru php8.4-8.4.27/Zend/tests/vm_interrupt_rearm.phpt php8.4-8.4.28/Zend/tests/vm_interrupt_rearm.phpt --- php8.4-8.4.27/Zend/tests/vm_interrupt_rearm.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/vm_interrupt_rearm.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,26 @@ +--TEST-- +VM interrupt re-armed by the interrupt handler must not stop execution from making progress +--DESCRIPTION-- +zend_test.rearm_vm_interrupt installs a zend_interrupt_function that sets +EG(vm_interrupt) again every time it runs, so an interrupt is always pending. +After handling an interrupt the VM has to run the next opline before it checks +the flag again, otherwise it calls the handler forever (or recurses until the +stack overflows). +--EXTENSIONS-- +zend_test +--INI-- +zend_test.rearm_vm_interrupt=1 +--FILE-- + +--EXPECT-- +int(1000) diff -Nru php8.4-8.4.27/Zend/tests/zend_alloc_realloc_shrink_boundary.phpt php8.4-8.4.28/Zend/tests/zend_alloc_realloc_shrink_boundary.phpt --- php8.4-8.4.27/Zend/tests/zend_alloc_realloc_shrink_boundary.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/zend_alloc_realloc_shrink_boundary.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,40 @@ +--TEST-- +erealloc() of a small block keeps it in the bin its new size maps to +--EXTENSIONS-- +zend_test +--SKIPIF-- + +--FILE-- + 3072) { + break; + } + $largest[$block] = $n; +} +var_dump(count($largest) > 20); + +// Shrink a block of each bin to every smaller size, down to the size of the +// bin below, which efree_size() maps to that bin. +$mismatches = []; +foreach ($largest as $old_size) { + for ($new_size = 1; $new_size < $old_size; $new_size++) { + [$block, $fresh] = zend_test_erealloc_block_size($old_size, $new_size); + if ($block !== $fresh) { + $mismatches[] = "$old_size -> $new_size: block of $block, expected $fresh"; + } + } +} +var_dump(array_slice($mismatches, 0, 5)); + +?> +--EXPECT-- +bool(true) +array(0) { +} diff -Nru php8.4-8.4.27/Zend/tests/zend_mm_chunk_alloc_mmap_failure.phpt php8.4-8.4.28/Zend/tests/zend_mm_chunk_alloc_mmap_failure.phpt --- php8.4-8.4.27/Zend/tests/zend_mm_chunk_alloc_mmap_failure.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/Zend/tests/zend_mm_chunk_alloc_mmap_failure.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,32 @@ +--TEST-- +Failed retry mmap() in zend_mm_chunk_alloc_int() must not unmap an unrelated range +--EXTENSIONS-- +posix +--SKIPIF-- + 0x40000000) { + die('skip only for non-PIE builds'); +} +?> +--INI-- +memory_limit=-1 +--FILE-- + +--EXPECTREGEX-- +bool\(true\)\s+(.*Out of memory|allocation succeeded)\s* diff -Nru php8.4-8.4.27/Zend/zend.c php8.4-8.4.28/Zend/zend.c --- php8.4-8.4.27/Zend/zend.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend.c 2026-11-17 20:29:32.000000000 +0000 @@ -1222,6 +1222,7 @@ #endif zend_map_ptr_static_last = 0; zend_map_ptr_static_size = 0; + global_map_ptr_last = 0; zend_destroy_rsrc_list_dtors(); @@ -2100,6 +2101,7 @@ do { ret = ZEND_MAP_PTR_NEW_OFFSET(); } while (ret <= 2); - GC_ADD_FLAGS(type_name, IS_STR_CLASS_NAME_MAP_PTR); GC_SET_REFCOUNT(type_name, ret); + ZEND_ATOMIC_FENCE_RELEASE(); + GC_ADD_FLAGS(type_name, IS_STR_CLASS_NAME_MAP_PTR); } diff -Nru php8.4-8.4.27/Zend/zend.h php8.4-8.4.28/Zend/zend.h --- php8.4-8.4.27/Zend/zend.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend.h 2026-11-17 20:29:32.000000000 +0000 @@ -20,7 +20,7 @@ #ifndef ZEND_H #define ZEND_H -#define ZEND_VERSION "4.4.27" +#define ZEND_VERSION "4.4.28" #define ZEND_ENGINE_3 diff -Nru php8.4-8.4.27/Zend/zend_API.c php8.4-8.4.28/Zend/zend_API.c --- php8.4-8.4.27/Zend/zend_API.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend_API.c 2026-11-17 20:29:32.000000000 +0000 @@ -34,7 +34,6 @@ #include "zend_enum.h" #include "zend_object_handlers.h" #include "zend_observer.h" -#include "zend_system_id.h" #include @@ -3124,7 +3123,6 @@ } zend_flf_handlers[zend_flf_count] = flf_info->handler; zend_flf_functions[zend_flf_count] = (zend_function *)reg_function; - zend_add_system_entropy("frameless", ZSTR_VAL(reg_function->function_name), &flf_info->num_args, sizeof(flf_info->num_args)); zend_flf_count++; flf_info++; } @@ -3432,6 +3430,9 @@ if (module->request_shutdown_func) { zend_try { module->request_shutdown_func(module->type, module->module_number); + } zend_catch { + /* module shutdown is incomplete */ + _exit(1); } zend_end_try(); } } ZEND_HASH_FOREACH_END(); @@ -3442,6 +3443,9 @@ zend_module_entry *module = *p; zend_try { module->request_shutdown_func(module->type, module->module_number); + } zend_catch { + /* module shutdown is incomplete */ + _exit(1); } zend_end_try(); p++; } diff -Nru php8.4-8.4.27/Zend/zend_alloc.c php8.4-8.4.28/Zend/zend_alloc.c --- php8.4-8.4.27/Zend/zend_alloc.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend_alloc.c 2026-11-17 20:29:32.000000000 +0000 @@ -905,6 +905,9 @@ /* chunk has to be aligned */ zend_mm_munmap(ptr, size); ptr = zend_mm_mmap(size + alignment - REAL_PAGE_SIZE); + if (ptr == NULL) { + return NULL; + } #ifdef _WIN32 offset = ZEND_MM_ALIGNED_OFFSET(ptr, alignment); if (offset != 0) { @@ -1849,8 +1852,9 @@ /* Check if requested size fits into current bin */ if (size <= old_size) { - /* Check if truncation is necessary */ - if (old_bin_num > 0 && size < bin_data_size[old_bin_num - 1]) { + /* Check if truncation is necessary. A size that fits the + * bin below moves there, as efree_size() maps it to that bin. */ + if (old_bin_num > 0 && size <= bin_data_size[old_bin_num - 1]) { /* truncation */ ret = zend_mm_alloc_small(heap, ZEND_MM_SMALL_SIZE_TO_BIN(size) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); if (UNEXPECTED(ret == NULL)) { diff -Nru php8.4-8.4.27/Zend/zend_ast.c php8.4-8.4.28/Zend/zend_ast.c --- php8.4-8.4.27/Zend/zend_ast.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend_ast.c 2026-11-17 20:29:32.000000000 +0000 @@ -942,6 +942,7 @@ zend_throw_error(NULL, "Named parameter $%s overwrites previous argument", ZSTR_VAL(name)); + zval_ptr_dtor(&arg); zend_array_destroy(args); zval_ptr_dtor(result); return FAILURE; @@ -2010,6 +2011,12 @@ if (ast->attr & ZEND_ACC_STATIC) { smart_str_appends(str, "static "); } + if (ast->attr & ZEND_ACC_ABSTRACT) { + smart_str_appends(str, "abstract "); + } + if (ast->attr & ZEND_ACC_FINAL) { + smart_str_appends(str, "final "); + } if (ast->attr & ZEND_ACC_READONLY) { smart_str_appends(str, "readonly "); } @@ -2032,6 +2039,9 @@ } zend_ast_export_visibility(str, ast->attr, ZEND_MODIFIER_TARGET_CONSTANT); + if (ast->attr & ZEND_ACC_FINAL) { + smart_str_appends(str, "final "); + } smart_str_appends(str, "const "); if (ast->child[2]) { zend_ast_export_type(str, ast->child[2], indent); @@ -2046,9 +2056,9 @@ break; case ZEND_AST_USE: smart_str_appends(str, "use "); - if (ast->attr == T_FUNCTION) { + if (ast->attr == ZEND_SYMBOL_FUNCTION) { smart_str_appends(str, "function "); - } else if (ast->attr == T_CONST) { + } else if (ast->attr == ZEND_SYMBOL_CONST) { smart_str_appends(str, "const "); } goto simple_list; @@ -2311,6 +2321,9 @@ if (decl->child[3]) { zend_ast_export_attributes(str, decl->child[3], indent, 0); } + if (decl->flags & ZEND_ACC_READONLY_CLASS) { + smart_str_appends(str, "readonly "); + } smart_str_appends(str, "class"); if (!zend_ast_is_list(ast->child[1]) || zend_ast_get_list(ast->child[1])->children) { @@ -2489,6 +2502,19 @@ } break; case ZEND_AST_USE_ELEM: + if (ast->attr == ZEND_SYMBOL_FUNCTION) { + smart_str_appends(str, "function "); + } else if (ast->attr == ZEND_SYMBOL_CONST) { + smart_str_appends(str, "const "); + } + + zend_ast_export_name(str, ast->child[0], 0, indent); + + if (ast->child[1]) { + smart_str_appends(str, " as "); + zend_ast_export_name(str, ast->child[1], 0, indent); + } + break; case ZEND_AST_TRAIT_ALIAS: zend_ast_export_name(str, ast->child[0], 0, indent); if (ast->attr & ZEND_ACC_PUBLIC) { @@ -2510,6 +2536,18 @@ smart_str_appends(str, ": "); ast = ast->child[1]; goto tail_call; + case ZEND_AST_GROUP_USE: + smart_str_appends(str, "use "); + if (ast->attr == ZEND_SYMBOL_FUNCTION) { + smart_str_appends(str, "function "); + } else if (ast->attr == ZEND_SYMBOL_CONST) { + smart_str_appends(str, "const "); + } + smart_str_append(str, zend_ast_get_str(ast->child[0])); + smart_str_appends(str, "\\{"); + zend_ast_export_list(str, zend_ast_get_list(ast->child[1]), true, 20, indent); + smart_str_appends(str, "}"); + break; /* 3 child nodes */ case ZEND_AST_METHOD_CALL: diff -Nru php8.4-8.4.27/Zend/zend_atomic.h php8.4-8.4.28/Zend/zend_atomic.h --- php8.4-8.4.27/Zend/zend_atomic.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend_atomic.h 2026-11-17 20:29:32.000000000 +0000 @@ -402,6 +402,19 @@ # define ZEND_ATOMIC_FENCE_ACQUIRE() ((void)0) #endif +static zend_always_inline uint32_t zend_atomic_load_acquire_32(const uint32_t *ptr) +{ +#if defined(__GNUC__) || defined(__clang__) || defined(HAVE_GNUC_ATOMICS) + return __atomic_load_n(ptr, __ATOMIC_ACQUIRE); +#else + uint32_t val = *(const volatile uint32_t *)ptr; + ZEND_ATOMIC_FENCE_ACQUIRE(); + return val; +#endif +} + +#define ZEND_ATOMIC_LOAD_ACQUIRE_32(ptr) zend_atomic_load_acquire_32(ptr) + END_EXTERN_C() #endif diff -Nru php8.4-8.4.27/Zend/zend_call_stack.c php8.4-8.4.28/Zend/zend_call_stack.c --- php8.4-8.4.27/Zend/zend_call_stack.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend_call_stack.c 2026-11-17 20:29:32.000000000 +0000 @@ -591,11 +591,13 @@ error = pthread_attr_getstack(&attr, &addr, &max_size); if (error) { + pthread_attr_destroy(&attr); return false; } error = pthread_attr_getguardsize(&attr, &guard_size); if (error) { + pthread_attr_destroy(&attr); return false; } @@ -605,6 +607,7 @@ stack->base = (char *)addr + max_size; stack->max_size = max_size; + pthread_attr_destroy(&attr); return true; } # else diff -Nru php8.4-8.4.27/Zend/zend_compile.c php8.4-8.4.28/Zend/zend_compile.c --- php8.4-8.4.27/Zend/zend_compile.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend_compile.c 2026-11-17 20:29:32.000000000 +0000 @@ -2467,10 +2467,15 @@ } /* }}} */ -static inline uint32_t zend_delayed_compile_begin(void) /* {{{ */ +static zend_always_inline uint32_t zend_delayed_oplines_stack_size(void) { return zend_stack_count(&CG(delayed_oplines_stack)); } + +static inline uint32_t zend_delayed_compile_begin(void) /* {{{ */ +{ + return zend_delayed_oplines_stack_size(); +} /* }}} */ static zend_op *zend_delayed_compile_end(uint32_t offset) /* {{{ */ @@ -3156,6 +3161,7 @@ /* We will throw if $this doesn't exist, so there's no need to emit a JMP_NULL * check for a nullsafe access. */ } else { + uint32_t offset = zend_delayed_oplines_stack_size(); zend_short_circuiting_mark_inner(obj_ast); opline = zend_delayed_compile_var(&obj_node, obj_ast, type, 0); if (opline && (opline->opcode == ZEND_FETCH_DIM_W @@ -3171,10 +3177,11 @@ /* Flush delayed oplines */ zend_op *opline = NULL, *oplines = zend_stack_base(&CG(delayed_oplines_stack)); uint32_t var = obj_node.u.op.var; - uint32_t count = zend_stack_count(&CG(delayed_oplines_stack)); + uint32_t count = zend_delayed_oplines_stack_size(); uint32_t i = count; - while (i > 0 && oplines[i-1].result_type == IS_TMP_VAR && oplines[i-1].result.var == var) { + /* Only consider the oplines delayed while compiling obj_ast. */ + while (i > offset && oplines[i-1].result_type == IS_TMP_VAR && oplines[i-1].result.var == var) { i--; if (oplines[i].op1_type == IS_TMP_VAR) { var = oplines[i].op1.var; @@ -6539,10 +6546,9 @@ if (opline->op1_type == IS_CONST) { Z_TRY_ADDREF_P(CT_CONSTANT(opline->op1)); } - if (arms->children == 0) { - /* Mark this as an "expression throw" for opcache. */ - opline->extended_value = ZEND_THROW_IS_EXPR; - } + /* Mark this as an "expression throw" for opcache. + * Even if there are arms, they may become unreachable after optimization, which loses live ranges. */ + opline->extended_value = ZEND_THROW_IS_EXPR; } for (uint32_t i = 0; i < arms->children; ++i) { diff -Nru php8.4-8.4.27/Zend/zend_exceptions.c php8.4-8.4.28/Zend/zend_exceptions.c --- php8.4-8.4.27/Zend/zend_exceptions.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend_exceptions.c 2026-11-17 20:29:32.000000000 +0000 @@ -137,6 +137,8 @@ } ex = previous; } while (Z_OBJ_P(ex) != add_previous); + + OBJ_RELEASE(add_previous); } /* }}} */ diff -Nru php8.4-8.4.27/Zend/zend_execute.c php8.4-8.4.28/Zend/zend_execute.c --- php8.4-8.4.27/Zend/zend_execute.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend_execute.c 2026-11-17 20:29:32.000000000 +0000 @@ -4713,7 +4713,10 @@ } if (kind == ZEND_LIVE_TMPVAR) { - zval_ptr_dtor_nogc(var); + zval tmp; + ZVAL_COPY_VALUE(&tmp, var); + ZVAL_UNDEF(var); + zval_ptr_dtor_nogc(&tmp); } else if (kind == ZEND_LIVE_NEW) { zend_object *obj; ZEND_ASSERT(Z_TYPE_P(var) == IS_OBJECT); @@ -4724,7 +4727,10 @@ if (Z_TYPE_P(var) != IS_ARRAY && Z_FE_ITER_P(var) != (uint32_t)-1) { zend_hash_iterator_del(Z_FE_ITER_P(var)); } - zval_ptr_dtor_nogc(var); + zval tmp; + ZVAL_COPY_VALUE(&tmp, var); + ZVAL_UNDEF(var); + zval_ptr_dtor_nogc(&tmp); } else if (kind == ZEND_LIVE_ROPE) { zend_string **rope = (zend_string **)var; zend_op *last = EX(func)->op_array.opcodes + op_num; diff -Nru php8.4-8.4.27/Zend/zend_execute_API.c php8.4-8.4.28/Zend/zend_execute_API.c --- php8.4-8.4.27/Zend/zend_execute_API.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend_execute_API.c 2026-11-17 20:29:32.000000000 +0000 @@ -1960,7 +1960,10 @@ if (ZSTR_H(*str) == h && zend_string_equal_content(*str, name)) { zval *var = EX_VAR_NUM(str - op_array->vars); + zval garbage; + ZVAL_COPY_VALUE(&garbage, var); ZVAL_COPY_VALUE(var, value); + zval_ptr_dtor(&garbage); return SUCCESS; } str++; @@ -2002,8 +2005,10 @@ if (ZSTR_H(*str) == h && zend_string_equals_cstr(*str, name, len)) { zval *var = EX_VAR_NUM(str - op_array->vars); - zval_ptr_dtor(var); + zval garbage; + ZVAL_COPY_VALUE(&garbage, var); ZVAL_COPY_VALUE(var, value); + zval_ptr_dtor(&garbage); return SUCCESS; } str++; diff -Nru php8.4-8.4.27/Zend/zend_fibers.c php8.4-8.4.28/Zend/zend_fibers.c --- php8.4-8.4.27/Zend/zend_fibers.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend_fibers.c 2026-11-17 20:29:32.000000000 +0000 @@ -564,6 +564,39 @@ fiber->caller = NULL; } +static void zend_fiber_addref_callable(zend_fiber *fiber) +{ + // Keep a reference to closures or callable objects while the fiber is running. + Z_TRY_ADDREF(fiber->fci.function_name); + + /* For [A::class, 'm'] or "A::m" inside a method of A, fci.object is the caller's $this. */ + if (fiber->fci.object != NULL) { + GC_ADDREF(fiber->fci.object); + } +} + +static void zend_fiber_get_gc_callable(zend_fiber *fiber, zend_get_gc_buffer *buf) +{ + zend_get_gc_buffer_add_zval(buf, &fiber->fci.function_name); + + if (fiber->fci.object != NULL) { + zend_get_gc_buffer_add_obj(buf, fiber->fci.object); + } +} + +static void zend_fiber_release_callable(zend_fiber *fiber) +{ + zval_ptr_dtor(&fiber->fci.function_name); + ZVAL_UNDEF(&fiber->fci.function_name); + fiber->fci_cache = empty_fcall_info_cache; + + if (fiber->fci.object != NULL) { + zend_object *object = fiber->fci.object; + fiber->fci.object = NULL; + OBJ_RELEASE(object); + } +} + static ZEND_STACK_ALIGNED void zend_fiber_execute(zend_fiber_transfer *transfer) { ZEND_ASSERT(Z_TYPE(transfer->value) == IS_NULL && "Initial transfer value to fiber context must be NULL"); @@ -609,13 +642,10 @@ zend_call_function(&fiber->fci, &fiber->fci_cache); /* Cleanup callback and unset field to prevent GC / duplicate dtor issues. */ - zval_ptr_dtor(&fiber->fci.function_name); - ZVAL_UNDEF(&fiber->fci.function_name); + zend_fiber_release_callable(fiber); if (EG(exception)) { - if (!(fiber->flags & ZEND_FIBER_FLAG_DESTROYED) - || !(zend_is_graceful_exit(EG(exception)) || zend_is_unwind_exit(EG(exception))) - ) { + if (!(fiber->flags & ZEND_FIBER_FLAG_DESTROYED) || !zend_is_graceful_exit(EG(exception))) { fiber->flags |= ZEND_FIBER_FLAG_THREW; transfer->flags = ZEND_FIBER_TRANSFER_FLAG_ERROR; @@ -775,6 +805,7 @@ } zend_object *exception = EG(exception); + const zend_op *opline_before_exception = EG(opline_before_exception); EG(exception) = NULL; zval graceful_exit; @@ -784,6 +815,8 @@ zend_fiber_transfer transfer = zend_fiber_resume_internal(fiber, &graceful_exit, true); + EG(opline_before_exception) = opline_before_exception; + zval_ptr_dtor(&graceful_exit); if (transfer.flags & ZEND_FIBER_TRANSFER_FLAG_ERROR) { @@ -809,7 +842,7 @@ { zend_fiber *fiber = (zend_fiber *) object; - zval_ptr_dtor(&fiber->fci.function_name); + zend_fiber_release_callable(fiber); zval_ptr_dtor(&fiber->result); zend_object_std_dtor(&fiber->std); @@ -820,7 +853,7 @@ zend_fiber *fiber = (zend_fiber *) object; zend_get_gc_buffer *buf = zend_get_gc_buffer_create(); - zend_get_gc_buffer_add_zval(buf, &fiber->fci.function_name); + zend_fiber_get_gc_callable(fiber, buf); zend_get_gc_buffer_add_zval(buf, &fiber->result); if (fiber->context.status != ZEND_FIBER_STATUS_SUSPENDED || fiber->caller != NULL) { @@ -888,8 +921,7 @@ fiber->fci = fci; fiber->fci_cache = fcc; - // Keep a reference to closures or callable objects while the fiber is running. - Z_TRY_ADDREF(fiber->fci.function_name); + zend_fiber_addref_callable(fiber); } ZEND_METHOD(Fiber, start) diff -Nru php8.4-8.4.27/Zend/zend_gc.c php8.4-8.4.28/Zend/zend_gc.c --- php8.4-8.4.27/Zend/zend_gc.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend_gc.c 2026-11-17 20:29:32.000000000 +0000 @@ -1897,6 +1897,7 @@ GC_G(dtor_end) = GC_G(first_unused); zend_object *exception = NULL; + const zend_op *opline_before_exception = EG(opline_before_exception); remember_prev_exception(&exception); zend_object *old_exception = exception; @@ -1933,6 +1934,7 @@ } EG(exception) = exception; + EG(opline_before_exception) = opline_before_exception; /* Destructors ran in another fiber, out of reach of zend_call_function()'s rethrow */ if (exception && !old_exception && EG(current_execute_data) && EG(current_execute_data)->func diff -Nru php8.4-8.4.27/Zend/zend_inheritance.c php8.4-8.4.28/Zend/zend_inheritance.c --- php8.4-8.4.27/Zend/zend_inheritance.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend_inheritance.c 2026-11-17 20:29:32.000000000 +0000 @@ -404,7 +404,7 @@ ht = (HashTable*)CG(current_linking_class)->inheritance_cache; - if (!(ce->ce_flags & ZEND_ACC_IMMUTABLE)) { + if (!(ce->ce_flags & ZEND_ACC_IMMUTABLE) || !(ce->ce_flags & ZEND_ACC_LINKED)) { // TODO: dependency on not-immutable class ??? if (ht) { zend_hash_destroy(ht); diff -Nru php8.4-8.4.27/Zend/zend_range_check.h php8.4-8.4.28/Zend/zend_range_check.h --- php8.4-8.4.27/Zend/zend_range_check.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend_range_check.h 2026-11-17 20:29:32.000000000 +0000 @@ -47,7 +47,7 @@ # define ZEND_LONG_INT_OVFL(zl) (0) # define ZEND_LONG_INT_UDFL(zl) (0) # define ZEND_LONG_EXCEEDS_INT(zlong) (0) -# define ZEND_LONG_UINT_OVFL(zl) (0) +# define ZEND_LONG_UINT_OVFL(zl) UNEXPECTED((zl) < 0) #endif /* size_t vs (unsigned) int checks. */ diff -Nru php8.4-8.4.27/Zend/zend_system_id.c php8.4-8.4.28/Zend/zend_system_id.c --- php8.4-8.4.27/Zend/zend_system_id.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend_system_id.c 2026-11-17 20:29:32.000000000 +0000 @@ -43,6 +43,7 @@ void zend_startup_system_id(void) { + finalized = 0; PHP_MD5Init(&context); PHP_MD5Update(&context, PHP_VERSION, sizeof(PHP_VERSION)-1); PHP_MD5Update(&context, ZEND_EXTENSION_BUILD_ID, sizeof(ZEND_EXTENSION_BUILD_ID)-1); @@ -89,6 +90,21 @@ } } + /* Cached scripts can refer to offsets of internal functions. + * Effects of disable_functions and frameless functions must be taken into account. + * Therefore, embed the function names in-order. + * Updating third party extensions may change function signatures, arginfo, offsets, ... + * Therefore, also embed the loaded modules and their versions. */ + ZEND_HASH_MAP_FOREACH_STR_KEY(CG(function_table), zend_string *name) { + PHP_MD5Update(&context, ZSTR_VAL(name), ZSTR_LEN(name) + 1); + } ZEND_HASH_FOREACH_END(); + ZEND_HASH_MAP_FOREACH_PTR(&module_registry, zend_module_entry *mod) { + PHP_MD5Update(&context, mod->name, strlen(mod->name) + 1); + if (EXPECTED(mod->version != NO_VERSION_YET)) { + PHP_MD5Update(&context, mod->version, strlen(mod->version) + 1); + } + } ZEND_HASH_FOREACH_END(); + PHP_MD5Final(digest, &context); php_hash_bin2hex(zend_system_id, digest, sizeof digest); finalized = 1; diff -Nru php8.4-8.4.27/Zend/zend_types.h php8.4-8.4.28/Zend/zend_types.h --- php8.4-8.4.27/Zend/zend_types.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend_types.h 2026-11-17 20:29:32.000000000 +0000 @@ -24,6 +24,7 @@ #include "zend_portability.h" #include "zend_long.h" +#include "zend_atomic.h" #include #include @@ -862,7 +863,13 @@ #define OBJ_EXTRA_FLAGS(obj) ((obj)->extra_flags) /* Fast class cache */ -#define ZSTR_HAS_CE_CACHE(s) (GC_FLAGS(s) & IS_STR_CLASS_NAME_MAP_PTR) +static zend_always_inline bool zstr_has_ce_cache(const zend_string *s) +{ + uint32_t type_info = ZEND_ATOMIC_LOAD_ACQUIRE_32(&GC_TYPE_INFO(s)); + return (type_info & (IS_STR_CLASS_NAME_MAP_PTR << GC_FLAGS_SHIFT)) != 0; +} + +#define ZSTR_HAS_CE_CACHE(s) zstr_has_ce_cache(s) #define ZSTR_GET_CE_CACHE(s) ZSTR_GET_CE_CACHE_EX(s, 1) #define ZSTR_SET_CE_CACHE(s, ce) ZSTR_SET_CE_CACHE_EX(s, ce, 1) diff -Nru php8.4-8.4.27/Zend/zend_vm_def.h php8.4-8.4.28/Zend/zend_vm_def.h --- php8.4-8.4.27/Zend/zend_vm_def.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend_vm_def.h 2026-11-17 20:29:32.000000000 +0000 @@ -8086,7 +8086,9 @@ Z_OPLINE_NUM_P(fast_call) = (uint32_t)-1; ZEND_VM_JMP_EX(&EX(func)->op_array.opcodes[try_catch->finally_op], 0); - } else if (op_num < try_catch->finally_end) { + } else if (op_num <= try_catch->finally_end) { + /* Exception thrown in the finally block, or at its FAST_RET + * (by an interrupt) */ zval *fast_call = EX_VAR(EX(func)->op_array.opcodes[try_catch->finally_end].op1.var); /* cleanup incomplete RETURN statement */ @@ -8166,7 +8168,7 @@ /* further blocks will not be relevant... */ break; } - if (throw_op_num < try_catch->catch_op || throw_op_num < try_catch->finally_end) { + if (throw_op_num < try_catch->catch_op || throw_op_num <= try_catch->finally_end) { current_try_catch_offset = i; } } @@ -8585,7 +8587,13 @@ if (Z_OPLINE_NUM_P(fast_call) != (uint32_t)-1) { const zend_op *fast_ret = EX(func)->op_array.opcodes + Z_OPLINE_NUM_P(fast_call); - ZEND_VM_JMP_EX(fast_ret + 1, 0); + /* Handle interrupts before jumping: fast_ret + 1 is inside the try + * block, so an exception thrown there would run the finally block + * again. An exception thrown at FAST_RET belongs to the finally + * block. */ + ZEND_VM_INTERRUPT_CHECK(); + ZEND_VM_SET_OPCODE_NO_INTERRUPT(fast_ret + 1); + ZEND_VM_CONTINUE(); } /* special case for unhandled exceptions */ @@ -9454,7 +9462,7 @@ ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } -ZEND_VM_TYPE_SPEC_HANDLER(ZEND_COUNT, (op1_info & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_REF)) == MAY_BE_ARRAY, ZEND_COUNT_ARRAY, CV|TMPVAR, UNUSED) +ZEND_VM_TYPE_SPEC_HANDLER(ZEND_COUNT, op->op1_type != IS_CONST && (op1_info & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_REF)) == MAY_BE_ARRAY, ZEND_COUNT_ARRAY, CV|TMPVAR, UNUSED) { USE_OPLINE zend_array *ht = Z_ARRVAL_P(GET_OP1_ZVAL_PTR_UNDEF(BP_VAR_R)); @@ -10029,11 +10037,11 @@ ZEND_VM_SMART_BRANCH(result, 0); } -ZEND_VM_TYPE_SPEC_HANDLER(ZEND_IS_IDENTICAL, op->op1_type == IS_CV && (op->op2_type & (IS_CONST|IS_CV)) && !(op1_info & (MAY_BE_UNDEF|MAY_BE_REF)) && !(op2_info & (MAY_BE_UNDEF|MAY_BE_REF)), ZEND_IS_IDENTICAL_NOTHROW, CV, CONST|CV, SPEC(COMMUTATIVE)) +ZEND_VM_TYPE_SPEC_HANDLER(ZEND_IS_IDENTICAL, op->op1_type == IS_CV && (op->op2_type & (IS_CONST|IS_CV)) && !(op1_info & (MAY_BE_UNDEF|MAY_BE_REF)) && !(op2_info & (MAY_BE_UNDEF|MAY_BE_REF)) && !((op1_info & op2_info) & MAY_BE_ARRAY_OF_ARRAY), ZEND_IS_IDENTICAL_NOTHROW, CV, CONST|CV, SPEC(COMMUTATIVE)) { /* This is declared below the specializations for MAY_BE_LONG/MAY_BE_DOUBLE so those will be used instead if possible. */ /* This optimizes $x === SOME_CONST_EXPR and $x === $y for non-refs and non-undef, which can't throw. */ - /* (Infinite recursion when comparing arrays is an uncatchable fatal error) */ + /* Comparing two arrays that may contain arrays is excluded, as recursion throws an Error. */ USE_OPLINE zval *op1, *op2; bool result; @@ -10045,7 +10053,7 @@ ZEND_VM_SMART_BRANCH(result, 0); } -ZEND_VM_TYPE_SPEC_HANDLER(ZEND_IS_NOT_IDENTICAL, op->op1_type == IS_CV && (op->op2_type & (IS_CONST|IS_CV)) && !(op1_info & (MAY_BE_UNDEF|MAY_BE_REF)) && !(op2_info & (MAY_BE_UNDEF|MAY_BE_REF)), ZEND_IS_NOT_IDENTICAL_NOTHROW, CV, CONST|CV, SPEC(COMMUTATIVE)) +ZEND_VM_TYPE_SPEC_HANDLER(ZEND_IS_NOT_IDENTICAL, op->op1_type == IS_CV && (op->op2_type & (IS_CONST|IS_CV)) && !(op1_info & (MAY_BE_UNDEF|MAY_BE_REF)) && !(op2_info & (MAY_BE_UNDEF|MAY_BE_REF)) && !((op1_info & op2_info) & MAY_BE_ARRAY_OF_ARRAY), ZEND_IS_NOT_IDENTICAL_NOTHROW, CV, CONST|CV, SPEC(COMMUTATIVE)) { USE_OPLINE zval *op1, *op2; @@ -10446,7 +10454,11 @@ } } - ZEND_VM_ENTER(); + /* Like ZEND_VM_ENTER() but don't check for interrupts yet to avoid recursion if the + * interrupt handler re-sets the vm_interrupt flag. */ + execute_data = EG(current_execute_data); + LOAD_OPLINE(); + ZEND_VM_LEAVE(); } ZEND_VM_CONTINUE(); } diff -Nru php8.4-8.4.27/Zend/zend_vm_execute.h php8.4-8.4.28/Zend/zend_vm_execute.h --- php8.4-8.4.27/Zend/zend_vm_execute.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/Zend/zend_vm_execute.h 2026-11-17 20:29:32.000000000 +0000 @@ -3201,7 +3201,9 @@ Z_OPLINE_NUM_P(fast_call) = (uint32_t)-1; ZEND_VM_JMP_EX(&EX(func)->op_array.opcodes[try_catch->finally_op], 0); - } else if (op_num < try_catch->finally_end) { + } else if (op_num <= try_catch->finally_end) { + /* Exception thrown in the finally block, or at its FAST_RET + * (by an interrupt) */ zval *fast_call = EX_VAR(EX(func)->op_array.opcodes[try_catch->finally_end].op1.var); /* cleanup incomplete RETURN statement */ @@ -3281,7 +3283,7 @@ /* further blocks will not be relevant... */ break; } - if (throw_op_num < try_catch->catch_op || throw_op_num < try_catch->finally_end) { + if (throw_op_num < try_catch->catch_op || throw_op_num <= try_catch->finally_end) { current_try_catch_offset = i; } } @@ -3403,7 +3405,13 @@ if (Z_OPLINE_NUM_P(fast_call) != (uint32_t)-1) { const zend_op *fast_ret = EX(func)->op_array.opcodes + Z_OPLINE_NUM_P(fast_call); - ZEND_VM_JMP_EX(fast_ret + 1, 0); + /* Handle interrupts before jumping: fast_ret + 1 is inside the try + * block, so an exception thrown there would run the finally block + * again. An exception thrown at FAST_RET belongs to the finally + * block. */ + ZEND_VM_INTERRUPT_CHECK(); + ZEND_VM_SET_OPCODE_NO_INTERRUPT(fast_ret + 1); + ZEND_VM_CONTINUE(); } /* special case for unhandled exceptions */ @@ -3901,7 +3909,11 @@ } } - ZEND_VM_ENTER(); + /* Like ZEND_VM_ENTER() but don't check for interrupts yet to avoid recursion if the + * interrupt handler re-sets the vm_interrupt flag. */ + execute_data = EG(current_execute_data); + LOAD_OPLINE(); + ZEND_VM_LEAVE(); } ZEND_VM_CONTINUE(); } @@ -45947,7 +45959,7 @@ { /* This is declared below the specializations for MAY_BE_LONG/MAY_BE_DOUBLE so those will be used instead if possible. */ /* This optimizes $x === SOME_CONST_EXPR and $x === $y for non-refs and non-undef, which can't throw. */ - /* (Infinite recursion when comparing arrays is an uncatchable fatal error) */ + /* Comparing two arrays that may contain arrays is excluded, as recursion throws an Error. */ USE_OPLINE zval *op1, *op2; bool result; @@ -55110,7 +55122,7 @@ { /* This is declared below the specializations for MAY_BE_LONG/MAY_BE_DOUBLE so those will be used instead if possible. */ /* This optimizes $x === SOME_CONST_EXPR and $x === $y for non-refs and non-undef, which can't throw. */ - /* (Infinite recursion when comparing arrays is an uncatchable fatal error) */ + /* Comparing two arrays that may contain arrays is excluded, as recursion throws an Error. */ USE_OPLINE zval *op1, *op2; bool result; @@ -68379,7 +68391,7 @@ break; } spec = 2885 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH | SPEC_RULE_COMMUTATIVE; - } else if (op->op1_type == IS_CV && (op->op2_type & (IS_CONST|IS_CV)) && !(op1_info & (MAY_BE_UNDEF|MAY_BE_REF)) && !(op2_info & (MAY_BE_UNDEF|MAY_BE_REF))) { + } else if (op->op1_type == IS_CV && (op->op2_type & (IS_CONST|IS_CV)) && !(op1_info & (MAY_BE_UNDEF|MAY_BE_REF)) && !(op2_info & (MAY_BE_UNDEF|MAY_BE_REF)) && !((op1_info & op2_info) & MAY_BE_ARRAY_OF_ARRAY)) { spec = 3110 | SPEC_RULE_OP2 | SPEC_RULE_COMMUTATIVE; } break; @@ -68397,7 +68409,7 @@ break; } spec = 3035 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH | SPEC_RULE_COMMUTATIVE; - } else if (op->op1_type == IS_CV && (op->op2_type & (IS_CONST|IS_CV)) && !(op1_info & (MAY_BE_UNDEF|MAY_BE_REF)) && !(op2_info & (MAY_BE_UNDEF|MAY_BE_REF))) { + } else if (op->op1_type == IS_CV && (op->op2_type & (IS_CONST|IS_CV)) && !(op1_info & (MAY_BE_UNDEF|MAY_BE_REF)) && !(op2_info & (MAY_BE_UNDEF|MAY_BE_REF)) && !((op1_info & op2_info) & MAY_BE_ARRAY_OF_ARRAY)) { spec = 3115 | SPEC_RULE_OP2 | SPEC_RULE_COMMUTATIVE; } break; @@ -68545,7 +68557,7 @@ } break; case ZEND_COUNT: - if ((op1_info & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_REF)) == MAY_BE_ARRAY) { + if (op->op1_type != IS_CONST && (op1_info & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_REF)) == MAY_BE_ARRAY) { spec = 2579 | SPEC_RULE_OP1; } break; diff -Nru php8.4-8.4.27/configure php8.4-8.4.28/configure --- php8.4-8.4.27/configure 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/configure 2026-11-17 20:29:32.000000000 +0000 @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.73 for PHP 8.4.27. +# Generated by GNU Autoconf 2.72 for PHP 8.4.28. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2026 Free Software Foundation, +# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, # Inc. # # @@ -22,7 +22,7 @@ emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # contradicts POSIX and common usage. Disable this. + # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else case e in #( @@ -109,7 +109,7 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi @@ -131,13 +131,10 @@ *x* ) as_opts=-x ;; * ) as_opts= ;; esac -case $# in # (( - 0) exec $CONFIG_SHELL $as_opts "$as_myself" ;; - *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;; -esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed 'exec'. -printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi # We don't want this to propagate to other subprocesses. @@ -148,7 +145,7 @@ emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which - # contradicts POSIX and common usage. Disable this. + # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST else case e in #( @@ -258,25 +255,22 @@ *x* ) as_opts=-x ;; * ) as_opts= ;; esac -case $# in # (( - 0) exec $CONFIG_SHELL $as_opts "$as_myself" ;; - *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;; -esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed 'exec'. -printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi if test x$as_have_required = xno then : - printf '%s\n' "$0: This script requires a shell more modern than all" - printf '%s\n' "$0: the shells that I found on your system." + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." if test ${ZSH_VERSION+y} ; then - printf '%s\n' "$0: In particular, zsh $ZSH_VERSION has bugs and should" - printf '%s\n' "$0: be upgraded to zsh 4.3.4 or later." + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else - printf '%s\n' "$0: Please tell bug-autoconf@gnu.org and + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and $0: https://github.com/php/php-src/issues about your $0: system, including any error possibly output before this $0: message. Then install a modern shell, or manually run @@ -337,7 +331,7 @@ as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -346,7 +340,7 @@ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -printf '%s\n' X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -429,9 +423,9 @@ as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - printf '%s\n' "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -458,7 +452,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -printf '%s\n' X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -504,7 +498,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { printf '%s\n' "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -518,6 +512,29 @@ exit } + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -617,10 +634,8 @@ if (d1 < d2) exit 1 if (d1 > d2) exit 2 } - # Beware Solaris 11 /usr/xgp4/bin/awk, which mishandles some - # comparisons of empty strings to integers. For example, - # LC_ALL=C /usr/xpg4/bin/awk "BEGIN {if (-1 < \"\") print \"a\"}" - # prints "a". + # Beware Solaris /usr/xgp4/bin/awk (at least through Solaris 10), + # which mishandles some comparisons of empty strings to integers. if (length(v2)) exit 1 if (length(v1)) exit 2 } @@ -790,7 +805,6 @@ # Initializations. # ac_default_prefix=/usr/local -ac_clean_CONFIG_STATUS= ac_clean_files= ac_config_libobj_dir=. LIBOBJS= @@ -802,8 +816,8 @@ # Identity of this package. PACKAGE_NAME='PHP' PACKAGE_TARNAME='php' -PACKAGE_VERSION='8.4.27' -PACKAGE_STRING='PHP 8.4.27' +PACKAGE_VERSION='8.4.28' +PACKAGE_STRING='PHP 8.4.28' PACKAGE_BUGREPORT='https://github.com/php/php-src/issues' PACKAGE_URL='https://www.php.net' @@ -1008,13 +1022,13 @@ SED EGREP GREP -ECHO_T -ECHO_N -ECHO_C target_alias host_alias build_alias LIBS +ECHO_T +ECHO_N +ECHO_C DEFS mandir localedir @@ -1164,13 +1178,13 @@ enable_opcache_jit with_capstone enable_pcntl +enable_pdo with_pdo_dblib with_pdo_firebird with_pdo_mysql with_pdo_odbc with_pdo_pgsql with_pdo_sqlite -enable_pdo with_pgsql enable_phar enable_posix @@ -1420,7 +1434,7 @@ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1446,7 +1460,7 @@ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1659,7 +1673,7 @@ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1675,7 +1689,7 @@ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1719,9 +1733,9 @@ *) # FIXME: should be removed in autoconf 3.0. - printf '%s\n' "$as_me: WARNING: you should use --build, --host, --target" >&2 + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - printf '%s\n' "$as_me: WARNING: invalid host type: $ac_option" >&2 + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1729,7 +1743,7 @@ done if test -n "$ac_prev"; then - ac_option=--`printf '%s\n' $ac_prev | sed 's/_/-/g'` + ac_option=--`echo $ac_prev | sed 's/_/-/g'` as_fn_error $? "missing argument to $ac_option" fi @@ -1737,7 +1751,7 @@ case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1801,7 +1815,7 @@ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -printf '%s\n' X"$as_myself" | +printf "%s\n" X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1858,7 +1872,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures PHP 8.4.27 to adapt to many kinds of systems. +'configure' configures PHP 8.4.28 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1930,7 +1944,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of PHP 8.4.27:";; + short | recursive ) echo "Configuration of PHP 8.4.28:";; esac cat <<\_ACEOF @@ -2126,6 +2140,7 @@ --disable-opcache-jit Disable JIT --with-capstone Support opcache JIT disassembly through Capstone --enable-pcntl Enable pcntl support (CLI/CGI only) + --disable-pdo Disable PHP Data Objects support --with-pdo-dblib[=DIR] PDO: DBLIB-DB support. DIR is the FreeTDS home directory --with-pdo-firebird[=DIR] @@ -2154,7 +2169,6 @@ environment variables can be used instead of the DIR argument to customize the libpq paths. --without-pdo-sqlite PDO: sqlite 3 support. - --disable-pdo Disable PHP Data Objects support --with-pgsql[=DIR] Include PostgreSQL support. Optional DIR is the PostgreSQL base install directory or the path to pg_config. Also, the PGSQL_CFLAGS and PGSQL_LIBS @@ -2387,9 +2401,9 @@ case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -2426,7 +2440,7 @@ echo && $SHELL "$ac_srcdir/configure" --help=recursive else - printf '%s\n' "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -2435,10 +2449,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -PHP configure 8.4.27 -generated by GNU Autoconf 2.73 +PHP configure 8.4.28 +generated by GNU Autoconf 2.72 -Copyright (C) 2026 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2462,7 +2476,7 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf '%s\n' "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2470,7 +2484,7 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err @@ -2478,7 +2492,7 @@ then : ac_retval=0 else case e in #( - e) printf '%s\n' "$as_me: failed program was:" >&5 + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 ;; @@ -2501,7 +2515,7 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf '%s\n' "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2509,7 +2523,7 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err @@ -2517,7 +2531,7 @@ then : ac_retval=0 else case e in #( - e) printf '%s\n' "$as_me: failed program was:" >&5 + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 ;; @@ -2535,7 +2549,7 @@ ac_fn_c_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : @@ -2557,8 +2571,8 @@ esac fi eval ac_res=\$$3 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -2576,7 +2590,7 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf '%s\n' "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2584,7 +2598,7 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err @@ -2595,7 +2609,7 @@ then : ac_retval=0 else case e in #( - e) printf '%s\n' "$as_me: failed program was:" >&5 + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 ;; @@ -2617,7 +2631,7 @@ ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : @@ -2669,8 +2683,8 @@ esac fi eval ac_res=\$$3 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -2688,26 +2702,26 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf '%s\n' "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf '%s\n' "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; } then : ac_retval=0 else case e in #( - e) printf '%s\n' "$as_me: program exited with status $ac_status" >&5 - printf '%s\n' "$as_me: failed program was:" >&5 + e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5 + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status ;; @@ -2732,7 +2746,7 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf '%s\n' "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2740,7 +2754,7 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err @@ -2748,7 +2762,7 @@ then : ac_retval=0 else case e in #( - e) printf '%s\n' "$as_me: failed program was:" >&5 + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 ;; @@ -2771,7 +2785,7 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf '%s\n' "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2779,7 +2793,7 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } > conftest.i && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err @@ -2787,7 +2801,7 @@ then : ac_retval=0 else case e in #( - e) printf '%s\n' "$as_me: failed program was:" >&5 + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 ;; @@ -2806,7 +2820,7 @@ { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack as_decl_name=`echo $2|sed 's/ *(.*//'` - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 printf %s "checking whether $as_decl_name is declared... " >&6; } if eval test \${$3+y} then : @@ -2846,8 +2860,8 @@ esac fi eval ac_res=\$$3 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_check_decl @@ -2859,7 +2873,7 @@ ac_fn_c_check_member () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 printf %s "checking for $2.$3... " >&6; } if eval test \${$4+y} then : @@ -2909,8 +2923,8 @@ esac fi eval ac_res=\$$4 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_member @@ -2922,7 +2936,7 @@ ac_fn_c_check_type () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : @@ -2968,8 +2982,8 @@ esac fi eval ac_res=\$$3 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type @@ -3173,7 +3187,7 @@ do case $ac_arg in *\'*) - ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append ac_configure_args_raw " '$ac_arg'" done @@ -3185,15 +3199,15 @@ ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. ac_unsafe_a="$ac_unsafe_z#~" ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" - ac_configure_args_raw=` printf '%s\n' "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; esac cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by PHP $as_me 8.4.27, which was -generated by GNU Autoconf 2.73. Invocation command line was +It was created by PHP $as_me 8.4.28, which was +generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -3233,7 +3247,7 @@ */) ;; *) as_dir=$as_dir/ ;; esac - printf '%s\n' "PATH: $as_dir" + printf "%s\n" "PATH: $as_dir" done IFS=$as_save_IFS @@ -3268,7 +3282,7 @@ | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -3297,22 +3311,31 @@ { ac_configure_args0=; unset ac_configure_args0;} { ac_configure_args1=; unset ac_configure_args1;} -# Dump the cache to stdout. It can be in a pipe (this is a requirement). -ac_cache_dump () -{ - # The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" + # Save into config.log some information that might help in debugging. + { + echo + + printf "%s\n" "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, ( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do eval ac_val=\$$ac_var case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -printf '%s\n' "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -3321,95 +3344,67 @@ esac ;; esac done - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # 'set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" ;; #( *) - # 'set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac | sort ) -} - -# Print debugging info to stdout. -ac_dump_debugging_info () -{ - echo - - printf '%s\n' "## ---------------- ## -## Cache variables. ## -## ---------------- ##" - echo - ac_cache_dump - echo + echo - printf '%s\n' "## ----------------- ## + printf "%s\n" "## ----------------- ## ## Output variables. ## ## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;; - esac - printf '%s\n' "$ac_var='$ac_val'" - done | sort - echo - - if test -n "$ac_subst_files"; then - printf '%s\n' "## ------------------- ## -## File substitutions. ## -## ------------------- ##" echo - for ac_var in $ac_subst_files + for ac_var in $ac_subst_vars do eval ac_val=\$$ac_var case $ac_val in - *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - printf '%s\n' "$ac_var='$ac_val'" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo - fi - if test -s confdefs.h; then - printf '%s\n' "## ----------- ## + if test -n "$ac_subst_files"; then + printf "%s\n" "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + printf "%s\n" "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + printf "%s\n" "## ----------- ## ## confdefs.h. ## ## ----------- ##" - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - printf '%s\n' "$as_me: caught signal $ac_signal" - printf '%s\n' "$as_me: exit $exit_status" -} - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. -ac_exit_trap () -{ - exit_status= - # Sanitize IFS. - IFS=" "" $as_nl" - # Save into config.log some information that might help in debugging. - ac_dump_debugging_info >&5 - eval "rm -f $ac_clean_CONFIG_STATUS core *.core core.conftest.*" && + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status -} - -trap 'ac_exit_trap $?' 0 +' 0 for ac_signal in 1 2 13 15; do trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done @@ -3418,21 +3413,21 @@ # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -printf '%s\n' "/* confdefs.h */" > confdefs.h +printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -printf '%s\n' "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -printf '%s\n' "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -printf '%s\n' "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -printf '%s\n' "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -printf '%s\n' "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -printf '%s\n' "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. @@ -3454,12 +3449,12 @@ ac_site_file=./$ac_site_file ;; esac if test -f "$ac_site_file" && test -r "$ac_site_file"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -printf '%s\n' "$as_me: loading site script $ac_site_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See 'config.log' for more details" "$LINENO" 5; } fi @@ -3469,120 +3464,27 @@ # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -printf '%s\n' "$as_me: loading cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -printf '%s\n' "$as_me: creating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -# Test code for whether the C compiler supports C23 (global declarations) -ac_c_conftest_c23_globals=' -/* Does the compiler advertise conformance to C17 or earlier? - Although GCC 14 does not do that, even with -std=gnu23, - it is close enough, and defines __STDC_VERSION == 202000L. */ -#if !defined __STDC_VERSION__ || __STDC_VERSION__ <= 201710L -# error "Compiler advertises conformance to C17 or earlier" -#endif - -// Check alignas. -char alignas (double) c23_aligned_as_double; -char alignas (0) c23_no_special_alignment; -extern char c23_aligned_as_int; -char alignas (0) alignas (int) c23_aligned_as_int; - -// Check alignof. -enum -{ - c23_int_alignment = alignof (int), - c23_int_array_alignment = alignof (int[100]), - c23_char_alignment = alignof (char) -}; -static_assert (0 < -alignof (int), "alignof is signed"); - -int function_with_unnamed_parameter (int) { return 0; } - -void c23_noreturn (); - -/* Test parsing of string and char UTF-8 literals (including hex escapes). - The parens pacify GCC 15. */ -bool use_u8 = (!sizeof u8"\xFF") == (!u8'\''x'\''); - -bool check_that_bool_works = true | false | !nullptr; -#if !true -# error "true does not work in #if" -#endif -#if false -#elifdef __STDC_VERSION__ -#else -# error "#elifdef does not work" -#endif - -#ifndef __has_c_attribute -# error "__has_c_attribute not defined" -#endif - -#ifndef __has_include -# error "__has_include not defined" -#endif - -#define LPAREN() ( -#define FORTY_TWO(x) 42 -#define VA_OPT_TEST(r, x, ...) __VA_OPT__ (FORTY_TWO r x)) -static_assert (VA_OPT_TEST (LPAREN (), 0, <:-) == 42); - -static_assert (0b101010 == 42); -static_assert (0B101010 == 42); -static_assert (0xDEAD'\''BEEF == 3'\''735'\''928'\''559); -static_assert (0.500'\''000'\''000 == 0.5); - -enum unsignedish : unsigned int { uione = 1 }; -static_assert (0 < -uione); - -#include -constexpr nullptr_t null_pointer = nullptr; - -static typeof (1 + 1L) two () { return 2; } -static long int three () { return 3; } -' - -# Test code for whether the C compiler supports C23 (body of main). -ac_c_conftest_c23_main=' - { - label_before_declaration: - int arr[10] = {}; - if (arr[0]) - goto label_before_declaration; - if (!arr[0]) - goto label_at_end_of_block; - label_at_end_of_block: - } - ok |= !null_pointer; - ok |= two != three; -' - -# Test code for whether the C compiler supports C23 (complete). -ac_c_conftest_c23_program="${ac_c_conftest_c23_globals} - -int -main (int, char **) -{ - int ok = 0; - ${ac_c_conftest_c23_main} - return ok; -} -" - # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' -/* Do not test the value of __STDC__, because some compilers define it to 0 - or do not define it, while otherwise adequately conforming. */ +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif #include #include @@ -3662,8 +3564,7 @@ // Check varargs macros. These examples are taken from C99 6.10.3.5. // dprintf is used instead of fprintf to avoid needing to declare -// FILE and stderr, and "aND" is used instead of "and" to work around -// GCC bug 40564 which is irrelevant here. +// FILE and stderr. #define debug(...) dprintf (2, __VA_ARGS__) #define showlist(...) puts (#__VA_ARGS__) #define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) @@ -3674,7 +3575,7 @@ int y = 5678; debug ("Flag"); debug ("X = %d\n", x); - showlist (The first, second, aND third items.); + showlist (The first, second, and third items.); report (x>y, "x is %d but y is %d", x, y); } @@ -3762,15 +3663,15 @@ // Check restrict. if (test_restrict ("String literal") == 0) success = true; - const char *restrict newvar = "Another string"; + char *restrict newvar = "Another string"; // Check varargs. success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); test_varargs_macros (); // Check flexible array members. - static struct incomplete_array *volatile incomplete_array_pointer; - struct incomplete_array *ia = incomplete_array_pointer; + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); ia->datasize = 10; for (int i = 0; i < ia->datasize; ++i) ia->data[i] = i * 1.234; @@ -3786,12 +3687,13 @@ ni.number = 58; - // Do not test for VLAs, as some otherwise-conforming compilers lack them. - // C code should instead use __STDC_NO_VLA__; see Autoconf manual. + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; // work around unused variable warnings ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' - || ni.number != 58); + || dynamic_array[ni.number - 1] != 543); ' # Test code for whether the C compiler supports C11 (global declarations) @@ -3911,6 +3813,222 @@ as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" +# Test code for whether the C++ compiler supports C++98 (global declarations) +ac_cxx_conftest_cxx98_globals=' +// Does the compiler advertise C++98 conformance? +#if !defined __cplusplus || __cplusplus < 199711L +# error "Compiler does not advertise C++98 conformance" +#endif + +// These inclusions are to reject old compilers that +// lack the unsuffixed header files. +#include +#include + +// and are *not* freestanding headers in C++98. +extern void assert (int); +namespace std { + extern int strcmp (const char *, const char *); +} + +// Namespaces, exceptions, and templates were all added after "C++ 2.0". +using std::exception; +using std::strcmp; + +namespace { + +void test_exception_syntax() +{ + try { + throw "test"; + } catch (const char *s) { + // Extra parentheses suppress a warning when building autoconf itself, + // due to lint rules shared with more typical C programs. + assert (!(strcmp) (s, "test")); + } +} + +template struct test_template +{ + T const val; + explicit test_template(T t) : val(t) {} + template T add(U u) { return static_cast(u) + val; } +}; + +} // anonymous namespace +' + +# Test code for whether the C++ compiler supports C++98 (body of main) +ac_cxx_conftest_cxx98_main=' + assert (argc); + assert (! argv[0]); +{ + test_exception_syntax (); + test_template tt (2.0); + assert (tt.add (4) == 6.0); + assert (true && !false); +} +' + +# Test code for whether the C++ compiler supports C++11 (global declarations) +ac_cxx_conftest_cxx11_globals=' +// Does the compiler advertise C++ 2011 conformance? +#if !defined __cplusplus || __cplusplus < 201103L +# error "Compiler does not advertise C++11 conformance" +#endif + +namespace cxx11test +{ + constexpr int get_val() { return 20; } + + struct testinit + { + int i; + double d; + }; + + class delegate + { + public: + delegate(int n) : n(n) {} + delegate(): delegate(2354) {} + + virtual int getval() { return this->n; }; + protected: + int n; + }; + + class overridden : public delegate + { + public: + overridden(int n): delegate(n) {} + virtual int getval() override final { return this->n * 2; } + }; + + class nocopy + { + public: + nocopy(int i): i(i) {} + nocopy() = default; + nocopy(const nocopy&) = delete; + nocopy & operator=(const nocopy&) = delete; + private: + int i; + }; + + // for testing lambda expressions + template Ret eval(Fn f, Ret v) + { + return f(v); + } + + // for testing variadic templates and trailing return types + template auto sum(V first) -> V + { + return first; + } + template auto sum(V first, Args... rest) -> V + { + return first + sum(rest...); + } +} +' + +# Test code for whether the C++ compiler supports C++11 (body of main) +ac_cxx_conftest_cxx11_main=' +{ + // Test auto and decltype + auto a1 = 6538; + auto a2 = 48573953.4; + auto a3 = "String literal"; + + int total = 0; + for (auto i = a3; *i; ++i) { total += *i; } + + decltype(a2) a4 = 34895.034; +} +{ + // Test constexpr + short sa[cxx11test::get_val()] = { 0 }; +} +{ + // Test initializer lists + cxx11test::testinit il = { 4323, 435234.23544 }; +} +{ + // Test range-based for + int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, + 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; + for (auto &x : array) { x += 23; } +} +{ + // Test lambda expressions + using cxx11test::eval; + assert (eval ([](int x) { return x*2; }, 21) == 42); + double d = 2.0; + assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0); + assert (d == 5.0); + assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0); + assert (d == 5.0); +} +{ + // Test use of variadic templates + using cxx11test::sum; + auto a = sum(1); + auto b = sum(1, 2); + auto c = sum(1.0, 2.0, 3.0); +} +{ + // Test constructor delegation + cxx11test::delegate d1; + cxx11test::delegate d2(); + cxx11test::delegate d3(45); +} +{ + // Test override and final + cxx11test::overridden o1(55464); +} +{ + // Test nullptr + char *c = nullptr; +} +{ + // Test template brackets + test_template<::test_template> v(test_template(12)); +} +{ + // Unicode literals + char const *utf8 = u8"UTF-8 string \u2500"; + char16_t const *utf16 = u"UTF-8 string \u2500"; + char32_t const *utf32 = U"UTF-32 string \u2500"; +} +' + +# Test code for whether the C compiler supports C++11 (complete). +ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals} +${ac_cxx_conftest_cxx11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_cxx_conftest_cxx98_main} + ${ac_cxx_conftest_cxx11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C++98 (complete). +ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals} +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_cxx_conftest_cxx98_main} + return ok; +} +" + # Auxiliary files required by this configure script. ac_aux_files="config.guess config.sub" @@ -3925,7 +4043,7 @@ # $ac_aux_dir_candidates and give up. ac_missing_aux_files="" ac_first_candidate=: -printf '%s\n' "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in $ac_aux_dir_candidates @@ -3938,7 +4056,7 @@ esac as_found=: - printf '%s\n' "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 ac_aux_dir_found=yes ac_install_sh= for ac_aux in $ac_aux_files @@ -3949,13 +4067,13 @@ if test x"$ac_aux" = x"install-sh" then if test -f "${as_dir}install-sh"; then - printf '%s\n' "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 ac_install_sh="${as_dir}install-sh -c" elif test -f "${as_dir}install.sh"; then - printf '%s\n' "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 ac_install_sh="${as_dir}install.sh -c" elif test -f "${as_dir}shtool"; then - printf '%s\n' "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 ac_install_sh="${as_dir}shtool install -c" else ac_aux_dir_found=no @@ -3967,7 +4085,7 @@ fi else if test -f "${as_dir}${ac_aux}"; then - printf '%s\n' "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 else ac_aux_dir_found=no if $ac_first_candidate; then @@ -4020,44 +4138,38 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 -printf '%s\n' "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 -printf '%s\n' "$as_me: error: '$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then # differences in whitespace do not lead to failure. - ac_old_val_w= - for ac_val in x $ac_old_val; do - ac_old_val_w="$ac_old_val_w $ac_val" - done - ac_new_val_w= - for ac_val in x $ac_new_val; do - ac_new_val_w="$ac_new_val_w $ac_val" - done + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 -printf '%s\n' "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 -printf '%s\n' "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 -printf '%s\n' "$as_me: former value: '$ac_old_val'" >&2;} - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 -printf '%s\n' "$as_me: current value: '$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`printf '%s\n' "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -4067,10 +4179,10 @@ fi done if $ac_cache_corrupted; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -printf '%s\n' "$as_me: error: changes in the environment can compromise the build" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' and start over" "$LINENO" 5 fi @@ -4078,23 +4190,6 @@ ## Main body of script. ## ## -------------------- ## - -# Determine whether it's possible to make 'echo' print without a newline. -# These variables are no longer used directly by Autoconf, but are AC_SUBSTed -# for compatibility with existing Makefiles. -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4108,7 +4203,7 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 printf %s "checking for grep that handles long lines and -e... " >&6; } if test ${ac_cv_path_GREP+y} then : @@ -4145,7 +4240,7 @@ cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf '%s\n' 'GREP' >> "conftest.nl" + printf "%s\n" 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -4174,12 +4269,12 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -printf '%s\n' "$ac_cv_path_GREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +printf "%s\n" "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 printf %s "checking for egrep... " >&6; } if test ${ac_cv_path_EGREP+y} then : @@ -4219,7 +4314,7 @@ cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf '%s\n' 'EGREP' >> "conftest.nl" + printf "%s\n" 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -4249,14 +4344,14 @@ fi ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -printf '%s\n' "$ac_cv_path_EGREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +printf "%s\n" "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" EGREP_TRADITIONAL=$EGREP ac_cv_path_EGREP_TRADITIONAL=$EGREP -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 printf %s "checking for a sed that does not truncate output... " >&6; } if test ${ac_cv_path_SED+y} then : @@ -4299,7 +4394,7 @@ cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf '%s\n' '' >> "conftest.nl" + printf "%s\n" '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -4328,8 +4423,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -printf '%s\n' "$ac_cv_path_SED" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +printf "%s\n" "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -4387,7 +4482,7 @@ else break fi - printf '%s\n' "$CURRENT_ARG \\" >>config.nice + printf "%s\n" "$CURRENT_ARG \\" >>config.nice CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CURRENT_ARG" done echo '"$@"' >> config.nice @@ -4404,7 +4499,7 @@ $SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 printf %s "checking build system type... " >&6; } if test ${ac_cv_build+y} then : @@ -4420,8 +4515,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -printf '%s\n' "$ac_cv_build" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +printf "%s\n" "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -4437,10 +4532,10 @@ # except with old shells: build_os=$* IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`printf '%s\n' "$build_os" | sed 's/ /-/g'`;; esac +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 printf %s "checking host system type... " >&6; } if test ${ac_cv_host+y} then : @@ -4455,8 +4550,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -printf '%s\n' "$ac_cv_host" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +printf "%s\n" "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -4472,10 +4567,10 @@ # except with old shells: host_os=$* IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`printf '%s\n' "$host_os" | sed 's/ /-/g'`;; esac +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 printf %s "checking target system type... " >&6; } if test ${ac_cv_target+y} then : @@ -4490,8 +4585,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 -printf '%s\n' "$ac_cv_target" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 +printf "%s\n" "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; @@ -4507,7 +4602,7 @@ # except with old shells: target_os=$* IFS=$ac_save_IFS -case $target_os in *\ *) target_os=`printf '%s\n' "$target_os" | sed 's/ /-/g'`;; esac +case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac # The aliases save the names the user supplied, while $host etc. @@ -4533,7 +4628,7 @@ ac_IFS=$IFS; IFS="." -set $(echo 8.4.27 | "${SED}" 's/\([0-9\.]*\)\(.*\)/\1\.\2/') +set $(echo 8.4.28 | "${SED}" 's/\([0-9\.]*\)\(.*\)/\1\.\2/') IFS=$ac_IFS PHP_MAJOR_VERSION=$1 PHP_MINOR_VERSION=$2 @@ -4593,7 +4688,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_AWK+y} then : @@ -4615,7 +4710,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4627,11 +4722,11 @@ fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -printf '%s\n' "$AWK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +printf "%s\n" "$AWK" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4641,26 +4736,26 @@ case $AWK in #( *mawk) : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&5 -printf '%s\n' "$as_me: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&2;} ;; #( + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&5 +printf "%s\n" "$as_me: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&2;} ;; #( *gawk) : ;; #( bork) : as_fn_error $? "Could not find awk; Install GNU awk" "$LINENO" 5 ;; #( *) : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $AWK is broken" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $AWK is broken" >&5 printf %s "checking if $AWK is broken... " >&6; } if ! $AWK 'function foo() {}' >/dev/null 2>&1 then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } as_fn_error $? "You should install GNU awk" "$LINENO" 5 else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi ;; @@ -4691,7 +4786,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PKG_CONFIG+y} then : @@ -4714,7 +4809,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4727,11 +4822,11 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -printf '%s\n' "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4740,7 +4835,7 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} then : @@ -4763,7 +4858,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4776,11 +4871,11 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -printf '%s\n' "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -4788,8 +4883,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -4801,14 +4896,14 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi @@ -4821,9 +4916,6 @@ - - - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4834,7 +4926,7 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : @@ -4855,7 +4947,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4867,11 +4959,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf '%s\n' "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4884,7 +4976,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : @@ -4905,7 +4997,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4917,11 +5009,11 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf '%s\n' "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4933,8 +5025,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -4942,13 +5034,13 @@ fi -test -z "$CC" && { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See 'config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion -version; do @@ -4958,7 +5050,7 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf '%s\n' "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -4968,7 +5060,7 @@ cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -4988,9 +5080,9 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 printf %s "checking whether the C compiler works... " >&6; } -ac_link_default=`printf '%s\n' "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -5011,10 +5103,10 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf '%s\n' "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. @@ -5055,29 +5147,29 @@ fi if test -z "$ac_file" then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } -printf '%s\n' "$as_me: failed program was:" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables See 'config.log' for more details" "$LINENO" 5; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 printf %s "checking for C compiler default output file name... " >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -printf '%s\n' "$ac_file" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 printf %s "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in @@ -5085,10 +5177,10 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf '%s\n' "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) @@ -5105,15 +5197,15 @@ esac done else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link See 'config.log' for more details" "$LINENO" 5; } ;; esac fi rm -f conftest conftest$ac_cv_exeext -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -printf '%s\n' "$ac_cv_exeext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -5136,7 +5228,7 @@ ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" @@ -5145,10 +5237,10 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf '%s\n' "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -5156,31 +5248,31 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf '%s\n' "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "cannot run C compiled programs. If you meant to cross compile, use '--host'. See 'config.log' for more details" "$LINENO" 5; } fi fi fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -printf '%s\n' "$cross_compiling" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext \ conftest.o conftest.obj conftest.out ac_clean_files=$ac_clean_files_save -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 printf %s "checking for suffix of object files... " >&6; } if test ${ac_cv_objext+y} then : @@ -5204,10 +5296,10 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf '%s\n' "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : for ac_file in conftest.o conftest.obj conftest.*; do @@ -5219,11 +5311,11 @@ esac done else case e in #( - e) printf '%s\n' "$as_me: failed program was:" >&5 + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -5231,11 +5323,11 @@ rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -printf '%s\n' "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 printf %s "checking whether the compiler supports GNU C... " >&6; } if test ${ac_cv_c_compiler_gnu+y} then : @@ -5267,8 +5359,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -printf '%s\n' "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } ac_compiler_gnu=$ac_cv_c_compiler_gnu if test $ac_compiler_gnu = yes; then @@ -5278,7 +5370,7 @@ fi ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 printf %s "checking whether $CC accepts -g... " >&6; } if test ${ac_cv_prog_cc_g+y} then : @@ -5346,8 +5438,8 @@ ac_c_werror_flag=$ac_save_c_werror_flag ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -printf '%s\n' "$ac_cv_prog_cc_g" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -5366,56 +5458,7 @@ ac_prog_cc_stdc=no if test x$ac_prog_cc_stdc = xno then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C23 features" >&5 -printf %s "checking for $CC option to enable C23 features... " >&6; } -if test ${ac_cv_prog_cc_c23+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c23=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_c_conftest_c23_program -_ACEOF -for ac_arg in '' -std=gnu23 -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c23=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c23" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac -fi - -if test "x$ac_cv_prog_cc_c23" = xno -then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf '%s\n' "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c23" = x -then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf '%s\n' "none needed" >&6; } -else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c23" >&5 -printf '%s\n' "$ac_cv_prog_cc_c23" >&6; } - CC="$CC $ac_cv_prog_cc_c23" ;; -esac -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c23 - ac_prog_cc_stdc=c23 ;; -esac -fi -fi -if test x$ac_prog_cc_stdc = xno -then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 printf %s "checking for $CC option to enable C11 features... " >&6; } if test ${ac_cv_prog_cc_c11+y} then : @@ -5427,7 +5470,7 @@ /* end confdefs.h. */ $ac_c_conftest_c11_program _ACEOF -for ac_arg in '' -std=gnu11 -std:c11 +for ac_arg in '' -std=gnu11 do CC="$ac_save_CC $ac_arg" if ac_fn_c_try_compile "$LINENO" @@ -5444,16 +5487,16 @@ if test "x$ac_cv_prog_cc_c11" = xno then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf '%s\n' "unsupported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } else case e in #( e) if test "x$ac_cv_prog_cc_c11" = x then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf '%s\n' "none needed" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 -printf '%s\n' "$ac_cv_prog_cc_c11" >&6; } + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } CC="$CC $ac_cv_prog_cc_c11" ;; esac fi @@ -5464,7 +5507,7 @@ fi if test x$ac_prog_cc_stdc = xno then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 printf %s "checking for $CC option to enable C99 features... " >&6; } if test ${ac_cv_prog_cc_c99+y} then : @@ -5493,16 +5536,16 @@ if test "x$ac_cv_prog_cc_c99" = xno then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf '%s\n' "unsupported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } else case e in #( e) if test "x$ac_cv_prog_cc_c99" = x then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf '%s\n' "none needed" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -printf '%s\n' "$ac_cv_prog_cc_c99" >&6; } + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } CC="$CC $ac_cv_prog_cc_c99" ;; esac fi @@ -5513,7 +5556,7 @@ fi if test x$ac_prog_cc_stdc = xno then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 printf %s "checking for $CC option to enable C89 features... " >&6; } if test ${ac_cv_prog_cc_c89+y} then : @@ -5542,16 +5585,16 @@ if test "x$ac_cv_prog_cc_c89" = xno then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf '%s\n' "unsupported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } else case e in #( e) if test "x$ac_cv_prog_cc_c89" = x then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf '%s\n' "none needed" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -printf '%s\n' "$ac_cv_prog_cc_c89" >&6; } + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } CC="$CC $ac_cv_prog_cc_c89" ;; esac fi @@ -5573,7 +5616,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 printf %s "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -5644,8 +5687,8 @@ else ac_cv_prog_CPP=$CPP fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -printf '%s\n' "$CPP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +printf "%s\n" "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -5693,8 +5736,8 @@ then : else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -5707,7 +5750,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5 printf %s "checking for egrep -e... " >&6; } if test ${ac_cv_path_EGREP_TRADITIONAL+y} then : @@ -5744,7 +5787,7 @@ cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf '%s\n' 'EGREP_TRADITIONAL' >> "conftest.nl" + printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl" "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -5806,7 +5849,7 @@ cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf '%s\n' 'EGREP_TRADITIONAL' >> "conftest.nl" + printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl" "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -5837,13 +5880,13 @@ fi ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5 -printf '%s\n' "$ac_cv_path_EGREP_TRADITIONAL" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5 +printf "%s\n" "$ac_cv_path_EGREP_TRADITIONAL" >&6; } EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL ICC="no" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for icc" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for icc" >&5 printf %s "checking for icc... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5853,13 +5896,13 @@ $EGREP_TRADITIONAL "^__INTEL_COMPILER" >/dev/null 2>&1 then : ICC="no" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else case e in #( e) ICC="yes" GCC="no" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; esac fi @@ -5868,7 +5911,7 @@ SUNCC="no" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suncc" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suncc" >&5 printf %s "checking for suncc... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5878,15 +5921,15 @@ $EGREP_TRADITIONAL "^__SUNPRO_C" >/dev/null 2>&1 then : SUNCC="no" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else case e in #( e) SUNCC="yes" GCC="no" test -n "$auto_cflags" && CFLAGS="-O -xs -xstrconst -zlazyload" GCC="" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; esac fi @@ -5900,7 +5943,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 printf %s "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -5971,8 +6014,8 @@ else ac_cv_prog_CPP=$CPP fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -printf '%s\n' "$CPP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +printf "%s\n" "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -6020,8 +6063,8 @@ then : else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -6039,7 +6082,7 @@ if test $ac_cache; then ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf '%s\n' "#define $ac_item 1" >> confdefs.h + printf "%s\n" "#define $ac_item 1" >> confdefs.h fi ac_header= ac_cache= elif test $ac_header; then @@ -6059,7 +6102,7 @@ if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes then : -printf '%s\n' "#define STDC_HEADERS 1" >>confdefs.h +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h fi @@ -6068,7 +6111,7 @@ - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } if test ${ac_cv_safe_to_define___extensions__+y} then : @@ -6097,10 +6140,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 -printf '%s\n' "$ac_cv_safe_to_define___extensions__" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } if test ${ac_cv_should_define__xopen_source+y} then : @@ -6151,51 +6194,49 @@ fi ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 -printf '%s\n' "$ac_cv_should_define__xopen_source" >&6; } - - printf '%s\n' "#define _ALL_SOURCE 1" >>confdefs.h +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } - printf '%s\n' "#define _COSMO_SOURCE 1" >>confdefs.h + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h - printf '%s\n' "#define _DARWIN_C_SOURCE 1" >>confdefs.h + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h - printf '%s\n' "#define _GNU_SOURCE 1" >>confdefs.h + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h - printf '%s\n' "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h - printf '%s\n' "#define _NETBSD_SOURCE 1" >>confdefs.h + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h - printf '%s\n' "#define _OPENBSD_SOURCE 1" >>confdefs.h + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h - printf '%s\n' "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h - printf '%s\n' "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h - printf '%s\n' "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h - printf '%s\n' "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h - printf '%s\n' "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h - printf '%s\n' "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h - printf '%s\n' "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h - printf '%s\n' "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h - printf '%s\n' "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h - printf '%s\n' "#define _TANDEM_SOURCE 1" >>confdefs.h + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h if test $ac_cv_header_minix_config_h = yes then : MINIX=yes - printf '%s\n' "#define _MINIX 1" >>confdefs.h + printf "%s\n" "#define _MINIX 1" >>confdefs.h - printf '%s\n' "#define _POSIX_SOURCE 1" >>confdefs.h + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h - printf '%s\n' "#define _POSIX_1_SOURCE 2" >>confdefs.h + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h else case e in #( e) MINIX= ;; @@ -6203,24 +6244,24 @@ fi if test $ac_cv_safe_to_define___extensions__ = yes then : - printf '%s\n' "#define __EXTENSIONS__ 1" >>confdefs.h + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h fi if test $ac_cv_should_define__xopen_source = yes then : - printf '%s\n' "#define _XOPEN_SOURCE 500" >>confdefs.h + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 printf %s "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -printf '%s\n' "no, using $LN_S" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +printf "%s\n" "no, using $LN_S" >&6; } fi @@ -6230,7 +6271,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_BUILD_CC+y} then : @@ -6251,7 +6292,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_BUILD_CC="$ac_prog" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6263,11 +6304,11 @@ fi BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5 -printf '%s\n' "$BUILD_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5 +printf "%s\n" "$BUILD_CC" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6275,10 +6316,10 @@ done test -n "$BUILD_CC" || BUILD_CC="none" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for native build C compiler" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for native build C compiler" >&5 printf %s "checking for native build C compiler... " >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5 -printf '%s\n' "$BUILD_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5 +printf "%s\n" "$BUILD_CC" >&6; } else case e in #( e) BUILD_CC=$CC ;; esac @@ -6287,7 +6328,7 @@ php_with_libdir=lib -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for system library directory" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for system library directory" >&5 printf %s "checking for system library directory... " >&6; } # Check whether --with-libdir was given. @@ -6304,8 +6345,8 @@ ext_output=$PHP_LIBDIR -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -6313,7 +6354,7 @@ php_enable_rpath=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable runpaths" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable runpaths" >&5 printf %s "checking whether to enable runpaths... " >&6; } # Check whether --enable-rpath was given. if test ${enable_rpath+y} @@ -6329,14 +6370,14 @@ ext_output=$PHP_RPATH -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if compiler supports -Wl,-rpath," >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler supports -Wl,-rpath," >&5 printf %s "checking if compiler supports -Wl,-rpath,... " >&6; } if test ${php_cv_cc_rpath+y} then : @@ -6369,13 +6410,13 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_cc_rpath" >&5 -printf '%s\n' "$php_cv_cc_rpath" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_cc_rpath" >&5 +printf "%s\n" "$php_cv_cc_rpath" >&6; } if test "x$php_cv_cc_rpath" = xyes then : ld_runpath_switch=-Wl,-rpath, else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if compiler supports -R" >&5 + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler supports -R" >&5 printf %s "checking if compiler supports -R... " >&6; } if test ${php_cv_cc_dashr+y} then : @@ -6408,8 +6449,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_cc_dashr" >&5 -printf '%s\n' "$php_cv_cc_dashr" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_cc_dashr" >&5 +printf "%s\n" "$php_cv_cc_dashr" >&6; } if test "x$php_cv_cc_dashr" = xyes then : ld_runpath_switch=-R @@ -6429,7 +6470,7 @@ # Extract the first word of "bison", so it can be a program name with args. set dummy bison; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_YACC+y} then : @@ -6450,7 +6491,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_YACC="bison" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6462,11 +6503,11 @@ fi YACC=$ac_cv_prog_YACC if test -n "$YACC"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 -printf '%s\n' "$YACC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 +printf "%s\n" "$YACC" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6475,7 +6516,7 @@ php_bison_excluded_versions='none' if test -n "$YACC"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for bison version" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bison version" >&5 printf %s "checking for bison version... " >&6; } php_bison_version=$($YACC --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | tr -d a-z) @@ -6518,11 +6559,11 @@ PHP_VAR_SUBST="$PHP_VAR_SUBST YFLAGS" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_bison_version (ok)" >&5 -printf '%s\n' "$php_bison_version (ok)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_bison_version (ok)" >&5 +printf "%s\n" "$php_bison_version (ok)" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_bison_version" >&5 -printf '%s\n' "$php_bison_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_bison_version" >&5 +printf "%s\n" "$php_bison_version" >&6; } fi fi @@ -6544,7 +6585,7 @@ # Extract the first word of "re2c", so it can be a program name with args. set dummy re2c; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_RE2C+y} then : @@ -6565,7 +6606,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_RE2C="re2c" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6577,11 +6618,11 @@ fi RE2C=$ac_cv_prog_RE2C if test -n "$RE2C"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RE2C" >&5 -printf '%s\n' "$RE2C" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RE2C" >&5 +printf "%s\n" "$RE2C" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6592,7 +6633,7 @@ else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for re2c version" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for re2c version" >&5 printf %s "checking for re2c version... " >&6; } php_re2c_version=$($RE2C --version | cut -d ' ' -f 2 2>/dev/null) @@ -6614,11 +6655,11 @@ if test "x$php_re2c_check" = xinvalid then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_re2c_version (too old)" >&5 -printf '%s\n' "$php_re2c_version (too old)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_re2c_version (too old)" >&5 +printf "%s\n" "$php_re2c_version (too old)" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_re2c_version (ok)" >&5 -printf '%s\n' "$php_re2c_version (ok)" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_re2c_version (ok)" >&5 +printf "%s\n" "$php_re2c_version (ok)" >&6; } ;; esac fi ;; @@ -6652,7 +6693,7 @@ php_required_version=7.4 # Extract the first word of "php", so it can be a program name with args. set dummy php; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_PHP+y} then : @@ -6673,7 +6714,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_PHP="php" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6685,11 +6726,11 @@ fi PHP=$ac_cv_prog_PHP if test -n "$PHP"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $PHP" >&5 -printf '%s\n' "$PHP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP" >&5 +printf "%s\n" "$PHP" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6698,7 +6739,7 @@ else case e in #( e) -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for php version" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for php version" >&5 printf %s "checking for php version... " >&6; } php_version=$($PHP -v | head -n1 | cut -d ' ' -f 2) as_arg_v1=$php_version @@ -6716,11 +6757,11 @@ esac if ${PHP:+false} : then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_version (too old, install $php_required_version or later)" >&5 -printf '%s\n' "$php_version (too old, install $php_required_version or later)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_version (too old, install $php_required_version or later)" >&5 +printf "%s\n" "$php_version (too old, install $php_required_version or later)" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_version (ok)" >&5 -printf '%s\n' "$php_version (ok)" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_version (ok)" >&5 +printf "%s\n" "$php_version (ok)" >&6; } ;; esac fi ;; @@ -6734,7 +6775,7 @@ php_enable_re2c_cgoto=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable computed goto extension with re2c" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable computed goto extension with re2c" >&5 printf %s "checking whether to enable computed goto extension with re2c... " >&6; } # Check whether --enable-re2c-cgoto was given. if test ${enable_re2c_cgoto+y} @@ -6750,8 +6791,8 @@ ext_output=$PHP_RE2C_CGOTO -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -6760,7 +6801,7 @@ then : else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether re2c -g works" >&5 + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether re2c -g works" >&5 printf %s "checking whether re2c -g works... " >&6; } if test ${php_cv_have_re2c_cgoto+y} then : @@ -6790,8 +6831,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_re2c_cgoto" >&5 -printf '%s\n' "$php_cv_have_re2c_cgoto" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_re2c_cgoto" >&5 +printf "%s\n" "$php_cv_have_re2c_cgoto" >&6; } if test "x$php_cv_have_re2c_cgoto" = xyes then : as_fn_append RE2C_FLAGS " -g" @@ -6816,7 +6857,7 @@ ;; esac -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -ffp-contract=off" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -ffp-contract=off" >&5 printf %s "checking whether the C compiler accepts -ffp-contract=off... " >&6; } if test ${ax_cv_check_cflags___ffp_contract_off+y} then : @@ -6847,8 +6888,8 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___ffp_contract_off" >&5 -printf '%s\n' "$ax_cv_check_cflags___ffp_contract_off" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___ffp_contract_off" >&5 +printf "%s\n" "$ax_cv_check_cflags___ffp_contract_off" >&6; } if test "x$ax_cv_check_cflags___ffp_contract_off" = xyes then : CFLAGS="$CFLAGS -ffp-contract=off" @@ -6858,7 +6899,7 @@ fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -fvisibility=hidden" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -fvisibility=hidden" >&5 printf %s "checking whether the C compiler accepts -fvisibility=hidden... " >&6; } if test ${ax_cv_check_cflags___fvisibility_hidden+y} then : @@ -6889,8 +6930,8 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fvisibility_hidden" >&5 -printf '%s\n' "$ax_cv_check_cflags___fvisibility_hidden" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fvisibility_hidden" >&5 +printf "%s\n" "$ax_cv_check_cflags___fvisibility_hidden" >&6; } if test "x$ax_cv_check_cflags___fvisibility_hidden" = xyes then : CFLAGS="$CFLAGS -fvisibility=hidden" @@ -6911,43 +6952,43 @@ ;; esac -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to force non-PIC code in shared modules" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to force non-PIC code in shared modules" >&5 printf %s "checking whether to force non-PIC code in shared modules... " >&6; } case $host_alias in i?86-*-linux*|i?86-*-freebsd*) if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then with_pic=no - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi ;; *) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether we are using musl libc" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using musl libc" >&5 printf %s "checking whether we are using musl libc... " >&6; } if command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1 then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } -printf '%s\n' "#define __MUSL__ 1" >>confdefs.h +printf "%s\n" "#define __MUSL__ 1" >>confdefs.h else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi as_fn_append CPPFLAGS " -D_GNU_SOURCE" -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5 printf %s "checking for pthreads_cflags... " >&6; } if test ${ac_cv_pthreads_cflags+y} then : @@ -7002,10 +7043,10 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5 -printf '%s\n' "$ac_cv_pthreads_cflags" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5 +printf "%s\n" "$ac_cv_pthreads_cflags" >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5 printf %s "checking for pthreads_lib... " >&6; } if test ${ac_cv_pthreads_lib+y} then : @@ -7060,8 +7101,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5 -printf '%s\n' "$ac_cv_pthreads_lib" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5 +printf "%s\n" "$ac_cv_pthreads_lib" >&6; } if test "x$ac_cv_pthreads_cflags" != "x" || test "x$ac_cv_pthreads_lib" != "x"; then pthreads_working="yes" @@ -7137,10 +7178,10 @@ SAPI_LIBTOOL=libphp.la - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5 -printf '%s\n' "" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring SAPI modules${T_ME}" >&5 -printf '%s\n' "${T_MD}Configuring SAPI modules${T_ME}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring SAPI modules${T_ME}" >&5 +printf "%s\n" "${T_MD}Configuring SAPI modules${T_ME}" >&6; } @@ -7153,7 +7194,7 @@ php_with_apxs2=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build Apache 2 handler module support via DSO through APXS" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build Apache 2 handler module support via DSO through APXS" >&5 printf %s "checking whether to build Apache 2 handler module support via DSO through APXS... " >&6; } # Check whether --with-apxs2 was given. @@ -7170,8 +7211,8 @@ ext_output=$PHP_APXS2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -7207,24 +7248,24 @@ $APXS -q CFLAGS >/dev/null 2>&1 if test "$?" != "0"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5 -printf '%s\n' "" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5 -printf '%s\n' "" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: Sorry, I cannot run apxs. Possible reasons follow:" >&5 -printf '%s\n' "Sorry, I cannot run apxs. Possible reasons follow:" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5 -printf '%s\n' "" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: 1. Perl is not installed" >&5 -printf '%s\n' "1. Perl is not installed" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: 2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&5 -printf '%s\n' "2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: 3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&5 -printf '%s\n' "3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5 -printf '%s\n' "" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: The output of $APXS follows:" >&5 -printf '%s\n' "The output of $APXS follows:" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Sorry, I cannot run apxs. Possible reasons follow:" >&5 +printf "%s\n" "Sorry, I cannot run apxs. Possible reasons follow:" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 1. Perl is not installed" >&5 +printf "%s\n" "1. Perl is not installed" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&5 +printf "%s\n" "2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&5 +printf "%s\n" "3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: The output of $APXS follows:" >&5 +printf "%s\n" "The output of $APXS follows:" >&6; } $APXS -q CFLAGS as_fn_error $? "Aborting" "$LINENO" 5 fi @@ -7546,7 +7587,7 @@ php_enable_cli=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for CLI build" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CLI build" >&5 printf %s "checking for CLI build... " >&6; } # Check whether --enable-cli was given. if test ${enable_cli+y} @@ -7562,8 +7603,8 @@ ext_output=$PHP_CLI -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -7572,7 +7613,7 @@ ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle" if test "x$ac_cv_func_setproctitle" = xyes then : - printf '%s\n' "#define HAVE_SETPROCTITLE 1" >>confdefs.h + printf "%s\n" "#define HAVE_SETPROCTITLE 1" >>confdefs.h fi @@ -7580,12 +7621,12 @@ ac_fn_c_check_header_compile "$LINENO" "sys/pstat.h" "ac_cv_header_sys_pstat_h" "$ac_includes_default" if test "x$ac_cv_header_sys_pstat_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_PSTAT_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_PSTAT_H 1" >>confdefs.h fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PS_STRINGS" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PS_STRINGS" >&5 printf %s "checking for PS_STRINGS... " >&6; } if test ${php_cv_var_PS_STRINGS+y} then : @@ -7619,12 +7660,12 @@ conftest$ac_exeext conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_var_PS_STRINGS" >&5 -printf '%s\n' "$php_cv_var_PS_STRINGS" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_var_PS_STRINGS" >&5 +printf "%s\n" "$php_cv_var_PS_STRINGS" >&6; } if test "x$php_cv_var_PS_STRINGS" = xyes then : -printf '%s\n' "#define HAVE_PS_STRINGS /**/" >>confdefs.h +printf "%s\n" "#define HAVE_PS_STRINGS /**/" >>confdefs.h fi @@ -7817,7 +7858,7 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for embedded SAPI library support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for embedded SAPI library support" >&5 printf %s "checking for embedded SAPI library support... " >&6; } if test "$PHP_EMBED" != "no"; then @@ -7848,12 +7889,12 @@ if ${PHP_EMBED_TYPE:+false} : then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $PHP_EMBED_TYPE" >&5 -printf '%s\n' "$PHP_EMBED_TYPE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_EMBED_TYPE" >&5 +printf "%s\n" "$PHP_EMBED_TYPE" >&6; } PHP_VAR_SUBST="$PHP_VAR_SUBST LIBPHP_CFLAGS" @@ -8075,8 +8116,8 @@ esac fi else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -8085,7 +8126,7 @@ php_enable_fpm=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for FPM build" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FPM build" >&5 printf %s "checking for FPM build... " >&6; } # Check whether --enable-fpm was given. if test ${enable_fpm+y} @@ -8101,8 +8142,8 @@ ext_output=$PHP_FPM -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -8129,12 +8170,12 @@ ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" if test "x$ac_cv_func_clock_gettime" = xyes then : - printf '%s\n' "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h + printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h else case e in #( e) LIBS_save=$LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 printf %s "checking for library containing clock_gettime... " >&6; } if test ${ac_cv_search_clock_gettime+y} then : @@ -8192,15 +8233,15 @@ LIBS=$ac_func_search_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 -printf '%s\n' "$ac_cv_search_clock_gettime" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 +printf "%s\n" "$ac_cv_search_clock_gettime" >&6; } ac_res=$ac_cv_search_clock_gettime if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ac_cv_func_clock_gettime=yes - printf '%s\n' "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h + printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h if test "x$ac_cv_search_clock_gettime" = x"none required" then : @@ -8221,7 +8262,7 @@ if test "x$ac_cv_func_clock_gettime" = xno then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for clock_get_time" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_get_time" >&5 printf %s "checking for clock_get_time... " >&6; } if test ${php_cv_func_clock_get_time+y} then : @@ -8270,17 +8311,17 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_clock_get_time" >&5 -printf '%s\n' "$php_cv_func_clock_get_time" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_clock_get_time" >&5 +printf "%s\n" "$php_cv_func_clock_get_time" >&6; } if test "x$php_cv_func_clock_get_time" = xyes then : -printf '%s\n' "#define HAVE_CLOCK_GET_TIME 1" >>confdefs.h +printf "%s\n" "#define HAVE_CLOCK_GET_TIME 1" >>confdefs.h fi fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ptrace" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ptrace" >&5 printf %s "checking for ptrace... " >&6; } if test ${php_cv_func_ptrace+y} then : @@ -8397,16 +8438,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_ptrace" >&5 -printf '%s\n' "$php_cv_func_ptrace" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_ptrace" >&5 +printf "%s\n" "$php_cv_func_ptrace" >&6; } if test "x$php_cv_func_ptrace" = xyes then : -printf '%s\n' "#define HAVE_PTRACE 1" >>confdefs.h +printf "%s\n" "#define HAVE_PTRACE 1" >>confdefs.h else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mach_vm_read" >&5 + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mach_vm_read" >&5 printf %s "checking for mach_vm_read... " >&6; } if test ${php_cv_func_mach_vm_read+y} then : @@ -8442,8 +8483,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_mach_vm_read" >&5 -printf '%s\n' "$php_cv_func_mach_vm_read" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_mach_vm_read" >&5 +printf "%s\n" "$php_cv_func_mach_vm_read" >&6; } ;; esac fi @@ -8451,11 +8492,11 @@ if test "x$php_cv_func_mach_vm_read" = xyes then : -printf '%s\n' "#define HAVE_MACH_VM_READ 1" >>confdefs.h +printf "%s\n" "#define HAVE_MACH_VM_READ 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for proc mem file" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for proc mem file" >&5 printf %s "checking for proc mem file... " >&6; } if test ${php_cv_file_proc_mem+y} then : @@ -8530,15 +8571,15 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_file_proc_mem" >&5 -printf '%s\n' "$php_cv_file_proc_mem" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_file_proc_mem" >&5 +printf "%s\n" "$php_cv_file_proc_mem" >&6; } if ${php_cv_file_proc_mem:+false} : then : else case e in #( e) -printf '%s\n' "#define PROC_MEM_FILE \"$php_cv_file_proc_mem\"" >>confdefs.h +printf "%s\n" "#define PROC_MEM_FILE \"$php_cv_file_proc_mem\"" >>confdefs.h ;; esac fi @@ -8559,11 +8600,11 @@ if ${fpm_trace_type:+false} : then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&5 -printf '%s\n' "$as_me: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&5 +printf "%s\n" "$as_me: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&2;} fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if compiler supports __sync_bool_compare_and_swap" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler supports __sync_bool_compare_and_swap" >&5 printf %s "checking if compiler supports __sync_bool_compare_and_swap... " >&6; } if test ${php_cv_have___sync_bool_compare_and_swap+y} then : @@ -8595,16 +8636,16 @@ conftest$ac_exeext conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___sync_bool_compare_and_swap" >&5 -printf '%s\n' "$php_cv_have___sync_bool_compare_and_swap" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___sync_bool_compare_and_swap" >&5 +printf "%s\n" "$php_cv_have___sync_bool_compare_and_swap" >&6; } if test "x$php_cv_have___sync_bool_compare_and_swap" = xyes then : -printf '%s\n' "#define HAVE_BUILTIN_ATOMIC 1" >>confdefs.h +printf "%s\n" "#define HAVE_BUILTIN_ATOMIC 1" >>confdefs.h fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for TCP_INFO" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TCP_INFO" >&5 printf %s "checking for TCP_INFO... " >&6; } if test ${php_cv_have_TCP_INFO+y} then : @@ -8636,16 +8677,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_TCP_INFO" >&5 -printf '%s\n' "$php_cv_have_TCP_INFO" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_TCP_INFO" >&5 +printf "%s\n" "$php_cv_have_TCP_INFO" >&6; } if test "x$php_cv_have_TCP_INFO" = xyes then : -printf '%s\n' "#define HAVE_LQ_TCP_INFO 1" >>confdefs.h +printf "%s\n" "#define HAVE_LQ_TCP_INFO 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for TCP_CONNECTION_INFO" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TCP_CONNECTION_INFO" >&5 printf %s "checking for TCP_CONNECTION_INFO... " >&6; } if test ${php_cv_have_TCP_CONNECTION_INFO+y} then : @@ -8677,16 +8718,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_TCP_CONNECTION_INFO" >&5 -printf '%s\n' "$php_cv_have_TCP_CONNECTION_INFO" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_TCP_CONNECTION_INFO" >&5 +printf "%s\n" "$php_cv_have_TCP_CONNECTION_INFO" >&6; } if test "x$php_cv_have_TCP_CONNECTION_INFO" = xyes then : -printf '%s\n' "#define HAVE_LQ_TCP_CONNECTION_INFO 1" >>confdefs.h +printf "%s\n" "#define HAVE_LQ_TCP_CONNECTION_INFO 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for SO_LISTENQLEN" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SO_LISTENQLEN" >&5 printf %s "checking for SO_LISTENQLEN... " >&6; } if test ${php_cv_have_SO_LISTENQLEN+y} then : @@ -8718,16 +8759,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_SO_LISTENQLEN" >&5 -printf '%s\n' "$php_cv_have_SO_LISTENQLEN" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_SO_LISTENQLEN" >&5 +printf "%s\n" "$php_cv_have_SO_LISTENQLEN" >&6; } if test "x$php_cv_have_SO_LISTENQLEN" = xyes then : -printf '%s\n' "#define HAVE_LQ_SO_LISTENQ 1" >>confdefs.h +printf "%s\n" "#define HAVE_LQ_SO_LISTENQ 1" >>confdefs.h fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for kqueue" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for kqueue" >&5 printf %s "checking for kqueue... " >&6; } if test ${php_cv_have_kqueue+y} then : @@ -8763,16 +8804,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_kqueue" >&5 -printf '%s\n' "$php_cv_have_kqueue" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_kqueue" >&5 +printf "%s\n" "$php_cv_have_kqueue" >&6; } if test "x$php_cv_have_kqueue" = xyes then : -printf '%s\n' "#define HAVE_KQUEUE 1" >>confdefs.h +printf "%s\n" "#define HAVE_KQUEUE 1" >>confdefs.h fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for epoll" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for epoll" >&5 printf %s "checking for epoll... " >&6; } if test ${php_cv_have_epoll+y} then : @@ -8818,16 +8859,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_epoll" >&5 -printf '%s\n' "$php_cv_have_epoll" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_epoll" >&5 +printf "%s\n" "$php_cv_have_epoll" >&6; } if test "x$php_cv_have_epoll" = xyes then : -printf '%s\n' "#define HAVE_EPOLL 1" >>confdefs.h +printf "%s\n" "#define HAVE_EPOLL 1" >>confdefs.h fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for select" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for select" >&5 printf %s "checking for select... " >&6; } if test ${php_cv_have_select+y} then : @@ -8869,12 +8910,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_select" >&5 -printf '%s\n' "$php_cv_have_select" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_select" >&5 +printf "%s\n" "$php_cv_have_select" >&6; } if test "x$php_cv_have_select" = xyes then : -printf '%s\n' "#define HAVE_SELECT 1" >>confdefs.h +printf "%s\n" "#define HAVE_SELECT 1" >>confdefs.h fi @@ -8882,19 +8923,19 @@ ac_fn_c_check_func "$LINENO" "clearenv" "ac_cv_func_clearenv" if test "x$ac_cv_func_clearenv" = xyes then : - printf '%s\n' "#define HAVE_CLEARENV 1" >>confdefs.h + printf "%s\n" "#define HAVE_CLEARENV 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle" if test "x$ac_cv_func_setproctitle" = xyes then : - printf '%s\n' "#define HAVE_SETPROCTITLE 1" >>confdefs.h + printf "%s\n" "#define HAVE_SETPROCTITLE 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "setproctitle_fast" "ac_cv_func_setproctitle_fast" if test "x$ac_cv_func_setproctitle_fast" = xyes then : - printf '%s\n' "#define HAVE_SETPROCTITLE_FAST 1" >>confdefs.h + printf "%s\n" "#define HAVE_SETPROCTITLE_FAST 1" >>confdefs.h fi @@ -8905,7 +8946,7 @@ ac_fn_c_check_func "$LINENO" "setpflags" "ac_cv_func_setpflags" if test "x$ac_cv_func_setpflags" = xyes then : - printf '%s\n' "#define HAVE_SETPFLAGS 1" >>confdefs.h + printf "%s\n" "#define HAVE_SETPFLAGS 1" >>confdefs.h fi @@ -8917,7 +8958,7 @@ ac_fn_c_check_func "$LINENO" "times" "ac_cv_func_times" if test "x$ac_cv_func_times" = xyes then : - printf '%s\n' "#define HAVE_TIMES 1" >>confdefs.h + printf "%s\n" "#define HAVE_TIMES 1" >>confdefs.h fi @@ -8929,7 +8970,7 @@ ac_fn_c_check_func "$LINENO" "port_create" "ac_cv_func_port_create" if test "x$ac_cv_func_port_create" = xyes then : - printf '%s\n' "#define HAVE_PORT_CREATE 1" >>confdefs.h + printf "%s\n" "#define HAVE_PORT_CREATE 1" >>confdefs.h fi @@ -8987,7 +9028,7 @@ php_with_fpm_systemd=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable systemd integration in PHP-FPM" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable systemd integration in PHP-FPM" >&5 printf %s "checking whether to enable systemd integration in PHP-FPM... " >&6; } # Check whether --with-fpm-systemd was given. @@ -9004,8 +9045,8 @@ ext_output=$PHP_FPM_SYSTEMD -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -9013,7 +9054,7 @@ php_with_fpm_acl=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use Access Control Lists (ACL) in PHP-FPM" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use Access Control Lists (ACL) in PHP-FPM" >&5 printf %s "checking whether to use Access Control Lists (ACL) in PHP-FPM... " >&6; } # Check whether --with-fpm-acl was given. @@ -9030,8 +9071,8 @@ ext_output=$PHP_FPM_ACL -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -9039,7 +9080,7 @@ php_with_fpm_apparmor=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable AppArmor confinement in PHP-FPM" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable AppArmor confinement in PHP-FPM" >&5 printf %s "checking whether to enable AppArmor confinement in PHP-FPM... " >&6; } # Check whether --with-fpm-apparmor was given. @@ -9056,8 +9097,8 @@ ext_output=$PHP_FPM_APPARMOR -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -9065,7 +9106,7 @@ php_with_fpm_selinux=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable SELinux support in PHP-FPM" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable SELinux support in PHP-FPM" >&5 printf %s "checking whether to enable SELinux support in PHP-FPM... " >&6; } # Check whether --with-fpm-selinux was given. @@ -9082,8 +9123,8 @@ ext_output=$PHP_FPM_SELINUX -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -9095,17 +9136,17 @@ e) pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libsystemd >= 209" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd >= 209" >&5 printf %s "checking for libsystemd >= 209... " >&6; } if test -n "$SYSTEMD_CFLAGS"; then pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -9119,10 +9160,10 @@ pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -9136,8 +9177,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -9163,10 +9204,10 @@ and SYSTEMD_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -9180,13 +9221,13 @@ else SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi -printf '%s\n' "#define HAVE_SYSTEMD 1" >>confdefs.h +printf "%s\n" "#define HAVE_SYSTEMD 1" >>confdefs.h PHP_FPM_SD_FILES="fpm/fpm_systemd.c" _php_ext_shared_saved=$ext_shared; ext_shared=yes @@ -9354,8 +9395,8 @@ then : else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Required header file not found. See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -9376,13 +9417,13 @@ ac_fn_c_check_header_compile "$LINENO" "sys/acl.h" "ac_cv_header_sys_acl_h" "$ac_includes_default" if test "x$ac_cv_header_sys_acl_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_ACL_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_ACL_H 1" >>confdefs.h fi LIBS_save=$LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing acl_free" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing acl_free" >&5 printf %s "checking for library containing acl_free... " >&6; } if test ${ac_cv_search_acl_free+y} then : @@ -9440,13 +9481,13 @@ LIBS=$ac_func_search_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acl_free" >&5 -printf '%s\n' "$ac_cv_search_acl_free" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acl_free" >&5 +printf "%s\n" "$ac_cv_search_acl_free" >&6; } ac_res=$ac_cv_search_acl_free if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ACL user/group permissions support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ACL user/group permissions support" >&5 printf %s "checking for ACL user/group permissions support... " >&6; } if test ${php_cv_lib_acl_user_group+y} then : @@ -9483,13 +9524,13 @@ conftest$ac_exeext conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_acl_user_group" >&5 -printf '%s\n' "$php_cv_lib_acl_user_group" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_acl_user_group" >&5 +printf "%s\n" "$php_cv_lib_acl_user_group" >&6; } if test "x$php_cv_lib_acl_user_group" = xyes then : -printf '%s\n' "#define HAVE_FPM_ACL 1" >>confdefs.h +printf "%s\n" "#define HAVE_FPM_ACL 1" >>confdefs.h if test "x$ac_cv_search_acl_free" = x"none required" then : @@ -9515,17 +9556,17 @@ e) pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libapparmor" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libapparmor" >&5 printf %s "checking for libapparmor... " >&6; } if test -n "$APPARMOR_CFLAGS"; then pkg_cv_APPARMOR_CFLAGS="$APPARMOR_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libapparmor\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libapparmor\""; } >&5 ($PKG_CONFIG --exists --print-errors "libapparmor") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_APPARMOR_CFLAGS=`$PKG_CONFIG --cflags "libapparmor" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -9539,10 +9580,10 @@ pkg_cv_APPARMOR_LIBS="$APPARMOR_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libapparmor\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libapparmor\""; } >&5 ($PKG_CONFIG --exists --print-errors "libapparmor") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_APPARMOR_LIBS=`$PKG_CONFIG --libs "libapparmor" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -9556,8 +9597,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -9572,7 +9613,7 @@ # Put the nasty error message in config.log where it belongs echo "$APPARMOR_PKG_ERRORS" >&5 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for aa_change_profile in -lapparmor" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for aa_change_profile in -lapparmor" >&5 printf %s "checking for aa_change_profile in -lapparmor... " >&6; } if test ${ac_cv_lib_apparmor_aa_change_profile+y} then : @@ -9613,23 +9654,23 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_apparmor_aa_change_profile" >&5 -printf '%s\n' "$ac_cv_lib_apparmor_aa_change_profile" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_apparmor_aa_change_profile" >&5 +printf "%s\n" "$ac_cv_lib_apparmor_aa_change_profile" >&6; } if test "x$ac_cv_lib_apparmor_aa_change_profile" = xyes then : APPARMOR_LIBS=-lapparmor else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Required libapparmor library not found. See 'config.log' for more details" "$LINENO" 5; } ;; esac fi elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for aa_change_profile in -lapparmor" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for aa_change_profile in -lapparmor" >&5 printf %s "checking for aa_change_profile in -lapparmor... " >&6; } if test ${ac_cv_lib_apparmor_aa_change_profile+y} then : @@ -9670,14 +9711,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_apparmor_aa_change_profile" >&5 -printf '%s\n' "$ac_cv_lib_apparmor_aa_change_profile" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_apparmor_aa_change_profile" >&5 +printf "%s\n" "$ac_cv_lib_apparmor_aa_change_profile" >&6; } if test "x$ac_cv_lib_apparmor_aa_change_profile" = xyes then : APPARMOR_LIBS=-lapparmor else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Required libapparmor library not found. See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -9686,8 +9727,8 @@ else APPARMOR_CFLAGS=$pkg_cv_APPARMOR_CFLAGS APPARMOR_LIBS=$pkg_cv_APPARMOR_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } for ac_i in $APPARMOR_CFLAGS; do case $ac_i in @@ -9851,11 +9892,11 @@ if test "x$ac_cv_header_sys_apparmor_h" = xyes then : -printf '%s\n' "#define HAVE_APPARMOR 1" >>confdefs.h +printf "%s\n" "#define HAVE_APPARMOR 1" >>confdefs.h else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Required header file not found. See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -9873,17 +9914,17 @@ e) pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libselinux" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libselinux" >&5 printf %s "checking for libselinux... " >&6; } if test -n "$SELINUX_CFLAGS"; then pkg_cv_SELINUX_CFLAGS="$SELINUX_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5 ($PKG_CONFIG --exists --print-errors "libselinux") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SELINUX_CFLAGS=`$PKG_CONFIG --cflags "libselinux" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -9897,10 +9938,10 @@ pkg_cv_SELINUX_LIBS="$SELINUX_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5 ($PKG_CONFIG --exists --print-errors "libselinux") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SELINUX_LIBS=`$PKG_CONFIG --libs "libselinux" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -9914,8 +9955,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -9930,7 +9971,7 @@ # Put the nasty error message in config.log where it belongs echo "$SELINUX_PKG_ERRORS" >&5 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for security_setenforce in -lselinux" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for security_setenforce in -lselinux" >&5 printf %s "checking for security_setenforce in -lselinux... " >&6; } if test ${ac_cv_lib_selinux_security_setenforce+y} then : @@ -9971,23 +10012,23 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_security_setenforce" >&5 -printf '%s\n' "$ac_cv_lib_selinux_security_setenforce" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_security_setenforce" >&5 +printf "%s\n" "$ac_cv_lib_selinux_security_setenforce" >&6; } if test "x$ac_cv_lib_selinux_security_setenforce" = xyes then : SELINUX_LIBS=-lselinux else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Required SELinux library not found. See 'config.log' for more details" "$LINENO" 5; } ;; esac fi elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for security_setenforce in -lselinux" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for security_setenforce in -lselinux" >&5 printf %s "checking for security_setenforce in -lselinux... " >&6; } if test ${ac_cv_lib_selinux_security_setenforce+y} then : @@ -10028,14 +10069,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_security_setenforce" >&5 -printf '%s\n' "$ac_cv_lib_selinux_security_setenforce" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_security_setenforce" >&5 +printf "%s\n" "$ac_cv_lib_selinux_security_setenforce" >&6; } if test "x$ac_cv_lib_selinux_security_setenforce" = xyes then : SELINUX_LIBS=-lselinux else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Required SELinux library not found. See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -10044,8 +10085,8 @@ else SELINUX_CFLAGS=$pkg_cv_SELINUX_CFLAGS SELINUX_LIBS=$pkg_cv_SELINUX_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } for ac_i in $SELINUX_CFLAGS; do case $ac_i in @@ -10209,11 +10250,11 @@ if test "x$ac_cv_header_selinux_selinux_h" = xyes then : -printf '%s\n' "#define HAVE_SELINUX 1" >>confdefs.h +printf "%s\n" "#define HAVE_SELINUX 1" >>confdefs.h else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Required header file not found. See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -10425,7 +10466,7 @@ php_enable_fuzzer=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for Clang fuzzer SAPI" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Clang fuzzer SAPI" >&5 printf %s "checking for Clang fuzzer SAPI... " >&6; } # Check whether --enable-fuzzer was given. if test ${enable_fuzzer+y} @@ -10441,8 +10482,8 @@ ext_output=$PHP_FUZZER -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -10457,7 +10498,13 @@ (--enable-fuzzer). Please build fuzzer without ZTS." "$LINENO" 5 fi - ac_ext=cpp + + + + + + +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -10471,7 +10518,7 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CXX+y} then : @@ -10492,7 +10539,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10504,11 +10551,11 @@ fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -printf '%s\n' "$CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +printf "%s\n" "$CXX" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -10521,7 +10568,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CXX+y} then : @@ -10542,7 +10589,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10554,11 +10601,11 @@ fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -printf '%s\n' "$ac_ct_CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +printf "%s\n" "$ac_ct_CXX" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -10570,8 +10617,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX @@ -10581,7 +10628,7 @@ fi fi # Provide some information about the compiler. -printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion; do @@ -10591,7 +10638,7 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf '%s\n' "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -10601,11 +10648,11 @@ cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 printf %s "checking whether the compiler supports GNU C++... " >&6; } if test ${ac_cv_cxx_compiler_gnu+y} then : @@ -10637,8 +10684,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -printf '%s\n' "$ac_cv_cxx_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test $ac_compiler_gnu = yes; then @@ -10648,7 +10695,7 @@ fi ac_test_CXXFLAGS=${CXXFLAGS+y} ac_save_CXXFLAGS=$CXXFLAGS -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 printf %s "checking whether $CXX accepts -g... " >&6; } if test ${ac_cv_prog_cxx_g+y} then : @@ -10716,8 +10763,8 @@ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -printf '%s\n' "$ac_cv_prog_cxx_g" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } if test $ac_test_CXXFLAGS; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then @@ -10733,6 +10780,106 @@ CXXFLAGS= fi fi +ac_prog_cxx_stdcxx=no +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 +printf %s "checking for $CXX option to enable C++11 features... " >&6; } +if test ${ac_cv_prog_cxx_cxx11+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_prog_cxx_cxx11=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx11_program +_ACEOF +for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx11" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX ;; +esac +fi + +if test "x$ac_cv_prog_cxx_cxx11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else case e in #( + e) if test "x$ac_cv_prog_cxx_cxx11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx11" ;; +esac +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 + ac_prog_cxx_stdcxx=cxx11 ;; +esac +fi +fi +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 +printf %s "checking for $CXX option to enable C++98 features... " >&6; } +if test ${ac_cv_prog_cxx_cxx98+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_prog_cxx_cxx98=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx98_program +_ACEOF +for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx98=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx98" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX ;; +esac +fi + +if test "x$ac_cv_prog_cxx_cxx98" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else case e in #( + e) if test "x$ac_cv_prog_cxx_cxx98" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx98" ;; +esac +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 + ac_prog_cxx_stdcxx=cxx98 ;; +esac +fi +fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -10744,7 +10891,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 printf %s "checking how to run the C++ preprocessor... " >&6; } if test -z "$CXXCPP"; then if test ${ac_cv_prog_CXXCPP+y} @@ -10811,8 +10958,8 @@ else ac_cv_prog_CXXCPP=$CXXCPP fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -printf '%s\n' "$CXXCPP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +printf "%s\n" "$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -10860,8 +11007,8 @@ then : else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -10887,7 +11034,7 @@ FUZZING_LIB="-fsanitize=fuzzer" FUZZING_CC=$CC - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -fsanitize=fuzzer-no-link" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -fsanitize=fuzzer-no-link" >&5 printf %s "checking whether the C compiler accepts -fsanitize=fuzzer-no-link... " >&6; } if test ${ax_cv_check_cflags___fsanitize_fuzzer_no_link+y} then : @@ -10918,8 +11065,8 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_fuzzer_no_link" >&5 -printf '%s\n' "$ax_cv_check_cflags___fsanitize_fuzzer_no_link" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_fuzzer_no_link" >&5 +printf "%s\n" "$ax_cv_check_cflags___fsanitize_fuzzer_no_link" >&6; } if test "x$ax_cv_check_cflags___fsanitize_fuzzer_no_link" = xyes then : @@ -11527,7 +11674,7 @@ php_enable_litespeed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for LiteSpeed support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LiteSpeed support" >&5 printf %s "checking for LiteSpeed support... " >&6; } # Check whether --enable-litespeed was given. if test ${enable_litespeed+y} @@ -11564,8 +11711,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -11702,7 +11849,7 @@ php_enable_phpdbg=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for phpdbg support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phpdbg support" >&5 printf %s "checking for phpdbg support... " >&6; } # Check whether --enable-phpdbg was given. if test ${enable_phpdbg+y} @@ -11739,8 +11886,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -11748,7 +11895,7 @@ php_enable_phpdbg_debug=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for phpdbg debug build" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phpdbg debug build" >&5 printf %s "checking for phpdbg debug build... " >&6; } # Check whether --enable-phpdbg-debug was given. if test ${enable_phpdbg_debug+y} @@ -11764,8 +11911,8 @@ ext_output=$PHP_PHPDBG_DEBUG -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -11773,7 +11920,7 @@ php_enable_phpdbg_readline=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for phpdbg readline support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phpdbg readline support" >&5 printf %s "checking for phpdbg readline support... " >&6; } # Check whether --enable-phpdbg-readline was given. if test ${enable_phpdbg_readline+y} @@ -11789,14 +11936,14 @@ ext_output=$PHP_PHPDBG_READLINE -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } if test "$PHP_PHPDBG" != "no"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether termios.h defines TIOCGWINSZ" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether termios.h defines TIOCGWINSZ" >&5 printf %s "checking whether termios.h defines TIOCGWINSZ... " >&6; } if test ${ac_cv_sys_tiocgwinsz_in_termios_h+y} then : @@ -11819,11 +11966,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_tiocgwinsz_in_termios_h" >&5 -printf '%s\n' "$ac_cv_sys_tiocgwinsz_in_termios_h" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_tiocgwinsz_in_termios_h" >&5 +printf "%s\n" "$ac_cv_sys_tiocgwinsz_in_termios_h" >&6; } if test $ac_cv_sys_tiocgwinsz_in_termios_h != yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether sys/ioctl.h defines TIOCGWINSZ" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sys/ioctl.h defines TIOCGWINSZ" >&5 printf %s "checking whether sys/ioctl.h defines TIOCGWINSZ... " >&6; } if test ${ac_cv_sys_tiocgwinsz_in_sys_ioctl_h+y} then : @@ -11846,12 +11993,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&5 -printf '%s\n' "$ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&5 +printf "%s\n" "$ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&6; } if test $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h = yes; then -printf '%s\n' "#define GWINSZ_IN_SYS_IOCTL 1" >>confdefs.h +printf "%s\n" "#define GWINSZ_IN_SYS_IOCTL 1" >>confdefs.h fi fi @@ -11866,29 +12013,29 @@ esac fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for phpdbg and readline integration" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phpdbg and readline integration" >&5 printf %s "checking for phpdbg and readline integration... " >&6; } if test "$PHP_PHPDBG_READLINE" = "yes"; then if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then -printf '%s\n' "#define HAVE_PHPDBG_READLINE 1" >>confdefs.h +printf "%s\n" "#define HAVE_PHPDBG_READLINE 1" >>confdefs.h PHPDBG_EXTRA_LIBS="$PHP_READLINE_LIBS" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -printf '%s\n' "ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +printf "%s\n" "ok" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: readline is not available" >&5 -printf '%s\n' "readline is not available" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: readline is not available" >&5 +printf "%s\n" "readline is not available" >&6; } fi else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -printf '%s\n' "disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +printf "%s\n" "disabled" >&6; } fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC options to detect undeclared functions" >&5 -printf %s "checking for $CC options to detect undeclared functions... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5 +printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; } if test ${ac_cv_c_undeclared_builtin_options+y} then : printf %s "(cached) " >&6 @@ -11956,12 +12103,12 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5 -printf '%s\n' "$ac_cv_c_undeclared_builtin_options" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5 +printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; } case $ac_cv_c_undeclared_builtin_options in #( 'cannot detect') : - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot make $CC report undeclared builtins See 'config.log' for more details" "$LINENO" 5; } ;; #( 'none needed') : @@ -11970,76 +12117,33 @@ ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;; esac -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC options to ignore future-version functions" >&5 -printf %s "checking for $CC options to ignore future-version functions... " >&6; } -if test ${ac_cv_c_future_darwin_options+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) ac_compile_saved="$ac_compile" - ac_compile="$ac_compile -Werror=unguarded-availability-new" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if ! (defined __APPLE__ && defined __MACH__) - #error "-Werror=unguarded-availability-new not needed here" - #endif - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_c_future_darwin_options='-Werror=unguarded-availability-new' -else case e in #( - e) ac_cv_c_future_darwin_options='none needed' ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_compile="$ac_compile_saved" - ;; -esac -fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_future_darwin_options" >&5 -printf '%s\n' "$ac_cv_c_future_darwin_options" >&6; } - case $ac_cv_c_future_darwin_options in #( - 'none needed') : - ac_c_future_darwin_options='' ;; #( - *) : - ac_c_future_darwin_options=$ac_cv_c_future_darwin_options ;; -esac - ac_fn_check_decl "$LINENO" "UFFDIO_WRITEPROTECT_MODE_WP" "ac_cv_have_decl_UFFDIO_WRITEPROTECT_MODE_WP" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_UFFDIO_WRITEPROTECT_MODE_WP" = xyes then : if test "x$enable_zts" = xyes then : - printf '%s\n' "#define HAVE_USERFAULTFD_WRITEFAULT 1" >>confdefs.h + printf "%s\n" "#define HAVE_USERFAULTFD_WRITEFAULT 1" >>confdefs.h else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking working pthreads" >&5 + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking working pthreads" >&5 printf %s "checking working pthreads... " >&6; } if test "x$pthreads_working" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib" >&5 -printf '%s\n' "$ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib" >&5 +printf "%s\n" "$ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib" >&6; } as_fn_append PHP_PHPDBG_CFLAGS " $ac_cv_pthreads_cflags" as_fn_append PHPDBG_EXTRA_LIBS " -l$ac_cv_pthreads_lib" - printf '%s\n' "#define HAVE_USERFAULTFD_WRITEFAULT 1" >>confdefs.h + printf "%s\n" "#define HAVE_USERFAULTFD_WRITEFAULT 1" >>confdefs.h else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: pthreads not available" >&5 -printf '%s\n' "$as_me: WARNING: pthreads not available" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: pthreads not available" >&5 +printf "%s\n" "$as_me: WARNING: pthreads not available" >&2;} ;; esac fi @@ -12200,7 +12304,7 @@ php_enable_cgi=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for CGI build" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CGI build" >&5 printf %s "checking for CGI build... " >&6; } # Check whether --enable-cgi was given. if test ${enable_cgi+y} @@ -12216,8 +12320,8 @@ ext_output=$PHP_CGI -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -12228,13 +12332,13 @@ if test "x$ac_cv_member_struct_sockaddr_un_sun_len" = xyes then : -printf '%s\n' "#define HAVE_STRUCT_SOCKADDR_UN_SUN_LEN 1" >>confdefs.h +printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_UN_SUN_LEN 1" >>confdefs.h fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether cross-process locking is required by accept()" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether cross-process locking is required by accept()" >&5 printf %s "checking whether cross-process locking is required by accept()... " >&6; } if test ${php_cv_have_cross_process_locking+y} then : @@ -12248,12 +12352,12 @@ esac ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_cross_process_locking" >&5 -printf '%s\n' "$php_cv_have_cross_process_locking" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_cross_process_locking" >&5 +printf "%s\n" "$php_cv_have_cross_process_locking" >&6; } if test "x$php_cv_have_cross_process_locking" = xyes then : -printf '%s\n' "#define USE_LOCKING 1" >>confdefs.h +printf "%s\n" "#define USE_LOCKING 1" >>confdefs.h fi @@ -12404,20 +12508,20 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for chosen SAPI module" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for chosen SAPI module" >&5 printf %s "checking for chosen SAPI module... " >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $PHP_SAPI" >&5 -printf '%s\n' "$PHP_SAPI" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_SAPI" >&5 +printf "%s\n" "$PHP_SAPI" >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for executable SAPI binaries" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for executable SAPI binaries" >&5 printf %s "checking for executable SAPI binaries... " >&6; } if ${PHP_BINARIES:+false} : then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none" >&5 -printf '%s\n' "none" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 +printf "%s\n" "none" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $PHP_BINARIES" >&5 -printf '%s\n' "$PHP_BINARIES" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_BINARIES" >&5 +printf "%s\n" "$PHP_BINARIES" >&6; } ;; esac fi @@ -12461,16 +12565,16 @@ - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5 -printf '%s\n' "" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Running system checks${T_ME}" >&5 -printf '%s\n' "${T_MD}Running system checks${T_ME}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Running system checks${T_ME}" >&5 +printf "%s\n" "${T_MD}Running system checks${T_ME}" >&6; } PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PROG_SENDMAIL+y} then : @@ -12494,7 +12598,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_path_PROG_SENDMAIL="$as_dir$ac_word$ac_exec_ext" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12507,22 +12611,22 @@ fi PROG_SENDMAIL=$ac_cv_path_PROG_SENDMAIL if test -n "$PROG_SENDMAIL"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $PROG_SENDMAIL" >&5 -printf '%s\n' "$PROG_SENDMAIL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PROG_SENDMAIL" >&5 +printf "%s\n" "$PROG_SENDMAIL" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if ${PROG_SENDMAIL:+false} : then : PROG_SENDMAIL=/usr/sbin/sendmail -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: default sendmail_path INI directive set to $PROG_SENDMAIL" >&5 -printf '%s\n' "$as_me: default sendmail_path INI directive set to $PROG_SENDMAIL" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: default sendmail_path INI directive set to $PROG_SENDMAIL" >&5 +printf "%s\n" "$as_me: default sendmail_path INI directive set to $PROG_SENDMAIL" >&6;} fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether system uses EBCDIC" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether system uses EBCDIC" >&5 printf %s "checking whether system uses EBCDIC... " >&6; } if test ${ac_cv_ebcdic+y} then : @@ -12554,18 +12658,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ebcdic" >&5 -printf '%s\n' "$ac_cv_ebcdic" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ebcdic" >&5 +printf "%s\n" "$ac_cv_ebcdic" >&6; } if test "x$ac_cv_ebcdic" = xyes then : - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "PHP does not support EBCDIC targets. See 'config.log' for more details" "$LINENO" 5; } fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 printf %s "checking whether byte ordering is bigendian... " >&6; } if test ${ac_cv_c_bigendian_php+y} then : @@ -12605,17 +12709,17 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian_php" >&5 -printf '%s\n' "$ac_cv_c_bigendian_php" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian_php" >&5 +printf "%s\n" "$ac_cv_c_bigendian_php" >&6; } if test "x$ac_cv_c_bigendian_php" = xyes then : -printf '%s\n' "#define WORDS_BIGENDIAN /**/" >>confdefs.h +printf "%s\n" "#define WORDS_BIGENDIAN /**/" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether writing to stdout works" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether writing to stdout works" >&5 printf %s "checking whether writing to stdout works... " >&6; } if test ${php_cv_have_write_stdout+y} then : @@ -12662,12 +12766,12 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_write_stdout" >&5 -printf '%s\n' "$php_cv_have_write_stdout" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_write_stdout" >&5 +printf "%s\n" "$php_cv_have_write_stdout" >&6; } if test "x$php_cv_have_write_stdout" = xyes then : -printf '%s\n' "#define PHP_WRITE_STDOUT 1" >>confdefs.h +printf "%s\n" "#define PHP_WRITE_STDOUT 1" >>confdefs.h fi @@ -12715,7 +12819,7 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5 printf %s "checking for library containing socket... " >&6; } if test ${ac_cv_search_socket+y} then : @@ -12773,8 +12877,8 @@ LIBS=$ac_func_search_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5 -printf '%s\n' "$ac_cv_search_socket" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5 +printf "%s\n" "$ac_cv_search_socket" >&6; } ac_res=$ac_cv_search_socket if test "$ac_res" != no then : @@ -12789,10 +12893,10 @@ ac_fn_c_check_func "$LINENO" "socketpair" "ac_cv_func_socketpair" if test "x$ac_cv_func_socketpair" = xyes then : - printf '%s\n' "#define HAVE_SOCKETPAIR 1" >>confdefs.h + printf "%s\n" "#define HAVE_SOCKETPAIR 1" >>confdefs.h else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing socketpair" >&5 + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing socketpair" >&5 printf %s "checking for library containing socketpair... " >&6; } if test ${ac_cv_search_socketpair+y} then : @@ -12850,13 +12954,13 @@ LIBS=$ac_func_search_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socketpair" >&5 -printf '%s\n' "$ac_cv_search_socketpair" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socketpair" >&5 +printf "%s\n" "$ac_cv_search_socketpair" >&6; } ac_res=$ac_cv_search_socketpair if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - printf '%s\n' "#define HAVE_SOCKETPAIR 1" >>confdefs.h + printf "%s\n" "#define HAVE_SOCKETPAIR 1" >>confdefs.h fi ;; @@ -12865,7 +12969,7 @@ done -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyaddr" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyaddr" >&5 printf %s "checking for library containing gethostbyaddr... " >&6; } if test ${ac_cv_search_gethostbyaddr+y} then : @@ -12923,8 +13027,8 @@ LIBS=$ac_func_search_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyaddr" >&5 -printf '%s\n' "$ac_cv_search_gethostbyaddr" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyaddr" >&5 +printf "%s\n" "$ac_cv_search_gethostbyaddr" >&6; } ac_res=$ac_cv_search_gethostbyaddr if test "$ac_res" != no then : @@ -12933,7 +13037,7 @@ fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 printf %s "checking for library containing dlopen... " >&6; } if test ${ac_cv_search_dlopen+y} then : @@ -12991,19 +13095,19 @@ LIBS=$ac_func_search_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 -printf '%s\n' "$ac_cv_search_dlopen" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 +printf "%s\n" "$ac_cv_search_dlopen" >&6; } ac_res=$ac_cv_search_dlopen if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -printf '%s\n' "#define HAVE_LIBDL 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing sin" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing sin" >&5 printf %s "checking for library containing sin... " >&6; } if test ${ac_cv_search_sin+y} then : @@ -13061,8 +13165,8 @@ LIBS=$ac_func_search_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sin" >&5 -printf '%s\n' "$ac_cv_search_sin" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sin" >&5 +printf "%s\n" "$ac_cv_search_sin" >&6; } ac_res=$ac_cv_search_sin if test "$ac_res" != no then : @@ -13099,7 +13203,7 @@ case $found in yes) -printf '%s\n' "#define HAVE___ATOMIC_EXCHANGE_1 1" >>confdefs.h +printf "%s\n" "#define HAVE___ATOMIC_EXCHANGE_1 1" >>confdefs.h ac_cv_func___atomic_exchange_1=yes ;; @@ -13109,7 +13213,7 @@ unset ac_cv_lib_atomic___atomic_exchange_1 unset ac_cv_lib_atomic_____atomic_exchange_1 unset found - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __atomic_exchange_1 in -latomic" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __atomic_exchange_1 in -latomic" >&5 printf %s "checking for __atomic_exchange_1 in -latomic... " >&6; } if test ${ac_cv_lib_atomic___atomic_exchange_1+y} then : @@ -13150,14 +13254,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atomic___atomic_exchange_1" >&5 -printf '%s\n' "$ac_cv_lib_atomic___atomic_exchange_1" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atomic___atomic_exchange_1" >&5 +printf "%s\n" "$ac_cv_lib_atomic___atomic_exchange_1" >&6; } if test "x$ac_cv_lib_atomic___atomic_exchange_1" = xyes then : found=yes else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ____atomic_exchange_1 in -latomic" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ____atomic_exchange_1 in -latomic" >&5 printf %s "checking for ____atomic_exchange_1 in -latomic... " >&6; } if test ${ac_cv_lib_atomic_____atomic_exchange_1+y} then : @@ -13198,8 +13302,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atomic_____atomic_exchange_1" >&5 -printf '%s\n' "$ac_cv_lib_atomic_____atomic_exchange_1" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atomic_____atomic_exchange_1" >&5 +printf "%s\n" "$ac_cv_lib_atomic_____atomic_exchange_1" >&6; } if test "x$ac_cv_lib_atomic_____atomic_exchange_1" = xyes then : found=yes @@ -13260,10 +13364,10 @@ -printf '%s\n' "#define HAVE___ATOMIC_EXCHANGE_1 1" >>confdefs.h +printf "%s\n" "#define HAVE___ATOMIC_EXCHANGE_1 1" >>confdefs.h -printf '%s\n' "#define HAVE_LIBATOMIC 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBATOMIC 1" >>confdefs.h ac_cv_func___atomic_exchange_1=yes else @@ -13279,7 +13383,7 @@ ;; esac -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing Pgrab" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing Pgrab" >&5 printf %s "checking for library containing Pgrab... " >&6; } if test ${ac_cv_search_Pgrab+y} then : @@ -13337,8 +13441,8 @@ LIBS=$ac_func_search_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_Pgrab" >&5 -printf '%s\n' "$ac_cv_search_Pgrab" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_Pgrab" >&5 +printf "%s\n" "$ac_cv_search_Pgrab" >&6; } ac_res=$ac_cv_search_Pgrab if test "$ac_res" != no then : @@ -13347,7 +13451,7 @@ fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing setsockopt" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing setsockopt" >&5 printf %s "checking for library containing setsockopt... " >&6; } if test ${ac_cv_search_setsockopt+y} then : @@ -13405,8 +13509,8 @@ LIBS=$ac_func_search_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_setsockopt" >&5 -printf '%s\n' "$ac_cv_search_setsockopt" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_setsockopt" >&5 +printf "%s\n" "$ac_cv_search_setsockopt" >&6; } ac_res=$ac_cv_search_setsockopt if test "$ac_res" != no then : @@ -13421,10 +13525,10 @@ ac_fn_c_check_func "$LINENO" "openpty" "ac_cv_func_openpty" if test "x$ac_cv_func_openpty" = xyes then : - printf '%s\n' "#define HAVE_OPENPTY 1" >>confdefs.h + printf "%s\n" "#define HAVE_OPENPTY 1" >>confdefs.h else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing openpty" >&5 + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing openpty" >&5 printf %s "checking for library containing openpty... " >&6; } if test ${ac_cv_search_openpty+y} then : @@ -13482,13 +13586,13 @@ LIBS=$ac_func_search_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_openpty" >&5 -printf '%s\n' "$ac_cv_search_openpty" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_openpty" >&5 +printf "%s\n" "$ac_cv_search_openpty" >&6; } ac_res=$ac_cv_search_openpty if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - printf '%s\n' "#define HAVE_OPENPTY 1" >>confdefs.h + printf "%s\n" "#define HAVE_OPENPTY 1" >>confdefs.h fi ;; @@ -13517,7 +13621,7 @@ " if test "x$ac_cv_header_dirent_h" = xyes then : - printf '%s\n' "#define HAVE_DIRENT_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_DIRENT_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "#ifdef HAVE_SYS_PARAM_H @@ -13539,7 +13643,7 @@ " if test "x$ac_cv_header_sys_param_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_PARAM_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "#ifdef HAVE_SYS_PARAM_H @@ -13561,7 +13665,7 @@ " if test "x$ac_cv_header_sys_types_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_TYPES_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_TYPES_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "#ifdef HAVE_SYS_PARAM_H @@ -13583,7 +13687,7 @@ " if test "x$ac_cv_header_sys_time_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_TIME_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "#ifdef HAVE_SYS_PARAM_H @@ -13605,7 +13709,7 @@ " if test "x$ac_cv_header_netinet_in_h" = xyes then : - printf '%s\n' "#define HAVE_NETINET_IN_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_NETINET_IN_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "alloca.h" "ac_cv_header_alloca_h" "#ifdef HAVE_SYS_PARAM_H @@ -13627,7 +13731,7 @@ " if test "x$ac_cv_header_alloca_h" = xyes then : - printf '%s\n' "#define HAVE_ALLOCA_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "#ifdef HAVE_SYS_PARAM_H @@ -13649,7 +13753,7 @@ " if test "x$ac_cv_header_arpa_inet_h" = xyes then : - printf '%s\n' "#define HAVE_ARPA_INET_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_ARPA_INET_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "arpa/nameser.h" "ac_cv_header_arpa_nameser_h" "#ifdef HAVE_SYS_PARAM_H @@ -13671,7 +13775,7 @@ " if test "x$ac_cv_header_arpa_nameser_h" = xyes then : - printf '%s\n' "#define HAVE_ARPA_NAMESER_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_ARPA_NAMESER_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "dns.h" "ac_cv_header_dns_h" "#ifdef HAVE_SYS_PARAM_H @@ -13693,7 +13797,7 @@ " if test "x$ac_cv_header_dns_h" = xyes then : - printf '%s\n' "#define HAVE_DNS_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_DNS_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "#ifdef HAVE_SYS_PARAM_H @@ -13715,7 +13819,7 @@ " if test "x$ac_cv_header_fcntl_h" = xyes then : - printf '%s\n' "#define HAVE_FCNTL_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "grp.h" "ac_cv_header_grp_h" "#ifdef HAVE_SYS_PARAM_H @@ -13737,7 +13841,7 @@ " if test "x$ac_cv_header_grp_h" = xyes then : - printf '%s\n' "#define HAVE_GRP_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_GRP_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "ieeefp.h" "ac_cv_header_ieeefp_h" "#ifdef HAVE_SYS_PARAM_H @@ -13759,7 +13863,7 @@ " if test "x$ac_cv_header_ieeefp_h" = xyes then : - printf '%s\n' "#define HAVE_IEEEFP_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_IEEEFP_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "langinfo.h" "ac_cv_header_langinfo_h" "#ifdef HAVE_SYS_PARAM_H @@ -13781,7 +13885,7 @@ " if test "x$ac_cv_header_langinfo_h" = xyes then : - printf '%s\n' "#define HAVE_LANGINFO_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_LANGINFO_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "linux/sock_diag.h" "ac_cv_header_linux_sock_diag_h" "#ifdef HAVE_SYS_PARAM_H @@ -13803,7 +13907,7 @@ " if test "x$ac_cv_header_linux_sock_diag_h" = xyes then : - printf '%s\n' "#define HAVE_LINUX_SOCK_DIAG_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_LINUX_SOCK_DIAG_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "poll.h" "ac_cv_header_poll_h" "#ifdef HAVE_SYS_PARAM_H @@ -13825,7 +13929,7 @@ " if test "x$ac_cv_header_poll_h" = xyes then : - printf '%s\n' "#define HAVE_POLL_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_POLL_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "pty.h" "ac_cv_header_pty_h" "#ifdef HAVE_SYS_PARAM_H @@ -13847,7 +13951,7 @@ " if test "x$ac_cv_header_pty_h" = xyes then : - printf '%s\n' "#define HAVE_PTY_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_PTY_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "pwd.h" "ac_cv_header_pwd_h" "#ifdef HAVE_SYS_PARAM_H @@ -13869,7 +13973,7 @@ " if test "x$ac_cv_header_pwd_h" = xyes then : - printf '%s\n' "#define HAVE_PWD_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_PWD_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "resolv.h" "ac_cv_header_resolv_h" "#ifdef HAVE_SYS_PARAM_H @@ -13891,7 +13995,7 @@ " if test "x$ac_cv_header_resolv_h" = xyes then : - printf '%s\n' "#define HAVE_RESOLV_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_RESOLV_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "strings.h" "ac_cv_header_strings_h" "#ifdef HAVE_SYS_PARAM_H @@ -13913,7 +14017,7 @@ " if test "x$ac_cv_header_strings_h" = xyes then : - printf '%s\n' "#define HAVE_STRINGS_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_STRINGS_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "syslog.h" "ac_cv_header_syslog_h" "#ifdef HAVE_SYS_PARAM_H @@ -13935,7 +14039,7 @@ " if test "x$ac_cv_header_syslog_h" = xyes then : - printf '%s\n' "#define HAVE_SYSLOG_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYSLOG_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sysexits.h" "ac_cv_header_sysexits_h" "#ifdef HAVE_SYS_PARAM_H @@ -13957,7 +14061,7 @@ " if test "x$ac_cv_header_sysexits_h" = xyes then : - printf '%s\n' "#define HAVE_SYSEXITS_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYSEXITS_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "#ifdef HAVE_SYS_PARAM_H @@ -13979,7 +14083,7 @@ " if test "x$ac_cv_header_sys_ioctl_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/file.h" "ac_cv_header_sys_file_h" "#ifdef HAVE_SYS_PARAM_H @@ -14001,7 +14105,7 @@ " if test "x$ac_cv_header_sys_file_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_FILE_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_FILE_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "#ifdef HAVE_SYS_PARAM_H @@ -14023,7 +14127,7 @@ " if test "x$ac_cv_header_sys_mman_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_MMAN_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_MMAN_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "#ifdef HAVE_SYS_PARAM_H @@ -14045,7 +14149,7 @@ " if test "x$ac_cv_header_sys_mount_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_MOUNT_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_MOUNT_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "#ifdef HAVE_SYS_PARAM_H @@ -14067,7 +14171,7 @@ " if test "x$ac_cv_header_sys_poll_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_POLL_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_POLL_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "#ifdef HAVE_SYS_PARAM_H @@ -14089,7 +14193,7 @@ " if test "x$ac_cv_header_sys_resource_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_RESOURCE_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_RESOURCE_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "#ifdef HAVE_SYS_PARAM_H @@ -14111,7 +14215,7 @@ " if test "x$ac_cv_header_sys_select_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_SELECT_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_SELECT_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "#ifdef HAVE_SYS_PARAM_H @@ -14133,7 +14237,7 @@ " if test "x$ac_cv_header_sys_socket_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_SOCKET_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_SOCKET_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/stat.h" "ac_cv_header_sys_stat_h" "#ifdef HAVE_SYS_PARAM_H @@ -14155,7 +14259,7 @@ " if test "x$ac_cv_header_sys_stat_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_STAT_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_STAT_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/statfs.h" "ac_cv_header_sys_statfs_h" "#ifdef HAVE_SYS_PARAM_H @@ -14177,7 +14281,7 @@ " if test "x$ac_cv_header_sys_statfs_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_STATFS_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_STATFS_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/statvfs.h" "ac_cv_header_sys_statvfs_h" "#ifdef HAVE_SYS_PARAM_H @@ -14199,7 +14303,7 @@ " if test "x$ac_cv_header_sys_statvfs_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_STATVFS_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_STATVFS_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/vfs.h" "ac_cv_header_sys_vfs_h" "#ifdef HAVE_SYS_PARAM_H @@ -14221,7 +14325,7 @@ " if test "x$ac_cv_header_sys_vfs_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_VFS_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_VFS_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/sysexits.h" "ac_cv_header_sys_sysexits_h" "#ifdef HAVE_SYS_PARAM_H @@ -14243,7 +14347,7 @@ " if test "x$ac_cv_header_sys_sysexits_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_SYSEXITS_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_SYSEXITS_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/uio.h" "ac_cv_header_sys_uio_h" "#ifdef HAVE_SYS_PARAM_H @@ -14265,7 +14369,7 @@ " if test "x$ac_cv_header_sys_uio_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_UIO_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_UIO_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "#ifdef HAVE_SYS_PARAM_H @@ -14287,7 +14391,7 @@ " if test "x$ac_cv_header_sys_wait_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_WAIT_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "#ifdef HAVE_SYS_PARAM_H @@ -14309,7 +14413,7 @@ " if test "x$ac_cv_header_sys_loadavg_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_LOADAVG_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_LOADAVG_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "#ifdef HAVE_SYS_PARAM_H @@ -14331,7 +14435,7 @@ " if test "x$ac_cv_header_unistd_h" = xyes then : - printf '%s\n' "#define HAVE_UNISTD_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "unix.h" "ac_cv_header_unix_h" "#ifdef HAVE_SYS_PARAM_H @@ -14353,7 +14457,7 @@ " if test "x$ac_cv_header_unix_h" = xyes then : - printf '%s\n' "#define HAVE_UNIX_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_UNIX_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "utime.h" "ac_cv_header_utime_h" "#ifdef HAVE_SYS_PARAM_H @@ -14375,7 +14479,7 @@ " if test "x$ac_cv_header_utime_h" = xyes then : - printf '%s\n' "#define HAVE_UTIME_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_UTIME_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/utsname.h" "ac_cv_header_sys_utsname_h" "#ifdef HAVE_SYS_PARAM_H @@ -14397,7 +14501,7 @@ " if test "x$ac_cv_header_sys_utsname_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_UTSNAME_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_UTSNAME_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/ipc.h" "ac_cv_header_sys_ipc_h" "#ifdef HAVE_SYS_PARAM_H @@ -14419,7 +14523,7 @@ " if test "x$ac_cv_header_sys_ipc_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_IPC_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_IPC_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "#ifdef HAVE_SYS_PARAM_H @@ -14441,7 +14545,7 @@ " if test "x$ac_cv_header_dlfcn_h" = xyes then : - printf '%s\n' "#define HAVE_DLFCN_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "tmmintrin.h" "ac_cv_header_tmmintrin_h" "#ifdef HAVE_SYS_PARAM_H @@ -14463,7 +14567,7 @@ " if test "x$ac_cv_header_tmmintrin_h" = xyes then : - printf '%s\n' "#define HAVE_TMMINTRIN_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_TMMINTRIN_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "nmmintrin.h" "ac_cv_header_nmmintrin_h" "#ifdef HAVE_SYS_PARAM_H @@ -14485,7 +14589,7 @@ " if test "x$ac_cv_header_nmmintrin_h" = xyes then : - printf '%s\n' "#define HAVE_NMMINTRIN_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_NMMINTRIN_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "wmmintrin.h" "ac_cv_header_wmmintrin_h" "#ifdef HAVE_SYS_PARAM_H @@ -14507,7 +14611,7 @@ " if test "x$ac_cv_header_wmmintrin_h" = xyes then : - printf '%s\n' "#define HAVE_WMMINTRIN_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_WMMINTRIN_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "immintrin.h" "ac_cv_header_immintrin_h" "#ifdef HAVE_SYS_PARAM_H @@ -14529,7 +14633,7 @@ " if test "x$ac_cv_header_immintrin_h" = xyes then : - printf '%s\n' "#define HAVE_IMMINTRIN_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_IMMINTRIN_H 1" >>confdefs.h fi @@ -14541,7 +14645,7 @@ ac_fn_c_check_func "$LINENO" "fopencookie" "ac_cv_func_fopencookie" if test "x$ac_cv_func_fopencookie" = xyes then : - printf '%s\n' "#define HAVE_FOPENCOOKIE 1" >>confdefs.h + printf "%s\n" "#define HAVE_FOPENCOOKIE 1" >>confdefs.h fi @@ -14549,7 +14653,7 @@ if test "x$ac_cv_func_fopencookie" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether fopencookie seeker uses off64_t" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fopencookie seeker uses off64_t" >&5 printf %s "checking whether fopencookie seeker uses off64_t... " >&6; } if test ${php_cv_type_cookie_off64_t+y} then : @@ -14610,19 +14714,19 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_type_cookie_off64_t" >&5 -printf '%s\n' "$php_cv_type_cookie_off64_t" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_type_cookie_off64_t" >&5 +printf "%s\n" "$php_cv_type_cookie_off64_t" >&6; } if test "x$php_cv_type_cookie_off64_t" = xyes then : -printf '%s\n' "#define COOKIE_SEEKER_USES_OFF64_T 1" >>confdefs.h +printf "%s\n" "#define COOKIE_SEEKER_USES_OFF64_T 1" >>confdefs.h fi fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for broken getcwd" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken getcwd" >&5 printf %s "checking for broken getcwd... " >&6; } if test ${php_cv_func_getcwd_broken+y} then : @@ -14636,18 +14740,18 @@ esac ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_getcwd_broken" >&5 -printf '%s\n' "$php_cv_func_getcwd_broken" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_getcwd_broken" >&5 +printf "%s\n" "$php_cv_func_getcwd_broken" >&6; } if test "x$php_cv_func_getcwd_broken" = xyes then : -printf '%s\n' "#define HAVE_BROKEN_GETCWD 1" >>confdefs.h +printf "%s\n" "#define HAVE_BROKEN_GETCWD 1" >>confdefs.h fi if test "x$GCC" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for broken gcc optimize-strlen" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken gcc optimize-strlen" >&5 printf %s "checking for broken gcc optimize-strlen... " >&6; } if test ${php_cv_have_broken_gcc_strlen_opt+y} then : @@ -14691,8 +14795,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_broken_gcc_strlen_opt" >&5 -printf '%s\n' "$php_cv_have_broken_gcc_strlen_opt" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_broken_gcc_strlen_opt" >&5 +printf "%s\n" "$php_cv_have_broken_gcc_strlen_opt" >&6; } if test "x$php_cv_have_broken_gcc_strlen_opt" = xyes then : as_fn_append CFLAGS " -fno-optimize-strlen" @@ -14706,7 +14810,7 @@ if test "x$ac_cv_header_sys_mkdev_h" = xyes then : -printf '%s\n' "#define MAJOR_IN_MKDEV 1" >>confdefs.h +printf "%s\n" "#define MAJOR_IN_MKDEV 1" >>confdefs.h fi @@ -14715,7 +14819,7 @@ if test "x$ac_cv_header_sys_sysmacros_h" = xyes then : -printf '%s\n' "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h +printf "%s\n" "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h fi @@ -14723,7 +14827,7 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 printf %s "checking whether struct tm is in sys/time.h or time.h... " >&6; } if test ${ac_cv_struct_tm+y} then : @@ -14754,11 +14858,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 -printf '%s\n' "$ac_cv_struct_tm" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 +printf "%s\n" "$ac_cv_struct_tm" >&6; } if test $ac_cv_struct_tm = sys/time.h; then -printf '%s\n' "#define TM_IN_SYS_TIME 1" >>confdefs.h +printf "%s\n" "#define TM_IN_SYS_TIME 1" >>confdefs.h fi @@ -14769,18 +14873,18 @@ if test "x$ac_cv_member_struct_tm_tm_zone" = xyes then : -printf '%s\n' "#define HAVE_STRUCT_TM_TM_ZONE 1" >>confdefs.h +printf "%s\n" "#define HAVE_STRUCT_TM_TM_ZONE 1" >>confdefs.h fi if test "$ac_cv_member_struct_tm_tm_zone" = yes; then -printf '%s\n' "#define HAVE_TM_ZONE 1" >>confdefs.h +printf "%s\n" "#define HAVE_TM_ZONE 1" >>confdefs.h else ac_fn_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_tzname" = xyes then : ac_have_decl=1 @@ -14788,9 +14892,9 @@ e) ac_have_decl=0 ;; esac fi -printf '%s\n' "#define HAVE_DECL_TZNAME $ac_have_decl" >>confdefs.h +printf "%s\n" "#define HAVE_DECL_TZNAME $ac_have_decl" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5 printf %s "checking for tzname... " >&6; } if test ${ac_cv_var_tzname+y} then : @@ -14822,11 +14926,11 @@ conftest$ac_exeext conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5 -printf '%s\n' "$ac_cv_var_tzname" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5 +printf "%s\n" "$ac_cv_var_tzname" >&6; } if test $ac_cv_var_tzname = yes; then -printf '%s\n' "#define HAVE_TZNAME 1" >>confdefs.h +printf "%s\n" "#define HAVE_TZNAME 1" >>confdefs.h fi fi @@ -14834,57 +14938,57 @@ ac_fn_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_localtime_r" = xyes then : else case e in #( e) -printf '%s\n' "#define MISSING_LOCALTIME_R_DECL 1" >>confdefs.h +printf "%s\n" "#define MISSING_LOCALTIME_R_DECL 1" >>confdefs.h ;; esac fi ac_fn_check_decl "$LINENO" "gmtime_r" "ac_cv_have_decl_gmtime_r" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_gmtime_r" = xyes then : else case e in #( e) -printf '%s\n' "#define MISSING_GMTIME_R_DECL 1" >>confdefs.h +printf "%s\n" "#define MISSING_GMTIME_R_DECL 1" >>confdefs.h ;; esac fi ac_fn_check_decl "$LINENO" "asctime_r" "ac_cv_have_decl_asctime_r" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_asctime_r" = xyes then : else case e in #( e) -printf '%s\n' "#define MISSING_ASCTIME_R_DECL 1" >>confdefs.h +printf "%s\n" "#define MISSING_ASCTIME_R_DECL 1" >>confdefs.h ;; esac fi ac_fn_check_decl "$LINENO" "ctime_r" "ac_cv_have_decl_ctime_r" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_ctime_r" = xyes then : else case e in #( e) -printf '%s\n' "#define MISSING_CTIME_R_DECL 1" >>confdefs.h +printf "%s\n" "#define MISSING_CTIME_R_DECL 1" >>confdefs.h ;; esac fi ac_fn_check_decl "$LINENO" "strtok_r" "ac_cv_have_decl_strtok_r" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_strtok_r" = xyes then : else case e in #( e) -printf '%s\n' "#define MISSING_STRTOK_R_DECL 1" >>confdefs.h +printf "%s\n" "#define MISSING_STRTOK_R_DECL 1" >>confdefs.h ;; esac fi @@ -14895,7 +14999,7 @@ if test "x$ac_cv_type_struct_flock" = xyes then : -printf '%s\n' "#define HAVE_STRUCT_FLOCK 1" >>confdefs.h +printf "%s\n" "#define HAVE_STRUCT_FLOCK 1" >>confdefs.h fi @@ -14912,14 +15016,14 @@ if test "x$ac_cv_type_socklen_t" = xyes then : -printf '%s\n' "#define HAVE_SOCKLEN_T 1" >>confdefs.h +printf "%s\n" "#define HAVE_SOCKLEN_T 1" >>confdefs.h fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking size of intmax_t" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of intmax_t" >&5 printf %s "checking size of intmax_t... " >&6; } php_cache_value=php_cv_sizeof_intmax_t @@ -14983,20 +15087,20 @@ if eval test "\$$php_cache_value" != "0"; then -printf '%s\n' "#define SIZEOF_INTMAX_T $php_cv_sizeof_intmax_t" >>confdefs.h +printf "%s\n" "#define SIZEOF_INTMAX_T $php_cv_sizeof_intmax_t" >>confdefs.h -printf '%s\n' "#define HAVE_INTMAX_T 1" >>confdefs.h +printf "%s\n" "#define HAVE_INTMAX_T 1" >>confdefs.h fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_intmax_t" >&5 -printf '%s\n' "$php_cv_sizeof_intmax_t" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_intmax_t" >&5 +printf "%s\n" "$php_cv_sizeof_intmax_t" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5 printf %s "checking size of ssize_t... " >&6; } php_cache_value=php_cv_sizeof_ssize_t @@ -15060,20 +15164,20 @@ if eval test "\$$php_cache_value" != "0"; then -printf '%s\n' "#define SIZEOF_SSIZE_T $php_cv_sizeof_ssize_t" >>confdefs.h +printf "%s\n" "#define SIZEOF_SSIZE_T $php_cv_sizeof_ssize_t" >>confdefs.h -printf '%s\n' "#define HAVE_SSIZE_T 1" >>confdefs.h +printf "%s\n" "#define HAVE_SSIZE_T 1" >>confdefs.h fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_ssize_t" >&5 -printf '%s\n' "$php_cv_sizeof_ssize_t" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_ssize_t" >&5 +printf "%s\n" "$php_cv_sizeof_ssize_t" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking size of ptrdiff_t" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of ptrdiff_t" >&5 printf %s "checking size of ptrdiff_t... " >&6; } php_cache_value=php_cv_sizeof_ptrdiff_t @@ -15137,17 +15241,17 @@ if eval test "\$$php_cache_value" != "0"; then -printf '%s\n' "#define SIZEOF_PTRDIFF_T $php_cv_sizeof_ptrdiff_t" >>confdefs.h +printf "%s\n" "#define SIZEOF_PTRDIFF_T $php_cv_sizeof_ptrdiff_t" >>confdefs.h -printf '%s\n' "#define HAVE_PTRDIFF_T 1" >>confdefs.h +printf "%s\n" "#define HAVE_PTRDIFF_T 1" >>confdefs.h fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_ptrdiff_t" >&5 -printf '%s\n' "$php_cv_sizeof_ptrdiff_t" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_ptrdiff_t" >&5 +printf "%s\n" "$php_cv_sizeof_ptrdiff_t" >&6; } @@ -15155,7 +15259,7 @@ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 printf %s "checking size of int... " >&6; } if test ${ac_cv_sizeof_int+y} then : @@ -15165,25 +15269,32 @@ then : else case e in #( - e) ac_cv_sizeof_int=0 ;; + e) if test "$ac_cv_type_int" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (int) +See 'config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_int=0 + fi ;; esac fi ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 -printf '%s\n' "$ac_cv_sizeof_int" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 +printf "%s\n" "$ac_cv_sizeof_int" >&6; } -printf '%s\n' "#define SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h +printf "%s\n" "#define SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 printf %s "checking size of long... " >&6; } if test ${ac_cv_sizeof_long+y} then : @@ -15193,25 +15304,32 @@ then : else case e in #( - e) ac_cv_sizeof_long=0 ;; + e) if test "$ac_cv_type_long" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long) +See 'config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long=0 + fi ;; esac fi ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -printf '%s\n' "$ac_cv_sizeof_long" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 +printf "%s\n" "$ac_cv_sizeof_long" >&6; } -printf '%s\n' "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h +printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 printf %s "checking size of long long... " >&6; } if test ${ac_cv_sizeof_long_long+y} then : @@ -15221,25 +15339,32 @@ then : else case e in #( - e) ac_cv_sizeof_long_long=0 ;; + e) if test "$ac_cv_type_long_long" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long long) +See 'config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long_long=0 + fi ;; esac fi ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 -printf '%s\n' "$ac_cv_sizeof_long_long" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 +printf "%s\n" "$ac_cv_sizeof_long_long" >&6; } -printf '%s\n' "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h +printf "%s\n" "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 printf %s "checking size of size_t... " >&6; } if test ${ac_cv_sizeof_size_t+y} then : @@ -15249,25 +15374,32 @@ then : else case e in #( - e) ac_cv_sizeof_size_t=0 ;; + e) if test "$ac_cv_type_size_t" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (size_t) +See 'config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_size_t=0 + fi ;; esac fi ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5 -printf '%s\n' "$ac_cv_sizeof_size_t" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5 +printf "%s\n" "$ac_cv_sizeof_size_t" >&6; } -printf '%s\n' "#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t" >>confdefs.h +printf "%s\n" "#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 printf %s "checking size of off_t... " >&6; } if test ${ac_cv_sizeof_off_t+y} then : @@ -15277,24 +15409,31 @@ then : else case e in #( - e) ac_cv_sizeof_off_t=0 ;; + e) if test "$ac_cv_type_off_t" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (off_t) +See 'config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_off_t=0 + fi ;; esac fi ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5 -printf '%s\n' "$ac_cv_sizeof_off_t" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5 +printf "%s\n" "$ac_cv_sizeof_off_t" >&6; } -printf '%s\n' "#define SIZEOF_OFF_T $ac_cv_sizeof_off_t" >>confdefs.h +printf "%s\n" "#define SIZEOF_OFF_T $ac_cv_sizeof_off_t" >>confdefs.h -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_clz" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_clz" >&5 printf %s "checking for __builtin_clz... " >&6; } if test ${php_cv_have___builtin_clz+y} then : @@ -15316,18 +15455,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_clz" >&5 -printf '%s\n' "$php_cv_have___builtin_clz" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_clz" >&5 +printf "%s\n" "$php_cv_have___builtin_clz" >&6; } if test "x$php_cv_have___builtin_clz" = xyes then : -printf '%s\n' "#define PHP_HAVE_BUILTIN_CLZ 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_BUILTIN_CLZ 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_clzl" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_clzl" >&5 printf %s "checking for __builtin_clzl... " >&6; } if test ${php_cv_have___builtin_clzl+y} then : @@ -15349,18 +15488,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_clzl" >&5 -printf '%s\n' "$php_cv_have___builtin_clzl" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_clzl" >&5 +printf "%s\n" "$php_cv_have___builtin_clzl" >&6; } if test "x$php_cv_have___builtin_clzl" = xyes then : -printf '%s\n' "#define PHP_HAVE_BUILTIN_CLZL 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_BUILTIN_CLZL 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_clzll" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_clzll" >&5 printf %s "checking for __builtin_clzll... " >&6; } if test ${php_cv_have___builtin_clzll+y} then : @@ -15382,18 +15521,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_clzll" >&5 -printf '%s\n' "$php_cv_have___builtin_clzll" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_clzll" >&5 +printf "%s\n" "$php_cv_have___builtin_clzll" >&6; } if test "x$php_cv_have___builtin_clzll" = xyes then : -printf '%s\n' "#define PHP_HAVE_BUILTIN_CLZLL 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_BUILTIN_CLZLL 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_cpu_init" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_cpu_init" >&5 printf %s "checking for __builtin_cpu_init... " >&6; } if test ${php_cv_have___builtin_cpu_init+y} then : @@ -15415,18 +15554,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_cpu_init" >&5 -printf '%s\n' "$php_cv_have___builtin_cpu_init" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_cpu_init" >&5 +printf "%s\n" "$php_cv_have___builtin_cpu_init" >&6; } if test "x$php_cv_have___builtin_cpu_init" = xyes then : -printf '%s\n' "#define PHP_HAVE_BUILTIN_CPU_INIT 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_BUILTIN_CPU_INIT 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_cpu_supports" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_cpu_supports" >&5 printf %s "checking for __builtin_cpu_supports... " >&6; } if test ${php_cv_have___builtin_cpu_supports+y} then : @@ -15448,18 +15587,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_cpu_supports" >&5 -printf '%s\n' "$php_cv_have___builtin_cpu_supports" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_cpu_supports" >&5 +printf "%s\n" "$php_cv_have___builtin_cpu_supports" >&6; } if test "x$php_cv_have___builtin_cpu_supports" = xyes then : -printf '%s\n' "#define PHP_HAVE_BUILTIN_CPU_SUPPORTS 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_BUILTIN_CPU_SUPPORTS 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_ctzl" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_ctzl" >&5 printf %s "checking for __builtin_ctzl... " >&6; } if test ${php_cv_have___builtin_ctzl+y} then : @@ -15481,18 +15620,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_ctzl" >&5 -printf '%s\n' "$php_cv_have___builtin_ctzl" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_ctzl" >&5 +printf "%s\n" "$php_cv_have___builtin_ctzl" >&6; } if test "x$php_cv_have___builtin_ctzl" = xyes then : -printf '%s\n' "#define PHP_HAVE_BUILTIN_CTZL 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_BUILTIN_CTZL 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_ctzll" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_ctzll" >&5 printf %s "checking for __builtin_ctzll... " >&6; } if test ${php_cv_have___builtin_ctzll+y} then : @@ -15514,18 +15653,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_ctzll" >&5 -printf '%s\n' "$php_cv_have___builtin_ctzll" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_ctzll" >&5 +printf "%s\n" "$php_cv_have___builtin_ctzll" >&6; } if test "x$php_cv_have___builtin_ctzll" = xyes then : -printf '%s\n' "#define PHP_HAVE_BUILTIN_CTZLL 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_BUILTIN_CTZLL 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5 printf %s "checking for __builtin_expect... " >&6; } if test ${php_cv_have___builtin_expect+y} then : @@ -15547,18 +15686,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_expect" >&5 -printf '%s\n' "$php_cv_have___builtin_expect" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_expect" >&5 +printf "%s\n" "$php_cv_have___builtin_expect" >&6; } if test "x$php_cv_have___builtin_expect" = xyes then : -printf '%s\n' "#define PHP_HAVE_BUILTIN_EXPECT 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_BUILTIN_EXPECT 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_frame_address" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_frame_address" >&5 printf %s "checking for __builtin_frame_address... " >&6; } if test ${php_cv_have___builtin_frame_address+y} then : @@ -15580,18 +15719,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_frame_address" >&5 -printf '%s\n' "$php_cv_have___builtin_frame_address" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_frame_address" >&5 +printf "%s\n" "$php_cv_have___builtin_frame_address" >&6; } if test "x$php_cv_have___builtin_frame_address" = xyes then : -printf '%s\n' "#define PHP_HAVE_BUILTIN_FRAME_ADDRESS 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_BUILTIN_FRAME_ADDRESS 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_saddl_overflow" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_saddl_overflow" >&5 printf %s "checking for __builtin_saddl_overflow... " >&6; } if test ${php_cv_have___builtin_saddl_overflow+y} then : @@ -15613,18 +15752,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_saddl_overflow" >&5 -printf '%s\n' "$php_cv_have___builtin_saddl_overflow" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_saddl_overflow" >&5 +printf "%s\n" "$php_cv_have___builtin_saddl_overflow" >&6; } if test "x$php_cv_have___builtin_saddl_overflow" = xyes then : -printf '%s\n' "#define PHP_HAVE_BUILTIN_SADDL_OVERFLOW 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_BUILTIN_SADDL_OVERFLOW 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_saddll_overflow" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_saddll_overflow" >&5 printf %s "checking for __builtin_saddll_overflow... " >&6; } if test ${php_cv_have___builtin_saddll_overflow+y} then : @@ -15646,18 +15785,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_saddll_overflow" >&5 -printf '%s\n' "$php_cv_have___builtin_saddll_overflow" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_saddll_overflow" >&5 +printf "%s\n" "$php_cv_have___builtin_saddll_overflow" >&6; } if test "x$php_cv_have___builtin_saddll_overflow" = xyes then : -printf '%s\n' "#define PHP_HAVE_BUILTIN_SADDLL_OVERFLOW 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_BUILTIN_SADDLL_OVERFLOW 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_smull_overflow" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_smull_overflow" >&5 printf %s "checking for __builtin_smull_overflow... " >&6; } if test ${php_cv_have___builtin_smull_overflow+y} then : @@ -15679,18 +15818,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_smull_overflow" >&5 -printf '%s\n' "$php_cv_have___builtin_smull_overflow" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_smull_overflow" >&5 +printf "%s\n" "$php_cv_have___builtin_smull_overflow" >&6; } if test "x$php_cv_have___builtin_smull_overflow" = xyes then : -printf '%s\n' "#define PHP_HAVE_BUILTIN_SMULL_OVERFLOW 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_BUILTIN_SMULL_OVERFLOW 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_smulll_overflow" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_smulll_overflow" >&5 printf %s "checking for __builtin_smulll_overflow... " >&6; } if test ${php_cv_have___builtin_smulll_overflow+y} then : @@ -15712,18 +15851,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_smulll_overflow" >&5 -printf '%s\n' "$php_cv_have___builtin_smulll_overflow" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_smulll_overflow" >&5 +printf "%s\n" "$php_cv_have___builtin_smulll_overflow" >&6; } if test "x$php_cv_have___builtin_smulll_overflow" = xyes then : -printf '%s\n' "#define PHP_HAVE_BUILTIN_SMULLL_OVERFLOW 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_BUILTIN_SMULLL_OVERFLOW 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_ssubl_overflow" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_ssubl_overflow" >&5 printf %s "checking for __builtin_ssubl_overflow... " >&6; } if test ${php_cv_have___builtin_ssubl_overflow+y} then : @@ -15745,18 +15884,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_ssubl_overflow" >&5 -printf '%s\n' "$php_cv_have___builtin_ssubl_overflow" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_ssubl_overflow" >&5 +printf "%s\n" "$php_cv_have___builtin_ssubl_overflow" >&6; } if test "x$php_cv_have___builtin_ssubl_overflow" = xyes then : -printf '%s\n' "#define PHP_HAVE_BUILTIN_SSUBL_OVERFLOW 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_BUILTIN_SSUBL_OVERFLOW 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_ssubll_overflow" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_ssubll_overflow" >&5 printf %s "checking for __builtin_ssubll_overflow... " >&6; } if test ${php_cv_have___builtin_ssubll_overflow+y} then : @@ -15778,18 +15917,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_ssubll_overflow" >&5 -printf '%s\n' "$php_cv_have___builtin_ssubll_overflow" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_ssubll_overflow" >&5 +printf "%s\n" "$php_cv_have___builtin_ssubll_overflow" >&6; } if test "x$php_cv_have___builtin_ssubll_overflow" = xyes then : -printf '%s\n' "#define PHP_HAVE_BUILTIN_SSUBLL_OVERFLOW 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_BUILTIN_SSUBLL_OVERFLOW 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_unreachable" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_unreachable" >&5 printf %s "checking for __builtin_unreachable... " >&6; } if test ${php_cv_have___builtin_unreachable+y} then : @@ -15811,18 +15950,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_unreachable" >&5 -printf '%s\n' "$php_cv_have___builtin_unreachable" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_unreachable" >&5 +printf "%s\n" "$php_cv_have___builtin_unreachable" >&6; } if test "x$php_cv_have___builtin_unreachable" = xyes then : -printf '%s\n' "#define PHP_HAVE_BUILTIN_UNREACHABLE 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_BUILTIN_UNREACHABLE 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_usub_overflow" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_usub_overflow" >&5 printf %s "checking for __builtin_usub_overflow... " >&6; } if test ${php_cv_have___builtin_usub_overflow+y} then : @@ -15844,18 +15983,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_usub_overflow" >&5 -printf '%s\n' "$php_cv_have___builtin_usub_overflow" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___builtin_usub_overflow" >&5 +printf "%s\n" "$php_cv_have___builtin_usub_overflow" >&6; } if test "x$php_cv_have___builtin_usub_overflow" = xyes then : -printf '%s\n' "#define PHP_HAVE_BUILTIN_USUB_OVERFLOW 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_BUILTIN_USUB_OVERFLOW 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether compiler supports AVX-512" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether compiler supports AVX-512" >&5 printf %s "checking whether compiler supports AVX-512... " >&6; } if test ${php_cv_have_avx512+y} then : @@ -15887,16 +16026,16 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_avx512" >&5 -printf '%s\n' "$php_cv_have_avx512" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_avx512" >&5 +printf "%s\n" "$php_cv_have_avx512" >&6; } if test "x$php_cv_have_avx512" = xyes then : -printf '%s\n' "#define PHP_HAVE_AVX512_SUPPORTS 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_AVX512_SUPPORTS 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether compiler supports AVX-512 VBMI" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether compiler supports AVX-512 VBMI" >&5 printf %s "checking whether compiler supports AVX-512 VBMI... " >&6; } if test ${php_cv_have_avx512vbmi+y} then : @@ -15928,17 +16067,17 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_avx512vbmi" >&5 -printf '%s\n' "$php_cv_have_avx512vbmi" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_avx512vbmi" >&5 +printf "%s\n" "$php_cv_have_avx512vbmi" >&6; } if test "x$php_cv_have_avx512vbmi" = xyes then : -printf '%s\n' "#define PHP_HAVE_AVX512_VBMI_SUPPORTS 1" >>confdefs.h +printf "%s\n" "#define PHP_HAVE_AVX512_VBMI_SUPPORTS 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports __alignof__" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports __alignof__" >&5 printf %s "checking whether the compiler supports __alignof__... " >&6; } if test ${php_cv_have_alignof+y} then : @@ -15968,12 +16107,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_alignof" >&5 -printf '%s\n' "$php_cv_have_alignof" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_alignof" >&5 +printf "%s\n" "$php_cv_have_alignof" >&6; } if test "x$php_cv_have_alignof" = xyes then : -printf '%s\n' "#define HAVE_ALIGNOF 1" >>confdefs.h +printf "%s\n" "#define HAVE_ALIGNOF 1" >>confdefs.h fi @@ -15982,7 +16121,7 @@ if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes then : -printf '%s\n' "#define HAVE_STRUCT_TM_TM_GMTOFF 1" >>confdefs.h +printf "%s\n" "#define HAVE_STRUCT_TM_TM_GMTOFF 1" >>confdefs.h fi @@ -15991,7 +16130,7 @@ if test "x$ac_cv_member_struct_stat_st_blksize" = xyes then : -printf '%s\n' "#define HAVE_STRUCT_STAT_ST_BLKSIZE 1" >>confdefs.h +printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BLKSIZE 1" >>confdefs.h fi @@ -15999,7 +16138,7 @@ if test "x$ac_cv_member_struct_stat_st_rdev" = xyes then : -printf '%s\n' "#define HAVE_STRUCT_STAT_ST_RDEV 1" >>confdefs.h +printf "%s\n" "#define HAVE_STRUCT_STAT_ST_RDEV 1" >>confdefs.h fi @@ -16009,10 +16148,10 @@ if test "x$ac_cv_member_struct_stat_st_blocks" = xyes then : -printf '%s\n' "#define HAVE_STRUCT_STAT_ST_BLOCKS 1" >>confdefs.h +printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BLOCKS 1" >>confdefs.h -printf '%s\n' "#define HAVE_ST_BLOCKS 1" >>confdefs.h +printf "%s\n" "#define HAVE_ST_BLOCKS 1" >>confdefs.h else case e in #( e) case " $LIBOBJS " in @@ -16033,7 +16172,7 @@ else case e in #( e) -printf '%s\n' "#define uid_t int" >>confdefs.h +printf "%s\n" "#define uid_t int" >>confdefs.h ;; esac fi @@ -16044,7 +16183,7 @@ else case e in #( e) -printf '%s\n' "#define gid_t int" >>confdefs.h +printf "%s\n" "#define gid_t int" >>confdefs.h ;; esac fi @@ -16055,7 +16194,7 @@ if test "x$ac_cv_type_struct_sockaddr_storage" = xyes then : -printf '%s\n' "#define HAVE_STRUCT_SOCKADDR_STORAGE 1" >>confdefs.h +printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_STORAGE 1" >>confdefs.h fi @@ -16065,7 +16204,7 @@ if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes then : -printf '%s\n' "#define HAVE_STRUCT_SOCKADDR_SA_LEN 1" >>confdefs.h +printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_SA_LEN 1" >>confdefs.h fi @@ -16080,7 +16219,7 @@ - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __attribute__((ifunc))" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __attribute__((ifunc))" >&5 printf %s "checking for __attribute__((ifunc))... " >&6; } if test ${ax_cv_have_func_attribute_ifunc+y} then : @@ -16122,13 +16261,13 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_ifunc" >&5 -printf '%s\n' "$ax_cv_have_func_attribute_ifunc" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_ifunc" >&5 +printf "%s\n" "$ax_cv_have_func_attribute_ifunc" >&6; } if test yes = $ax_cv_have_func_attribute_ifunc then : -printf '%s\n' "#define HAVE_FUNC_ATTRIBUTE_IFUNC 1" >>confdefs.h +printf "%s\n" "#define HAVE_FUNC_ATTRIBUTE_IFUNC 1" >>confdefs.h fi @@ -16137,7 +16276,7 @@ - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __attribute__((target))" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __attribute__((target))" >&5 printf %s "checking for __attribute__((target))... " >&6; } if test ${ax_cv_have_func_attribute_target+y} then : @@ -16177,13 +16316,13 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_target" >&5 -printf '%s\n' "$ax_cv_have_func_attribute_target" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_target" >&5 +printf "%s\n" "$ax_cv_have_func_attribute_target" >&6; } if test yes = $ax_cv_have_func_attribute_target then : -printf '%s\n' "#define HAVE_FUNC_ATTRIBUTE_TARGET 1" >>confdefs.h +printf "%s\n" "#define HAVE_FUNC_ATTRIBUTE_TARGET 1" >>confdefs.h fi @@ -16194,7 +16333,7 @@ esac -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for variable __attribute__((aligned))" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for variable __attribute__((aligned))" >&5 printf %s "checking for variable __attribute__((aligned))... " >&6; } if test ${php_cv_have_variable_attribute_aligned+y} then : @@ -16228,12 +16367,12 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_variable_attribute_aligned" >&5 -printf '%s\n' "$php_cv_have_variable_attribute_aligned" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_variable_attribute_aligned" >&5 +printf "%s\n" "$php_cv_have_variable_attribute_aligned" >&6; } if test "x$php_cv_have_variable_attribute_aligned" = xyes then : -printf '%s\n' "#define HAVE_ATTRIBUTE_ALIGNED 1" >>confdefs.h +printf "%s\n" "#define HAVE_ATTRIBUTE_ALIGNED 1" >>confdefs.h fi @@ -16243,355 +16382,355 @@ ac_fn_c_check_func "$LINENO" "alphasort" "ac_cv_func_alphasort" if test "x$ac_cv_func_alphasort" = xyes then : - printf '%s\n' "#define HAVE_ALPHASORT 1" >>confdefs.h + printf "%s\n" "#define HAVE_ALPHASORT 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "asctime_r" "ac_cv_func_asctime_r" if test "x$ac_cv_func_asctime_r" = xyes then : - printf '%s\n' "#define HAVE_ASCTIME_R 1" >>confdefs.h + printf "%s\n" "#define HAVE_ASCTIME_R 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf" if test "x$ac_cv_func_asprintf" = xyes then : - printf '%s\n' "#define HAVE_ASPRINTF 1" >>confdefs.h + printf "%s\n" "#define HAVE_ASPRINTF 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "chroot" "ac_cv_func_chroot" if test "x$ac_cv_func_chroot" = xyes then : - printf '%s\n' "#define HAVE_CHROOT 1" >>confdefs.h + printf "%s\n" "#define HAVE_CHROOT 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "ctime_r" "ac_cv_func_ctime_r" if test "x$ac_cv_func_ctime_r" = xyes then : - printf '%s\n' "#define HAVE_CTIME_R 1" >>confdefs.h + printf "%s\n" "#define HAVE_CTIME_R 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "explicit_memset" "ac_cv_func_explicit_memset" if test "x$ac_cv_func_explicit_memset" = xyes then : - printf '%s\n' "#define HAVE_EXPLICIT_MEMSET 1" >>confdefs.h + printf "%s\n" "#define HAVE_EXPLICIT_MEMSET 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "fdatasync" "ac_cv_func_fdatasync" if test "x$ac_cv_func_fdatasync" = xyes then : - printf '%s\n' "#define HAVE_FDATASYNC 1" >>confdefs.h + printf "%s\n" "#define HAVE_FDATASYNC 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock" if test "x$ac_cv_func_flock" = xyes then : - printf '%s\n' "#define HAVE_FLOCK 1" >>confdefs.h + printf "%s\n" "#define HAVE_FLOCK 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "ftok" "ac_cv_func_ftok" if test "x$ac_cv_func_ftok" = xyes then : - printf '%s\n' "#define HAVE_FTOK 1" >>confdefs.h + printf "%s\n" "#define HAVE_FTOK 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "funopen" "ac_cv_func_funopen" if test "x$ac_cv_func_funopen" = xyes then : - printf '%s\n' "#define HAVE_FUNOPEN 1" >>confdefs.h + printf "%s\n" "#define HAVE_FUNOPEN 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "gai_strerror" "ac_cv_func_gai_strerror" if test "x$ac_cv_func_gai_strerror" = xyes then : - printf '%s\n' "#define HAVE_GAI_STRERROR 1" >>confdefs.h + printf "%s\n" "#define HAVE_GAI_STRERROR 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd" if test "x$ac_cv_func_getcwd" = xyes then : - printf '%s\n' "#define HAVE_GETCWD 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETCWD 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getgrnam_r" "ac_cv_func_getgrnam_r" if test "x$ac_cv_func_getgrnam_r" = xyes then : - printf '%s\n' "#define HAVE_GETGRNAM_R 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETGRNAM_R 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "gethostname" "ac_cv_func_gethostname" if test "x$ac_cv_func_gethostname" = xyes then : - printf '%s\n' "#define HAVE_GETHOSTNAME 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETHOSTNAME 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg" if test "x$ac_cv_func_getloadavg" = xyes then : - printf '%s\n' "#define HAVE_GETLOADAVG 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETLOADAVG 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getlogin" "ac_cv_func_getlogin" if test "x$ac_cv_func_getlogin" = xyes then : - printf '%s\n' "#define HAVE_GETLOGIN 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETLOGIN 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getprotobyname" "ac_cv_func_getprotobyname" if test "x$ac_cv_func_getprotobyname" = xyes then : - printf '%s\n' "#define HAVE_GETPROTOBYNAME 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETPROTOBYNAME 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getprotobynumber" "ac_cv_func_getprotobynumber" if test "x$ac_cv_func_getprotobynumber" = xyes then : - printf '%s\n' "#define HAVE_GETPROTOBYNUMBER 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETPROTOBYNUMBER 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getpwnam_r" "ac_cv_func_getpwnam_r" if test "x$ac_cv_func_getpwnam_r" = xyes then : - printf '%s\n' "#define HAVE_GETPWNAM_R 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETPWNAM_R 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getpwuid_r" "ac_cv_func_getpwuid_r" if test "x$ac_cv_func_getpwuid_r" = xyes then : - printf '%s\n' "#define HAVE_GETPWUID_R 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETPWUID_R 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getrusage" "ac_cv_func_getrusage" if test "x$ac_cv_func_getrusage" = xyes then : - printf '%s\n' "#define HAVE_GETRUSAGE 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETRUSAGE 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getservbyname" "ac_cv_func_getservbyname" if test "x$ac_cv_func_getservbyname" = xyes then : - printf '%s\n' "#define HAVE_GETSERVBYNAME 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETSERVBYNAME 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getservbyport" "ac_cv_func_getservbyport" if test "x$ac_cv_func_getservbyport" = xyes then : - printf '%s\n' "#define HAVE_GETSERVBYPORT 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETSERVBYPORT 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" if test "x$ac_cv_func_gettimeofday" = xyes then : - printf '%s\n' "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getwd" "ac_cv_func_getwd" if test "x$ac_cv_func_getwd" = xyes then : - printf '%s\n' "#define HAVE_GETWD 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETWD 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "glob" "ac_cv_func_glob" if test "x$ac_cv_func_glob" = xyes then : - printf '%s\n' "#define HAVE_GLOB 1" >>confdefs.h + printf "%s\n" "#define HAVE_GLOB 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r" if test "x$ac_cv_func_gmtime_r" = xyes then : - printf '%s\n' "#define HAVE_GMTIME_R 1" >>confdefs.h + printf "%s\n" "#define HAVE_GMTIME_R 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "lchown" "ac_cv_func_lchown" if test "x$ac_cv_func_lchown" = xyes then : - printf '%s\n' "#define HAVE_LCHOWN 1" >>confdefs.h + printf "%s\n" "#define HAVE_LCHOWN 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r" if test "x$ac_cv_func_localtime_r" = xyes then : - printf '%s\n' "#define HAVE_LOCALTIME_R 1" >>confdefs.h + printf "%s\n" "#define HAVE_LOCALTIME_R 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "memcntl" "ac_cv_func_memcntl" if test "x$ac_cv_func_memcntl" = xyes then : - printf '%s\n' "#define HAVE_MEMCNTL 1" >>confdefs.h + printf "%s\n" "#define HAVE_MEMCNTL 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "memfd_create" "ac_cv_func_memfd_create" if test "x$ac_cv_func_memfd_create" = xyes then : - printf '%s\n' "#define HAVE_MEMFD_CREATE 1" >>confdefs.h + printf "%s\n" "#define HAVE_MEMFD_CREATE 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "memmem" "ac_cv_func_memmem" if test "x$ac_cv_func_memmem" = xyes then : - printf '%s\n' "#define HAVE_MEMMEM 1" >>confdefs.h + printf "%s\n" "#define HAVE_MEMMEM 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "mempcpy" "ac_cv_func_mempcpy" if test "x$ac_cv_func_mempcpy" = xyes then : - printf '%s\n' "#define HAVE_MEMPCPY 1" >>confdefs.h + printf "%s\n" "#define HAVE_MEMPCPY 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "memrchr" "ac_cv_func_memrchr" if test "x$ac_cv_func_memrchr" = xyes then : - printf '%s\n' "#define HAVE_MEMRCHR 1" >>confdefs.h + printf "%s\n" "#define HAVE_MEMRCHR 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp" if test "x$ac_cv_func_mkstemp" = xyes then : - printf '%s\n' "#define HAVE_MKSTEMP 1" >>confdefs.h + printf "%s\n" "#define HAVE_MKSTEMP 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" if test "x$ac_cv_func_mmap" = xyes then : - printf '%s\n' "#define HAVE_MMAP 1" >>confdefs.h + printf "%s\n" "#define HAVE_MMAP 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "nice" "ac_cv_func_nice" if test "x$ac_cv_func_nice" = xyes then : - printf '%s\n' "#define HAVE_NICE 1" >>confdefs.h + printf "%s\n" "#define HAVE_NICE 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo" if test "x$ac_cv_func_nl_langinfo" = xyes then : - printf '%s\n' "#define HAVE_NL_LANGINFO 1" >>confdefs.h + printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll" if test "x$ac_cv_func_poll" = xyes then : - printf '%s\n' "#define HAVE_POLL 1" >>confdefs.h + printf "%s\n" "#define HAVE_POLL 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "pthread_jit_write_protect_np" "ac_cv_func_pthread_jit_write_protect_np" if test "x$ac_cv_func_pthread_jit_write_protect_np" = xyes then : - printf '%s\n' "#define HAVE_PTHREAD_JIT_WRITE_PROTECT_NP 1" >>confdefs.h + printf "%s\n" "#define HAVE_PTHREAD_JIT_WRITE_PROTECT_NP 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" if test "x$ac_cv_func_putenv" = xyes then : - printf '%s\n' "#define HAVE_PUTENV 1" >>confdefs.h + printf "%s\n" "#define HAVE_PUTENV 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "scandir" "ac_cv_func_scandir" if test "x$ac_cv_func_scandir" = xyes then : - printf '%s\n' "#define HAVE_SCANDIR 1" >>confdefs.h + printf "%s\n" "#define HAVE_SCANDIR 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "setenv" "ac_cv_func_setenv" if test "x$ac_cv_func_setenv" = xyes then : - printf '%s\n' "#define HAVE_SETENV 1" >>confdefs.h + printf "%s\n" "#define HAVE_SETENV 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "setitimer" "ac_cv_func_setitimer" if test "x$ac_cv_func_setitimer" = xyes then : - printf '%s\n' "#define HAVE_SETITIMER 1" >>confdefs.h + printf "%s\n" "#define HAVE_SETITIMER 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "shutdown" "ac_cv_func_shutdown" if test "x$ac_cv_func_shutdown" = xyes then : - printf '%s\n' "#define HAVE_SHUTDOWN 1" >>confdefs.h + printf "%s\n" "#define HAVE_SHUTDOWN 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask" if test "x$ac_cv_func_sigprocmask" = xyes then : - printf '%s\n' "#define HAVE_SIGPROCMASK 1" >>confdefs.h + printf "%s\n" "#define HAVE_SIGPROCMASK 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "statfs" "ac_cv_func_statfs" if test "x$ac_cv_func_statfs" = xyes then : - printf '%s\n' "#define HAVE_STATFS 1" >>confdefs.h + printf "%s\n" "#define HAVE_STATFS 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "statvfs" "ac_cv_func_statvfs" if test "x$ac_cv_func_statvfs" = xyes then : - printf '%s\n' "#define HAVE_STATVFS 1" >>confdefs.h + printf "%s\n" "#define HAVE_STATVFS 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "std_syslog" "ac_cv_func_std_syslog" if test "x$ac_cv_func_std_syslog" = xyes then : - printf '%s\n' "#define HAVE_STD_SYSLOG 1" >>confdefs.h + printf "%s\n" "#define HAVE_STD_SYSLOG 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" if test "x$ac_cv_func_strcasecmp" = xyes then : - printf '%s\n' "#define HAVE_STRCASECMP 1" >>confdefs.h + printf "%s\n" "#define HAVE_STRCASECMP 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen" if test "x$ac_cv_func_strnlen" = xyes then : - printf '%s\n' "#define HAVE_STRNLEN 1" >>confdefs.h + printf "%s\n" "#define HAVE_STRNLEN 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "strptime" "ac_cv_func_strptime" if test "x$ac_cv_func_strptime" = xyes then : - printf '%s\n' "#define HAVE_STRPTIME 1" >>confdefs.h + printf "%s\n" "#define HAVE_STRPTIME 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "strtok_r" "ac_cv_func_strtok_r" if test "x$ac_cv_func_strtok_r" = xyes then : - printf '%s\n' "#define HAVE_STRTOK_R 1" >>confdefs.h + printf "%s\n" "#define HAVE_STRTOK_R 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "symlink" "ac_cv_func_symlink" if test "x$ac_cv_func_symlink" = xyes then : - printf '%s\n' "#define HAVE_SYMLINK 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYMLINK 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "tzset" "ac_cv_func_tzset" if test "x$ac_cv_func_tzset" = xyes then : - printf '%s\n' "#define HAVE_TZSET 1" >>confdefs.h + printf "%s\n" "#define HAVE_TZSET 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv" if test "x$ac_cv_func_unsetenv" = xyes then : - printf '%s\n' "#define HAVE_UNSETENV 1" >>confdefs.h + printf "%s\n" "#define HAVE_UNSETENV 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "usleep" "ac_cv_func_usleep" if test "x$ac_cv_func_usleep" = xyes then : - printf '%s\n' "#define HAVE_USLEEP 1" >>confdefs.h + printf "%s\n" "#define HAVE_USLEEP 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "utime" "ac_cv_func_utime" if test "x$ac_cv_func_utime" = xyes then : - printf '%s\n' "#define HAVE_UTIME 1" >>confdefs.h + printf "%s\n" "#define HAVE_UTIME 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf" if test "x$ac_cv_func_vasprintf" = xyes then : - printf '%s\n' "#define HAVE_VASPRINTF 1" >>confdefs.h + printf "%s\n" "#define HAVE_VASPRINTF 1" >>confdefs.h fi @@ -16601,8 +16740,8 @@ then : else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Required inet_ntop not found. See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -16613,15 +16752,15 @@ then : else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Required inet_pton not found. See 'config.log' for more details" "$LINENO" 5; } ;; esac fi -ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_strerror_r" = xyes then : ac_have_decl=1 @@ -16629,7 +16768,7 @@ e) ac_have_decl=0 ;; esac fi -printf '%s\n' "#define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h +printf "%s\n" "#define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h if test $ac_cv_have_decl_strerror_r = yes; then @@ -16637,11 +16776,11 @@ # (We used to run AC_CHECK_FUNCS_ONCE for strerror_r, as well # as AC_CHECK_DECLS_ONCE.) -printf '%s\n' "#define HAVE_STRERROR_R 1" >>confdefs.h +printf "%s\n" "#define HAVE_STRERROR_R 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5 printf %s "checking whether strerror_r returns char *... " >&6; } if test ${ac_cv_func_strerror_r_char_p+y} then : @@ -16676,11 +16815,11 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5 -printf '%s\n' "$ac_cv_func_strerror_r_char_p" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5 +printf "%s\n" "$ac_cv_func_strerror_r_char_p" >&6; } if test $ac_cv_func_strerror_r_char_p = yes; then -printf '%s\n' "#define STRERROR_R_CHAR_P 1" >>confdefs.h +printf "%s\n" "#define STRERROR_R_CHAR_P 1" >>confdefs.h fi @@ -16691,7 +16830,7 @@ ac_fn_c_check_func "$LINENO" "prctl" "ac_cv_func_prctl" if test "x$ac_cv_func_prctl" = xyes then : - printf '%s\n' "#define HAVE_PRCTL 1" >>confdefs.h + printf "%s\n" "#define HAVE_PRCTL 1" >>confdefs.h fi @@ -16703,7 +16842,7 @@ ac_fn_c_check_func "$LINENO" "procctl" "ac_cv_func_procctl" if test "x$ac_cv_func_procctl" = xyes then : - printf '%s\n' "#define HAVE_PROCCTL 1" >>confdefs.h + printf "%s\n" "#define HAVE_PROCCTL 1" >>confdefs.h fi @@ -16718,7 +16857,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how many arguments gethostbyname_r() takes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how many arguments gethostbyname_r() takes" >&5 printf %s "checking how many arguments gethostbyname_r() takes... " >&6; } if test ${ac_cv_func_which_gethostbyname_r+y} @@ -16866,44 +17005,44 @@ case "$ac_cv_func_which_gethostbyname_r" in three|five|six) -printf '%s\n' "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h +printf "%s\n" "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h ;; esac case "$ac_cv_func_which_gethostbyname_r" in three) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: three" >&5 -printf '%s\n' "three" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: three" >&5 +printf "%s\n" "three" >&6; } -printf '%s\n' "#define HAVE_FUNC_GETHOSTBYNAME_R_3 1" >>confdefs.h +printf "%s\n" "#define HAVE_FUNC_GETHOSTBYNAME_R_3 1" >>confdefs.h ;; five) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: five" >&5 -printf '%s\n' "five" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: five" >&5 +printf "%s\n" "five" >&6; } -printf '%s\n' "#define HAVE_FUNC_GETHOSTBYNAME_R_5 1" >>confdefs.h +printf "%s\n" "#define HAVE_FUNC_GETHOSTBYNAME_R_5 1" >>confdefs.h ;; six) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: six" >&5 -printf '%s\n' "six" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: six" >&5 +printf "%s\n" "six" >&6; } -printf '%s\n' "#define HAVE_FUNC_GETHOSTBYNAME_R_6 1" >>confdefs.h +printf "%s\n" "#define HAVE_FUNC_GETHOSTBYNAME_R_6 1" >>confdefs.h ;; no) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: cannot find function declaration in netdb.h" >&5 -printf '%s\n' "cannot find function declaration in netdb.h" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot find function declaration in netdb.h" >&5 +printf "%s\n" "cannot find function declaration in netdb.h" >&6; } ;; unknown) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: can't tell" >&5 -printf '%s\n' "can't tell" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: can't tell" >&5 +printf "%s\n" "can't tell" >&6; } ;; *) @@ -16926,10 +17065,10 @@ ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep" if test "x$ac_cv_func_nanosleep" = xyes then : - printf '%s\n' "#define HAVE_NANOSLEEP 1" >>confdefs.h + printf "%s\n" "#define HAVE_NANOSLEEP 1" >>confdefs.h else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing nanosleep" >&5 + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing nanosleep" >&5 printf %s "checking for library containing nanosleep... " >&6; } if test ${ac_cv_search_nanosleep+y} then : @@ -16987,13 +17126,13 @@ LIBS=$ac_func_search_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_nanosleep" >&5 -printf '%s\n' "$ac_cv_search_nanosleep" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_nanosleep" >&5 +printf "%s\n" "$ac_cv_search_nanosleep" >&6; } ac_res=$ac_cv_search_nanosleep if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - printf '%s\n' "#define HAVE_NANOSLEEP 1" >>confdefs.h + printf "%s\n" "#define HAVE_NANOSLEEP 1" >>confdefs.h fi ;; @@ -17002,7 +17141,7 @@ done -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5 printf %s "checking for getaddrinfo... " >&6; } if test ${php_cv_func_getaddrinfo+y} then : @@ -17092,16 +17231,16 @@ conftest$ac_exeext conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_getaddrinfo" >&5 -printf '%s\n' "$php_cv_func_getaddrinfo" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_getaddrinfo" >&5 +printf "%s\n" "$php_cv_func_getaddrinfo" >&6; } if test "x$php_cv_func_getaddrinfo" = xyes then : -printf '%s\n' "#define HAVE_GETADDRINFO 1" >>confdefs.h +printf "%s\n" "#define HAVE_GETADDRINFO 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for copy_file_range" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for copy_file_range" >&5 printf %s "checking for copy_file_range... " >&6; } if test ${php_cv_func_copy_file_range+y} then : @@ -17139,19 +17278,19 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_copy_file_range" >&5 -printf '%s\n' "$php_cv_func_copy_file_range" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_copy_file_range" >&5 +printf "%s\n" "$php_cv_func_copy_file_range" >&6; } if test "x$php_cv_func_copy_file_range" = xyes then : -printf '%s\n' "#define HAVE_COPY_FILE_RANGE 1" >>confdefs.h +printf "%s\n" "#define HAVE_COPY_FILE_RANGE 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat" if test "x$ac_cv_func_strlcat" = xyes then : - printf '%s\n' "#define HAVE_STRLCAT 1" >>confdefs.h + printf "%s\n" "#define HAVE_STRLCAT 1" >>confdefs.h else case e in #( e) case " $LIBOBJS " in @@ -17165,7 +17304,7 @@ ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy" if test "x$ac_cv_func_strlcpy" = xyes then : - printf '%s\n' "#define HAVE_STRLCPY 1" >>confdefs.h + printf "%s\n" "#define HAVE_STRLCPY 1" >>confdefs.h else case e in #( e) case " $LIBOBJS " in @@ -17179,7 +17318,7 @@ ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero" if test "x$ac_cv_func_explicit_bzero" = xyes then : - printf '%s\n' "#define HAVE_EXPLICIT_BZERO 1" >>confdefs.h + printf "%s\n" "#define HAVE_EXPLICIT_BZERO 1" >>confdefs.h else case e in #( e) case " $LIBOBJS " in @@ -17193,7 +17332,7 @@ ac_fn_c_check_func "$LINENO" "getopt" "ac_cv_func_getopt" if test "x$ac_cv_func_getopt" = xyes then : - printf '%s\n' "#define HAVE_GETOPT 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETOPT 1" >>confdefs.h else case e in #( e) case " $LIBOBJS " in @@ -17211,14 +17350,14 @@ else case e in #( e) -printf '%s\n' "#define size_t unsigned int" >>confdefs.h +printf "%s\n" "#define size_t unsigned int" >>confdefs.h ;; esac fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 printf %s "checking for working alloca.h... " >&6; } if test ${ac_cv_working_alloca_h+y} then : @@ -17247,15 +17386,15 @@ conftest$ac_exeext conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 -printf '%s\n' "$ac_cv_working_alloca_h" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 +printf "%s\n" "$ac_cv_working_alloca_h" >&6; } if test $ac_cv_working_alloca_h = yes; then -printf '%s\n' "#define HAVE_ALLOCA_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 printf %s "checking for alloca... " >&6; } if test ${ac_cv_func_alloca_works+y} then : @@ -17300,12 +17439,12 @@ fi ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 -printf '%s\n' "$ac_cv_func_alloca_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 +printf "%s\n" "$ac_cv_func_alloca_works" >&6; } if test $ac_cv_func_alloca_works = yes; then -printf '%s\n' "#define HAVE_ALLOCA 1" >>confdefs.h +printf "%s\n" "#define HAVE_ALLOCA 1" >>confdefs.h else # The SVR3 libPW and SVR4 libucb both contain incompatible functions @@ -17315,10 +17454,10 @@ ALLOCA=\${LIBOBJDIR}alloca.$ac_objext -printf '%s\n' "#define C_ALLOCA 1" >>confdefs.h +printf "%s\n" "#define C_ALLOCA 1" >>confdefs.h -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 printf %s "checking stack direction for C alloca... " >&6; } if test ${ac_cv_c_stack_direction+y} then : @@ -17362,14 +17501,14 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 -printf '%s\n' "$ac_cv_c_stack_direction" >&6; } -printf '%s\n' "#define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 +printf "%s\n" "$ac_cv_c_stack_direction" >&6; } +printf "%s\n" "#define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for type of reentrant time-related functions" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for type of reentrant time-related functions" >&5 printf %s "checking for type of reentrant time-related functions... " >&6; } if test ${php_cv_time_r_type+y} then : @@ -17443,23 +17582,23 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_time_r_type" >&5 -printf '%s\n' "$php_cv_time_r_type" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_time_r_type" >&5 +printf "%s\n" "$php_cv_time_r_type" >&6; } case $php_cv_time_r_type in #( hpux) : -printf '%s\n' "#define PHP_HPUX_TIME_R 1" >>confdefs.h +printf "%s\n" "#define PHP_HPUX_TIME_R 1" >>confdefs.h ;; #( irix) : -printf '%s\n' "#define PHP_IRIX_TIME_R 1" >>confdefs.h +printf "%s\n" "#define PHP_IRIX_TIME_R 1" >>confdefs.h ;; #( *) : ;; esac -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for aarch64 CRC32 API" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for aarch64 CRC32 API" >&5 printf %s "checking for aarch64 CRC32 API... " >&6; } if test ${php_cv_func___crc32d+y} then : @@ -17499,16 +17638,16 @@ conftest$ac_exeext conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_func___crc32d" >&5 -printf '%s\n' "$php_cv_func___crc32d" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_func___crc32d" >&5 +printf "%s\n" "$php_cv_func___crc32d" >&6; } if test "x$php_cv_func___crc32d" = xyes then : -printf '%s\n' "#define HAVE_AARCH64_CRC32 1" >>confdefs.h +printf "%s\n" "#define HAVE_AARCH64_CRC32 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for asm goto" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for asm goto" >&5 printf %s "checking for asm goto... " >&6; } if test ${php_cv_have__asm_goto+y} then : @@ -17544,19 +17683,19 @@ conftest$ac_exeext conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have__asm_goto" >&5 -printf '%s\n' "$php_cv_have__asm_goto" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have__asm_goto" >&5 +printf "%s\n" "$php_cv_have__asm_goto" >&6; } if test "x$php_cv_have__asm_goto" = xyes then : -printf '%s\n' "#define HAVE_ASM_GOTO 1" >>confdefs.h +printf "%s\n" "#define HAVE_ASM_GOTO 1" >>confdefs.h fi php_with_valgrind=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable Valgrind support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable Valgrind support" >&5 printf %s "checking whether to enable Valgrind support... " >&6; } # Check whether --with-valgrind was given. @@ -17573,8 +17712,8 @@ ext_output=$PHP_VALGRIND -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -17586,17 +17725,17 @@ e) pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for valgrind" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for valgrind" >&5 printf %s "checking for valgrind... " >&6; } if test -n "$VALGRIND_CFLAGS"; then pkg_cv_VALGRIND_CFLAGS="$VALGRIND_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind\""; } >&5 ($PKG_CONFIG --exists --print-errors "valgrind") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VALGRIND_CFLAGS=`$PKG_CONFIG --cflags "valgrind" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -17610,10 +17749,10 @@ pkg_cv_VALGRIND_LIBS="$VALGRIND_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind\""; } >&5 ($PKG_CONFIG --exists --print-errors "valgrind") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VALGRIND_LIBS=`$PKG_CONFIG --libs "valgrind" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -17627,8 +17766,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -17654,10 +17793,10 @@ and VALGRIND_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -17671,8 +17810,8 @@ else VALGRIND_CFLAGS=$pkg_cv_VALGRIND_CFLAGS VALGRIND_LIBS=$pkg_cv_VALGRIND_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } for ac_i in $VALGRIND_CFLAGS; do case $ac_i in @@ -17717,7 +17856,7 @@ done -printf '%s\n' "#define HAVE_VALGRIND 1" >>confdefs.h +printf "%s\n" "#define HAVE_VALGRIND 1" >>confdefs.h fi save_CFLAGS=$CFLAGS @@ -17725,7 +17864,7 @@ ac_fn_c_check_header_compile "$LINENO" "valgrind/cachegrind.h" "ac_cv_header_valgrind_cachegrind_h" "$ac_includes_default" if test "x$ac_cv_header_valgrind_cachegrind_h" = xyes then : - printf '%s\n' "#define HAVE_VALGRIND_CACHEGRIND_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_VALGRIND_CACHEGRIND_H 1" >>confdefs.h fi @@ -17735,10 +17874,10 @@ fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5 -printf '%s\n' "" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${T_MD}General settings${T_ME}" >&5 -printf '%s\n' "${T_MD}General settings${T_ME}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}General settings${T_ME}" >&5 +printf "%s\n" "${T_MD}General settings${T_ME}" >&6; } # Check whether --enable- was given. @@ -17751,7 +17890,7 @@ php_enable_gcov=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to include gcov symbols" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to include gcov symbols" >&5 printf %s "checking whether to include gcov symbols... " >&6; } # Check whether --enable-gcov was given. if test ${enable_gcov+y} @@ -17767,8 +17906,8 @@ ext_output=$PHP_GCOV -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -17797,7 +17936,7 @@ fi -printf '%s\n' "#define HAVE_GCOV 1" >>confdefs.h +printf "%s\n" "#define HAVE_GCOV 1" >>confdefs.h src=$abs_srcdir/build/Makefile.gcov ac_srcdir=$abs_srcdir @@ -17819,7 +17958,7 @@ php_enable_debug=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to include debugging symbols" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to include debugging symbols" >&5 printf %s "checking whether to include debugging symbols... " >&6; } # Check whether --enable-debug was given. if test ${enable_debug+y} @@ -17835,8 +17974,8 @@ ext_output=$PHP_DEBUG -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -17876,7 +18015,7 @@ php_enable_debug_assertions=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable debug assertions in release mode" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable debug assertions in release mode" >&5 printf %s "checking whether to enable debug assertions in release mode... " >&6; } # Check whether --enable-debug-assertions was given. if test ${enable_debug_assertions+y} @@ -17892,8 +18031,8 @@ ext_output=$PHP_DEBUG_ASSERTIONS -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -17931,25 +18070,25 @@ then : else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Unable to verify system support for POSIX Threads, which are required for PHP thread safety (ZTS) build. See 'config.log' for more details" "$LINENO" 5; } ;; esac fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for POSIX threads" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for POSIX threads" >&5 printf %s "checking for POSIX threads... " >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi php_enable_rtld_now=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY" >&5 printf %s "checking whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY... " >&6; } # Check whether --enable-rtld-now was given. if test ${enable_rtld_now+y} @@ -17965,8 +18104,8 @@ ext_output=$PHP_RTLD_NOW -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -17974,14 +18113,14 @@ if test "x$PHP_RTLD_NOW" = xyes then : -printf '%s\n' "#define PHP_USE_RTLD_NOW 1" >>confdefs.h +printf "%s\n" "#define PHP_USE_RTLD_NOW 1" >>confdefs.h fi php_with_layout=PHP -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking layout of installed files" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking layout of installed files" >&5 printf %s "checking layout of installed files... " >&6; } # Check whether --with-layout was given. @@ -17998,8 +18137,8 @@ ext_output=$PHP_LAYOUT -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -18014,7 +18153,7 @@ php_with_config_file_path=DEFAULT -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking path to configuration file" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking path to configuration file" >&5 printf %s "checking path to configuration file... " >&6; } # Check whether --with-config-file-path was given. @@ -18031,8 +18170,8 @@ ext_output=$PHP_CONFIG_FILE_PATH -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -18047,7 +18186,7 @@ esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking where to scan for configuration files" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to scan for configuration files" >&5 printf %s "checking where to scan for configuration files... " >&6; } php_with_config_file_scan_dir=DEFAULT @@ -18077,13 +18216,13 @@ then : PHP_CONFIG_FILE_SCAN_DIR= fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $PHP_CONFIG_FILE_SCAN_DIR" >&5 -printf '%s\n' "$PHP_CONFIG_FILE_SCAN_DIR" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_CONFIG_FILE_SCAN_DIR" >&5 +printf "%s\n" "$PHP_CONFIG_FILE_SCAN_DIR" >&6; } php_enable_sigchild=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable PHP's own SIGCHLD handler" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable PHP's own SIGCHLD handler" >&5 printf %s "checking whether to enable PHP's own SIGCHLD handler... " >&6; } # Check whether --enable-sigchild was given. if test ${enable_sigchild+y} @@ -18099,8 +18238,8 @@ ext_output=$PHP_SIGCHILD -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -18108,10 +18247,10 @@ if test "x$PHP_SIGCHILD" = xyes then : - printf '%s\n' "#define PHP_SIGCHILD 1" >>confdefs.h + printf "%s\n" "#define PHP_SIGCHILD 1" >>confdefs.h else case e in #( - e) printf '%s\n' "#define PHP_SIGCHILD 0" >>confdefs.h + e) printf "%s\n" "#define PHP_SIGCHILD 0" >>confdefs.h ;; esac fi @@ -18119,7 +18258,7 @@ php_enable_libgcc=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to explicitly link against libgcc" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to explicitly link against libgcc" >&5 printf %s "checking whether to explicitly link against libgcc... " >&6; } # Check whether --enable-libgcc was given. if test ${enable_libgcc+y} @@ -18135,8 +18274,8 @@ ext_output=$PHP_LIBGCC -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -18206,7 +18345,7 @@ php_enable_short_tags=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable short tags by default" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable short tags by default" >&5 printf %s "checking whether to enable short tags by default... " >&6; } # Check whether --enable-short-tags was given. if test ${enable_short_tags+y} @@ -18222,8 +18361,8 @@ ext_output=$PHP_SHORT_TAGS -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -18231,10 +18370,10 @@ if test "x$PHP_SHORT_TAGS" = xyes then : - printf '%s\n' "#define DEFAULT_SHORT_OPEN_TAG \"1\"" >>confdefs.h + printf "%s\n" "#define DEFAULT_SHORT_OPEN_TAG \"1\"" >>confdefs.h else case e in #( - e) printf '%s\n' "#define DEFAULT_SHORT_OPEN_TAG \"0\"" >>confdefs.h + e) printf "%s\n" "#define DEFAULT_SHORT_OPEN_TAG \"0\"" >>confdefs.h ;; esac fi @@ -18242,7 +18381,7 @@ php_enable_dmalloc=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable dmalloc" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable dmalloc" >&5 printf %s "checking whether to enable dmalloc... " >&6; } # Check whether --enable-dmalloc was given. if test ${enable_dmalloc+y} @@ -18258,15 +18397,15 @@ ext_output=$PHP_DMALLOC -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } if test "x$PHP_DMALLOC" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dmalloc_error in -ldmalloc" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dmalloc_error in -ldmalloc" >&5 printf %s "checking for dmalloc_error in -ldmalloc... " >&6; } if test ${ac_cv_lib_dmalloc_dmalloc_error+y} then : @@ -18307,8 +18446,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmalloc_dmalloc_error" >&5 -printf '%s\n' "$ac_cv_lib_dmalloc_dmalloc_error" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmalloc_dmalloc_error" >&5 +printf "%s\n" "$ac_cv_lib_dmalloc_dmalloc_error" >&6; } if test "x$ac_cv_lib_dmalloc_dmalloc_error" = xyes then : @@ -18322,12 +18461,12 @@ -printf '%s\n' "#define HAVE_DMALLOC 1" >>confdefs.h +printf "%s\n" "#define HAVE_DMALLOC 1" >>confdefs.h as_fn_append CPPFLAGS " -DDMALLOC_FUNC_CHECK" else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The dmalloc check failed. Cannot enable dmalloc. See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -18338,7 +18477,7 @@ php_enable_ipv6=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable IPv6 support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable IPv6 support" >&5 printf %s "checking whether to enable IPv6 support... " >&6; } # Check whether --enable-ipv6 was given. if test ${enable_ipv6+y} @@ -18354,15 +18493,15 @@ ext_output=$PHP_IPV6 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } if test "x$PHP_IPV6" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for IPv6 support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IPv6 support" >&5 printf %s "checking for IPv6 support... " >&6; } if test ${php_cv_have_ipv6+y} then : @@ -18401,21 +18540,21 @@ conftest$ac_exeext conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_ipv6" >&5 -printf '%s\n' "$php_cv_have_ipv6" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_ipv6" >&5 +printf "%s\n" "$php_cv_have_ipv6" >&6; } fi if test "x$php_cv_have_ipv6" = xyes then : -printf '%s\n' "#define HAVE_IPV6 1" >>confdefs.h +printf "%s\n" "#define HAVE_IPV6 1" >>confdefs.h fi php_enable_dtrace=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable DTrace support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable DTrace support" >&5 printf %s "checking whether to enable DTrace support... " >&6; } # Check whether --enable-dtrace was given. if test ${enable_dtrace+y} @@ -18431,8 +18570,8 @@ ext_output=$PHP_DTRACE -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -18445,8 +18584,8 @@ then : else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Cannot find required to enable DTrace support. See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -18554,12 +18693,12 @@ -printf '%s\n' "#define HAVE_DTRACE 1" >>confdefs.h +printf "%s\n" "#define HAVE_DTRACE 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how big to make fd sets" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how big to make fd sets" >&5 printf %s "checking how big to make fd sets... " >&6; } php_enable_fd_setsize=no @@ -18586,14 +18725,14 @@ if test "x$PHP_FD_SETSIZE" = xno then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: using system default" >&5 -printf '%s\n' "using system default" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using system default" >&5 +printf "%s\n" "using system default" >&6; } else case e in #( e) if test "0$PHP_FD_SETSIZE" -gt 0 2>/dev/null; then CPPFLAGS="$CPPFLAGS -DFD_SETSIZE=$PHP_FD_SETSIZE" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: using $PHP_FD_SETSIZE" >&5 -printf '%s\n' "using $PHP_FD_SETSIZE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using $PHP_FD_SETSIZE" >&5 +printf "%s\n" "using $PHP_FD_SETSIZE" >&6; } else as_fn_error $? "Invalid value passed to --enable-fd-setsize!" "$LINENO" 5 fi @@ -18699,10 +18838,10 @@ - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5 -printf '%s\n' "" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring extensions${T_ME}" >&5 -printf '%s\n' "${T_MD}Configuring extensions${T_ME}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring extensions${T_ME}" >&5 +printf "%s\n" "${T_MD}Configuring extensions${T_ME}" >&6; } # Check whether --enable-all was given. @@ -18718,7 +18857,7 @@ ac_fn_c_check_header_compile "$LINENO" "io.h" "ac_cv_header_io_h" "$ac_includes_default" if test "x$ac_cv_header_io_h" = xyes then : - printf '%s\n' "#define HAVE_IO_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_IO_H 1" >>confdefs.h fi @@ -18726,18 +18865,18 @@ ac_fn_c_check_func "$LINENO" "strtoll" "ac_cv_func_strtoll" if test "x$ac_cv_func_strtoll" = xyes then : - printf '%s\n' "#define HAVE_STRTOLL 1" >>confdefs.h + printf "%s\n" "#define HAVE_STRTOLL 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "atoll" "ac_cv_func_atoll" if test "x$ac_cv_func_atoll" = xyes then : - printf '%s\n' "#define HAVE_ATOLL 1" >>confdefs.h + printf "%s\n" "#define HAVE_ATOLL 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wno-implicit-fallthrough" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wno-implicit-fallthrough" >&5 printf %s "checking whether the C compiler accepts -Wno-implicit-fallthrough... " >&6; } if test ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+y} then : @@ -18768,8 +18907,8 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5 -printf '%s\n' "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5 +printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; } if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes then : PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough" @@ -18781,7 +18920,7 @@ PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1" -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -fwrapv" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -fwrapv" >&5 printf %s "checking whether the C compiler accepts -fwrapv... " >&6; } if test ${ax_cv_check_cflags___fwrapv+y} then : @@ -18812,8 +18951,8 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fwrapv" >&5 -printf '%s\n' "$ax_cv_check_cflags___fwrapv" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fwrapv" >&5 +printf "%s\n" "$ax_cv_check_cflags___fwrapv" >&6; } if test "x$ax_cv_check_cflags___fwrapv" = xyes then : PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -fwrapv" @@ -18961,7 +19100,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_DATE 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_DATE 1" >>confdefs.h fi fi @@ -19169,7 +19308,7 @@ -printf '%s\n' "#define HAVE_TIMELIB_CONFIG_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_TIMELIB_CONFIG_H 1" >>confdefs.h cat > $ext_builddir/lib/timelib_config.h <&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with LIBXML support" >&5 printf %s "checking whether to build with LIBXML support... " >&6; } # Check whether --with-libxml was given. @@ -19235,8 +19374,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -19247,17 +19386,17 @@ pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.4" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.4" >&5 printf %s "checking for libxml-2.0 >= 2.9.4... " >&6; } if test -n "$LIBXML_CFLAGS"; then pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.4") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -19271,10 +19410,10 @@ pkg_cv_LIBXML_LIBS="$LIBXML_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.4") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -19288,8 +19427,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -19315,10 +19454,10 @@ and LIBXML_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -19332,8 +19471,8 @@ else LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS LIBXML_LIBS=$pkg_cv_LIBXML_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -19493,7 +19632,7 @@ -printf '%s\n' "#define HAVE_LIBXML 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h ext_builddir=ext/libxml @@ -19630,7 +19769,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_LIBXML 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_LIBXML 1" >>confdefs.h fi fi @@ -19775,7 +19914,7 @@ php_with_openssl=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for OpenSSL support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL support" >&5 printf %s "checking for OpenSSL support... " >&6; } # Check whether --with-openssl was given. @@ -19813,8 +19952,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -19822,7 +19961,7 @@ php_with_system_ciphers=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use system default cipher list instead of hardcoded value" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use system default cipher list instead of hardcoded value" >&5 printf %s "checking whether to use system default cipher list instead of hardcoded value... " >&6; } # Check whether --with-system-ciphers was given. @@ -19839,8 +19978,8 @@ ext_output=$PHP_SYSTEM_CIPHERS -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -19848,7 +19987,7 @@ php_with_openssl_legacy_provider=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to load legacy algorithm provider" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to load legacy algorithm provider" >&5 printf %s "checking whether to load legacy algorithm provider... " >&6; } # Check whether --with-openssl-legacy-provider was given. @@ -19865,8 +20004,8 @@ ext_output=$PHP_OPENSSL_LEGACY_PROVIDER -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -19874,7 +20013,7 @@ php_with_openssl_argon2=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable argon2 password hashing (requires OpenSSL >= 3.2)" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable argon2 password hashing (requires OpenSSL >= 3.2)" >&5 printf %s "checking whether to enable argon2 password hashing (requires OpenSSL >= 3.2)... " >&6; } # Check whether --with-openssl-argon2 was given. @@ -19891,8 +20030,8 @@ ext_output=$PHP_OPENSSL_ARGON2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -20033,7 +20172,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_OPENSSL 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_OPENSSL 1" >>confdefs.h fi fi @@ -20159,17 +20298,17 @@ pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.1.1" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.1.1" >&5 printf %s "checking for openssl >= 1.1.1... " >&6; } if test -n "$OPENSSL_CFLAGS"; then pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.1\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "openssl >= 1.1.1") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.1.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -20183,10 +20322,10 @@ pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.1\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "openssl >= 1.1.1") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.1.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -20200,8 +20339,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -20227,10 +20366,10 @@ and OPENSSL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -20244,8 +20383,8 @@ else OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } found_openssl=yes fi @@ -20406,7 +20545,7 @@ done -printf '%s\n' "#define HAVE_OPENSSL_EXT 1" >>confdefs.h +printf "%s\n" "#define HAVE_OPENSSL_EXT 1" >>confdefs.h fi @@ -20529,7 +20668,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for RAND_egd in -lcrypto" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for RAND_egd in -lcrypto" >&5 printf %s "checking for RAND_egd in -lcrypto... " >&6; } if test ${ac_cv_lib_crypto_RAND_egd+y} then : @@ -20570,15 +20709,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RAND_egd" >&5 -printf '%s\n' "$ac_cv_lib_crypto_RAND_egd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RAND_egd" >&5 +printf "%s\n" "$ac_cv_lib_crypto_RAND_egd" >&6; } if test "x$ac_cv_lib_crypto_RAND_egd" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_RAND_EGD 1" >>confdefs.h +printf "%s\n" "#define HAVE_RAND_EGD 1" >>confdefs.h else case e in #( @@ -20597,7 +20736,7 @@ else case e in #( e) -printf '%s\n' "#define USE_OPENSSL_SYSTEM_CIPHERS 1" >>confdefs.h +printf "%s\n" "#define USE_OPENSSL_SYSTEM_CIPHERS 1" >>confdefs.h ;; esac fi @@ -20607,7 +20746,7 @@ else case e in #( e) -printf '%s\n' "#define LOAD_OPENSSL_LEGACY_PROVIDER 1" >>confdefs.h +printf "%s\n" "#define LOAD_OPENSSL_LEGACY_PROVIDER 1" >>confdefs.h ;; esac fi @@ -20740,7 +20879,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for OSSL_set_max_threads in -lcrypto" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OSSL_set_max_threads in -lcrypto" >&5 printf %s "checking for OSSL_set_max_threads in -lcrypto... " >&6; } if test ${ac_cv_lib_crypto_OSSL_set_max_threads+y} then : @@ -20781,15 +20920,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_OSSL_set_max_threads" >&5 -printf '%s\n' "$ac_cv_lib_crypto_OSSL_set_max_threads" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_OSSL_set_max_threads" >&5 +printf "%s\n" "$ac_cv_lib_crypto_OSSL_set_max_threads" >&6; } if test "x$ac_cv_lib_crypto_OSSL_set_max_threads" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_OPENSSL_ARGON2 1" >>confdefs.h +printf "%s\n" "#define HAVE_OPENSSL_ARGON2 1" >>confdefs.h else case e in #( @@ -20837,7 +20976,7 @@ php_with_pcre_jit=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable PCRE JIT functionality" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable PCRE JIT functionality" >&5 printf %s "checking whether to enable PCRE JIT functionality... " >&6; } # Check whether --with-pcre-jit was given. @@ -20854,8 +20993,8 @@ ext_output=$PHP_PCRE_JIT -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -20866,17 +21005,17 @@ if test "$PHP_EXTERNAL_PCRE" != "no"; then pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libpcre2-8 >= 10.30" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpcre2-8 >= 10.30" >&5 printf %s "checking for libpcre2-8 >= 10.30... " >&6; } if test -n "$PCRE2_CFLAGS"; then pkg_cv_PCRE2_CFLAGS="$PCRE2_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8 >= 10.30\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8 >= 10.30\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpcre2-8 >= 10.30") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PCRE2_CFLAGS=`$PKG_CONFIG --cflags "libpcre2-8 >= 10.30" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -20890,10 +21029,10 @@ pkg_cv_PCRE2_LIBS="$PCRE2_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8 >= 10.30\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8 >= 10.30\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpcre2-8 >= 10.30") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PCRE2_LIBS=`$PKG_CONFIG --libs "libpcre2-8 >= 10.30" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -20907,8 +21046,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -20934,10 +21073,10 @@ and PCRE2_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -20951,8 +21090,8 @@ else PCRE2_CFLAGS=$pkg_cv_PCRE2_CFLAGS PCRE2_LIBS=$pkg_cv_PCRE2_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -21093,14 +21232,14 @@ esac done - printf '%s\n' "#define PCRE2_CODE_UNIT_WIDTH 8" >>confdefs.h + printf "%s\n" "#define PCRE2_CODE_UNIT_WIDTH 8" >>confdefs.h if test "x$PHP_PCRE_JIT" = xno then : else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether external PCRE2 library has JIT supported" >&5 + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether external PCRE2 library has JIT supported" >&5 printf %s "checking whether external PCRE2 library has JIT supported... " >&6; } if test ${php_cv_have_pcre2_jit+y} then : @@ -21149,11 +21288,11 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_pcre2_jit" >&5 -printf '%s\n' "$php_cv_have_pcre2_jit" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_pcre2_jit" >&5 +printf "%s\n" "$php_cv_have_pcre2_jit" >&6; } if test "x$php_cv_have_pcre2_jit" = xyes then : - printf '%s\n' "#define HAVE_PCRE_JIT_SUPPORT 1" >>confdefs.h + printf "%s\n" "#define HAVE_PCRE_JIT_SUPPORT 1" >>confdefs.h fi ;; @@ -21295,7 +21434,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_PCRE 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_PCRE 1" >>confdefs.h fi fi @@ -21431,13 +21570,13 @@ else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PCRE library to use" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PCRE library to use" >&5 printf %s "checking for PCRE library to use... " >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: bundled" >&5 -printf '%s\n' "bundled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: bundled" >&5 +printf "%s\n" "bundled" >&6; } pcrelib_sources=" pcre2lib/pcre2_auto_possess.c pcre2lib/pcre2_chartables.c pcre2lib/pcre2_chkdint.c pcre2lib/pcre2_compile.c pcre2lib/pcre2_config.c pcre2lib/pcre2_context.c pcre2lib/pcre2_convert.c pcre2lib/pcre2_dfa_match.c pcre2lib/pcre2_error.c pcre2lib/pcre2_extuni.c pcre2lib/pcre2_find_bracket.c pcre2lib/pcre2_jit_compile.c pcre2lib/pcre2_maketables.c pcre2lib/pcre2_match_data.c pcre2lib/pcre2_match.c pcre2lib/pcre2_newline.c pcre2lib/pcre2_ord2utf.c pcre2lib/pcre2_pattern_info.c pcre2lib/pcre2_script_run.c pcre2lib/pcre2_serialize.c pcre2lib/pcre2_string_utils.c pcre2lib/pcre2_study.c pcre2lib/pcre2_substitute.c pcre2lib/pcre2_substring.c pcre2lib/pcre2_tables.c pcre2lib/pcre2_ucd.c pcre2lib/pcre2_valid_utf.c pcre2lib/pcre2_xclass.c " - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wno-implicit-fallthrough" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wno-implicit-fallthrough" >&5 printf %s "checking whether the C compiler accepts -Wno-implicit-fallthrough... " >&6; } if test ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+y} then : @@ -21468,8 +21607,8 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5 -printf '%s\n' "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5 +printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; } if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes then : PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -Wno-implicit-fallthrough" @@ -21481,18 +21620,18 @@ PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" -printf '%s\n' "#define HAVE_BUNDLED_PCRE 1" >>confdefs.h +printf "%s\n" "#define HAVE_BUNDLED_PCRE 1" >>confdefs.h - printf '%s\n' "#define PCRE2_CODE_UNIT_WIDTH 8" >>confdefs.h + printf "%s\n" "#define PCRE2_CODE_UNIT_WIDTH 8" >>confdefs.h if test "x$PHP_PCRE_JIT" = xno then : else case e in #( - e) printf '%s\n' "#define HAVE_PCRE_JIT_SUPPORT 1" >>confdefs.h + e) printf "%s\n" "#define HAVE_PCRE_JIT_SUPPORT 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether Intel CET is enabled" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Intel CET is enabled" >&5 printf %s "checking whether Intel CET is enabled... " >&6; } if test ${php_cv_have_pcre2_intel_cet+y} then : @@ -21524,8 +21663,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_pcre2_intel_cet" >&5 -printf '%s\n' "$php_cv_have_pcre2_intel_cet" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_pcre2_intel_cet" >&5 +printf "%s\n" "$php_cv_have_pcre2_intel_cet" >&6; } if test "x$php_cv_have_pcre2_intel_cet" = xyes then : PHP_PCRE_CFLAGS="-mshstk $PHP_PCRE_CFLAGS" @@ -21541,7 +21680,7 @@ e) if test "x$ZEND_DEBUG" = xyes then : -printf '%s\n' "#define HAVE_PCRE_VALGRIND_SUPPORT 1" >>confdefs.h +printf "%s\n" "#define HAVE_PCRE_VALGRIND_SUPPORT 1" >>confdefs.h fi ;; esac @@ -21682,7 +21821,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_PCRE 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_PCRE 1" >>confdefs.h fi fi @@ -21827,7 +21966,7 @@ php_with_sqlite3=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable the SQLite3 extension" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable the SQLite3 extension" >&5 printf %s "checking whether to enable the SQLite3 extension... " >&6; } # Check whether --with-sqlite3 was given. @@ -21865,8 +22004,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -21875,17 +22014,17 @@ pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sqlite3 >= 3.7.7" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3 >= 3.7.7" >&5 printf %s "checking for sqlite3 >= 3.7.7... " >&6; } if test -n "$SQLITE_CFLAGS"; then pkg_cv_SQLITE_CFLAGS="$SQLITE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5 ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.7.7") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.7.7" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -21899,10 +22038,10 @@ pkg_cv_SQLITE_LIBS="$SQLITE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5 ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.7.7") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.7.7" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -21916,8 +22055,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -21943,10 +22082,10 @@ and SQLITE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -21960,8 +22099,8 @@ else SQLITE_CFLAGS=$pkg_cv_SQLITE_CFLAGS SQLITE_LIBS=$pkg_cv_SQLITE_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } for ac_i in $SQLITE_CFLAGS; do @@ -22122,7 +22261,7 @@ fi -printf '%s\n' "#define HAVE_SQLITE3 1" >>confdefs.h +printf "%s\n" "#define HAVE_SQLITE3 1" >>confdefs.h @@ -22243,7 +22382,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sqlite3_errstr in -lsqlite3" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_errstr in -lsqlite3" >&5 printf %s "checking for sqlite3_errstr in -lsqlite3... " >&6; } if test ${ac_cv_lib_sqlite3_sqlite3_errstr+y} then : @@ -22284,15 +22423,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_errstr" >&5 -printf '%s\n' "$ac_cv_lib_sqlite3_sqlite3_errstr" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_errstr" >&5 +printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_errstr" >&6; } if test "x$ac_cv_lib_sqlite3_sqlite3_errstr" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_SQLITE3_ERRSTR 1" >>confdefs.h +printf "%s\n" "#define HAVE_SQLITE3_ERRSTR 1" >>confdefs.h else case e in #( @@ -22424,7 +22563,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sqlite3_expanded_sql in -lsqlite3" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_expanded_sql in -lsqlite3" >&5 printf %s "checking for sqlite3_expanded_sql in -lsqlite3... " >&6; } if test ${ac_cv_lib_sqlite3_sqlite3_expanded_sql+y} then : @@ -22465,15 +22604,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_expanded_sql" >&5 -printf '%s\n' "$ac_cv_lib_sqlite3_sqlite3_expanded_sql" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_expanded_sql" >&5 +printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_expanded_sql" >&6; } if test "x$ac_cv_lib_sqlite3_sqlite3_expanded_sql" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_SQLITE3_EXPANDED_SQL 1" >>confdefs.h +printf "%s\n" "#define HAVE_SQLITE3_EXPANDED_SQL 1" >>confdefs.h else case e in #( @@ -22605,7 +22744,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sqlite3_load_extension in -lsqlite3" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_load_extension in -lsqlite3" >&5 printf %s "checking for sqlite3_load_extension in -lsqlite3... " >&6; } if test ${ac_cv_lib_sqlite3_sqlite3_load_extension+y} then : @@ -22646,8 +22785,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5 -printf '%s\n' "$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5 +printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6; } if test "x$ac_cv_lib_sqlite3_sqlite3_load_extension" = xyes then : @@ -22661,7 +22800,7 @@ ext_shared=$save_ext_shared unset ac_cv_lib_sqlite3_sqlite3_load_extension -printf '%s\n' "#define SQLITE_OMIT_LOAD_EXTENSION 1" >>confdefs.h +printf "%s\n" "#define SQLITE_OMIT_LOAD_EXTENSION 1" >>confdefs.h ;; esac @@ -22803,7 +22942,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_SQLITE3 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_SQLITE3 1" >>confdefs.h fi fi @@ -22932,7 +23071,7 @@ php_with_zlib=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ZLIB support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ZLIB support" >&5 printf %s "checking for ZLIB support... " >&6; } # Check whether --with-zlib was given. @@ -22970,8 +23109,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -22979,17 +23118,17 @@ if test "$PHP_ZLIB" != "no"; then pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for zlib >= 1.2.11" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zlib >= 1.2.11" >&5 printf %s "checking for zlib >= 1.2.11... " >&6; } if test -n "$ZLIB_CFLAGS"; then pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.11\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.11\""; } >&5 ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.11") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ZLIB_CFLAGS=`$PKG_CONFIG --cflags "zlib >= 1.2.11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23003,10 +23142,10 @@ pkg_cv_ZLIB_LIBS="$ZLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.11\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.11\""; } >&5 ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.11") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ZLIB_LIBS=`$PKG_CONFIG --libs "zlib >= 1.2.11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23020,8 +23159,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -23047,10 +23186,10 @@ and ZLIB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -23064,8 +23203,8 @@ else ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS ZLIB_LIBS=$pkg_cv_ZLIB_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } for ac_i in $ZLIB_CFLAGS; do case $ac_i in @@ -23222,7 +23361,7 @@ done -printf '%s\n' "#define HAVE_ZLIB 1" >>confdefs.h +printf "%s\n" "#define HAVE_ZLIB 1" >>confdefs.h ext_builddir=ext/zlib @@ -23359,7 +23498,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_ZLIB 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_ZLIB 1" >>confdefs.h fi fi @@ -23489,7 +23628,7 @@ php_enable_bcmath=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable bc style precision math functions" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable bc style precision math functions" >&5 printf %s "checking whether to enable bc style precision math functions... " >&6; } # Check whether --enable-bcmath was given. if test ${enable_bcmath+y} @@ -23526,8 +23665,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -23668,7 +23807,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_BCMATH 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_BCMATH 1" >>confdefs.h fi fi @@ -23789,7 +23928,7 @@ as_fn_append BUILD_DIR " $ext_builddir/libbcmath/src" -printf '%s\n' "#define HAVE_BCMATH 1" >>confdefs.h +printf "%s\n" "#define HAVE_BCMATH 1" >>confdefs.h fi @@ -23799,7 +23938,7 @@ php_with_bz2=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for BZip2 support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BZip2 support" >&5 printf %s "checking for BZip2 support... " >&6; } # Check whether --with-bz2 was given. @@ -23837,8 +23976,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -23859,18 +23998,18 @@ esac fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for BZip2" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BZip2" >&5 printf %s "checking for BZip2... " >&6; } if ${BZIP_DIR:+false} : then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: bzlib.h not found" >&5 -printf '%s\n' "bzlib.h not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: bzlib.h not found" >&5 +printf "%s\n" "bzlib.h not found" >&6; } as_fn_error $? "Please reinstall the BZip2 library package" "$LINENO" 5 else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: found in $BZIP_DIR" >&5 -printf '%s\n' "found in $BZIP_DIR" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in $BZIP_DIR" >&5 +printf "%s\n" "found in $BZIP_DIR" >&6; } ;; esac fi @@ -23992,7 +24131,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzerror in -lbz2" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzerror in -lbz2" >&5 printf %s "checking for BZ2_bzerror in -lbz2... " >&6; } if test ${ac_cv_lib_bz2_BZ2_bzerror+y} then : @@ -24033,8 +24172,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzerror" >&5 -printf '%s\n' "$ac_cv_lib_bz2_BZ2_bzerror" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzerror" >&5 +printf "%s\n" "$ac_cv_lib_bz2_BZ2_bzerror" >&6; } if test "x$ac_cv_lib_bz2_BZ2_bzerror" = xyes then : @@ -24181,7 +24320,7 @@ -printf '%s\n' "#define HAVE_BZ2 1" >>confdefs.h +printf "%s\n" "#define HAVE_BZ2 1" >>confdefs.h @@ -24190,8 +24329,8 @@ LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_bz2_BZ2_bzerror - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The bz2 extension requires libbz2 >= 1.0.0 See 'config.log' for more details" "$LINENO" 5; } ;; @@ -24334,7 +24473,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_BZ2 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_BZ2 1" >>confdefs.h fi fi @@ -24463,7 +24602,7 @@ php_enable_calendar=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable calendar conversion support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable calendar conversion support" >&5 printf %s "checking whether to enable calendar conversion support... " >&6; } # Check whether --enable-calendar was given. if test ${enable_calendar+y} @@ -24500,15 +24639,15 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } if test "$PHP_CALENDAR" = "yes"; then -printf '%s\n' "#define HAVE_CALENDAR 1" >>confdefs.h +printf "%s\n" "#define HAVE_CALENDAR 1" >>confdefs.h ext_builddir=ext/calendar @@ -24645,7 +24784,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_CALENDAR 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_CALENDAR 1" >>confdefs.h fi fi @@ -24771,7 +24910,7 @@ php_enable_ctype=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable ctype functions" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable ctype functions" >&5 printf %s "checking whether to enable ctype functions... " >&6; } # Check whether --enable-ctype was given. if test ${enable_ctype+y} @@ -24808,15 +24947,15 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } if test "$PHP_CTYPE" != "no"; then -printf '%s\n' "#define HAVE_CTYPE 1" >>confdefs.h +printf "%s\n" "#define HAVE_CTYPE 1" >>confdefs.h ext_builddir=ext/ctype @@ -24953,7 +25092,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_CTYPE 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_CTYPE 1" >>confdefs.h fi fi @@ -25079,7 +25218,7 @@ php_with_curl=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for cURL support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cURL support" >&5 printf %s "checking for cURL support... " >&6; } # Check whether --with-curl was given. @@ -25117,8 +25256,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -25126,17 +25265,17 @@ if test "$PHP_CURL" != "no"; then pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libcurl >= 7.61.0" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl >= 7.61.0" >&5 printf %s "checking for libcurl >= 7.61.0... " >&6; } if test -n "$CURL_CFLAGS"; then pkg_cv_CURL_CFLAGS="$CURL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.61.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.61.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libcurl >= 7.61.0") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.61.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25150,10 +25289,10 @@ pkg_cv_CURL_LIBS="$CURL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.61.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.61.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libcurl >= 7.61.0") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.61.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25167,8 +25306,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -25194,10 +25333,10 @@ and CURL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -25211,8 +25350,8 @@ else CURL_CFLAGS=$pkg_cv_CURL_CFLAGS CURL_LIBS=$pkg_cv_CURL_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -25220,10 +25359,10 @@ pkg_cv_CURL_FEATURES="$CURL_FEATURES" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5 ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CURL_FEATURES=`$PKG_CONFIG --variable="supported_features" "libcurl" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25396,7 +25535,7 @@ done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for SSL support in libcurl" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SSL support in libcurl" >&5 printf %s "checking for SSL support in libcurl... " >&6; } case $CURL_FEATURES in #( *SSL*) : @@ -25404,12 +25543,12 @@ *) : CURL_SSL=no ;; esac - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CURL_SSL" >&5 -printf '%s\n' "$CURL_SSL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CURL_SSL" >&5 +printf "%s\n" "$CURL_SSL" >&6; } if test "x$PHP_THREAD_SAFETY" = xyes && test "x$CURL_SSL" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether libcurl is linked against old OpenSSL < 1.1" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether libcurl is linked against old OpenSSL < 1.1" >&5 printf %s "checking whether libcurl is linked against old OpenSSL < 1.1... " >&6; } if test ${php_cv_lib_curl_ssl+y} then : @@ -25486,31 +25625,31 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_curl_ssl" >&5 -printf '%s\n' "$php_cv_lib_curl_ssl" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_curl_ssl" >&5 +printf "%s\n" "$php_cv_lib_curl_ssl" >&6; } if test "x$php_cv_lib_curl_ssl" = xyes then : -printf '%s\n' "#define HAVE_CURL_OLD_OPENSSL 1" >>confdefs.h +printf "%s\n" "#define HAVE_CURL_OLD_OPENSSL 1" >>confdefs.h found_openssl=no pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.1.1" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.1.1" >&5 printf %s "checking for openssl >= 1.1.1... " >&6; } if test -n "$OPENSSL_CFLAGS"; then pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.1\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "openssl >= 1.1.1") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.1.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25524,10 +25663,10 @@ pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.1\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "openssl >= 1.1.1") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.1.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25541,8 +25680,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -25568,10 +25707,10 @@ and OPENSSL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -25585,8 +25724,8 @@ else OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } found_openssl=yes fi @@ -25749,7 +25888,7 @@ ac_fn_c_check_header_compile "$LINENO" "openssl/crypto.h" "ac_cv_header_openssl_crypto_h" "$ac_includes_default" if test "x$ac_cv_header_openssl_crypto_h" = xyes then : - printf '%s\n' "#define HAVE_OPENSSL_CRYPTO_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_OPENSSL_CRYPTO_H 1" >>confdefs.h fi @@ -25878,7 +26017,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for curl_easy_perform in -lcurl" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curl_easy_perform in -lcurl" >&5 printf %s "checking for curl_easy_perform in -lcurl... " >&6; } if test ${ac_cv_lib_curl_curl_easy_perform+y} then : @@ -25919,15 +26058,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_perform" >&5 -printf '%s\n' "$ac_cv_lib_curl_curl_easy_perform" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_perform" >&5 +printf "%s\n" "$ac_cv_lib_curl_curl_easy_perform" >&6; } if test "x$ac_cv_lib_curl_curl_easy_perform" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_CURL 1" >>confdefs.h +printf "%s\n" "#define HAVE_CURL 1" >>confdefs.h else case e in #( @@ -25935,8 +26074,8 @@ LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_curl_curl_easy_perform - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The libcurl check failed. See 'config.log' for more details" "$LINENO" 5; } ;; @@ -26079,7 +26218,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_CURL 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_CURL 1" >>confdefs.h fi fi @@ -26654,8 +26793,8 @@ esac done - as_ac_Lib=`printf '%s\n' "ac_cv_lib_$LIB""_dpopen" | sed "$as_sed_sh"` -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dpopen in -l$LIB" >&5 + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_dpopen" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dpopen in -l$LIB" >&5 printf %s "checking for dpopen in -l$LIB... " >&6; } if eval test \${$as_ac_Lib+y} then : @@ -26697,8 +26836,8 @@ esac fi eval ac_res=\$$as_ac_Lib - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : @@ -26706,10 +26845,10 @@ ext_shared=$save_ext_shared -printf '%s\n' "#define QDBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h +printf "%s\n" "#define QDBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h -printf '%s\n' "#define DBA_QDBM 1" >>confdefs.h +printf "%s\n" "#define DBA_QDBM 1" >>confdefs.h THIS_LIBS=$LIB @@ -26862,7 +27001,7 @@ else THIS_FULL_NAME="$THIS_NAME" fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 printf %s "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then as_fn_error $? "" "$LINENO" 5 @@ -26870,11 +27009,11 @@ if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 -printf '%s\n' "$THIS_RESULT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +printf "%s\n" "$THIS_RESULT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -26890,7 +27029,7 @@ else THIS_FULL_NAME="$THIS_NAME" fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 printf %s "checking for $THIS_FULL_NAME support... " >&6; } if test -n "You cannot combine --with-gdbm with --with-qdbm"; then as_fn_error $? "You cannot combine --with-gdbm with --with-qdbm" "$LINENO" 5 @@ -26898,11 +27037,11 @@ if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 -printf '%s\n' "$THIS_RESULT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +printf "%s\n" "$THIS_RESULT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -27034,7 +27173,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for gdbm_open in -lgdbm" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdbm_open in -lgdbm" >&5 printf %s "checking for gdbm_open in -lgdbm... " >&6; } if test ${ac_cv_lib_gdbm_gdbm_open+y} then : @@ -27075,8 +27214,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_gdbm_open" >&5 -printf '%s\n' "$ac_cv_lib_gdbm_gdbm_open" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_gdbm_open" >&5 +printf "%s\n" "$ac_cv_lib_gdbm_gdbm_open" >&6; } if test "x$ac_cv_lib_gdbm_gdbm_open" = xyes then : @@ -27084,10 +27223,10 @@ ext_shared=$save_ext_shared -printf '%s\n' "#define GDBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h +printf "%s\n" "#define GDBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h -printf '%s\n' "#define DBA_GDBM 1" >>confdefs.h +printf "%s\n" "#define DBA_GDBM 1" >>confdefs.h THIS_LIBS=gdbm @@ -27236,7 +27375,7 @@ else THIS_FULL_NAME="$THIS_NAME" fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 printf %s "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then as_fn_error $? "" "$LINENO" 5 @@ -27244,11 +27383,11 @@ if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 -printf '%s\n' "$THIS_RESULT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +printf "%s\n" "$THIS_RESULT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -27387,8 +27526,8 @@ esac done - as_ac_Lib=`printf '%s\n' "ac_cv_lib_$LIB""_dbm_open" | sed "$as_sed_sh"` -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -l$LIB" >&5 + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_dbm_open" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -l$LIB" >&5 printf %s "checking for dbm_open in -l$LIB... " >&6; } if eval test \${$as_ac_Lib+y} then : @@ -27430,8 +27569,8 @@ esac fi eval ac_res=\$$as_ac_Lib - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : @@ -27439,10 +27578,10 @@ ext_shared=$save_ext_shared -printf '%s\n' "#define NDBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h +printf "%s\n" "#define NDBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h -printf '%s\n' "#define DBA_NDBM 1" >>confdefs.h +printf "%s\n" "#define DBA_NDBM 1" >>confdefs.h THIS_LIBS=$LIB @@ -27595,7 +27734,7 @@ else THIS_FULL_NAME="$THIS_NAME" fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 printf %s "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then as_fn_error $? "" "$LINENO" 5 @@ -27603,11 +27742,11 @@ if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 -printf '%s\n' "$THIS_RESULT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +printf "%s\n" "$THIS_RESULT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -27776,8 +27915,8 @@ esac done - as_ac_Lib=`printf '%s\n' "ac_cv_lib_$LIB""_tcadbopen" | sed "$as_sed_sh"` -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for tcadbopen in -l$LIB" >&5 + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_tcadbopen" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tcadbopen in -l$LIB" >&5 printf %s "checking for tcadbopen in -l$LIB... " >&6; } if eval test \${$as_ac_Lib+y} then : @@ -27819,8 +27958,8 @@ esac fi eval ac_res=\$$as_ac_Lib - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : @@ -27828,10 +27967,10 @@ ext_shared=$save_ext_shared -printf '%s\n' "#define TCADB_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h +printf "%s\n" "#define TCADB_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h -printf '%s\n' "#define DBA_TCADB 1" >>confdefs.h +printf "%s\n" "#define DBA_TCADB 1" >>confdefs.h THIS_LIBS=$LIB @@ -27984,7 +28123,7 @@ else THIS_FULL_NAME="$THIS_NAME" fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 printf %s "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then as_fn_error $? "" "$LINENO" 5 @@ -27992,11 +28131,11 @@ if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 -printf '%s\n' "$THIS_RESULT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +printf "%s\n" "$THIS_RESULT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -28165,8 +28304,8 @@ esac done - as_ac_Lib=`printf '%s\n' "ac_cv_lib_$LIB""_mdb_env_open" | sed "$as_sed_sh"` -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mdb_env_open in -l$LIB" >&5 + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_mdb_env_open" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mdb_env_open in -l$LIB" >&5 printf %s "checking for mdb_env_open in -l$LIB... " >&6; } if eval test \${$as_ac_Lib+y} then : @@ -28208,8 +28347,8 @@ esac fi eval ac_res=\$$as_ac_Lib - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : @@ -28217,10 +28356,10 @@ ext_shared=$save_ext_shared -printf '%s\n' "#define LMDB_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h +printf "%s\n" "#define LMDB_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h -printf '%s\n' "#define DBA_LMDB 1" >>confdefs.h +printf "%s\n" "#define DBA_LMDB 1" >>confdefs.h THIS_LIBS=$LIB @@ -28373,7 +28512,7 @@ else THIS_FULL_NAME="$THIS_NAME" fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 printf %s "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then as_fn_error $? "" "$LINENO" 5 @@ -28381,11 +28520,11 @@ if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 -printf '%s\n' "$THIS_RESULT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +printf "%s\n" "$THIS_RESULT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -28526,14 +28665,14 @@ if ${THIS_LIBS:+false} : then : - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "DB4 major version check failed: header contains different version See 'config.log' for more details" "$LINENO" 5; } fi if test "4" = "4"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5 printf %s "checking for DB4 minor version and patch level... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -28547,8 +28686,8 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -printf '%s\n' "ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +printf "%s\n" "ok" >&6; } else case e in #( e) as_fn_error $? "Version 4.1 requires patch level 25" "$LINENO" 5 ;; esac @@ -28559,7 +28698,7 @@ if test "x$ext_shared" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5 printf %s "checking if dba can be used as shared extension... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -28573,8 +28712,8 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( e) as_fn_error $? "At least version 3.3 is required" "$LINENO" 5 ;; esac @@ -28590,7 +28729,7 @@ fi -printf '%s\n' "#define DBA_DB4 1" >>confdefs.h +printf "%s\n" "#define DBA_DB4 1" >>confdefs.h if ${THIS_INCLUDE:+false} : @@ -28598,7 +28737,7 @@ else case e in #( e) -printf '%s\n' "#define DB4_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h +printf "%s\n" "#define DB4_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h ;; esac fi @@ -28729,7 +28868,7 @@ else THIS_FULL_NAME="$THIS_NAME" fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 printf %s "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then as_fn_error $? "" "$LINENO" 5 @@ -28737,11 +28876,11 @@ if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 -printf '%s\n' "$THIS_RESULT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +printf "%s\n" "$THIS_RESULT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -28757,7 +28896,7 @@ else THIS_FULL_NAME="$THIS_NAME" fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 printf %s "checking for $THIS_FULL_NAME support... " >&6; } if test -n "You cannot combine --with-db3 with --with-db4"; then as_fn_error $? "You cannot combine --with-db3 with --with-db4" "$LINENO" 5 @@ -28765,11 +28904,11 @@ if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 -printf '%s\n' "$THIS_RESULT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +printf "%s\n" "$THIS_RESULT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -28865,14 +29004,14 @@ if ${THIS_LIBS:+false} : then : - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "DB3 major version check failed: header contains different version See 'config.log' for more details" "$LINENO" 5; } fi if test "3" = "4"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5 printf %s "checking for DB4 minor version and patch level... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -28886,8 +29025,8 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -printf '%s\n' "ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +printf "%s\n" "ok" >&6; } else case e in #( e) as_fn_error $? "Version 4.1 requires patch level 25" "$LINENO" 5 ;; esac @@ -28898,7 +29037,7 @@ if test "x$ext_shared" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5 printf %s "checking if dba can be used as shared extension... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -28912,8 +29051,8 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( e) as_fn_error $? "At least version 3.3 is required" "$LINENO" 5 ;; esac @@ -28929,7 +29068,7 @@ fi -printf '%s\n' "#define DBA_DB3 1" >>confdefs.h +printf "%s\n" "#define DBA_DB3 1" >>confdefs.h if ${THIS_INCLUDE:+false} : @@ -28937,7 +29076,7 @@ else case e in #( e) -printf '%s\n' "#define DB3_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h +printf "%s\n" "#define DB3_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h ;; esac fi @@ -29068,7 +29207,7 @@ else THIS_FULL_NAME="$THIS_NAME" fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 printf %s "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then as_fn_error $? "" "$LINENO" 5 @@ -29076,11 +29215,11 @@ if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 -printf '%s\n' "$THIS_RESULT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +printf "%s\n" "$THIS_RESULT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -29095,7 +29234,7 @@ else THIS_FULL_NAME="$THIS_NAME" fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 printf %s "checking for $THIS_FULL_NAME support... " >&6; } if test -n "You cannot combine --with-db2 with --with-db3 or --with-db4"; then as_fn_error $? "You cannot combine --with-db2 with --with-db3 or --with-db4" "$LINENO" 5 @@ -29103,11 +29242,11 @@ if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 -printf '%s\n' "$THIS_RESULT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +printf "%s\n" "$THIS_RESULT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -29195,14 +29334,14 @@ if ${THIS_LIBS:+false} : then : - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "DB2 major version check failed: header contains different version See 'config.log' for more details" "$LINENO" 5; } fi if test "2" = "4"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5 printf %s "checking for DB4 minor version and patch level... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -29216,8 +29355,8 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -printf '%s\n' "ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +printf "%s\n" "ok" >&6; } else case e in #( e) as_fn_error $? "Version 4.1 requires patch level 25" "$LINENO" 5 ;; esac @@ -29228,7 +29367,7 @@ if test "x$ext_shared" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5 printf %s "checking if dba can be used as shared extension... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -29242,8 +29381,8 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( e) as_fn_error $? "At least version 3.3 is required" "$LINENO" 5 ;; esac @@ -29259,7 +29398,7 @@ fi -printf '%s\n' "#define DBA_DB2 1" >>confdefs.h +printf "%s\n" "#define DBA_DB2 1" >>confdefs.h if ${THIS_INCLUDE:+false} : @@ -29267,7 +29406,7 @@ else case e in #( e) -printf '%s\n' "#define DB2_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h +printf "%s\n" "#define DB2_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h ;; esac fi @@ -29398,7 +29537,7 @@ else THIS_FULL_NAME="$THIS_NAME" fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 printf %s "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then as_fn_error $? "" "$LINENO" 5 @@ -29406,18 +29545,18 @@ if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 -printf '%s\n' "$THIS_RESULT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +printf "%s\n" "$THIS_RESULT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME if test "$PHP_DB1" != "no"; then unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for DB1 in library" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB1 in library" >&5 printf %s "checking for DB1 in library... " >&6; } if test "$HAVE_DB4" = "1"; then THIS_VERSION=4 @@ -29433,7 +29572,7 @@ fi if test "$HAVE_DB4" = "1" || test "$HAVE_DB3" = "1" || test "$HAVE_DB2" = "1"; then -printf '%s\n' "#define DB1_VERSION \"Berkeley DB 1.85 emulation in DB$THIS_VERSION\"" >>confdefs.h +printf "%s\n" "#define DB1_VERSION \"Berkeley DB 1.85 emulation in DB$THIS_VERSION\"" >>confdefs.h for i in \ db$THIS_VERSION/db_185.h \ @@ -29447,7 +29586,7 @@ done else -printf '%s\n' "#define DB1_VERSION \"Unknown DB1\"" >>confdefs.h +printf "%s\n" "#define DB1_VERSION \"Unknown DB1\"" >>confdefs.h for i in $PHP_DB1 /usr/local /usr; do if test -f "$i/db1/db.h"; then @@ -29466,12 +29605,12 @@ done THIS_LIBS=db fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_LIBS" >&5 -printf '%s\n' "$THIS_LIBS" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for DB1 in header" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_LIBS" >&5 +printf "%s\n" "$THIS_LIBS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB1 in header" >&5 printf %s "checking for DB1 in header... " >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_INCLUDE" >&5 -printf '%s\n' "$THIS_INCLUDE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_INCLUDE" >&5 +printf "%s\n" "$THIS_INCLUDE" >&6; } if test -n "$THIS_INCLUDE"; then old_LDFLAGS=$LDFLAGS @@ -29492,10 +29631,10 @@ if ac_fn_c_try_link "$LINENO" then : -printf '%s\n' "#define DB1_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h +printf "%s\n" "#define DB1_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h -printf '%s\n' "#define DBA_DB1 1" >>confdefs.h +printf "%s\n" "#define DBA_DB1 1" >>confdefs.h THIS_RESULT=yes @@ -29641,7 +29780,7 @@ else THIS_FULL_NAME="$THIS_NAME" fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 printf %s "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then as_fn_error $? "" "$LINENO" 5 @@ -29649,11 +29788,11 @@ if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 -printf '%s\n' "$THIS_RESULT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +printf "%s\n" "$THIS_RESULT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -29669,7 +29808,7 @@ else THIS_FULL_NAME="$THIS_NAME" fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 printf %s "checking for $THIS_FULL_NAME support... " >&6; } if test -n "You cannot combine --with-dbm with --with-qdbm"; then as_fn_error $? "You cannot combine --with-dbm with --with-qdbm" "$LINENO" 5 @@ -29677,11 +29816,11 @@ if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 -printf '%s\n' "$THIS_RESULT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +printf "%s\n" "$THIS_RESULT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -29818,8 +29957,8 @@ esac done - as_ac_Lib=`printf '%s\n' "ac_cv_lib_$LIB""_dbminit" | sed "$as_sed_sh"` -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dbminit in -l$LIB" >&5 + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_dbminit" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dbminit in -l$LIB" >&5 printf %s "checking for dbminit in -l$LIB... " >&6; } if eval test \${$as_ac_Lib+y} then : @@ -29861,40 +30000,40 @@ esac fi eval ac_res=\$$as_ac_Lib - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for DBM using GDBM" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DBM using GDBM" >&5 printf %s "checking for DBM using GDBM... " >&6; } -printf '%s\n' "#define DBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h +printf "%s\n" "#define DBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h if test "x$LIB" = xgdbm then : -printf '%s\n' "#define DBM_VERSION \"GDBM\"" >>confdefs.h +printf "%s\n" "#define DBM_VERSION \"GDBM\"" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( e) -printf '%s\n' "#define DBM_VERSION \"DBM\"" >>confdefs.h +printf "%s\n" "#define DBM_VERSION \"DBM\"" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi -printf '%s\n' "#define DBA_DBM 1" >>confdefs.h +printf "%s\n" "#define DBA_DBM 1" >>confdefs.h THIS_LIBS=$LIB @@ -30047,7 +30186,7 @@ else THIS_FULL_NAME="$THIS_NAME" fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 printf %s "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then as_fn_error $? "" "$LINENO" 5 @@ -30055,11 +30194,11 @@ if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 -printf '%s\n' "$THIS_RESULT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +printf "%s\n" "$THIS_RESULT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME @@ -30142,10 +30281,10 @@ if test "$PHP_CDB" = "yes"; then -printf '%s\n' "#define DBA_CDB_BUILTIN 1" >>confdefs.h +printf "%s\n" "#define DBA_CDB_BUILTIN 1" >>confdefs.h -printf '%s\n' "#define DBA_CDB 1" >>confdefs.h +printf "%s\n" "#define DBA_CDB 1" >>confdefs.h cdb_sources="libcdb/cdb.c libcdb/cdb_make.c libcdb/uint32.c" THIS_RESULT="builtin" @@ -30279,8 +30418,8 @@ esac done - as_ac_Lib=`printf '%s\n' "ac_cv_lib_$LIB""_cdb_read" | sed "$as_sed_sh"` -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for cdb_read in -l$LIB" >&5 + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_cdb_read" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cdb_read in -l$LIB" >&5 printf %s "checking for cdb_read in -l$LIB... " >&6; } if eval test \${$as_ac_Lib+y} then : @@ -30322,8 +30461,8 @@ esac fi eval ac_res=\$$as_ac_Lib - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : @@ -30331,10 +30470,10 @@ ext_shared=$save_ext_shared -printf '%s\n' "#define CDB_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h +printf "%s\n" "#define CDB_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h -printf '%s\n' "#define DBA_CDB 1" >>confdefs.h +printf "%s\n" "#define DBA_CDB 1" >>confdefs.h THIS_LIBS=$LIB @@ -30487,7 +30626,7 @@ else THIS_FULL_NAME="$THIS_NAME" fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 printf %s "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then as_fn_error $? "" "$LINENO" 5 @@ -30495,18 +30634,18 @@ if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 -printf '%s\n' "$THIS_RESULT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +printf "%s\n" "$THIS_RESULT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME if test "$PHP_INIFILE" != "no"; then -printf '%s\n' "#define DBA_INIFILE 1" >>confdefs.h +printf "%s\n" "#define DBA_INIFILE 1" >>confdefs.h ini_sources="libinifile/inifile.c" THIS_RESULT="builtin" @@ -30518,7 +30657,7 @@ else THIS_FULL_NAME="$THIS_NAME" fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 printf %s "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then as_fn_error $? "" "$LINENO" 5 @@ -30526,18 +30665,18 @@ if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 -printf '%s\n' "$THIS_RESULT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +printf "%s\n" "$THIS_RESULT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME if test "$PHP_FLATFILE" != "no"; then -printf '%s\n' "#define DBA_FLATFILE 1" >>confdefs.h +printf "%s\n" "#define DBA_FLATFILE 1" >>confdefs.h flat_sources="libflatfile/flatfile.c" THIS_RESULT="builtin" @@ -30549,7 +30688,7 @@ else THIS_FULL_NAME="$THIS_NAME" fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5 printf %s "checking for $THIS_FULL_NAME support... " >&6; } if test -n ""; then as_fn_error $? "" "$LINENO" 5 @@ -30557,32 +30696,32 @@ if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 -printf '%s\n' "$THIS_RESULT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5 +printf "%s\n" "$THIS_RESULT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable DBA interface" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable DBA interface" >&5 printf %s "checking whether to enable DBA interface... " >&6; } if test "x$HAVE_DBA" = x1 then : if test "x$ext_shared" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes, shared" >&5 -printf '%s\n' "yes, shared" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, shared" >&5 +printf "%s\n" "yes, shared" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; esac fi -printf '%s\n' "#define HAVE_DBA 1" >>confdefs.h +printf "%s\n" "#define HAVE_DBA 1" >>confdefs.h ext_builddir=ext/dba @@ -30719,7 +30858,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_DBA 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_DBA 1" >>confdefs.h fi fi @@ -30844,8 +30983,8 @@ else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi @@ -30855,7 +30994,7 @@ php_enable_dl_test=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable dl-test extension" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable dl-test extension" >&5 printf %s "checking whether to enable dl-test extension... " >&6; } # Check whether --enable-dl-test was given. if test ${enable_dl_test+y} @@ -30892,8 +31031,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -31036,7 +31175,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_DL_TEST 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_DL_TEST 1" >>confdefs.h fi fi @@ -31162,7 +31301,7 @@ php_enable_dom=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable DOM support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable DOM support" >&5 printf %s "checking whether to enable DOM support... " >&6; } # Check whether --enable-dom was given. if test ${enable_dom+y} @@ -31199,8 +31338,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -31209,17 +31348,17 @@ pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.4" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.4" >&5 printf %s "checking for libxml-2.0 >= 2.9.4... " >&6; } if test -n "$LIBXML_CFLAGS"; then pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.4") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -31233,10 +31372,10 @@ pkg_cv_LIBXML_LIBS="$LIBXML_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.4") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -31250,8 +31389,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -31277,10 +31416,10 @@ and LIBXML_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -31294,8 +31433,8 @@ else LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS LIBXML_LIBS=$pkg_cv_LIBXML_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -31455,7 +31594,7 @@ -printf '%s\n' "#define HAVE_DOM 1" >>confdefs.h +printf "%s\n" "#define HAVE_DOM 1" >>confdefs.h PHP_LEXBOR_CFLAGS="-Wno-unknown-warning-option -Wno-unterminated-string-initialization -I@ext_srcdir@/lexbor -DLEXBOR_STATIC" LEXBOR_DIR="lexbor/lexbor" @@ -31595,7 +31734,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_DOM 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_DOM 1" >>confdefs.h fi fi @@ -31764,7 +31903,7 @@ php_with_enchant=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build with Enchant support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with Enchant support" >&5 printf %s "checking whether to build with Enchant support... " >&6; } # Check whether --with-enchant was given. @@ -31802,8 +31941,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -31811,17 +31950,17 @@ if test "$PHP_ENCHANT" != "no"; then pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for enchant-2" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for enchant-2" >&5 printf %s "checking for enchant-2... " >&6; } if test -n "$ENCHANT2_CFLAGS"; then pkg_cv_ENCHANT2_CFLAGS="$ENCHANT2_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5 ($PKG_CONFIG --exists --print-errors "enchant-2") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ENCHANT2_CFLAGS=`$PKG_CONFIG --cflags "enchant-2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -31835,10 +31974,10 @@ pkg_cv_ENCHANT2_LIBS="$ENCHANT2_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5 ($PKG_CONFIG --exists --print-errors "enchant-2") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ENCHANT2_LIBS=`$PKG_CONFIG --libs "enchant-2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -31852,8 +31991,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -31870,14 +32009,14 @@ found_enchant_2=no elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } found_enchant_2=no else ENCHANT2_CFLAGS=$pkg_cv_ENCHANT2_CFLAGS ENCHANT2_LIBS=$pkg_cv_ENCHANT2_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } found_enchant_2=yes fi @@ -32040,26 +32179,26 @@ done -printf '%s\n' "#define HAVE_ENCHANT_GET_VERSION 1" >>confdefs.h +printf "%s\n" "#define HAVE_ENCHANT_GET_VERSION 1" >>confdefs.h else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: libenchant-2 not found trying with old libenchant" >&5 -printf '%s\n' "$as_me: WARNING: libenchant-2 not found trying with old libenchant" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libenchant-2 not found trying with old libenchant" >&5 +printf "%s\n" "$as_me: WARNING: libenchant-2 not found trying with old libenchant" >&2;} pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for enchant >= 1.4.2" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for enchant >= 1.4.2" >&5 printf %s "checking for enchant >= 1.4.2... " >&6; } if test -n "$ENCHANT_CFLAGS"; then pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.4.2\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.4.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "enchant >= 1.4.2") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant >= 1.4.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -32073,10 +32212,10 @@ pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.4.2\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.4.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "enchant >= 1.4.2") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant >= 1.4.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -32090,8 +32229,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -32117,10 +32256,10 @@ and ENCHANT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -32134,8 +32273,8 @@ else ENCHANT_CFLAGS=$pkg_cv_ENCHANT_CFLAGS ENCHANT_LIBS=$pkg_cv_ENCHANT_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -32413,7 +32552,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for enchant_get_version in -lenchant" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for enchant_get_version in -lenchant" >&5 printf %s "checking for enchant_get_version in -lenchant... " >&6; } if test ${ac_cv_lib_enchant_enchant_get_version+y} then : @@ -32454,14 +32593,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_enchant_enchant_get_version" >&5 -printf '%s\n' "$ac_cv_lib_enchant_enchant_get_version" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_enchant_enchant_get_version" >&5 +printf "%s\n" "$ac_cv_lib_enchant_enchant_get_version" >&6; } if test "x$ac_cv_lib_enchant_enchant_get_version" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - printf '%s\n' "#define HAVE_ENCHANT_GET_VERSION 1" >>confdefs.h + printf "%s\n" "#define HAVE_ENCHANT_GET_VERSION 1" >>confdefs.h else case e in #( @@ -32593,7 +32732,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for enchant_broker_set_param in -lenchant" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for enchant_broker_set_param in -lenchant" >&5 printf %s "checking for enchant_broker_set_param in -lenchant... " >&6; } if test ${ac_cv_lib_enchant_enchant_broker_set_param+y} then : @@ -32634,15 +32773,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_enchant_enchant_broker_set_param" >&5 -printf '%s\n' "$ac_cv_lib_enchant_enchant_broker_set_param" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_enchant_enchant_broker_set_param" >&5 +printf "%s\n" "$ac_cv_lib_enchant_enchant_broker_set_param" >&6; } if test "x$ac_cv_lib_enchant_enchant_broker_set_param" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_ENCHANT_BROKER_SET_PARAM 1" >>confdefs.h +printf "%s\n" "#define HAVE_ENCHANT_BROKER_SET_PARAM 1" >>confdefs.h else case e in #( @@ -32660,7 +32799,7 @@ fi -printf '%s\n' "#define HAVE_ENCHANT 1" >>confdefs.h +printf "%s\n" "#define HAVE_ENCHANT 1" >>confdefs.h @@ -32798,7 +32937,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_ENCHANT 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_ENCHANT 1" >>confdefs.h fi fi @@ -32927,7 +33066,7 @@ php_enable_exif=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable EXIF (metadata from images) support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable EXIF (metadata from images) support" >&5 printf %s "checking whether to enable EXIF (metadata from images) support... " >&6; } # Check whether --enable-exif was given. if test ${enable_exif+y} @@ -32964,15 +33103,15 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } if test "$PHP_EXIF" != "no"; then -printf '%s\n' "#define HAVE_EXIF 1" >>confdefs.h +printf "%s\n" "#define HAVE_EXIF 1" >>confdefs.h ext_builddir=ext/exif @@ -33109,7 +33248,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_EXIF 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_EXIF 1" >>confdefs.h fi fi @@ -33235,7 +33374,7 @@ php_with_ffi=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for FFI support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FFI support" >&5 printf %s "checking for FFI support... " >&6; } # Check whether --with-ffi was given. @@ -33273,8 +33412,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -33282,17 +33421,17 @@ if test "$PHP_FFI" != "no"; then pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libffi >= 3.0.11" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libffi >= 3.0.11" >&5 printf %s "checking for libffi >= 3.0.11... " >&6; } if test -n "$FFI_CFLAGS"; then pkg_cv_FFI_CFLAGS="$FFI_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi >= 3.0.11\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi >= 3.0.11\""; } >&5 ($PKG_CONFIG --exists --print-errors "libffi >= 3.0.11") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi >= 3.0.11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -33306,10 +33445,10 @@ pkg_cv_FFI_LIBS="$FFI_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi >= 3.0.11\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi >= 3.0.11\""; } >&5 ($PKG_CONFIG --exists --print-errors "libffi >= 3.0.11") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FFI_LIBS=`$PKG_CONFIG --libs "libffi >= 3.0.11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -33323,8 +33462,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -33350,10 +33489,10 @@ and FFI_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -33367,8 +33506,8 @@ else FFI_CFLAGS=$pkg_cv_FFI_CFLAGS FFI_LIBS=$pkg_cv_FFI_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -33529,14 +33668,14 @@ -printf '%s\n' "#define HAVE_FFI 1" >>confdefs.h +printf "%s\n" "#define HAVE_FFI 1" >>confdefs.h ac_fn_c_check_type "$LINENO" "long double" "ac_cv_type_long_double" "$ac_includes_default" if test "x$ac_cv_type_long_double" = xyes then : -printf '%s\n' "#define HAVE_LONG_DOUBLE 1" >>confdefs.h +printf "%s\n" "#define HAVE_LONG_DOUBLE 1" >>confdefs.h fi @@ -33547,59 +33686,59 @@ CFLAGS_SAVE=$CFLAGS CFLAGS="$CFLAGS $FFI_CFLAGS" ac_fn_check_decl "$LINENO" "FFI_FASTCALL" "ac_cv_have_decl_FFI_FASTCALL" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_FFI_FASTCALL" = xyes then : -printf '%s\n' "#define HAVE_FFI_FASTCALL 1" >>confdefs.h +printf "%s\n" "#define HAVE_FFI_FASTCALL 1" >>confdefs.h fi ac_fn_check_decl "$LINENO" "FFI_THISCALL" "ac_cv_have_decl_FFI_THISCALL" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_FFI_THISCALL" = xyes then : -printf '%s\n' "#define HAVE_FFI_THISCALL 1" >>confdefs.h +printf "%s\n" "#define HAVE_FFI_THISCALL 1" >>confdefs.h fi ac_fn_check_decl "$LINENO" "FFI_STDCALL" "ac_cv_have_decl_FFI_STDCALL" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_FFI_STDCALL" = xyes then : -printf '%s\n' "#define HAVE_FFI_STDCALL 1" >>confdefs.h +printf "%s\n" "#define HAVE_FFI_STDCALL 1" >>confdefs.h fi ac_fn_check_decl "$LINENO" "FFI_PASCAL" "ac_cv_have_decl_FFI_PASCAL" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_FFI_PASCAL" = xyes then : -printf '%s\n' "#define HAVE_FFI_PASCAL 1" >>confdefs.h +printf "%s\n" "#define HAVE_FFI_PASCAL 1" >>confdefs.h fi ac_fn_check_decl "$LINENO" "FFI_REGISTER" "ac_cv_have_decl_FFI_REGISTER" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_FFI_REGISTER" = xyes then : -printf '%s\n' "#define HAVE_FFI_REGISTER 1" >>confdefs.h +printf "%s\n" "#define HAVE_FFI_REGISTER 1" >>confdefs.h fi ac_fn_check_decl "$LINENO" "FFI_MS_CDECL" "ac_cv_have_decl_FFI_MS_CDECL" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_FFI_MS_CDECL" = xyes then : -printf '%s\n' "#define HAVE_FFI_MS_CDECL 1" >>confdefs.h +printf "%s\n" "#define HAVE_FFI_MS_CDECL 1" >>confdefs.h fi ac_fn_check_decl "$LINENO" "FFI_SYSV" "ac_cv_have_decl_FFI_SYSV" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_FFI_SYSV" = xyes then : -printf '%s\n' "#define HAVE_FFI_SYSV 1" >>confdefs.h +printf "%s\n" "#define HAVE_FFI_SYSV 1" >>confdefs.h fi CFLAGS=$CFLAGS_SAVE @@ -33739,7 +33878,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_FFI 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_FFI 1" >>confdefs.h fi fi @@ -33868,7 +34007,7 @@ php_enable_fileinfo=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for fileinfo support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fileinfo support" >&5 printf %s "checking for fileinfo support... " >&6; } # Check whether --enable-fileinfo was given. if test ${enable_fileinfo+y} @@ -33905,8 +34044,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -33917,7 +34056,7 @@ ac_fn_c_check_header_compile "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" if test "x$ac_cv_header_sys_sysmacros_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_SYSMACROS_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_SYSMACROS_H 1" >>confdefs.h fi @@ -33928,12 +34067,12 @@ ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr" if test "x$ac_cv_func_strcasestr" = xyes then : - printf '%s\n' "#define HAVE_STRCASESTR 1" >>confdefs.h + printf "%s\n" "#define HAVE_STRCASESTR 1" >>confdefs.h else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: using libmagic strcasestr implementation" >&5 -printf '%s\n' "$as_me: using libmagic strcasestr implementation" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: using libmagic strcasestr implementation" >&5 +printf "%s\n" "$as_me: using libmagic strcasestr implementation" >&6;} libmagic_sources="$libmagic_sources libmagic/strcasestr.c" ;; esac @@ -33944,7 +34083,7 @@ - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __attribute__((visibility))" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __attribute__((visibility))" >&5 printf %s "checking for __attribute__((visibility))... " >&6; } if test ${ax_cv_have_func_attribute_visibility+y} then : @@ -33987,13 +34126,13 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_visibility" >&5 -printf '%s\n' "$ax_cv_have_func_attribute_visibility" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_visibility" >&5 +printf "%s\n" "$ax_cv_have_func_attribute_visibility" >&6; } if test yes = $ax_cv_have_func_attribute_visibility then : -printf '%s\n' "#define HAVE_FUNC_ATTRIBUTE_VISIBILITY 1" >>confdefs.h +printf "%s\n" "#define HAVE_FUNC_ATTRIBUTE_VISIBILITY 1" >>confdefs.h fi @@ -34135,7 +34274,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_FILEINFO 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_FILEINFO 1" >>confdefs.h fi fi @@ -34278,13 +34417,13 @@ ac_fn_c_check_func "$LINENO" "utimes" "ac_cv_func_utimes" if test "x$ac_cv_func_utimes" = xyes then : - printf '%s\n' "#define HAVE_UTIMES 1" >>confdefs.h + printf "%s\n" "#define HAVE_UTIMES 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "strndup" "ac_cv_func_strndup" if test "x$ac_cv_func_strndup" = xyes then : - printf '%s\n' "#define HAVE_STRNDUP 1" >>confdefs.h + printf "%s\n" "#define HAVE_STRNDUP 1" >>confdefs.h fi @@ -34302,7 +34441,7 @@ php_enable_filter=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable input filter support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable input filter support" >&5 printf %s "checking whether to enable input filter support... " >&6; } # Check whether --enable-filter was given. if test ${enable_filter+y} @@ -34339,8 +34478,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -34481,7 +34620,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_FILTER 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_FILTER 1" >>confdefs.h fi fi @@ -34644,7 +34783,7 @@ php_enable_ftp=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable FTP support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable FTP support" >&5 printf %s "checking whether to enable FTP support... " >&6; } # Check whether --enable-ftp was given. if test ${enable_ftp+y} @@ -34681,8 +34820,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -34695,7 +34834,7 @@ php_with_ftp_ssl=$PHP_OPENSSL -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable FTP over SSL support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable FTP over SSL support" >&5 printf %s "checking whether to enable FTP over SSL support... " >&6; } # Check whether --with-ftp-ssl was given. @@ -34712,15 +34851,15 @@ ext_output=$PHP_FTP_SSL -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } if test "$PHP_FTP" = "yes"; then -printf '%s\n' "#define HAVE_FTP 1" >>confdefs.h +printf "%s\n" "#define HAVE_FTP 1" >>confdefs.h ext_builddir=ext/ftp @@ -34857,7 +34996,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_FTP 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_FTP 1" >>confdefs.h fi fi @@ -34986,17 +35125,17 @@ pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.1.1" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.1.1" >&5 printf %s "checking for openssl >= 1.1.1... " >&6; } if test -n "$OPENSSL_CFLAGS"; then pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.1\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "openssl >= 1.1.1") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.1.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35010,10 +35149,10 @@ pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.1\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "openssl >= 1.1.1") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.1.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35027,8 +35166,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -35054,10 +35193,10 @@ and OPENSSL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -35071,8 +35210,8 @@ else OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } found_openssl=yes fi @@ -35239,7 +35378,7 @@ PHP_VAR_SUBST="$PHP_VAR_SUBST FTP_SHARED_LIBADD" -printf '%s\n' "#define HAVE_FTP_SSL 1" >>confdefs.h +printf "%s\n" "#define HAVE_FTP_SSL 1" >>confdefs.h ;; esac @@ -35252,7 +35391,7 @@ php_enable_gd=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GD support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GD support" >&5 printf %s "checking for GD support... " >&6; } # Check whether --enable-gd was given. if test ${enable_gd+y} @@ -35289,8 +35428,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -35298,7 +35437,7 @@ php_with_external_gd=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for external libgd" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for external libgd" >&5 printf %s "checking for external libgd... " >&6; } # Check whether --with-external-gd was given. @@ -35315,8 +35454,8 @@ ext_output=$PHP_EXTERNAL_GD -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -35324,7 +35463,7 @@ php_with_avif=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libavif" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libavif" >&5 printf %s "checking for libavif... " >&6; } # Check whether --with-avif was given. @@ -35341,8 +35480,8 @@ ext_output=$PHP_AVIF -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -35350,7 +35489,7 @@ php_with_webp=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libwebp" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libwebp" >&5 printf %s "checking for libwebp... " >&6; } # Check whether --with-webp was given. @@ -35367,8 +35506,8 @@ ext_output=$PHP_WEBP -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -35376,7 +35515,7 @@ php_with_jpeg=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5 printf %s "checking for libjpeg... " >&6; } # Check whether --with-jpeg was given. @@ -35393,8 +35532,8 @@ ext_output=$PHP_JPEG -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -35402,7 +35541,7 @@ php_with_xpm=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libXpm" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libXpm" >&5 printf %s "checking for libXpm... " >&6; } # Check whether --with-xpm was given. @@ -35419,8 +35558,8 @@ ext_output=$PHP_XPM -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -35428,7 +35567,7 @@ php_with_freetype=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for FreeType 2" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FreeType 2" >&5 printf %s "checking for FreeType 2... " >&6; } # Check whether --with-freetype was given. @@ -35445,8 +35584,8 @@ ext_output=$PHP_FREETYPE -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -35454,7 +35593,7 @@ php_enable_gd_jis_conv=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable JIS-mapped Japanese font support in GD" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable JIS-mapped Japanese font support in GD" >&5 printf %s "checking whether to enable JIS-mapped Japanese font support in GD... " >&6; } # Check whether --enable-gd-jis-conv was given. if test ${enable_gd_jis_conv+y} @@ -35470,8 +35609,8 @@ ext_output=$PHP_GD_JIS_CONV -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -35501,31 +35640,31 @@ extra_sources=" libgd/gd_avif.c libgd/gd_bmp.c libgd/gd_color_match.c libgd/gd_crop.c libgd/gd_filter.c libgd/gd_gd.c libgd/gd_gd2.c libgd/gd_gif_in.c libgd/gd_gif_out.c libgd/gd_interpolation.c libgd/gd_io_dp.c libgd/gd_io_file.c libgd/gd_io_ss.c libgd/gd_io.c libgd/gd_jpeg.c libgd/gd_matrix.c libgd/gd_pixelate.c libgd/gd_png.c libgd/gd_rotate.c libgd/gd_security.c libgd/gd_ss.c libgd/gd_tga.c libgd/gd_topal.c libgd/gd_transform.c libgd/gd_wbmp.c libgd/gd_webp.c libgd/gd_xbm.c libgd/gd.c libgd/gdcache.c libgd/gdfontg.c libgd/gdfontl.c libgd/gdfontmb.c libgd/gdfonts.c libgd/gdfontt.c libgd/gdft.c libgd/gdhelpers.c libgd/gdkanji.c libgd/gdtables.c libgd/gdxpm.c libgd/wbmp.c " -printf '%s\n' "#define HAVE_GD_BUNDLED 1" >>confdefs.h +printf "%s\n" "#define HAVE_GD_BUNDLED 1" >>confdefs.h -printf '%s\n' "#define HAVE_GD_PNG 1" >>confdefs.h +printf "%s\n" "#define HAVE_GD_PNG 1" >>confdefs.h -printf '%s\n' "#define HAVE_GD_BMP 1" >>confdefs.h +printf "%s\n" "#define HAVE_GD_BMP 1" >>confdefs.h -printf '%s\n' "#define HAVE_GD_TGA 1" >>confdefs.h +printf "%s\n" "#define HAVE_GD_TGA 1" >>confdefs.h pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for zlib >= 1.2.11" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zlib >= 1.2.11" >&5 printf %s "checking for zlib >= 1.2.11... " >&6; } if test -n "$ZLIB_CFLAGS"; then pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.11\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.11\""; } >&5 ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.11") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ZLIB_CFLAGS=`$PKG_CONFIG --cflags "zlib >= 1.2.11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35539,10 +35678,10 @@ pkg_cv_ZLIB_LIBS="$ZLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.11\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.11\""; } >&5 ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.11") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ZLIB_LIBS=`$PKG_CONFIG --libs "zlib >= 1.2.11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35556,8 +35695,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -35583,10 +35722,10 @@ and ZLIB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -35600,8 +35739,8 @@ else ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS ZLIB_LIBS=$pkg_cv_ZLIB_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } for ac_i in $ZLIB_CFLAGS; do case $ac_i in @@ -35762,17 +35901,17 @@ pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5 printf %s "checking for libpng... " >&6; } if test -n "$PNG_CFLAGS"; then pkg_cv_PNG_CFLAGS="$PNG_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpng") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35786,10 +35925,10 @@ pkg_cv_PNG_LIBS="$PNG_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpng") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -35803,8 +35942,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -35830,10 +35969,10 @@ and PNG_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -35847,8 +35986,8 @@ else PNG_CFLAGS=$pkg_cv_PNG_CFLAGS PNG_LIBS=$pkg_cv_PNG_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -36007,7 +36146,7 @@ done -printf '%s\n' "#define HAVE_LIBPNG 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBPNG 1" >>confdefs.h @@ -36018,17 +36157,17 @@ e) pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libavif >= 0.8.2" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libavif >= 0.8.2" >&5 printf %s "checking for libavif >= 0.8.2... " >&6; } if test -n "$AVIF_CFLAGS"; then pkg_cv_AVIF_CFLAGS="$AVIF_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavif >= 0.8.2\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavif >= 0.8.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libavif >= 0.8.2") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_AVIF_CFLAGS=`$PKG_CONFIG --cflags "libavif >= 0.8.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36042,10 +36181,10 @@ pkg_cv_AVIF_LIBS="$AVIF_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavif >= 0.8.2\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavif >= 0.8.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libavif >= 0.8.2") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_AVIF_LIBS=`$PKG_CONFIG --libs "libavif >= 0.8.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36059,8 +36198,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -36086,10 +36225,10 @@ and AVIF_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -36103,8 +36242,8 @@ else AVIF_CFLAGS=$pkg_cv_AVIF_CFLAGS AVIF_LIBS=$pkg_cv_AVIF_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -36263,10 +36402,10 @@ done -printf '%s\n' "#define HAVE_LIBAVIF 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBAVIF 1" >>confdefs.h -printf '%s\n' "#define HAVE_GD_AVIF 1" >>confdefs.h +printf "%s\n" "#define HAVE_GD_AVIF 1" >>confdefs.h ;; esac @@ -36280,17 +36419,17 @@ e) pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libwebp >= 0.2.0" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libwebp >= 0.2.0" >&5 printf %s "checking for libwebp >= 0.2.0... " >&6; } if test -n "$WEBP_CFLAGS"; then pkg_cv_WEBP_CFLAGS="$WEBP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp >= 0.2.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp >= 0.2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libwebp >= 0.2.0") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WEBP_CFLAGS=`$PKG_CONFIG --cflags "libwebp >= 0.2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36304,10 +36443,10 @@ pkg_cv_WEBP_LIBS="$WEBP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp >= 0.2.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp >= 0.2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libwebp >= 0.2.0") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WEBP_LIBS=`$PKG_CONFIG --libs "libwebp >= 0.2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36321,8 +36460,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -36348,10 +36487,10 @@ and WEBP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -36365,8 +36504,8 @@ else WEBP_CFLAGS=$pkg_cv_WEBP_CFLAGS WEBP_LIBS=$pkg_cv_WEBP_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -36525,10 +36664,10 @@ done -printf '%s\n' "#define HAVE_LIBWEBP 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBWEBP 1" >>confdefs.h -printf '%s\n' "#define HAVE_GD_WEBP 1" >>confdefs.h +printf "%s\n" "#define HAVE_GD_WEBP 1" >>confdefs.h ;; esac @@ -36542,17 +36681,17 @@ e) pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5 printf %s "checking for libjpeg... " >&6; } if test -n "$JPEG_CFLAGS"; then pkg_cv_JPEG_CFLAGS="$JPEG_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5 ($PKG_CONFIG --exists --print-errors "libjpeg") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_JPEG_CFLAGS=`$PKG_CONFIG --cflags "libjpeg" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36566,10 +36705,10 @@ pkg_cv_JPEG_LIBS="$JPEG_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5 ($PKG_CONFIG --exists --print-errors "libjpeg") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_JPEG_LIBS=`$PKG_CONFIG --libs "libjpeg" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36583,8 +36722,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -36610,10 +36749,10 @@ and JPEG_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -36627,8 +36766,8 @@ else JPEG_CFLAGS=$pkg_cv_JPEG_CFLAGS JPEG_LIBS=$pkg_cv_JPEG_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -36787,10 +36926,10 @@ done -printf '%s\n' "#define HAVE_LIBJPEG 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBJPEG 1" >>confdefs.h -printf '%s\n' "#define HAVE_GD_JPG 1" >>confdefs.h +printf "%s\n" "#define HAVE_GD_JPG 1" >>confdefs.h ;; esac @@ -36804,17 +36943,17 @@ e) pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for xpm" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xpm" >&5 printf %s "checking for xpm... " >&6; } if test -n "$XPM_CFLAGS"; then pkg_cv_XPM_CFLAGS="$XPM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5 ($PKG_CONFIG --exists --print-errors "xpm") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XPM_CFLAGS=`$PKG_CONFIG --cflags "xpm" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36828,10 +36967,10 @@ pkg_cv_XPM_LIBS="$XPM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5 ($PKG_CONFIG --exists --print-errors "xpm") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XPM_LIBS=`$PKG_CONFIG --libs "xpm" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -36845,8 +36984,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -36872,10 +37011,10 @@ and XPM_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -36889,8 +37028,8 @@ else XPM_CFLAGS=$pkg_cv_XPM_CFLAGS XPM_LIBS=$pkg_cv_XPM_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -37049,10 +37188,10 @@ done -printf '%s\n' "#define HAVE_XPM 1" >>confdefs.h +printf "%s\n" "#define HAVE_XPM 1" >>confdefs.h -printf '%s\n' "#define HAVE_GD_XPM 1" >>confdefs.h +printf "%s\n" "#define HAVE_GD_XPM 1" >>confdefs.h ;; esac @@ -37066,17 +37205,17 @@ e) pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5 printf %s "checking for freetype2... " >&6; } if test -n "$FREETYPE2_CFLAGS"; then pkg_cv_FREETYPE2_CFLAGS="$FREETYPE2_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5 ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags "freetype2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37090,10 +37229,10 @@ pkg_cv_FREETYPE2_LIBS="$FREETYPE2_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5 ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FREETYPE2_LIBS=`$PKG_CONFIG --libs "freetype2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37107,8 +37246,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -37134,10 +37273,10 @@ and FREETYPE2_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -37151,8 +37290,8 @@ else FREETYPE2_CFLAGS=$pkg_cv_FREETYPE2_CFLAGS FREETYPE2_LIBS=$pkg_cv_FREETYPE2_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -37311,10 +37450,10 @@ done -printf '%s\n' "#define HAVE_LIBFREETYPE 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBFREETYPE 1" >>confdefs.h -printf '%s\n' "#define HAVE_GD_FREETYPE 1" >>confdefs.h +printf "%s\n" "#define HAVE_GD_FREETYPE 1" >>confdefs.h ;; esac @@ -37325,10 +37464,10 @@ then : -printf '%s\n' "#define USE_GD_JISX0208 1" >>confdefs.h +printf "%s\n" "#define USE_GD_JISX0208 1" >>confdefs.h -printf '%s\n' "#define JISX0208 1" >>confdefs.h +printf "%s\n" "#define JISX0208 1" >>confdefs.h fi @@ -37469,7 +37608,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_GD 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_GD 1" >>confdefs.h fi fi @@ -37608,7 +37747,7 @@ - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether build works" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build works" >&5 printf %s "checking whether build works... " >&6; } if test ${php_cv_lib_gd_works+y} then : @@ -37641,14 +37780,14 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_gd_works" >&5 -printf '%s\n' "$php_cv_lib_gd_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_gd_works" >&5 +printf "%s\n" "$php_cv_lib_gd_works" >&6; } if test "x$php_cv_lib_gd_works" = xyes then : else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "GD library build test failed. See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -37657,17 +37796,17 @@ extra_sources="gd_compat.c" pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for gdlib >= 2.1.0" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdlib >= 2.1.0" >&5 printf %s "checking for gdlib >= 2.1.0... " >&6; } if test -n "$GDLIB_CFLAGS"; then pkg_cv_GDLIB_CFLAGS="$GDLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.1.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gdlib >= 2.1.0") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GDLIB_CFLAGS=`$PKG_CONFIG --cflags "gdlib >= 2.1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37681,10 +37820,10 @@ pkg_cv_GDLIB_LIBS="$GDLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.1.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gdlib >= 2.1.0") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GDLIB_LIBS=`$PKG_CONFIG --libs "gdlib >= 2.1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -37698,8 +37837,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -37725,10 +37864,10 @@ and GDLIB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -37742,8 +37881,8 @@ else GDLIB_CFLAGS=$pkg_cv_GDLIB_CFLAGS GDLIB_LIBS=$pkg_cv_GDLIB_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -37902,7 +38041,7 @@ done -printf '%s\n' "#define HAVE_LIBGD 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBGD 1" >>confdefs.h @@ -37916,7 +38055,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromPng in libgd" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromPng in libgd" >&5 printf %s "checking for working gdImageCreateFromPng in libgd... " >&6; } if test ${php_cv_lib_gd_gdImageCreateFromPng+y} then : @@ -37961,11 +38100,11 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_gd_gdImageCreateFromPng" >&5 -printf '%s\n' "$php_cv_lib_gd_gdImageCreateFromPng" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_gd_gdImageCreateFromPng" >&5 +printf "%s\n" "$php_cv_lib_gd_gdImageCreateFromPng" >&6; } if test "x$php_cv_lib_gd_gdImageCreateFromPng" = xyes then : - printf '%s\n' "#define HAVE_GD_PNG 1" >>confdefs.h + printf "%s\n" "#define HAVE_GD_PNG 1" >>confdefs.h fi ac_ext=c @@ -37989,7 +38128,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromAvif in libgd" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromAvif in libgd" >&5 printf %s "checking for working gdImageCreateFromAvif in libgd... " >&6; } if test ${php_cv_lib_gd_gdImageCreateFromAvif+y} then : @@ -38034,11 +38173,11 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_gd_gdImageCreateFromAvif" >&5 -printf '%s\n' "$php_cv_lib_gd_gdImageCreateFromAvif" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_gd_gdImageCreateFromAvif" >&5 +printf "%s\n" "$php_cv_lib_gd_gdImageCreateFromAvif" >&6; } if test "x$php_cv_lib_gd_gdImageCreateFromAvif" = xyes then : - printf '%s\n' "#define HAVE_GD_AVIF 1" >>confdefs.h + printf "%s\n" "#define HAVE_GD_AVIF 1" >>confdefs.h fi ac_ext=c @@ -38062,7 +38201,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromWebp in libgd" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromWebp in libgd" >&5 printf %s "checking for working gdImageCreateFromWebp in libgd... " >&6; } if test ${php_cv_lib_gd_gdImageCreateFromWebp+y} then : @@ -38107,11 +38246,11 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_gd_gdImageCreateFromWebp" >&5 -printf '%s\n' "$php_cv_lib_gd_gdImageCreateFromWebp" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_gd_gdImageCreateFromWebp" >&5 +printf "%s\n" "$php_cv_lib_gd_gdImageCreateFromWebp" >&6; } if test "x$php_cv_lib_gd_gdImageCreateFromWebp" = xyes then : - printf '%s\n' "#define HAVE_GD_WEBP 1" >>confdefs.h + printf "%s\n" "#define HAVE_GD_WEBP 1" >>confdefs.h fi ac_ext=c @@ -38135,7 +38274,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromJpeg in libgd" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromJpeg in libgd" >&5 printf %s "checking for working gdImageCreateFromJpeg in libgd... " >&6; } if test ${php_cv_lib_gd_gdImageCreateFromJpeg+y} then : @@ -38180,11 +38319,11 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_gd_gdImageCreateFromJpeg" >&5 -printf '%s\n' "$php_cv_lib_gd_gdImageCreateFromJpeg" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_gd_gdImageCreateFromJpeg" >&5 +printf "%s\n" "$php_cv_lib_gd_gdImageCreateFromJpeg" >&6; } if test "x$php_cv_lib_gd_gdImageCreateFromJpeg" = xyes then : - printf '%s\n' "#define HAVE_GD_JPG 1" >>confdefs.h + printf "%s\n" "#define HAVE_GD_JPG 1" >>confdefs.h fi ac_ext=c @@ -38208,7 +38347,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromXpm in libgd" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromXpm in libgd" >&5 printf %s "checking for working gdImageCreateFromXpm in libgd... " >&6; } if test ${php_cv_lib_gd_gdImageCreateFromXpm+y} then : @@ -38253,11 +38392,11 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_gd_gdImageCreateFromXpm" >&5 -printf '%s\n' "$php_cv_lib_gd_gdImageCreateFromXpm" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_gd_gdImageCreateFromXpm" >&5 +printf "%s\n" "$php_cv_lib_gd_gdImageCreateFromXpm" >&6; } if test "x$php_cv_lib_gd_gdImageCreateFromXpm" = xyes then : - printf '%s\n' "#define HAVE_GD_XPM 1" >>confdefs.h + printf "%s\n" "#define HAVE_GD_XPM 1" >>confdefs.h fi ac_ext=c @@ -38281,7 +38420,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromBmp in libgd" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromBmp in libgd" >&5 printf %s "checking for working gdImageCreateFromBmp in libgd... " >&6; } if test ${php_cv_lib_gd_gdImageCreateFromBmp+y} then : @@ -38326,11 +38465,11 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_gd_gdImageCreateFromBmp" >&5 -printf '%s\n' "$php_cv_lib_gd_gdImageCreateFromBmp" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_gd_gdImageCreateFromBmp" >&5 +printf "%s\n" "$php_cv_lib_gd_gdImageCreateFromBmp" >&6; } if test "x$php_cv_lib_gd_gdImageCreateFromBmp" = xyes then : - printf '%s\n' "#define HAVE_GD_BMP 1" >>confdefs.h + printf "%s\n" "#define HAVE_GD_BMP 1" >>confdefs.h fi ac_ext=c @@ -38354,7 +38493,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromTga in libgd" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromTga in libgd" >&5 printf %s "checking for working gdImageCreateFromTga in libgd... " >&6; } if test ${php_cv_lib_gd_gdImageCreateFromTga+y} then : @@ -38399,11 +38538,11 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_gd_gdImageCreateFromTga" >&5 -printf '%s\n' "$php_cv_lib_gd_gdImageCreateFromTga" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_gd_gdImageCreateFromTga" >&5 +printf "%s\n" "$php_cv_lib_gd_gdImageCreateFromTga" >&6; } if test "x$php_cv_lib_gd_gdImageCreateFromTga" = xyes then : - printf '%s\n' "#define HAVE_GD_TGA 1" >>confdefs.h + printf "%s\n" "#define HAVE_GD_TGA 1" >>confdefs.h fi ac_ext=c @@ -38534,7 +38673,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for gdFontCacheShutdown in -lgd" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdFontCacheShutdown in -lgd" >&5 printf %s "checking for gdFontCacheShutdown in -lgd... " >&6; } if test ${ac_cv_lib_gd_gdFontCacheShutdown+y} then : @@ -38575,14 +38714,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdFontCacheShutdown" >&5 -printf '%s\n' "$ac_cv_lib_gd_gdFontCacheShutdown" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdFontCacheShutdown" >&5 +printf "%s\n" "$ac_cv_lib_gd_gdFontCacheShutdown" >&6; } if test "x$ac_cv_lib_gd_gdFontCacheShutdown" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - printf '%s\n' "#define HAVE_GD_FREETYPE 1" >>confdefs.h + printf "%s\n" "#define HAVE_GD_FREETYPE 1" >>confdefs.h else case e in #( @@ -38713,7 +38852,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for gdVersionString in -lgd" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdVersionString in -lgd" >&5 printf %s "checking for gdVersionString in -lgd... " >&6; } if test ${ac_cv_lib_gd_gdVersionString+y} then : @@ -38754,15 +38893,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdVersionString" >&5 -printf '%s\n' "$ac_cv_lib_gd_gdVersionString" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdVersionString" >&5 +printf "%s\n" "$ac_cv_lib_gd_gdVersionString" >&6; } if test "x$ac_cv_lib_gd_gdVersionString" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_GD_LIBVERSION 1" >>confdefs.h +printf "%s\n" "#define HAVE_GD_LIBVERSION 1" >>confdefs.h else case e in #( @@ -38893,7 +39032,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for gdImageGetInterpolationMethod in -lgd" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdImageGetInterpolationMethod in -lgd" >&5 printf %s "checking for gdImageGetInterpolationMethod in -lgd... " >&6; } if test ${ac_cv_lib_gd_gdImageGetInterpolationMethod+y} then : @@ -38934,15 +39073,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageGetInterpolationMethod" >&5 -printf '%s\n' "$ac_cv_lib_gd_gdImageGetInterpolationMethod" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageGetInterpolationMethod" >&5 +printf "%s\n" "$ac_cv_lib_gd_gdImageGetInterpolationMethod" >&6; } if test "x$ac_cv_lib_gd_gdImageGetInterpolationMethod" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_GD_GET_INTERPOLATION 1" >>confdefs.h +printf "%s\n" "#define HAVE_GD_GET_INTERPOLATION 1" >>confdefs.h else case e in #( @@ -39092,7 +39231,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_GD 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_GD 1" >>confdefs.h fi fi @@ -39345,7 +39484,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for gdImageCreate in -lgd" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdImageCreate in -lgd" >&5 printf %s "checking for gdImageCreate in -lgd... " >&6; } if test ${ac_cv_lib_gd_gdImageCreate+y} then : @@ -39386,8 +39525,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreate" >&5 -printf '%s\n' "$ac_cv_lib_gd_gdImageCreate" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreate" >&5 +printf "%s\n" "$ac_cv_lib_gd_gdImageCreate" >&6; } if test "x$ac_cv_lib_gd_gdImageCreate" = xyes then : @@ -39400,8 +39539,8 @@ LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_gd_gdImageCreate - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "GD library build test failed. See 'config.log' for more details" "$LINENO" 5; } ;; @@ -39421,7 +39560,7 @@ php_with_gettext=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU gettext support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext support" >&5 printf %s "checking for GNU gettext support... " >&6; } # Check whether --with-gettext was given. @@ -39459,8 +39598,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -39483,7 +39622,7 @@ O_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 printf %s "checking for bindtextdomain in -lintl... " >&6; } if test ${ac_cv_lib_intl_bindtextdomain+y} then : @@ -39524,8 +39663,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 -printf '%s\n' "$ac_cv_lib_intl_bindtextdomain" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 +printf "%s\n" "$ac_cv_lib_intl_bindtextdomain" >&6; } if test "x$ac_cv_lib_intl_bindtextdomain" = xyes then : @@ -39533,7 +39672,7 @@ GETTEXT_CHECK_IN_LIB=intl else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lc" >&5 + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lc" >&5 printf %s "checking for bindtextdomain in -lc... " >&6; } if test ${ac_cv_lib_c_bindtextdomain+y} then : @@ -39574,16 +39713,16 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_bindtextdomain" >&5 -printf '%s\n' "$ac_cv_lib_c_bindtextdomain" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_bindtextdomain" >&5 +printf "%s\n" "$ac_cv_lib_c_bindtextdomain" >&6; } if test "x$ac_cv_lib_c_bindtextdomain" = xyes then : GETTEXT_LIBS= GETTEXT_CHECK_IN_LIB=c - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: symlinking en_US.UTF-8 messages to en_US in case you are on musl" >&5 -printf '%s\n' "$as_me: symlinking en_US.UTF-8 messages to en_US in case you are on musl" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: symlinking en_US.UTF-8 messages to en_US in case you are on musl" >&5 +printf "%s\n" "$as_me: symlinking en_US.UTF-8 messages to en_US in case you are on musl" >&6;} _linkdest="${srcdir%/}"/ext/gettext/tests/locale/en_US if test ! -e "${_linkdest}" then : @@ -39594,8 +39733,8 @@ else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Unable to find required intl library for gettext. See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -39606,7 +39745,7 @@ -printf '%s\n' "#define HAVE_LIBINTL 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBINTL 1" >>confdefs.h ext_builddir=ext/gettext @@ -39743,7 +39882,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_GETTEXT 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_GETTEXT 1" >>confdefs.h fi fi @@ -39900,8 +40039,8 @@ done - as_ac_Lib=`printf '%s\n' "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_ngettext" | sed "$as_sed_sh"` -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_ngettext" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 printf %s "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; } if eval test \${$as_ac_Lib+y} then : @@ -39943,17 +40082,17 @@ esac fi eval ac_res=\$$as_ac_Lib - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : -printf '%s\n' "#define HAVE_NGETTEXT 1" >>confdefs.h +printf "%s\n" "#define HAVE_NGETTEXT 1" >>confdefs.h fi - as_ac_Lib=`printf '%s\n' "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_dngettext" | sed "$as_sed_sh"` -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_dngettext" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 printf %s "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; } if eval test \${$as_ac_Lib+y} then : @@ -39995,17 +40134,17 @@ esac fi eval ac_res=\$$as_ac_Lib - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : -printf '%s\n' "#define HAVE_DNGETTEXT 1" >>confdefs.h +printf "%s\n" "#define HAVE_DNGETTEXT 1" >>confdefs.h fi - as_ac_Lib=`printf '%s\n' "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_dcngettext" | sed "$as_sed_sh"` -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_dcngettext" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 printf %s "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; } if eval test \${$as_ac_Lib+y} then : @@ -40047,17 +40186,17 @@ esac fi eval ac_res=\$$as_ac_Lib - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : -printf '%s\n' "#define HAVE_DCNGETTEXT 1" >>confdefs.h +printf "%s\n" "#define HAVE_DCNGETTEXT 1" >>confdefs.h fi - as_ac_Lib=`printf '%s\n' "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_bind_textdomain_codeset" | sed "$as_sed_sh"` -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5 + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_bind_textdomain_codeset" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5 printf %s "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB... " >&6; } if eval test \${$as_ac_Lib+y} then : @@ -40099,12 +40238,12 @@ esac fi eval ac_res=\$$as_ac_Lib - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : -printf '%s\n' "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h +printf "%s\n" "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h fi @@ -40229,7 +40368,7 @@ php_with_gmp=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU MP support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU MP support" >&5 printf %s "checking for GNU MP support... " >&6; } # Check whether --with-gmp was given. @@ -40267,8 +40406,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -40279,17 +40418,17 @@ then : pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for gmp >= 4.2" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gmp >= 4.2" >&5 printf %s "checking for gmp >= 4.2... " >&6; } if test -n "$GMP_CFLAGS"; then pkg_cv_GMP_CFLAGS="$GMP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmp >= 4.2\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmp >= 4.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "gmp >= 4.2") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GMP_CFLAGS=`$PKG_CONFIG --cflags "gmp >= 4.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40303,10 +40442,10 @@ pkg_cv_GMP_LIBS="$GMP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmp >= 4.2\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmp >= 4.2\""; } >&5 ($PKG_CONFIG --exists --print-errors "gmp >= 4.2") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GMP_LIBS=`$PKG_CONFIG --libs "gmp >= 4.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -40320,8 +40459,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -40338,14 +40477,14 @@ : elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } : else GMP_CFLAGS=$pkg_cv_GMP_CFLAGS GMP_LIBS=$pkg_cv_GMP_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } gmp_found=yes fi fi @@ -40385,8 +40524,8 @@ if test "x$gmp_check" = xno then : - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? " The required GNU MP library version 4.2 or greater not found. @@ -40702,7 +40841,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_GMP 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_GMP 1" >>confdefs.h fi fi @@ -40824,7 +40963,7 @@ PHP_VAR_SUBST="$PHP_VAR_SUBST GMP_SHARED_LIBADD" -printf '%s\n' "#define HAVE_GMP 1" >>confdefs.h +printf "%s\n" "#define HAVE_GMP 1" >>confdefs.h fi @@ -40834,7 +40973,7 @@ php_with_mhash=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mhash support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mhash support" >&5 printf %s "checking for mhash support... " >&6; } # Check whether --with-mhash was given. @@ -40872,8 +41011,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -40883,10 +41022,10 @@ else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: The --with-mhash option and mhash* functions are deprecated as of PHP 8.1.0" >&5 -printf '%s\n' "$as_me: WARNING: The --with-mhash option and mhash* functions are deprecated as of PHP 8.1.0" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The --with-mhash option and mhash* functions are deprecated as of PHP 8.1.0" >&5 +printf "%s\n" "$as_me: WARNING: The --with-mhash option and mhash* functions are deprecated as of PHP 8.1.0" >&2;} -printf '%s\n' "#define PHP_MHASH_BC 1" >>confdefs.h +printf "%s\n" "#define PHP_MHASH_BC 1" >>confdefs.h ;; esac @@ -40897,10 +41036,10 @@ EXT_HASH_SHA3_SOURCES= -printf '%s\n' "#define HAVE_SLOW_HASH3 1" >>confdefs.h +printf "%s\n" "#define HAVE_SLOW_HASH3 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: Using SHA3 slow implementation on bigendian" >&5 -printf '%s\n' "$as_me: WARNING: Using SHA3 slow implementation on bigendian" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Using SHA3 slow implementation on bigendian" >&5 +printf "%s\n" "$as_me: WARNING: Using SHA3 slow implementation on bigendian" >&2;} SHA3_DIR= else case e in #( @@ -40909,7 +41048,7 @@ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 printf %s "checking size of long... " >&6; } if test ${ac_cv_sizeof_long+y} then : @@ -40919,30 +41058,37 @@ then : else case e in #( - e) ac_cv_sizeof_long=0 ;; + e) if test "$ac_cv_type_long" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long) +See 'config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long=0 + fi ;; esac fi ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -printf '%s\n' "$ac_cv_sizeof_long" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 +printf "%s\n" "$ac_cv_sizeof_long" >&6; } -printf '%s\n' "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h +printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5 printf %s "checking if we're at 64-bit platform... " >&6; } if test "$ac_cv_sizeof_long" -eq 4 then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } SHA3_DIR="sha3/generic32lc" SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-inplace32BI.c" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wno-implicit-fallthrough" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wno-implicit-fallthrough" >&5 printf %s "checking whether the C compiler accepts -Wno-implicit-fallthrough... " >&6; } if test ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+y} then : @@ -40973,8 +41119,8 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5 -printf '%s\n' "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5 +printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; } if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes then : PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -Wno-implicit-fallthrough" @@ -40986,8 +41132,8 @@ else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SHA3_DIR="sha3/generic64lc" SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-opt64.c" ;; @@ -41134,7 +41280,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_HASH 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_HASH 1" >>confdefs.h fi fi @@ -41286,7 +41432,7 @@ php_with_iconv=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for iconv support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv support" >&5 printf %s "checking for iconv support... " >&6; } # Check whether --with-iconv was given. @@ -41324,8 +41470,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -41350,7 +41496,7 @@ if test "x$ac_cv_func_libiconv" = xyes then : - printf '%s\n' "#define HAVE_LIBICONV 1" >>confdefs.h + printf "%s\n" "#define HAVE_LIBICONV 1" >>confdefs.h found_iconv=yes @@ -41507,8 +41653,8 @@ esac done - as_ac_Lib=`printf '%s\n' "ac_cv_lib_$iconv_lib_name""_libiconv" | sed "$as_sed_sh"` -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libiconv in -l$iconv_lib_name" >&5 + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$iconv_lib_name""_libiconv" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libiconv in -l$iconv_lib_name" >&5 printf %s "checking for libiconv in -l$iconv_lib_name... " >&6; } if eval test \${$as_ac_Lib+y} then : @@ -41550,8 +41696,8 @@ esac fi eval ac_res=\$$as_ac_Lib - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : @@ -41559,10 +41705,10 @@ ext_shared=$save_ext_shared found_iconv=yes - printf '%s\n' "#define HAVE_LIBICONV 1" >>confdefs.h + printf "%s\n" "#define HAVE_LIBICONV 1" >>confdefs.h -printf '%s\n' "#define ICONV_ALIASED_LIBICONV 1" >>confdefs.h +printf "%s\n" "#define ICONV_ALIASED_LIBICONV 1" >>confdefs.h @@ -41689,8 +41835,8 @@ esac done - as_ac_Lib=`printf '%s\n' "ac_cv_lib_$iconv_lib_name""_iconv" | sed "$as_sed_sh"` -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for iconv in -l$iconv_lib_name" >&5 + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$iconv_lib_name""_iconv" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv in -l$iconv_lib_name" >&5 printf %s "checking for iconv in -l$iconv_lib_name... " >&6; } if eval test \${$as_ac_Lib+y} then : @@ -41732,8 +41878,8 @@ esac fi eval ac_res=\$$as_ac_Lib - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : @@ -41902,8 +42048,8 @@ fi -else { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} +else { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The iconv not found. See 'config.log' for more details" "$LINENO" 5; } fi @@ -41914,7 +42060,7 @@ LIBS="$LIBS $ICONV_SHARED_LIBADD" CFLAGS="$INCLUDES $CFLAGS" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for iconv implementation" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv implementation" >&5 printf %s "checking for iconv implementation... " >&6; } if test ${php_cv_iconv_implementation+y} then : @@ -42016,8 +42162,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_iconv_implementation" >&5 -printf '%s\n' "$php_cv_iconv_implementation" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_iconv_implementation" >&5 +printf "%s\n" "$php_cv_iconv_implementation" >&6; } @@ -42025,34 +42171,34 @@ glibc) : -printf '%s\n' "#define HAVE_GLIBC_ICONV 1" >>confdefs.h +printf "%s\n" "#define HAVE_GLIBC_ICONV 1" >>confdefs.h - printf '%s\n' "#define PHP_ICONV_IMPL \"glibc\"" >>confdefs.h + printf "%s\n" "#define PHP_ICONV_IMPL \"glibc\"" >>confdefs.h ;; #( "GNU libiconv") : - printf '%s\n' "#define PHP_ICONV_IMPL \"libiconv\"" >>confdefs.h + printf "%s\n" "#define PHP_ICONV_IMPL \"libiconv\"" >>confdefs.h - printf '%s\n' "#define HAVE_LIBICONV 1" >>confdefs.h + printf "%s\n" "#define HAVE_LIBICONV 1" >>confdefs.h ;; #( BSD) : - printf '%s\n' "#define PHP_ICONV_IMPL \"BSD iconv\"" >>confdefs.h + printf "%s\n" "#define PHP_ICONV_IMPL \"BSD iconv\"" >>confdefs.h ;; #( IBM) : -printf '%s\n' "#define HAVE_IBM_ICONV 1" >>confdefs.h +printf "%s\n" "#define HAVE_IBM_ICONV 1" >>confdefs.h - printf '%s\n' "#define PHP_ICONV_IMPL \"IBM iconv\"" >>confdefs.h + printf "%s\n" "#define PHP_ICONV_IMPL \"IBM iconv\"" >>confdefs.h ;; #( *) : ;; esac - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if iconv supports errno" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if iconv supports errno" >&5 printf %s "checking if iconv supports errno... " >&6; } if test ${php_cv_iconv_errno+y} then : @@ -42097,20 +42243,20 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_iconv_errno" >&5 -printf '%s\n' "$php_cv_iconv_errno" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_iconv_errno" >&5 +printf "%s\n" "$php_cv_iconv_errno" >&6; } if test "x$php_cv_iconv_errno" = xyes then : else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The iconv check failed, 'errno' is missing. See 'config.log' for more details" "$LINENO" 5; } ;; esac fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if iconv input parameter is const (non-standard)" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if iconv input parameter is const (non-standard)" >&5 printf %s "checking if iconv input parameter is const (non-standard)... " >&6; } if test ${php_cv_iconv_const+y} then : @@ -42134,14 +42280,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_iconv_const" >&5 -printf '%s\n' "$php_cv_iconv_const" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_iconv_const" >&5 +printf "%s\n" "$php_cv_iconv_const" >&6; } if test "x$php_cv_iconv_const" = xnon-const then : php_cv_iconv_const= fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if iconv supports //IGNORE" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if iconv supports //IGNORE" >&5 printf %s "checking if iconv supports //IGNORE... " >&6; } if test ${php_cv_iconv_ignore+y} then : @@ -42188,12 +42334,12 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_iconv_ignore" >&5 -printf '%s\n' "$php_cv_iconv_ignore" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_iconv_ignore" >&5 +printf "%s\n" "$php_cv_iconv_ignore" >&6; } if test "x$php_cv_iconv_ignore" = xno then : -printf '%s\n' "#define ICONV_BROKEN_IGNORE 1" >>confdefs.h +printf "%s\n" "#define ICONV_BROKEN_IGNORE 1" >>confdefs.h fi @@ -42201,7 +42347,7 @@ CFLAGS=$save_CFLAGS -printf '%s\n' "#define HAVE_ICONV 1" >>confdefs.h +printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h @@ -42339,7 +42485,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_ICONV 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_ICONV 1" >>confdefs.h fi fi @@ -42485,7 +42631,7 @@ php_enable_intl=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable internationalization support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable internationalization support" >&5 printf %s "checking whether to enable internationalization support... " >&6; } # Check whether --enable-intl was given. if test ${enable_intl+y} @@ -42522,8 +42668,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -42532,17 +42678,17 @@ pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for icu-uc >= 50.1 icu-io icu-i18n" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for icu-uc >= 50.1 icu-io icu-i18n" >&5 printf %s "checking for icu-uc >= 50.1 icu-io icu-i18n... " >&6; } if test -n "$ICU_CFLAGS"; then pkg_cv_ICU_CFLAGS="$ICU_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc >= 50.1 icu-io icu-i18n\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc >= 50.1 icu-io icu-i18n\""; } >&5 ($PKG_CONFIG --exists --print-errors "icu-uc >= 50.1 icu-io icu-i18n") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-uc >= 50.1 icu-io icu-i18n" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -42556,10 +42702,10 @@ pkg_cv_ICU_LIBS="$ICU_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc >= 50.1 icu-io icu-i18n\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc >= 50.1 icu-io icu-i18n\""; } >&5 ($PKG_CONFIG --exists --print-errors "icu-uc >= 50.1 icu-io icu-i18n") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-uc >= 50.1 icu-io icu-i18n" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -42573,8 +42719,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -42600,10 +42746,10 @@ and ICU_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -42617,8 +42763,8 @@ else ICU_CFLAGS=$pkg_cv_ICU_CFLAGS ICU_LIBS=$pkg_cv_ICU_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -42925,7 +43071,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_INTL 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_INTL 1" >>confdefs.h fi fi @@ -43084,7 +43230,7 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CXX+y} then : @@ -43105,7 +43251,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -43117,11 +43263,11 @@ fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -printf '%s\n' "$CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +printf "%s\n" "$CXX" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -43134,7 +43280,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CXX+y} then : @@ -43155,7 +43301,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -43167,11 +43313,11 @@ fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -printf '%s\n' "$ac_ct_CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +printf "%s\n" "$ac_ct_CXX" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -43183,8 +43329,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX @@ -43194,7 +43340,7 @@ fi fi # Provide some information about the compiler. -printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion; do @@ -43204,7 +43350,7 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf '%s\n' "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -43214,11 +43360,11 @@ cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 printf %s "checking whether the compiler supports GNU C++... " >&6; } if test ${ac_cv_cxx_compiler_gnu+y} then : @@ -43250,8 +43396,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -printf '%s\n' "$ac_cv_cxx_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test $ac_compiler_gnu = yes; then @@ -43261,7 +43407,7 @@ fi ac_test_CXXFLAGS=${CXXFLAGS+y} ac_save_CXXFLAGS=$CXXFLAGS -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 printf %s "checking whether $CXX accepts -g... " >&6; } if test ${ac_cv_prog_cxx_g+y} then : @@ -43329,8 +43475,8 @@ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -printf '%s\n' "$ac_cv_prog_cxx_g" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } if test $ac_test_CXXFLAGS; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then @@ -43346,6 +43492,106 @@ CXXFLAGS= fi fi +ac_prog_cxx_stdcxx=no +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 +printf %s "checking for $CXX option to enable C++11 features... " >&6; } +if test ${ac_cv_prog_cxx_cxx11+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_prog_cxx_cxx11=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx11_program +_ACEOF +for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx11" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX ;; +esac +fi + +if test "x$ac_cv_prog_cxx_cxx11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else case e in #( + e) if test "x$ac_cv_prog_cxx_cxx11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx11" ;; +esac +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 + ac_prog_cxx_stdcxx=cxx11 ;; +esac +fi +fi +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 +printf %s "checking for $CXX option to enable C++98 features... " >&6; } +if test ${ac_cv_prog_cxx_cxx98+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_prog_cxx_cxx98=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx98_program +_ACEOF +for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx98=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx98" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX ;; +esac +fi + +if test "x$ac_cv_prog_cxx_cxx98" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else case e in #( + e) if test "x$ac_cv_prog_cxx_cxx98" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx98" ;; +esac +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 + ac_prog_cxx_stdcxx=cxx98 ;; +esac +fi +fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -43357,7 +43603,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 printf %s "checking how to run the C++ preprocessor... " >&6; } if test -z "$CXXCPP"; then if test ${ac_cv_prog_CXXCPP+y} @@ -43424,8 +43670,8 @@ else ac_cv_prog_CXXCPP=$CXXCPP fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -printf '%s\n' "$CXXCPP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +printf "%s\n" "$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -43473,8 +43719,8 @@ then : else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -43501,14 +43747,14 @@ fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if intl requires -std=gnu++17" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if intl requires -std=gnu++17" >&5 printf %s "checking if intl requires -std=gnu++17... " >&6; } if $PKG_CONFIG icu-uc --atleast-version=74 then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ax_cxx_compile_alternatives="17 1z" ax_cxx_compile_cxx17_required=true ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -43518,8 +43764,8 @@ for alternative in ${ax_cxx_compile_alternatives}; do for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do - cachevar=`printf '%s\n' "ax_cv_cxx_compile_cxx17_$switch" | sed "$as_sed_sh"` - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5 + cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx17_$switch" | sed "$as_sed_sh"` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5 printf %s "checking whether $CXX supports C++17 features with $switch... " >&6; } if eval test \${$cachevar+y} then : @@ -44328,8 +44574,8 @@ esac fi eval ac_res=\$$cachevar - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test x\$$cachevar = xyes; then eval PHP_INTL_STDCXX="$switch" ac_success=yes @@ -44353,16 +44599,16 @@ fi fi if test x$ac_success = xno; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: No compiler with C++17 support was found" >&5 -printf '%s\n' "$as_me: No compiler with C++17 support was found" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++17 support was found" >&5 +printf "%s\n" "$as_me: No compiler with C++17 support was found" >&6;} fi else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ax_cxx_compile_alternatives="11 0x" ax_cxx_compile_cxx11_required=true ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -44372,8 +44618,8 @@ for alternative in ${ax_cxx_compile_alternatives}; do for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do - cachevar=`printf '%s\n' "ax_cv_cxx_compile_cxx11_$switch" | sed "$as_sed_sh"` - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 + cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx11_$switch" | sed "$as_sed_sh"` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 printf %s "checking whether $CXX supports C++11 features with $switch... " >&6; } if eval test \${$cachevar+y} then : @@ -44684,8 +44930,8 @@ esac fi eval ac_res=\$$cachevar - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test x\$$cachevar = xyes; then eval PHP_INTL_STDCXX="$switch" ac_success=yes @@ -44709,8 +44955,8 @@ fi fi if test x$ac_success = xno; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5 -printf '%s\n' "$as_me: No compiler with C++11 support was found" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5 +printf "%s\n" "$as_me: No compiler with C++11 support was found" >&6;} fi @@ -44983,7 +45229,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_JSON 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_JSON 1" >>confdefs.h fi fi @@ -45132,7 +45378,7 @@ php_with_ldap=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for LDAP support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LDAP support" >&5 printf %s "checking for LDAP support... " >&6; } # Check whether --with-ldap was given. @@ -45170,8 +45416,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -45179,7 +45425,7 @@ php_with_ldap_sasl=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build with LDAP Cyrus SASL support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with LDAP Cyrus SASL support" >&5 printf %s "checking whether to build with LDAP Cyrus SASL support... " >&6; } # Check whether --with-ldap-sasl was given. @@ -45196,8 +45442,8 @@ ext_output=$PHP_LDAP_SASL -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -45338,7 +45584,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_LDAP 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_LDAP 1" >>confdefs.h fi fi @@ -45476,7 +45722,7 @@ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 printf %s "checking size of long... " >&6; } if test ${ac_cv_sizeof_long+y} then : @@ -45486,33 +45732,40 @@ then : else case e in #( - e) ac_cv_sizeof_long=0 ;; + e) if test "$ac_cv_type_long" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long) +See 'config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long=0 + fi ;; esac fi ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -printf '%s\n' "$ac_cv_sizeof_long" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 +printf "%s\n" "$ac_cv_sizeof_long" >&6; } -printf '%s\n' "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h +printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5 printf %s "checking if we're at 64-bit platform... " >&6; } if test "$ac_cv_sizeof_long" -eq 4 then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PHP_OCI8_IC_LIBDIR_SUFFIX="" else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } PHP_OCI8_IC_LIBDIR_SUFFIX=64 ;; esac @@ -45549,7 +45802,7 @@ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 printf %s "checking size of long... " >&6; } if test ${ac_cv_sizeof_long+y} then : @@ -45559,33 +45812,40 @@ then : else case e in #( - e) ac_cv_sizeof_long=0 ;; + e) if test "$ac_cv_type_long" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long) +See 'config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long=0 + fi ;; esac fi ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -printf '%s\n' "$ac_cv_sizeof_long" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 +printf "%s\n" "$ac_cv_sizeof_long" >&6; } -printf '%s\n' "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h +printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5 printf %s "checking if we're at 64-bit platform... " >&6; } if test "$ac_cv_sizeof_long" -eq 4 then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PHP_OCI8_IC_LIBDIR_SUFFIX="" else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } PHP_OCI8_IC_LIBDIR_SUFFIX=64 ;; esac @@ -46041,7 +46301,7 @@ fi - printf '%s\n' "#define HAVE_ORALDAP 1" >>confdefs.h + printf "%s\n" "#define HAVE_ORALDAP 1" >>confdefs.h elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then @@ -46150,7 +46410,7 @@ fi - printf '%s\n' "#define HAVE_ORALDAP 1" >>confdefs.h + printf "%s\n" "#define HAVE_ORALDAP 1" >>confdefs.h elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME; then @@ -46259,7 +46519,7 @@ fi - printf '%s\n' "#define HAVE_ORALDAP 1" >>confdefs.h + printf "%s\n" "#define HAVE_ORALDAP 1" >>confdefs.h else @@ -46304,7 +46564,7 @@ PHP_VAR_SUBST="$PHP_VAR_SUBST LDAP_SHARED_LIBADD" -printf '%s\n' "#define HAVE_LDAP 1" >>confdefs.h +printf "%s\n" "#define HAVE_LDAP 1" >>confdefs.h _SAVE_CPPFLAGS=$CPPFLAGS @@ -46312,7 +46572,7 @@ CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR" LIBS="$LIBS $LDAP_SHARED_LIBADD" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for 3 arg ldap_set_rebind_proc" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 3 arg ldap_set_rebind_proc" >&5 printf %s "checking for 3 arg ldap_set_rebind_proc... " >&6; } if test ${php_cv_have_3arg_setrebindproc+y} then : @@ -46339,73 +46599,73 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_3arg_setrebindproc" >&5 -printf '%s\n' "$php_cv_have_3arg_setrebindproc" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_3arg_setrebindproc" >&5 +printf "%s\n" "$php_cv_have_3arg_setrebindproc" >&6; } if test "x$php_cv_have_3arg_setrebindproc" = xyes then : -printf '%s\n' "#define HAVE_3ARG_SETREBINDPROC 1" >>confdefs.h +printf "%s\n" "#define HAVE_3ARG_SETREBINDPROC 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "ldap_control_find" "ac_cv_func_ldap_control_find" if test "x$ac_cv_func_ldap_control_find" = xyes then : - printf '%s\n' "#define HAVE_LDAP_CONTROL_FIND 1" >>confdefs.h + printf "%s\n" "#define HAVE_LDAP_CONTROL_FIND 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "ldap_extended_operation" "ac_cv_func_ldap_extended_operation" if test "x$ac_cv_func_ldap_extended_operation" = xyes then : - printf '%s\n' "#define HAVE_LDAP_EXTENDED_OPERATION 1" >>confdefs.h + printf "%s\n" "#define HAVE_LDAP_EXTENDED_OPERATION 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "ldap_extended_operation_s" "ac_cv_func_ldap_extended_operation_s" if test "x$ac_cv_func_ldap_extended_operation_s" = xyes then : - printf '%s\n' "#define HAVE_LDAP_EXTENDED_OPERATION_S 1" >>confdefs.h + printf "%s\n" "#define HAVE_LDAP_EXTENDED_OPERATION_S 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "ldap_parse_extended_result" "ac_cv_func_ldap_parse_extended_result" if test "x$ac_cv_func_ldap_parse_extended_result" = xyes then : - printf '%s\n' "#define HAVE_LDAP_PARSE_EXTENDED_RESULT 1" >>confdefs.h + printf "%s\n" "#define HAVE_LDAP_PARSE_EXTENDED_RESULT 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "ldap_parse_reference" "ac_cv_func_ldap_parse_reference" if test "x$ac_cv_func_ldap_parse_reference" = xyes then : - printf '%s\n' "#define HAVE_LDAP_PARSE_REFERENCE 1" >>confdefs.h + printf "%s\n" "#define HAVE_LDAP_PARSE_REFERENCE 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "ldap_parse_result" "ac_cv_func_ldap_parse_result" if test "x$ac_cv_func_ldap_parse_result" = xyes then : - printf '%s\n' "#define HAVE_LDAP_PARSE_RESULT 1" >>confdefs.h + printf "%s\n" "#define HAVE_LDAP_PARSE_RESULT 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "ldap_passwd" "ac_cv_func_ldap_passwd" if test "x$ac_cv_func_ldap_passwd" = xyes then : - printf '%s\n' "#define HAVE_LDAP_PASSWD 1" >>confdefs.h + printf "%s\n" "#define HAVE_LDAP_PASSWD 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "ldap_refresh_s" "ac_cv_func_ldap_refresh_s" if test "x$ac_cv_func_ldap_refresh_s" = xyes then : - printf '%s\n' "#define HAVE_LDAP_REFRESH_S 1" >>confdefs.h + printf "%s\n" "#define HAVE_LDAP_REFRESH_S 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "ldap_start_tls_s" "ac_cv_func_ldap_start_tls_s" if test "x$ac_cv_func_ldap_start_tls_s" = xyes then : - printf '%s\n' "#define HAVE_LDAP_START_TLS_S 1" >>confdefs.h + printf "%s\n" "#define HAVE_LDAP_START_TLS_S 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "ldap_whoami_s" "ac_cv_func_ldap_whoami_s" if test "x$ac_cv_func_ldap_whoami_s" = xyes then : - printf '%s\n' "#define HAVE_LDAP_WHOAMI_S 1" >>confdefs.h + printf "%s\n" "#define HAVE_LDAP_WHOAMI_S 1" >>confdefs.h fi @@ -46417,17 +46677,17 @@ e) pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libsasl2" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsasl2" >&5 printf %s "checking for libsasl2... " >&6; } if test -n "$SASL_CFLAGS"; then pkg_cv_SASL_CFLAGS="$SASL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsasl2\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsasl2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsasl2") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SASL_CFLAGS=`$PKG_CONFIG --cflags "libsasl2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46441,10 +46701,10 @@ pkg_cv_SASL_LIBS="$SASL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsasl2\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsasl2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsasl2") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SASL_LIBS=`$PKG_CONFIG --libs "libsasl2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46458,8 +46718,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -46485,10 +46745,10 @@ and SASL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -46502,8 +46762,8 @@ else SASL_CFLAGS=$pkg_cv_SASL_CFLAGS SASL_LIBS=$pkg_cv_SASL_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -46662,7 +46922,7 @@ done -printf '%s\n' "#define HAVE_LDAP_SASL 1" >>confdefs.h +printf "%s\n" "#define HAVE_LDAP_SASL 1" >>confdefs.h ;; esac @@ -46711,7 +46971,7 @@ php_enable_mbstring=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte string support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte string support" >&5 printf %s "checking whether to enable multibyte string support... " >&6; } # Check whether --enable-mbstring was given. if test ${enable_mbstring+y} @@ -46748,8 +47008,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -46757,7 +47017,7 @@ php_enable_mbregex=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte regex support (requires oniguruma)" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte regex support (requires oniguruma)" >&5 printf %s "checking whether to enable multibyte regex support (requires oniguruma)... " >&6; } # Check whether --enable-mbregex was given. if test ${enable_mbregex+y} @@ -46773,15 +47033,15 @@ ext_output=$PHP_MBREGEX -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } if test "$PHP_MBSTRING" != "no"; then -printf '%s\n' "#define HAVE_MBSTRING 1" >>confdefs.h +printf "%s\n" "#define HAVE_MBSTRING 1" >>confdefs.h @@ -46793,17 +47053,17 @@ pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for oniguruma" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for oniguruma" >&5 printf %s "checking for oniguruma... " >&6; } if test -n "$ONIG_CFLAGS"; then pkg_cv_ONIG_CFLAGS="$ONIG_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"oniguruma\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"oniguruma\""; } >&5 ($PKG_CONFIG --exists --print-errors "oniguruma") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ONIG_CFLAGS=`$PKG_CONFIG --cflags "oniguruma" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46817,10 +47077,10 @@ pkg_cv_ONIG_LIBS="$ONIG_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"oniguruma\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"oniguruma\""; } >&5 ($PKG_CONFIG --exists --print-errors "oniguruma") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ONIG_LIBS=`$PKG_CONFIG --libs "oniguruma" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -46834,8 +47094,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -46861,10 +47121,10 @@ and ONIG_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -46878,8 +47138,8 @@ else ONIG_CFLAGS=$pkg_cv_ONIG_CFLAGS ONIG_LIBS=$pkg_cv_ONIG_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -47038,7 +47298,7 @@ done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if oniguruma has an invalid entry for KOI8 encoding" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if oniguruma has an invalid entry for KOI8 encoding" >&5 printf %s "checking if oniguruma has an invalid entry for KOI8 encoding... " >&6; } if test ${php_cv_lib_onig_invalid_koi8+y} then : @@ -47075,12 +47335,12 @@ CFLAGS=$save_old_CFLAGS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_onig_invalid_koi8" >&5 -printf '%s\n' "$php_cv_lib_onig_invalid_koi8" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_lib_onig_invalid_koi8" >&5 +printf "%s\n" "$php_cv_lib_onig_invalid_koi8" >&6; } if test "x$php_cv_lib_onig_invalid_koi8" = xyes then : -printf '%s\n' "#define PHP_ONIG_BAD_KOI8_ENTRY 1" >>confdefs.h +printf "%s\n" "#define PHP_ONIG_BAD_KOI8_ENTRY 1" >>confdefs.h fi @@ -47092,7 +47352,7 @@ -printf '%s\n' "#define HAVE_MBREGEX 1" >>confdefs.h +printf "%s\n" "#define HAVE_MBREGEX 1" >>confdefs.h @@ -47333,7 +47593,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_MBSTRING 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_MBSTRING 1" >>confdefs.h fi fi @@ -47589,7 +47849,7 @@ php_with_mysqli=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for MySQLi support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MySQLi support" >&5 printf %s "checking for MySQLi support... " >&6; } # Check whether --with-mysqli was given. @@ -47627,8 +47887,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -47636,7 +47896,7 @@ php_with_mysql_sock=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for specified location of the MySQL Unix socket" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for specified location of the MySQL Unix socket" >&5 printf %s "checking for specified location of the MySQL Unix socket... " >&6; } # Check whether --with-mysql-sock was given. @@ -47653,8 +47913,8 @@ ext_output=$PHP_MYSQL_SOCK -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -47668,7 +47928,7 @@ '--with-mysqli=$PHP_MYSQLI' with '--with-mysqli'." "$LINENO" 5 ;; esac - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for MySQL Unix socket location" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MySQL Unix socket location" >&5 printf %s "checking for MySQL Unix socket location... " >&6; } case $PHP_MYSQL_SOCK in #( yes) : @@ -47692,28 +47952,28 @@ if ${MYSQL_SOCK:+false} : then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else case e in #( e) -printf '%s\n' "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$MYSQL_SOCK\"" >>confdefs.h +printf "%s\n" "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$MYSQL_SOCK\"" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5 -printf '%s\n' "$MYSQL_SOCK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5 +printf "%s\n" "$MYSQL_SOCK" >&6; } ;; esac fi ;; #( no) : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; #( + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; #( *) : - printf '%s\n' "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$PHP_MYSQL_SOCK\"" >>confdefs.h + printf "%s\n" "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$PHP_MYSQL_SOCK\"" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $PHP_MYSQL_SOCK" >&5 -printf '%s\n' "$PHP_MYSQL_SOCK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_MYSQL_SOCK" >&5 +printf "%s\n" "$PHP_MYSQL_SOCK" >&6; } ;; esac @@ -47852,7 +48112,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_MYSQLI 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_MYSQLI 1" >>confdefs.h fi fi @@ -48090,7 +48350,7 @@ php_with_adabas=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for Adabas support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Adabas support" >&5 printf %s "checking for Adabas support... " >&6; } # Check whether --with-adabas was given. @@ -48128,8 +48388,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -48299,7 +48559,7 @@ as_fn_error $? "ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" "$LINENO" 5 fi -printf '%s\n' "#define HAVE_ADABAS 1" >>confdefs.h +printf "%s\n" "#define HAVE_ADABAS 1" >>confdefs.h ;; esac @@ -48313,7 +48573,7 @@ php_with_sapdb=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for SAP DB support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SAP DB support" >&5 printf %s "checking for SAP DB support... " >&6; } # Check whether --with-sapdb was given. @@ -48351,8 +48611,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -48449,7 +48709,7 @@ ODBC_TYPE=sapdb -printf '%s\n' "#define HAVE_SAPDB 1" >>confdefs.h +printf "%s\n" "#define HAVE_SAPDB 1" >>confdefs.h ;; esac @@ -48463,7 +48723,7 @@ php_with_solid=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for Solid support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Solid support" >&5 printf %s "checking for Solid support... " >&6; } # Check whether --with-solid was given. @@ -48501,8 +48761,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -48522,19 +48782,19 @@ ODBC_TYPE=solid if test -f $ODBC_LIBDIR/soc*35.a; then -printf '%s\n' "#define HAVE_SOLID_35 1" >>confdefs.h +printf "%s\n" "#define HAVE_SOLID_35 1" >>confdefs.h elif test -f $ODBC_LIBDIR/scl*30.a; then -printf '%s\n' "#define HAVE_SOLID_30 1" >>confdefs.h +printf "%s\n" "#define HAVE_SOLID_30 1" >>confdefs.h elif test -f $ODBC_LIBDIR/scl*23.a; then -printf '%s\n' "#define HAVE_SOLID 1" >>confdefs.h +printf "%s\n" "#define HAVE_SOLID 1" >>confdefs.h fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking Solid library file" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Solid library file" >&5 printf %s "checking Solid library file... " >&6; } ac_solid_uname_r=$(uname -r 2>/dev/null) ac_solid_uname_s=$(uname -s 2>/dev/null) @@ -48548,7 +48808,7 @@ ac_solid_os=lux fi -printf '%s\n' "#define SS_LINUX 1" >>confdefs.h +printf "%s\n" "#define SS_LINUX 1" >>confdefs.h ;; SunOS) @@ -48560,7 +48820,7 @@ ac_solid_os=fbx fi -printf '%s\n' "#define SS_FBX 1" >>confdefs.h +printf "%s\n" "#define SS_FBX 1" >>confdefs.h ;; esac @@ -48590,8 +48850,8 @@ ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version} fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $(echo $ODBC_LIBS | $SED -e 's!.*/!!')" >&5 -printf '%s\n' "$(echo $ODBC_LIBS | $SED -e 's!.*/!!')" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $(echo $ODBC_LIBS | $SED -e 's!.*/!!')" >&5 +printf "%s\n" "$(echo $ODBC_LIBS | $SED -e 's!.*/!!')" >&6; } ;; esac @@ -48605,7 +48865,7 @@ php_with_ibm_db2=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for IBM DB2 support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IBM DB2 support" >&5 printf %s "checking for IBM DB2 support... " >&6; } # Check whether --with-ibm-db2 was given. @@ -48643,8 +48903,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -48684,11 +48944,11 @@ if test "x$ac_cv_func_SQLExecute" = xyes then : -printf '%s\n' "#define HAVE_IBMDB2 1" >>confdefs.h +printf "%s\n" "#define HAVE_IBMDB2 1" >>confdefs.h else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? " ODBC build test failed. You need to source your DB2 environment before running PHP configure: @@ -48711,7 +48971,7 @@ php_with_empress=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for Empress support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Empress support" >&5 printf %s "checking for Empress support... " >&6; } # Check whether --with-empress was given. @@ -48749,8 +49009,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -48777,17 +49037,17 @@ ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_TYPE=empress -printf '%s\n' "#define HAVE_EMPRESS 1" >>confdefs.h +printf "%s\n" "#define HAVE_EMPRESS 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking Empress library file" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Empress library file" >&5 printf %s "checking Empress library file... " >&6; } ODBC_LIBS=$(echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1) if test ! -f $ODBC_LIBS; then ODBC_LIBS=$(echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1) fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $(echo $ODBC_LIBS | $SED -e 's!.*/!!')" >&5 -printf '%s\n' "$(echo $ODBC_LIBS | $SED -e 's!.*/!!')" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $(echo $ODBC_LIBS | $SED -e 's!.*/!!')" >&5 +printf "%s\n" "$(echo $ODBC_LIBS | $SED -e 's!.*/!!')" >&6; } ;; esac @@ -48801,7 +49061,7 @@ php_with_empress_bcs=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for Empress local access support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Empress local access support" >&5 printf %s "checking for Empress local access support... " >&6; } # Check whether --with-empress-bcs was given. @@ -48839,8 +49099,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -48883,17 +49143,17 @@ ODBC_LIBS="-lempphpbcs -lms -lmscfg -lbasic -lbasic_os -lnlscstab -lnlsmsgtab -lm -ldl -lcrypt" ODBC_TYPE=empress-bcs -printf '%s\n' "#define HAVE_EMPRESS 1" >>confdefs.h +printf "%s\n" "#define HAVE_EMPRESS 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking Empress local access library file" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Empress local access library file" >&5 printf %s "checking Empress local access library file... " >&6; } ODBCBCS_LIBS=$(echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1) if test ! -f $ODBCBCS_LIBS; then ODBCBCS_LIBS=$(echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1) fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $(echo $ODBCBCS_LIBS | $SED -e 's!.*/!!')" >&5 -printf '%s\n' "$(echo $ODBCBCS_LIBS | $SED -e 's!.*/!!')" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $(echo $ODBCBCS_LIBS | $SED -e 's!.*/!!')" >&5 +printf "%s\n" "$(echo $ODBCBCS_LIBS | $SED -e 's!.*/!!')" >&6; } ;; esac @@ -48907,7 +49167,7 @@ php_with_custom_odbc=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a custom ODBC support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a custom ODBC support" >&5 printf %s "checking for a custom ODBC support... " >&6; } # Check whether --with-custom-odbc was given. @@ -48945,8 +49205,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -48967,7 +49227,7 @@ ODBC_LIBS=$CUSTOM_ODBC_LIBS ODBC_TYPE=custom-odbc -printf '%s\n' "#define HAVE_CODBC 1" >>confdefs.h +printf "%s\n" "#define HAVE_CODBC 1" >>confdefs.h ;; esac @@ -48981,7 +49241,7 @@ php_with_iodbc=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build with iODBC support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with iODBC support" >&5 printf %s "checking whether to build with iODBC support... " >&6; } # Check whether --with-iodbc was given. @@ -49019,8 +49279,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -49032,17 +49292,17 @@ e) pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libiodbc" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libiodbc" >&5 printf %s "checking for libiodbc... " >&6; } if test -n "$ODBC_CFLAGS"; then pkg_cv_ODBC_CFLAGS="$ODBC_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiodbc\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiodbc\""; } >&5 ($PKG_CONFIG --exists --print-errors "libiodbc") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ODBC_CFLAGS=`$PKG_CONFIG --cflags "libiodbc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -49056,10 +49316,10 @@ pkg_cv_ODBC_LIBS="$ODBC_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiodbc\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiodbc\""; } >&5 ($PKG_CONFIG --exists --print-errors "libiodbc") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ODBC_LIBS=`$PKG_CONFIG --libs "libiodbc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -49073,8 +49333,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -49100,10 +49360,10 @@ and ODBC_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -49117,8 +49377,8 @@ else ODBC_CFLAGS=$pkg_cv_ODBC_CFLAGS ODBC_LIBS=$pkg_cv_ODBC_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -49166,7 +49426,7 @@ ODBC_TYPE=iodbc -printf '%s\n' "#define HAVE_IODBC 1" >>confdefs.h +printf "%s\n" "#define HAVE_IODBC 1" >>confdefs.h ;; esac @@ -49180,7 +49440,7 @@ php_with_esoob=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for Easysoft ODBC-ODBC Bridge support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Easysoft ODBC-ODBC Bridge support" >&5 printf %s "checking for Easysoft ODBC-ODBC Bridge support... " >&6; } # Check whether --with-esoob was given. @@ -49218,8 +49478,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -49240,7 +49500,7 @@ ODBC_LIBS=-lesoobclient ODBC_TYPE=esoob -printf '%s\n' "#define HAVE_ESOOB 1" >>confdefs.h +printf "%s\n" "#define HAVE_ESOOB 1" >>confdefs.h ;; esac @@ -49254,7 +49514,7 @@ php_with_unixodbc=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build with unixODBC support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with unixODBC support" >&5 printf %s "checking whether to build with unixODBC support... " >&6; } # Check whether --with-unixODBC was given. @@ -49292,8 +49552,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -49308,17 +49568,17 @@ pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for odbc" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for odbc" >&5 printf %s "checking for odbc... " >&6; } if test -n "$ODBC_CFLAGS"; then pkg_cv_ODBC_CFLAGS="$ODBC_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"odbc\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"odbc\""; } >&5 ($PKG_CONFIG --exists --print-errors "odbc") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ODBC_CFLAGS=`$PKG_CONFIG --cflags "odbc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -49332,10 +49592,10 @@ pkg_cv_ODBC_LIBS="$ODBC_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"odbc\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"odbc\""; } >&5 ($PKG_CONFIG --exists --print-errors "odbc") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ODBC_LIBS=`$PKG_CONFIG --libs "odbc" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -49349,8 +49609,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -49376,10 +49636,10 @@ and ODBC_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -49393,8 +49653,8 @@ else ODBC_CFLAGS=$pkg_cv_ODBC_CFLAGS ODBC_LIBS=$pkg_cv_ODBC_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -49452,14 +49712,14 @@ then : as_fn_error $? "ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" "$LINENO" 5 fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: Using unixODBC in $PHP_UNIXODBC" >&5 -printf '%s\n' "$as_me: Using unixODBC in $PHP_UNIXODBC" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using unixODBC in $PHP_UNIXODBC" >&5 +printf "%s\n" "$as_me: Using unixODBC in $PHP_UNIXODBC" >&6;} ;; esac fi ODBC_TYPE=unixODBC -printf '%s\n' "#define HAVE_UNIXODBC 1" >>confdefs.h +printf "%s\n" "#define HAVE_UNIXODBC 1" >>confdefs.h ;; esac @@ -49473,7 +49733,7 @@ php_with_dbmaker=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for DBMaker support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DBMaker support" >&5 printf %s "checking for DBMaker support... " >&6; } # Check whether --with-dbmaker was given. @@ -49511,8 +49771,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -49554,7 +49814,7 @@ ODBC_TYPE=dbmaker -printf '%s\n' "#define HAVE_DBMAKER 1" >>confdefs.h +printf "%s\n" "#define HAVE_DBMAKER 1" >>confdefs.h if test "x$ext_shared" = xyes @@ -49661,14 +49921,14 @@ if test "x$PHP_ODBCVER" = xno then : - printf '%s\n' "#define ODBCVER 0x0350" >>confdefs.h + printf "%s\n" "#define ODBCVER 0x0350" >>confdefs.h else case e in #( e) if test "x$PHP_ODBCVER" = x0 then : else case e in #( - e) printf '%s\n' "#define ODBCVER $PHP_ODBCVER" >>confdefs.h + e) printf "%s\n" "#define ODBCVER $PHP_ODBCVER" >>confdefs.h ;; esac fi ;; @@ -49798,7 +50058,7 @@ else case e in #( e) -printf '%s\n' "#define HAVE_SQLDATASOURCES 1" >>confdefs.h +printf "%s\n" "#define HAVE_SQLDATASOURCES 1" >>confdefs.h ;; esac fi @@ -49807,7 +50067,7 @@ fi -printf '%s\n' "#define HAVE_UODBC 1" >>confdefs.h +printf "%s\n" "#define HAVE_UODBC 1" >>confdefs.h PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_SHARED_LIBADD" @@ -49952,7 +50212,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_ODBC 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_ODBC 1" >>confdefs.h fi fi @@ -50071,10 +50331,10 @@ fi else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for any ODBC driver support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for any ODBC driver support" >&5 printf %s "checking for any ODBC driver support... " >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -50083,7 +50343,7 @@ php_enable_opcache=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend OPcache support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend OPcache support" >&5 printf %s "checking whether to enable Zend OPcache support... " >&6; } # Check whether --enable-opcache was given. if test ${enable_opcache+y} @@ -50120,8 +50380,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -50129,7 +50389,7 @@ php_enable_huge_code_pages=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable copying PHP CODE pages into HUGE PAGES" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable copying PHP CODE pages into HUGE PAGES" >&5 printf %s "checking whether to enable copying PHP CODE pages into HUGE PAGES... " >&6; } # Check whether --enable-huge-code-pages was given. if test ${enable_huge_code_pages+y} @@ -50145,8 +50405,8 @@ ext_output=$PHP_HUGE_CODE_PAGES -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -50154,7 +50414,7 @@ php_enable_opcache_jit=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable JIT" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable JIT" >&5 printf %s "checking whether to enable JIT... " >&6; } # Check whether --enable-opcache-jit was given. if test ${enable_opcache_jit+y} @@ -50170,8 +50430,8 @@ ext_output=$PHP_OPCACHE_JIT -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -50179,7 +50439,7 @@ php_with_capstone=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to support opcache JIT disassembly through Capstone" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support opcache JIT disassembly through Capstone" >&5 printf %s "checking whether to support opcache JIT disassembly through Capstone... " >&6; } # Check whether --with-capstone was given. @@ -50196,8 +50456,8 @@ ext_output=$PHP_CAPSTONE -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -50208,7 +50468,7 @@ if test "x$PHP_HUGE_CODE_PAGES" = xyes then : -printf '%s\n' "#define HAVE_HUGE_CODE_PAGES 1" >>confdefs.h +printf "%s\n" "#define HAVE_HUGE_CODE_PAGES 1" >>confdefs.h fi @@ -50220,15 +50480,15 @@ ;; #( *) : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: JIT not supported by host architecture" >&5 -printf '%s\n' "$as_me: WARNING: JIT not supported by host architecture" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: JIT not supported by host architecture" >&5 +printf "%s\n" "$as_me: WARNING: JIT not supported by host architecture" >&2;} PHP_OPCACHE_JIT=no ;; esac if test "$host_vendor" = "apple" && test "$host_cpu" = "aarch64" && test "$PHP_THREAD_SAFETY" = "yes"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: JIT not supported on Apple Silicon with ZTS" >&5 -printf '%s\n' "$as_me: WARNING: JIT not supported on Apple Silicon with ZTS" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: JIT not supported on Apple Silicon with ZTS" >&5 +printf "%s\n" "$as_me: WARNING: JIT not supported on Apple Silicon with ZTS" >&2;} PHP_OPCACHE_JIT=no fi @@ -50238,7 +50498,7 @@ then : -printf '%s\n' "#define HAVE_JIT 1" >>confdefs.h +printf "%s\n" "#define HAVE_JIT 1" >>confdefs.h ZEND_JIT_SRC=" jit/ir/ir_cfg.c jit/ir/ir_check.c jit/ir/ir_dump.c jit/ir/ir_emit.c jit/ir/ir_gcm.c jit/ir/ir_gdb.c jit/ir/ir_patch.c jit/ir/ir_perf.c jit/ir/ir_ra.c jit/ir/ir_save.c jit/ir/ir_sccp.c jit/ir/ir_strtab.c jit/ir/ir.c jit/zend_jit_vm_helpers.c jit/zend_jit.c " @@ -50273,17 +50533,17 @@ then : pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for capstone >= 3.0.0" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for capstone >= 3.0.0" >&5 printf %s "checking for capstone >= 3.0.0... " >&6; } if test -n "$CAPSTONE_CFLAGS"; then pkg_cv_CAPSTONE_CFLAGS="$CAPSTONE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capstone >= 3.0.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capstone >= 3.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "capstone >= 3.0.0") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CAPSTONE_CFLAGS=`$PKG_CONFIG --cflags "capstone >= 3.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -50297,10 +50557,10 @@ pkg_cv_CAPSTONE_LIBS="$CAPSTONE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capstone >= 3.0.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capstone >= 3.0.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "capstone >= 3.0.0") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CAPSTONE_LIBS=`$PKG_CONFIG --libs "capstone >= 3.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -50314,8 +50574,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -50341,10 +50601,10 @@ and CAPSTONE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -50358,11 +50618,11 @@ else CAPSTONE_CFLAGS=$pkg_cv_CAPSTONE_CFLAGS CAPSTONE_LIBS=$pkg_cv_CAPSTONE_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } -printf '%s\n' "#define HAVE_CAPSTONE 1" >>confdefs.h +printf "%s\n" "#define HAVE_CAPSTONE 1" >>confdefs.h for ac_i in $CAPSTONE_LIBS; do @@ -50545,18 +50805,18 @@ ac_fn_c_check_func "$LINENO" "mprotect" "ac_cv_func_mprotect" if test "x$ac_cv_func_mprotect" = xyes then : - printf '%s\n' "#define HAVE_MPROTECT 1" >>confdefs.h + printf "%s\n" "#define HAVE_MPROTECT 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "shm_create_largepage" "ac_cv_func_shm_create_largepage" if test "x$ac_cv_func_shm_create_largepage" = xyes then : - printf '%s\n' "#define HAVE_SHM_CREATE_LARGEPAGE 1" >>confdefs.h + printf "%s\n" "#define HAVE_SHM_CREATE_LARGEPAGE 1" >>confdefs.h fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sysvipc shared memory support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysvipc shared memory support" >&5 printf %s "checking for sysvipc shared memory support... " >&6; } if test ${php_cv_shm_ipc+y} then : @@ -50648,16 +50908,16 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_shm_ipc" >&5 -printf '%s\n' "$php_cv_shm_ipc" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_shm_ipc" >&5 +printf "%s\n" "$php_cv_shm_ipc" >&6; } if test "x$php_cv_shm_ipc" = xyes then : -printf '%s\n' "#define HAVE_SHM_IPC 1" >>confdefs.h +printf "%s\n" "#define HAVE_SHM_IPC 1" >>confdefs.h fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mmap() using MAP_ANON shared memory support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mmap() using MAP_ANON shared memory support" >&5 printf %s "checking for mmap() using MAP_ANON shared memory support... " >&6; } if test ${php_cv_shm_mmap_anon+y} then : @@ -50736,18 +50996,18 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_shm_mmap_anon" >&5 -printf '%s\n' "$php_cv_shm_mmap_anon" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_shm_mmap_anon" >&5 +printf "%s\n" "$php_cv_shm_mmap_anon" >&6; } if test "x$php_cv_shm_mmap_anon" = xyes then : -printf '%s\n' "#define HAVE_SHM_MMAP_ANON 1" >>confdefs.h +printf "%s\n" "#define HAVE_SHM_MMAP_ANON 1" >>confdefs.h fi LIBS_save=$LIBS LIBS= - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5 printf %s "checking for library containing shm_open... " >&6; } if test ${ac_cv_search_shm_open+y} then : @@ -50805,13 +51065,13 @@ LIBS=$ac_func_search_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shm_open" >&5 -printf '%s\n' "$ac_cv_search_shm_open" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shm_open" >&5 +printf "%s\n" "$ac_cv_search_shm_open" >&6; } ac_res=$ac_cv_search_shm_open if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mmap() using shm_open() shared memory support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mmap() using shm_open() shared memory support" >&5 printf %s "checking for mmap() using shm_open() shared memory support... " >&6; } if test ${php_cv_shm_mmap_posix+y} then : @@ -50902,8 +51162,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_shm_mmap_posix" >&5 -printf '%s\n' "$php_cv_shm_mmap_posix" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_shm_mmap_posix" >&5 +printf "%s\n" "$php_cv_shm_mmap_posix" >&6; } fi @@ -50913,7 +51173,7 @@ then : -printf '%s\n' "#define HAVE_SHM_MMAP_POSIX 1" >>confdefs.h +printf "%s\n" "#define HAVE_SHM_MMAP_POSIX 1" >>confdefs.h case $ac_cv_search_shm_open in #( "none required"|no) : @@ -51170,7 +51430,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_OPCACHE 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_OPCACHE 1" >>confdefs.h fi fi @@ -51329,8 +51589,8 @@ if test "$php_cv_shm_ipc" != "yes" && test "$php_cv_shm_mmap_posix" != "yes" && test "$php_cv_shm_mmap_anon" != "yes"; then - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "No supported shared memory caching support was found when configuring opcache. See 'config.log' for more details" "$LINENO" 5; } fi @@ -51358,7 +51618,7 @@ php_enable_pcntl=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable pcntl support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable pcntl support" >&5 printf %s "checking whether to enable pcntl support... " >&6; } # Check whether --enable-pcntl was given. if test ${enable_pcntl+y} @@ -51395,22 +51655,22 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } if test "$PHP_PCNTL" != "no"; then for function in fork sigaction waitpid; do - as_ac_var=`printf '%s\n' "ac_cv_func_$function" | sed "$as_sed_sh"` + as_ac_var=`printf "%s\n" "ac_cv_func_$function" | sed "$as_sed_sh"` ac_fn_c_check_func "$LINENO" "$function" "$as_ac_var" if eval test \"x\$"$as_ac_var"\" = x"yes" then : else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "ext/pcntl: required function $function() not found. See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -51421,91 +51681,91 @@ ac_fn_c_check_func "$LINENO" "forkx" "ac_cv_func_forkx" if test "x$ac_cv_func_forkx" = xyes then : - printf '%s\n' "#define HAVE_FORKX 1" >>confdefs.h + printf "%s\n" "#define HAVE_FORKX 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getcpuid" "ac_cv_func_getcpuid" if test "x$ac_cv_func_getcpuid" = xyes then : - printf '%s\n' "#define HAVE_GETCPUID 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETCPUID 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getpriority" "ac_cv_func_getpriority" if test "x$ac_cv_func_getpriority" = xyes then : - printf '%s\n' "#define HAVE_GETPRIORITY 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETPRIORITY 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "pidfd_open" "ac_cv_func_pidfd_open" if test "x$ac_cv_func_pidfd_open" = xyes then : - printf '%s\n' "#define HAVE_PIDFD_OPEN 1" >>confdefs.h + printf "%s\n" "#define HAVE_PIDFD_OPEN 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "pset_bind" "ac_cv_func_pset_bind" if test "x$ac_cv_func_pset_bind" = xyes then : - printf '%s\n' "#define HAVE_PSET_BIND 1" >>confdefs.h + printf "%s\n" "#define HAVE_PSET_BIND 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "pthread_set_qos_class_self_np" "ac_cv_func_pthread_set_qos_class_self_np" if test "x$ac_cv_func_pthread_set_qos_class_self_np" = xyes then : - printf '%s\n' "#define HAVE_PTHREAD_SET_QOS_CLASS_SELF_NP 1" >>confdefs.h + printf "%s\n" "#define HAVE_PTHREAD_SET_QOS_CLASS_SELF_NP 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "rfork" "ac_cv_func_rfork" if test "x$ac_cv_func_rfork" = xyes then : - printf '%s\n' "#define HAVE_RFORK 1" >>confdefs.h + printf "%s\n" "#define HAVE_RFORK 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "sched_setaffinity" "ac_cv_func_sched_setaffinity" if test "x$ac_cv_func_sched_setaffinity" = xyes then : - printf '%s\n' "#define HAVE_SCHED_SETAFFINITY 1" >>confdefs.h + printf "%s\n" "#define HAVE_SCHED_SETAFFINITY 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "setpriority" "ac_cv_func_setpriority" if test "x$ac_cv_func_setpriority" = xyes then : - printf '%s\n' "#define HAVE_SETPRIORITY 1" >>confdefs.h + printf "%s\n" "#define HAVE_SETPRIORITY 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "sigwaitinfo" "ac_cv_func_sigwaitinfo" if test "x$ac_cv_func_sigwaitinfo" = xyes then : - printf '%s\n' "#define HAVE_SIGWAITINFO 1" >>confdefs.h + printf "%s\n" "#define HAVE_SIGWAITINFO 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "sigtimedwait" "ac_cv_func_sigtimedwait" if test "x$ac_cv_func_sigtimedwait" = xyes then : - printf '%s\n' "#define HAVE_SIGTIMEDWAIT 1" >>confdefs.h + printf "%s\n" "#define HAVE_SIGTIMEDWAIT 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "unshare" "ac_cv_func_unshare" if test "x$ac_cv_func_unshare" = xyes then : - printf '%s\n' "#define HAVE_UNSHARE 1" >>confdefs.h + printf "%s\n" "#define HAVE_UNSHARE 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "wait3" "ac_cv_func_wait3" if test "x$ac_cv_func_wait3" = xyes then : - printf '%s\n' "#define HAVE_WAIT3 1" >>confdefs.h + printf "%s\n" "#define HAVE_WAIT3 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "wait4" "ac_cv_func_wait4" if test "x$ac_cv_func_wait4" = xyes then : - printf '%s\n' "#define HAVE_WAIT4 1" >>confdefs.h + printf "%s\n" "#define HAVE_WAIT4 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "waitid" "ac_cv_func_waitid" if test "x$ac_cv_func_waitid" = xyes then : - printf '%s\n' "#define HAVE_WAITID 1" >>confdefs.h + printf "%s\n" "#define HAVE_WAITID 1" >>confdefs.h fi @@ -51516,14 +51776,14 @@ ac_fn_c_check_func "$LINENO" "WIFCONTINUED" "ac_cv_func_WIFCONTINUED" if test "x$ac_cv_func_WIFCONTINUED" = xyes then : - printf '%s\n' "#define HAVE_WIFCONTINUED 1" >>confdefs.h + printf "%s\n" "#define HAVE_WIFCONTINUED 1" >>confdefs.h else case e in #( e) ac_fn_check_decl "$LINENO" "WIFCONTINUED" "ac_cv_have_decl_WIFCONTINUED" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_WIFCONTINUED" = xyes then : - printf '%s\n' "#define HAVE_WIFCONTINUED 1" >>confdefs.h + printf "%s\n" "#define HAVE_WIFCONTINUED 1" >>confdefs.h fi ;; esac @@ -51532,7 +51792,7 @@ done ac_fn_check_decl "$LINENO" "WCONTINUED" "ac_cv_have_decl_WCONTINUED" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_WCONTINUED" = xyes then : ac_have_decl=1 @@ -51540,9 +51800,9 @@ e) ac_have_decl=0 ;; esac fi -printf '%s\n' "#define HAVE_DECL_WCONTINUED $ac_have_decl" >>confdefs.h +printf "%s\n" "#define HAVE_DECL_WCONTINUED $ac_have_decl" >>confdefs.h ac_fn_check_decl "$LINENO" "WEXITED" "ac_cv_have_decl_WEXITED" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_WEXITED" = xyes then : ac_have_decl=1 @@ -51550,9 +51810,9 @@ e) ac_have_decl=0 ;; esac fi -printf '%s\n' "#define HAVE_DECL_WEXITED $ac_have_decl" >>confdefs.h +printf "%s\n" "#define HAVE_DECL_WEXITED $ac_have_decl" >>confdefs.h ac_fn_check_decl "$LINENO" "WSTOPPED" "ac_cv_have_decl_WSTOPPED" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_WSTOPPED" = xyes then : ac_have_decl=1 @@ -51560,9 +51820,9 @@ e) ac_have_decl=0 ;; esac fi -printf '%s\n' "#define HAVE_DECL_WSTOPPED $ac_have_decl" >>confdefs.h +printf "%s\n" "#define HAVE_DECL_WSTOPPED $ac_have_decl" >>confdefs.h ac_fn_check_decl "$LINENO" "WNOWAIT" "ac_cv_have_decl_WNOWAIT" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_WNOWAIT" = xyes then : ac_have_decl=1 @@ -51570,9 +51830,9 @@ e) ac_have_decl=0 ;; esac fi -printf '%s\n' "#define HAVE_DECL_WNOWAIT $ac_have_decl" >>confdefs.h +printf "%s\n" "#define HAVE_DECL_WNOWAIT $ac_have_decl" >>confdefs.h ac_fn_check_decl "$LINENO" "P_ALL" "ac_cv_have_decl_P_ALL" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_P_ALL" = xyes then : ac_have_decl=1 @@ -51580,9 +51840,9 @@ e) ac_have_decl=0 ;; esac fi -printf '%s\n' "#define HAVE_DECL_P_ALL $ac_have_decl" >>confdefs.h +printf "%s\n" "#define HAVE_DECL_P_ALL $ac_have_decl" >>confdefs.h ac_fn_check_decl "$LINENO" "P_PIDFD" "ac_cv_have_decl_P_PIDFD" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_P_PIDFD" = xyes then : ac_have_decl=1 @@ -51590,9 +51850,9 @@ e) ac_have_decl=0 ;; esac fi -printf '%s\n' "#define HAVE_DECL_P_PIDFD $ac_have_decl" >>confdefs.h +printf "%s\n" "#define HAVE_DECL_P_PIDFD $ac_have_decl" >>confdefs.h ac_fn_check_decl "$LINENO" "P_UID" "ac_cv_have_decl_P_UID" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_P_UID" = xyes then : ac_have_decl=1 @@ -51600,9 +51860,9 @@ e) ac_have_decl=0 ;; esac fi -printf '%s\n' "#define HAVE_DECL_P_UID $ac_have_decl" >>confdefs.h +printf "%s\n" "#define HAVE_DECL_P_UID $ac_have_decl" >>confdefs.h ac_fn_check_decl "$LINENO" "P_JAILID" "ac_cv_have_decl_P_JAILID" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_P_JAILID" = xyes then : ac_have_decl=1 @@ -51610,10 +51870,10 @@ e) ac_have_decl=0 ;; esac fi -printf '%s\n' "#define HAVE_DECL_P_JAILID $ac_have_decl" >>confdefs.h +printf "%s\n" "#define HAVE_DECL_P_JAILID $ac_have_decl" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if sched_getcpu is supported" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if sched_getcpu is supported" >&5 printf %s "checking if sched_getcpu is supported... " >&6; } if test ${php_cv_func_sched_getcpu+y} then : @@ -51649,12 +51909,12 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_sched_getcpu" >&5 -printf '%s\n' "$php_cv_func_sched_getcpu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_sched_getcpu" >&5 +printf "%s\n" "$php_cv_func_sched_getcpu" >&6; } if test "x$php_cv_func_sched_getcpu" = xyes then : -printf '%s\n' "#define HAVE_SCHED_GETCPU 1" >>confdefs.h +printf "%s\n" "#define HAVE_SCHED_GETCPU 1" >>confdefs.h fi @@ -51801,7 +52061,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_PCNTL 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_PCNTL 1" >>confdefs.h fi fi @@ -51925,9 +52185,357 @@ +php_enable_pdo=yes + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable PDO support" >&5 +printf %s "checking whether to enable PDO support... " >&6; } +# Check whether --enable-pdo was given. +if test ${enable_pdo+y} +then : + enableval=$enable_pdo; PHP_PDO=$enableval +else case e in #( + e) + PHP_PDO=yes + test "$PHP_ENABLE_ALL" && PHP_PDO=$PHP_ENABLE_ALL + ;; +esac +fi + + + +ext_output="yes, shared" +ext_shared=yes +case $PHP_PDO in +shared,*) + PHP_PDO=$(echo "$PHP_PDO"|$SED 's/^shared,//') + ;; +shared) + PHP_PDO=yes + ;; +no) + ext_output=no + ext_shared=no + ;; +*) + ext_output=yes + ext_shared=no + ;; +esac + + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } + + + + +if test "$PHP_PDO" != "no"; then + PHP_PDO=yes + + + ext_builddir=ext/pdo + ext_srcdir=$abs_srcdir/ext/pdo + ext_dir=ext/pdo + + ac_extra= + + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + PHP_PDO_SHARED=no + + + case $ext_dir in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=$(echo "$ext_dir"|cut -c 2-)"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/$ext_dir/"; ac_bdir="$ext_dir/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + + + b_c_pre=$php_c_pre + b_cxx_pre=$php_cxx_pre + b_c_meta=$php_c_meta + b_cxx_meta=$php_cxx_meta + b_c_post=$php_c_post + b_cxx_post=$php_cxx_post + b_lo=$php_lo + + + old_IFS=$IFS + for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do + + IFS=. + set $ac_src + ac_obj=$1 + IFS=$old_IFS + + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + + case $ac_src in + *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; + esac + + ac_comp="$ac_comp -MMD -MF $ac_bdir$ac_obj.dep -MT $ac_bdir$ac_obj.lo" + + cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<>confdefs.h + + fi + fi + + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then + PHP_PDO_SHARED=no + case "$PHP_SAPI" in + cgi|embed|phpdbg) + + + case $ext_dir in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=$(echo "$ext_dir"|cut -c 2-)"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/$ext_dir/"; ac_bdir="$ext_dir/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + + + b_c_pre=$php_c_pre + b_cxx_pre=$php_cxx_pre + b_c_meta=$php_c_meta + b_cxx_meta=$php_cxx_meta + b_c_post=$php_c_post + b_cxx_post=$php_cxx_post + b_lo=$php_lo + + + old_IFS=$IFS + for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do + + IFS=. + set $ac_src + ac_obj=$1 + IFS=$old_IFS + + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + + case $ac_src in + *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; + esac + + ac_comp="$ac_comp -MMD -MF $ac_bdir$ac_obj.dep -MT $ac_bdir$ac_obj.lo" + + cat >>Makefile.objects<>Makefile.objects<> Makefile.fragments + +fi + + + + + php_with_pdo_dblib=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PDO_DBLIB support via FreeTDS" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO_DBLIB support via FreeTDS" >&5 printf %s "checking for PDO_DBLIB support via FreeTDS... " >&6; } # Check whether --with-pdo-dblib was given. @@ -51965,8 +52573,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -52093,7 +52701,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dbsqlexec in -lsybdb" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dbsqlexec in -lsybdb" >&5 printf %s "checking for dbsqlexec in -lsybdb... " >&6; } if test ${ac_cv_lib_sybdb_dbsqlexec+y} then : @@ -52134,8 +52742,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybdb_dbsqlexec" >&5 -printf '%s\n' "$ac_cv_lib_sybdb_dbsqlexec" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybdb_dbsqlexec" >&5 +printf "%s\n" "$ac_cv_lib_sybdb_dbsqlexec" >&6; } if test "x$ac_cv_lib_sybdb_dbsqlexec" = xyes then : @@ -52148,8 +52756,8 @@ LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_sybdb_dbsqlexec - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Cannot find FreeTDS in known installation directories. See 'config.log' for more details" "$LINENO" 5; } ;; @@ -52340,7 +52948,7 @@ fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 printf %s "checking for PDO includes... " >&6; } if test ${pdo_cv_inc_path+y} then : @@ -52355,8 +52963,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5 -printf '%s\n' "$pdo_cv_inc_path" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5 +printf "%s\n" "$pdo_cv_inc_path" >&6; } if test -n "$pdo_cv_inc_path"; then : else @@ -52500,7 +53108,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_PDO_DBLIB 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_PDO_DBLIB 1" >>confdefs.h fi fi @@ -52649,7 +53257,7 @@ php_with_pdo_firebird=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for Firebird support for PDO" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Firebird support for PDO" >&5 printf %s "checking for Firebird support for PDO... " >&6; } # Check whether --with-pdo-firebird was given. @@ -52687,8 +53295,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -52696,7 +53304,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then # Extract the first word of "fb_config", so it can be a program name with args. set dummy fb_config; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FB_CONFIG+y} then : @@ -52719,7 +53327,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_path_FB_CONFIG="$as_dir$ac_word$ac_exec_ext" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -52733,23 +53341,23 @@ fi FB_CONFIG=$ac_cv_path_FB_CONFIG if test -n "$FB_CONFIG"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $FB_CONFIG" >&5 -printf '%s\n' "$FB_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FB_CONFIG" >&5 +printf "%s\n" "$FB_CONFIG" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test -x "$FB_CONFIG" && test "$PHP_PDO_FIREBIRD" = "yes"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libfbconfig" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libfbconfig" >&5 printf %s "checking for libfbconfig... " >&6; } FB_CFLAGS=$($FB_CONFIG --cflags) FB_LIBDIR=$($FB_CONFIG --libs) FB_VERSION=$($FB_CONFIG --version) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: version $FB_VERSION" >&5 -printf '%s\n' "version $FB_VERSION" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: version $FB_VERSION" >&5 +printf "%s\n" "version $FB_VERSION" >&6; } as_arg_v1=$FB_VERSION as_arg_v2=3.0 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null @@ -53053,7 +53661,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for fb_get_master_interface in -lfbclient" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fb_get_master_interface in -lfbclient" >&5 printf %s "checking for fb_get_master_interface in -lfbclient... " >&6; } if test ${ac_cv_lib_fbclient_fb_get_master_interface+y} then : @@ -53094,8 +53702,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fbclient_fb_get_master_interface" >&5 -printf '%s\n' "$ac_cv_lib_fbclient_fb_get_master_interface" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fbclient_fb_get_master_interface" >&5 +printf "%s\n" "$ac_cv_lib_fbclient_fb_get_master_interface" >&6; } if test "x$ac_cv_lib_fbclient_fb_get_master_interface" = xyes then : @@ -53108,8 +53716,8 @@ LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_fbclient_fb_get_master_interface - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "libfbclient not found. See 'config.log' for more details" "$LINENO" 5; } ;; @@ -53258,7 +53866,7 @@ fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 printf %s "checking for PDO includes... " >&6; } if test ${pdo_cv_inc_path+y} then : @@ -53273,8 +53881,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5 -printf '%s\n' "$pdo_cv_inc_path" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5 +printf "%s\n" "$pdo_cv_inc_path" >&6; } if test -n "$pdo_cv_inc_path"; then : else @@ -53417,7 +54025,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_PDO_FIREBIRD 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_PDO_FIREBIRD 1" >>confdefs.h fi fi @@ -53576,7 +54184,7 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CXX+y} then : @@ -53597,7 +54205,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -53609,11 +54217,11 @@ fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -printf '%s\n' "$CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +printf "%s\n" "$CXX" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -53626,7 +54234,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CXX+y} then : @@ -53647,7 +54255,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -53659,11 +54267,11 @@ fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -printf '%s\n' "$ac_ct_CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +printf "%s\n" "$ac_ct_CXX" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -53675,8 +54283,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX @@ -53686,7 +54294,7 @@ fi fi # Provide some information about the compiler. -printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion; do @@ -53696,7 +54304,7 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf '%s\n' "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -53706,11 +54314,11 @@ cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 printf %s "checking whether the compiler supports GNU C++... " >&6; } if test ${ac_cv_cxx_compiler_gnu+y} then : @@ -53742,8 +54350,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -printf '%s\n' "$ac_cv_cxx_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test $ac_compiler_gnu = yes; then @@ -53753,7 +54361,7 @@ fi ac_test_CXXFLAGS=${CXXFLAGS+y} ac_save_CXXFLAGS=$CXXFLAGS -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 printf %s "checking whether $CXX accepts -g... " >&6; } if test ${ac_cv_prog_cxx_g+y} then : @@ -53821,8 +54429,8 @@ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -printf '%s\n' "$ac_cv_prog_cxx_g" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } if test $ac_test_CXXFLAGS; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then @@ -53838,6 +54446,106 @@ CXXFLAGS= fi fi +ac_prog_cxx_stdcxx=no +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 +printf %s "checking for $CXX option to enable C++11 features... " >&6; } +if test ${ac_cv_prog_cxx_cxx11+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_prog_cxx_cxx11=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx11_program +_ACEOF +for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx11" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX ;; +esac +fi + +if test "x$ac_cv_prog_cxx_cxx11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else case e in #( + e) if test "x$ac_cv_prog_cxx_cxx11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx11" ;; +esac +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 + ac_prog_cxx_stdcxx=cxx11 ;; +esac +fi +fi +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 +printf %s "checking for $CXX option to enable C++98 features... " >&6; } +if test ${ac_cv_prog_cxx_cxx98+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_prog_cxx_cxx98=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx98_program +_ACEOF +for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx98=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx98" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX ;; +esac +fi + +if test "x$ac_cv_prog_cxx_cxx98" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else case e in #( + e) if test "x$ac_cv_prog_cxx_cxx98" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx98" ;; +esac +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 + ac_prog_cxx_stdcxx=cxx98 ;; +esac +fi +fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -53849,7 +54557,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 printf %s "checking how to run the C++ preprocessor... " >&6; } if test -z "$CXXCPP"; then if test ${ac_cv_prog_CXXCPP+y} @@ -53916,8 +54624,8 @@ else ac_cv_prog_CXXCPP=$CXXCPP fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -printf '%s\n' "$CXXCPP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +printf "%s\n" "$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -53965,8 +54673,8 @@ then : else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -54001,8 +54709,8 @@ for alternative in ${ax_cxx_compile_alternatives}; do for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do - cachevar=`printf '%s\n' "ax_cv_cxx_compile_cxx11_$switch" | sed "$as_sed_sh"` - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 + cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx11_$switch" | sed "$as_sed_sh"` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 printf %s "checking whether $CXX supports C++11 features with $switch... " >&6; } if eval test \${$cachevar+y} then : @@ -54313,8 +55021,8 @@ esac fi eval ac_res=\$$cachevar - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test x\$$cachevar = xyes; then eval PHP_PDO_FIREBIRD_STDCXX="$switch" ac_success=yes @@ -54338,8 +55046,8 @@ fi fi if test x$ac_success = xno; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5 -printf '%s\n' "$as_me: No compiler with C++11 support was found" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5 +printf "%s\n" "$as_me: No compiler with C++11 support was found" >&6;} fi @@ -54449,7 +55157,7 @@ php_with_pdo_mysql=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for MySQL support for PDO" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MySQL support for PDO" >&5 printf %s "checking for MySQL support for PDO... " >&6; } # Check whether --with-pdo-mysql was given. @@ -54487,14 +55195,14 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } if test "$PHP_PDO_MYSQL" != "no"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for MySQL Unix socket location" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MySQL Unix socket location" >&5 printf %s "checking for MySQL Unix socket location... " >&6; } case $PHP_MYSQL_SOCK in #( yes) : @@ -54518,29 +55226,29 @@ if ${MYSQL_SOCK:+false} : then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else case e in #( e) -printf '%s\n' "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$MYSQL_SOCK\"" >>confdefs.h +printf "%s\n" "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$MYSQL_SOCK\"" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5 -printf '%s\n' "$MYSQL_SOCK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5 +printf "%s\n" "$MYSQL_SOCK" >&6; } ;; esac fi ;; #( no) : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; #( + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; #( *) : -printf '%s\n' "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$PHP_MYSQL_SOCK\"" >>confdefs.h +printf "%s\n" "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$PHP_MYSQL_SOCK\"" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $PHP_MYSQL_SOCK" >&5 -printf '%s\n' "$PHP_MYSQL_SOCK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_MYSQL_SOCK" >&5 +printf "%s\n" "$PHP_MYSQL_SOCK" >&6; } ;; esac @@ -54549,12 +55257,12 @@ PHP_MYSQLND_ENABLED=yes -printf '%s\n' "#define PDO_USE_MYSQLND 1" >>confdefs.h +printf "%s\n" "#define PDO_USE_MYSQLND 1" >>confdefs.h ;; #( *) : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mysql_config" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql_config" >&5 printf %s "checking for mysql_config... " >&6; } if test -f $PHP_PDO_MYSQL && test -x $PHP_PDO_MYSQL ; then PDO_MYSQL_CONFIG=$PHP_PDO_MYSQL @@ -54569,18 +55277,18 @@ fi if test -n "$PDO_MYSQL_CONFIG"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $PDO_MYSQL_CONFIG" >&5 -printf '%s\n' "$PDO_MYSQL_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PDO_MYSQL_CONFIG" >&5 +printf "%s\n" "$PDO_MYSQL_CONFIG" >&6; } PDO_MYSQL_LIBS=$($PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g") PDO_MYSQL_INCLUDE=$($PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g") PDO_MYSQL_SOCKET=$($PDO_MYSQL_CONFIG --socket) -printf '%s\n' "#define PDO_MYSQL_UNIX_ADDR \"$PDO_MYSQL_SOCKET\"" >>confdefs.h +printf "%s\n" "#define PDO_MYSQL_UNIX_ADDR \"$PDO_MYSQL_SOCKET\"" >>confdefs.h elif test -n "$PDO_MYSQL_DIR"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -printf '%s\n' "not found" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mysql install under $PDO_MYSQL_DIR" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql install under $PDO_MYSQL_DIR" >&5 printf %s "checking for mysql install under $PDO_MYSQL_DIR... " >&6; } if test -r $PDO_MYSQL_DIR/include/mysql; then PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql @@ -54594,19 +55302,19 @@ fi if test -r "$PDO_MYSQL_LIB_DIR"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: libs under $PDO_MYSQL_LIB_DIR; seems promising" >&5 -printf '%s\n' "libs under $PDO_MYSQL_LIB_DIR; seems promising" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libs under $PDO_MYSQL_LIB_DIR; seems promising" >&5 +printf "%s\n" "libs under $PDO_MYSQL_LIB_DIR; seems promising" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: can not find it" >&5 -printf '%s\n' "can not find it" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: can not find it" >&5 +printf "%s\n" "can not find it" >&6; } as_fn_error $? "Unable to find your mysql installation" "$LINENO" 5 fi PDO_MYSQL_INCLUDE=-I$PDO_MYSQL_INC_DIR PDO_MYSQL_LIBS="-L$PDO_MYSQL_LIB_DIR -lmysqlclient" else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -printf '%s\n' "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } as_fn_error $? "Unable to find your mysql installation" "$LINENO" 5 fi @@ -54769,7 +55477,7 @@ esac - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 printf %s "checking for PDO includes... " >&6; } if test ${pdo_cv_inc_path+y} then : @@ -54784,8 +55492,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5 -printf '%s\n' "$pdo_cv_inc_path" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5 +printf "%s\n" "$pdo_cv_inc_path" >&6; } if test -n "$pdo_cv_inc_path"; then : else @@ -54928,7 +55636,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_PDO_MYSQL 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_PDO_MYSQL 1" >>confdefs.h fi fi @@ -55112,7 +55820,7 @@ php_with_pdo_odbc=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ODBC v3 support for PDO" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ODBC v3 support for PDO" >&5 printf %s "checking for ODBC v3 support for PDO... " >&6; } # Check whether --with-pdo-odbc was given. @@ -55150,8 +55858,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -55160,7 +55868,7 @@ if test "$PHP_PDO_ODBC" != "no"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 printf %s "checking for PDO includes... " >&6; } if test ${pdo_cv_inc_path+y} then : @@ -55175,8 +55883,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5 -printf '%s\n' "$pdo_cv_inc_path" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5 +printf "%s\n" "$pdo_cv_inc_path" >&6; } if test -n "$pdo_cv_inc_path"; then : else @@ -55184,7 +55892,7 @@ fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for selected PDO ODBC flavour" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for selected PDO ODBC flavour" >&5 printf %s "checking for selected PDO ODBC flavour... " >&6; } pdo_odbc_flavour="$(echo $PHP_PDO_ODBC | cut -d, -f1)" @@ -55228,21 +55936,21 @@ esac if test -n "$pdo_odbc_pkgconfig_module"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $pdo_odbc_flavour using pkg-config" >&5 -printf '%s\n' "$pdo_odbc_flavour using pkg-config" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_odbc_flavour using pkg-config" >&5 +printf "%s\n" "$pdo_odbc_flavour using pkg-config" >&6; } pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $pdo_odbc_pkgconfig_module" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $pdo_odbc_pkgconfig_module" >&5 printf %s "checking for $pdo_odbc_pkgconfig_module... " >&6; } if test -n "$PDO_ODBC_CFLAGS"; then pkg_cv_PDO_ODBC_CFLAGS="$PDO_ODBC_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pdo_odbc_pkgconfig_module\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pdo_odbc_pkgconfig_module\""; } >&5 ($PKG_CONFIG --exists --print-errors "$pdo_odbc_pkgconfig_module") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PDO_ODBC_CFLAGS=`$PKG_CONFIG --cflags "$pdo_odbc_pkgconfig_module" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -55256,10 +55964,10 @@ pkg_cv_PDO_ODBC_LIBS="$PDO_ODBC_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pdo_odbc_pkgconfig_module\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pdo_odbc_pkgconfig_module\""; } >&5 ($PKG_CONFIG --exists --print-errors "$pdo_odbc_pkgconfig_module") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PDO_ODBC_LIBS=`$PKG_CONFIG --libs "$pdo_odbc_pkgconfig_module" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -55273,8 +55981,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -55300,10 +56008,10 @@ and PDO_ODBC_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -55317,8 +56025,8 @@ else PDO_ODBC_CFLAGS=$pkg_cv_PDO_ODBC_CFLAGS PDO_ODBC_LIBS=$pkg_cv_PDO_ODBC_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi else @@ -55336,16 +56044,16 @@ esac fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $pdo_odbc_flavour + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_odbc_flavour libs $PDO_ODBC_LIBDIR, headers $PDO_ODBC_INCDIR" >&5 -printf '%s\n' "$pdo_odbc_flavour +printf "%s\n" "$pdo_odbc_flavour libs $PDO_ODBC_LIBDIR, headers $PDO_ODBC_INCDIR" >&6; } if test ! -d "$PDO_ODBC_LIBDIR" ; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&5 -printf '%s\n' "$as_me: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&5 +printf "%s\n" "$as_me: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&2;} fi PDO_ODBC_CFLAGS="$pdo_odbc_def_cflags -I$PDO_ODBC_INCDIR" @@ -55469,8 +56177,8 @@ esac done - as_ac_Lib=`printf '%s\n' "ac_cv_lib_$pdo_odbc_def_lib""_SQLBindCol" | sed "$as_sed_sh"` -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5 + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$pdo_odbc_def_lib""_SQLBindCol" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5 printf %s "checking for SQLBindCol in -l$pdo_odbc_def_lib... " >&6; } if eval test \${$as_ac_Lib+y} then : @@ -55512,8 +56220,8 @@ esac fi eval ac_res=\$$as_ac_Lib - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : @@ -55637,8 +56345,8 @@ esac done - as_ac_Lib=`printf '%s\n' "ac_cv_lib_$pdo_odbc_def_lib""_SQLAllocHandle" | sed "$as_sed_sh"` -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5 + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$pdo_odbc_def_lib""_SQLAllocHandle" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5 printf %s "checking for SQLAllocHandle in -l$pdo_odbc_def_lib... " >&6; } if eval test \${$as_ac_Lib+y} then : @@ -55680,8 +56388,8 @@ esac fi eval ac_res=\$$as_ac_Lib - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : @@ -55694,8 +56402,8 @@ LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$pdo_odbc_def_lib_SQLAllocHandle - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? " Your ODBC library does not appear to be ODBC 3 compatible. You should consider using iODBC or unixODBC instead, and loading your @@ -55713,8 +56421,8 @@ LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$pdo_odbc_def_lib_SQLBindCol - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Your ODBC library does not exist or there was an error. See 'config.log' for more details" "$LINENO" 5; } ;; @@ -55881,7 +56589,7 @@ OLD_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $PDO_ODBC_CFLAGS" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for cli0cli.h" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0cli.h" >&5 printf %s "checking for cli0cli.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -55899,19 +56607,19 @@ php_pdo_odbc_have_header=yes -printf '%s\n' "#define HAVE_CLI0CLI_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_CLI0CLI_H 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi rm -f conftest.err conftest.i conftest.$ac_ext - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for cli0core.h" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0core.h" >&5 printf %s "checking for cli0core.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -55929,19 +56637,19 @@ php_pdo_odbc_have_header=yes -printf '%s\n' "#define HAVE_CLI0CORE_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_CLI0CORE_H 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi rm -f conftest.err conftest.i conftest.$ac_ext - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for cli0defs.h" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0defs.h" >&5 printf %s "checking for cli0defs.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -55959,19 +56667,19 @@ php_pdo_odbc_have_header=yes -printf '%s\n' "#define HAVE_CLI0DEFS_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_CLI0DEFS_H 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi rm -f conftest.err conftest.i conftest.$ac_ext - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for cli0env.h" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0env.h" >&5 printf %s "checking for cli0env.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -55989,19 +56697,19 @@ php_pdo_odbc_have_header=yes -printf '%s\n' "#define HAVE_CLI0ENV_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_CLI0ENV_H 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi rm -f conftest.err conftest.i conftest.$ac_ext - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for cli0ext.h" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0ext.h" >&5 printf %s "checking for cli0ext.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -56019,19 +56727,19 @@ php_pdo_odbc_have_header=yes -printf '%s\n' "#define HAVE_CLI0EXT_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_CLI0EXT_H 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi rm -f conftest.err conftest.i conftest.$ac_ext - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for iodbc.h" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iodbc.h" >&5 printf %s "checking for iodbc.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -56049,19 +56757,19 @@ php_pdo_odbc_have_header=yes -printf '%s\n' "#define HAVE_IODBC_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_IODBC_H 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi rm -f conftest.err conftest.i conftest.$ac_ext - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for isql.h" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isql.h" >&5 printf %s "checking for isql.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -56079,19 +56787,19 @@ php_pdo_odbc_have_header=yes -printf '%s\n' "#define HAVE_ISQL_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_ISQL_H 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi rm -f conftest.err conftest.i conftest.$ac_ext - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for isqlext.h" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isqlext.h" >&5 printf %s "checking for isqlext.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -56109,19 +56817,19 @@ php_pdo_odbc_have_header=yes -printf '%s\n' "#define HAVE_ISQLEXT_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_ISQLEXT_H 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi rm -f conftest.err conftest.i conftest.$ac_ext - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for LibraryManager.h" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LibraryManager.h" >&5 printf %s "checking for LibraryManager.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -56139,19 +56847,19 @@ php_pdo_odbc_have_header=yes -printf '%s\n' "#define HAVE_LIBRARYMANAGER_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBRARYMANAGER_H 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi rm -f conftest.err conftest.i conftest.$ac_ext - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for odbc.h" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for odbc.h" >&5 printf %s "checking for odbc.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -56169,19 +56877,19 @@ php_pdo_odbc_have_header=yes -printf '%s\n' "#define HAVE_ODBC_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_ODBC_H 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi rm -f conftest.err conftest.i conftest.$ac_ext - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sql.h" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sql.h" >&5 printf %s "checking for sql.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -56199,19 +56907,19 @@ php_pdo_odbc_have_header=yes -printf '%s\n' "#define HAVE_SQL_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_SQL_H 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi rm -f conftest.err conftest.i conftest.$ac_ext - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sqlcli1.h" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlcli1.h" >&5 printf %s "checking for sqlcli1.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -56229,19 +56937,19 @@ php_pdo_odbc_have_header=yes -printf '%s\n' "#define HAVE_SQLCLI1_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_SQLCLI1_H 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi rm -f conftest.err conftest.i conftest.$ac_ext - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sqlext.h" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlext.h" >&5 printf %s "checking for sqlext.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -56259,19 +56967,19 @@ php_pdo_odbc_have_header=yes -printf '%s\n' "#define HAVE_SQLEXT_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_SQLEXT_H 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi rm -f conftest.err conftest.i conftest.$ac_ext - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sqltypes.h" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqltypes.h" >&5 printf %s "checking for sqltypes.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -56289,19 +56997,19 @@ php_pdo_odbc_have_header=yes -printf '%s\n' "#define HAVE_SQLTYPES_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_SQLTYPES_H 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi rm -f conftest.err conftest.i conftest.$ac_ext - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sqlucode.h" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlucode.h" >&5 printf %s "checking for sqlucode.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -56319,19 +57027,19 @@ php_pdo_odbc_have_header=yes -printf '%s\n' "#define HAVE_SQLUCODE_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_SQLUCODE_H 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi rm -f conftest.err conftest.i conftest.$ac_ext - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sqlunix.h" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlunix.h" >&5 printf %s "checking for sqlunix.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -56349,19 +57057,19 @@ php_pdo_odbc_have_header=yes -printf '%s\n' "#define HAVE_SQLUNIX_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_SQLUNIX_H 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi rm -f conftest.err conftest.i conftest.$ac_ext - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for udbcext.h" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for udbcext.h" >&5 printf %s "checking for udbcext.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -56379,14 +57087,14 @@ php_pdo_odbc_have_header=yes -printf '%s\n' "#define HAVE_UDBCEXT_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_UDBCEXT_H 1" >>confdefs.h - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi rm -f conftest.err conftest.i conftest.$ac_ext @@ -56402,7 +57110,7 @@ fi -printf '%s\n' "#define PDO_ODBC_TYPE \"$pdo_odbc_flavour\"" >>confdefs.h +printf "%s\n" "#define PDO_ODBC_TYPE \"$pdo_odbc_flavour\"" >>confdefs.h @@ -56540,7 +57248,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_PDO_ODBC 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_PDO_ODBC 1" >>confdefs.h fi fi @@ -56688,7 +57396,7 @@ php_with_pdo_pgsql=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support for PDO" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support for PDO" >&5 printf %s "checking for PostgreSQL support for PDO... " >&6; } # Check whether --with-pdo-pgsql was given. @@ -56726,8 +57434,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -56744,17 +57452,17 @@ then : pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libpq >= 10.0" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpq >= 10.0" >&5 printf %s "checking for libpq >= 10.0... " >&6; } if test -n "$PGSQL_CFLAGS"; then pkg_cv_PGSQL_CFLAGS="$PGSQL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpq >= 10.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpq >= 10.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpq >= 10.0") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PGSQL_CFLAGS=`$PKG_CONFIG --cflags "libpq >= 10.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -56768,10 +57476,10 @@ pkg_cv_PGSQL_LIBS="$PGSQL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpq >= 10.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpq >= 10.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpq >= 10.0") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PGSQL_LIBS=`$PKG_CONFIG --libs "libpq >= 10.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -56785,8 +57493,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -56803,21 +57511,21 @@ found_pgsql=no elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } found_pgsql=no else PGSQL_CFLAGS=$pkg_cv_PGSQL_CFLAGS PGSQL_LIBS=$pkg_cv_PGSQL_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } found_pgsql=yes fi fi if test "x$found_pgsql" = xno then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for pg_config" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pg_config" >&5 printf %s "checking for pg_config... " >&6; } for i in $pgsql_dir $pgsql_dir/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do if test -x $i/pg_config @@ -56828,8 +57536,8 @@ if ${PG_CONFIG:+false} : then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -printf '%s\n' "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } if ${pgsql_dir:+false} : then : pgsql_search_paths="/usr /usr/local /usr/local/pgsql" @@ -56855,8 +57563,8 @@ done else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 -printf '%s\n' "$PG_CONFIG" >&6; } + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 +printf "%s\n" "$PG_CONFIG" >&6; } PGSQL_INCLUDE=$($PG_CONFIG --includedir) PGSQL_LIBDIR=$($PG_CONFIG --libdir) ;; @@ -57148,7 +57856,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PQencryptPasswordConn in -lpq" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQencryptPasswordConn in -lpq" >&5 printf %s "checking for PQencryptPasswordConn in -lpq... " >&6; } if test ${ac_cv_lib_pq_PQencryptPasswordConn+y} then : @@ -57189,8 +57897,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQencryptPasswordConn" >&5 -printf '%s\n' "$ac_cv_lib_pq_PQencryptPasswordConn" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQencryptPasswordConn" >&5 +printf "%s\n" "$ac_cv_lib_pq_PQencryptPasswordConn" >&6; } if test "x$ac_cv_lib_pq_PQencryptPasswordConn" = xyes then : @@ -57203,8 +57911,8 @@ LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_pq_PQencryptPasswordConn - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "PostgreSQL check failed: libpq 10.0 or later is required. See 'config.log' for more details" "$LINENO" 5; } ;; @@ -57213,8 +57921,8 @@ else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Cannot find libpq-fe.h or pq library (libpq). Please specify the correct PostgreSQL installation path with environment variables PGSQL_CFLAGS and PGSQL_LIBS or provide the PostgreSQL installation directory. @@ -57227,7 +57935,7 @@ -printf '%s\n' "#define HAVE_PDO_PGSQL 1" >>confdefs.h +printf "%s\n" "#define HAVE_PDO_PGSQL 1" >>confdefs.h @@ -57348,7 +58056,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PQresultMemorySize in -lpq" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQresultMemorySize in -lpq" >&5 printf %s "checking for PQresultMemorySize in -lpq... " >&6; } if test ${ac_cv_lib_pq_PQresultMemorySize+y} then : @@ -57389,15 +58097,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQresultMemorySize" >&5 -printf '%s\n' "$ac_cv_lib_pq_PQresultMemorySize" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQresultMemorySize" >&5 +printf "%s\n" "$ac_cv_lib_pq_PQresultMemorySize" >&6; } if test "x$ac_cv_lib_pq_PQresultMemorySize" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_PG_RESULT_MEMORY_SIZE 1" >>confdefs.h +printf "%s\n" "#define HAVE_PG_RESULT_MEMORY_SIZE 1" >>confdefs.h else case e in #( @@ -57529,7 +58237,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PQclosePrepared in -lpq" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQclosePrepared in -lpq" >&5 printf %s "checking for PQclosePrepared in -lpq... " >&6; } if test ${ac_cv_lib_pq_PQclosePrepared+y} then : @@ -57570,15 +58278,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQclosePrepared" >&5 -printf '%s\n' "$ac_cv_lib_pq_PQclosePrepared" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQclosePrepared" >&5 +printf "%s\n" "$ac_cv_lib_pq_PQclosePrepared" >&6; } if test "x$ac_cv_lib_pq_PQclosePrepared" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_PQCLOSEPREPARED 1" >>confdefs.h +printf "%s\n" "#define HAVE_PQCLOSEPREPARED 1" >>confdefs.h else case e in #( @@ -57710,7 +58418,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PQclosePortal in -lpq" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQclosePortal in -lpq" >&5 printf %s "checking for PQclosePortal in -lpq... " >&6; } if test ${ac_cv_lib_pq_PQclosePortal+y} then : @@ -57751,15 +58459,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQclosePortal" >&5 -printf '%s\n' "$ac_cv_lib_pq_PQclosePortal" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQclosePortal" >&5 +printf "%s\n" "$ac_cv_lib_pq_PQclosePortal" >&6; } if test "x$ac_cv_lib_pq_PQclosePortal" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_PQCLOSEPORTAL 1" >>confdefs.h +printf "%s\n" "#define HAVE_PQCLOSEPORTAL 1" >>confdefs.h else case e in #( @@ -57774,7 +58482,7 @@ - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 printf %s "checking for PDO includes... " >&6; } if test ${pdo_cv_inc_path+y} then : @@ -57789,8 +58497,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5 -printf '%s\n' "$pdo_cv_inc_path" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5 +printf "%s\n" "$pdo_cv_inc_path" >&6; } if test -n "$pdo_cv_inc_path"; then : else @@ -57933,7 +58641,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_PDO_PGSQL 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_PDO_PGSQL 1" >>confdefs.h fi fi @@ -58083,7 +58791,7 @@ php_with_pdo_sqlite=$PHP_PDO -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sqlite 3 support for PDO" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite 3 support for PDO" >&5 printf %s "checking for sqlite 3 support for PDO... " >&6; } # Check whether --with-pdo-sqlite was given. @@ -58121,15 +58829,15 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } if test "$PHP_PDO_SQLITE" != "no"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5 printf %s "checking for PDO includes... " >&6; } if test ${pdo_cv_inc_path+y} then : @@ -58144,8 +58852,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5 -printf '%s\n' "$pdo_cv_inc_path" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5 +printf "%s\n" "$pdo_cv_inc_path" >&6; } if test -n "$pdo_cv_inc_path"; then : else @@ -58156,17 +58864,17 @@ pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sqlite3 >= 3.7.7" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3 >= 3.7.7" >&5 printf %s "checking for sqlite3 >= 3.7.7... " >&6; } if test -n "$SQLITE_CFLAGS"; then pkg_cv_SQLITE_CFLAGS="$SQLITE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5 ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.7.7") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.7.7" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -58180,10 +58888,10 @@ pkg_cv_SQLITE_LIBS="$SQLITE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5 ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.7.7") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.7.7" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -58197,8 +58905,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -58224,10 +58932,10 @@ and SQLITE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -58241,8 +58949,8 @@ else SQLITE_CFLAGS=$pkg_cv_SQLITE_CFLAGS SQLITE_LIBS=$pkg_cv_SQLITE_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } for ac_i in $SQLITE_CFLAGS; do @@ -58521,7 +59229,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sqlite3_close_v2 in -lsqlite3" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_close_v2 in -lsqlite3" >&5 printf %s "checking for sqlite3_close_v2 in -lsqlite3... " >&6; } if test ${ac_cv_lib_sqlite3_sqlite3_close_v2+y} then : @@ -58562,15 +59270,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_close_v2" >&5 -printf '%s\n' "$ac_cv_lib_sqlite3_sqlite3_close_v2" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_close_v2" >&5 +printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_close_v2" >&6; } if test "x$ac_cv_lib_sqlite3_sqlite3_close_v2" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_SQLITE3_CLOSE_V2 1" >>confdefs.h +printf "%s\n" "#define HAVE_SQLITE3_CLOSE_V2 1" >>confdefs.h else case e in #( @@ -58702,7 +59410,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sqlite3_column_table_name in -lsqlite3" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_column_table_name in -lsqlite3" >&5 printf %s "checking for sqlite3_column_table_name in -lsqlite3... " >&6; } if test ${ac_cv_lib_sqlite3_sqlite3_column_table_name+y} then : @@ -58743,15 +59451,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_column_table_name" >&5 -printf '%s\n' "$ac_cv_lib_sqlite3_sqlite3_column_table_name" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_column_table_name" >&5 +printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_column_table_name" >&6; } if test "x$ac_cv_lib_sqlite3_sqlite3_column_table_name" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_SQLITE3_COLUMN_TABLE_NAME 1" >>confdefs.h +printf "%s\n" "#define HAVE_SQLITE3_COLUMN_TABLE_NAME 1" >>confdefs.h else case e in #( @@ -58883,7 +59591,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sqlite3_load_extension in -lsqlite3" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_load_extension in -lsqlite3" >&5 printf %s "checking for sqlite3_load_extension in -lsqlite3... " >&6; } if test ${ac_cv_lib_sqlite3_sqlite3_load_extension+y} then : @@ -58924,8 +59632,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5 -printf '%s\n' "$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5 +printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6; } if test "x$ac_cv_lib_sqlite3_sqlite3_load_extension" = xyes then : @@ -58939,7 +59647,7 @@ ext_shared=$save_ext_shared unset ac_cv_lib_sqlite3_sqlite3_load_extension -printf '%s\n' "#define PDO_SQLITE_OMIT_LOAD_EXTENSION 1" >>confdefs.h +printf "%s\n" "#define PDO_SQLITE_OMIT_LOAD_EXTENSION 1" >>confdefs.h ;; esac @@ -59084,7 +59792,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_PDO_SQLITE 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_PDO_SQLITE 1" >>confdefs.h fi fi @@ -59233,357 +59941,9 @@ -php_enable_pdo=yes - -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable PDO support" >&5 -printf %s "checking whether to enable PDO support... " >&6; } -# Check whether --enable-pdo was given. -if test ${enable_pdo+y} -then : - enableval=$enable_pdo; PHP_PDO=$enableval -else case e in #( - e) - PHP_PDO=yes - test "$PHP_ENABLE_ALL" && PHP_PDO=$PHP_ENABLE_ALL - ;; -esac -fi - - - -ext_output="yes, shared" -ext_shared=yes -case $PHP_PDO in -shared,*) - PHP_PDO=$(echo "$PHP_PDO"|$SED 's/^shared,//') - ;; -shared) - PHP_PDO=yes - ;; -no) - ext_output=no - ext_shared=no - ;; -*) - ext_output=yes - ext_shared=no - ;; -esac - - - -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } - - - - -if test "$PHP_PDO" != "no"; then - PHP_PDO=yes - - - ext_builddir=ext/pdo - ext_srcdir=$abs_srcdir/ext/pdo - ext_dir=ext/pdo - - ac_extra= - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - PHP_PDO_SHARED=no - - - case $ext_dir in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=$(echo "$ext_dir"|cut -c 2-)"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/$ext_dir/"; ac_bdir="$ext_dir/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - - - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre - b_c_meta=$php_c_meta - b_cxx_meta=$php_cxx_meta - b_c_post=$php_c_post - b_cxx_post=$php_cxx_post - b_lo=$php_lo - - - old_IFS=$IFS - for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac - - ac_comp="$ac_comp -MMD -MF $ac_bdir$ac_obj.dep -MT $ac_bdir$ac_obj.lo" - - cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<>confdefs.h - - fi - fi - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then - PHP_PDO_SHARED=no - case "$PHP_SAPI" in - cgi|embed|phpdbg) - - - case $ext_dir in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=$(echo "$ext_dir"|cut -c 2-)"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/$ext_dir/"; ac_bdir="$ext_dir/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - - - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre - b_c_meta=$php_c_meta - b_cxx_meta=$php_cxx_meta - b_c_post=$php_c_post - b_cxx_post=$php_cxx_post - b_lo=$php_lo - - - old_IFS=$IFS - for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac - - ac_comp="$ac_comp -MMD -MF $ac_bdir$ac_obj.dep -MT $ac_bdir$ac_obj.lo" - - cat >>Makefile.objects<>Makefile.objects<> Makefile.fragments - -fi - - - - - php_with_pgsql=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support" >&5 printf %s "checking for PostgreSQL support... " >&6; } # Check whether --with-pgsql was given. @@ -59621,8 +59981,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -59639,17 +59999,17 @@ then : pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libpq >= 10.0" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpq >= 10.0" >&5 printf %s "checking for libpq >= 10.0... " >&6; } if test -n "$PGSQL_CFLAGS"; then pkg_cv_PGSQL_CFLAGS="$PGSQL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpq >= 10.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpq >= 10.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpq >= 10.0") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PGSQL_CFLAGS=`$PKG_CONFIG --cflags "libpq >= 10.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -59663,10 +60023,10 @@ pkg_cv_PGSQL_LIBS="$PGSQL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpq >= 10.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpq >= 10.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpq >= 10.0") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PGSQL_LIBS=`$PKG_CONFIG --libs "libpq >= 10.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -59680,8 +60040,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -59698,21 +60058,21 @@ found_pgsql=no elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } found_pgsql=no else PGSQL_CFLAGS=$pkg_cv_PGSQL_CFLAGS PGSQL_LIBS=$pkg_cv_PGSQL_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } found_pgsql=yes fi fi if test "x$found_pgsql" = xno then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for pg_config" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pg_config" >&5 printf %s "checking for pg_config... " >&6; } for i in $pgsql_dir $pgsql_dir/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do if test -x $i/pg_config @@ -59723,8 +60083,8 @@ if ${PG_CONFIG:+false} : then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -printf '%s\n' "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } if ${pgsql_dir:+false} : then : pgsql_search_paths="/usr /usr/local /usr/local/pgsql" @@ -59750,8 +60110,8 @@ done else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 -printf '%s\n' "$PG_CONFIG" >&6; } + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 +printf "%s\n" "$PG_CONFIG" >&6; } PGSQL_INCLUDE=$($PG_CONFIG --includedir) PGSQL_LIBDIR=$($PG_CONFIG --libdir) ;; @@ -60043,7 +60403,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PQencryptPasswordConn in -lpq" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQencryptPasswordConn in -lpq" >&5 printf %s "checking for PQencryptPasswordConn in -lpq... " >&6; } if test ${ac_cv_lib_pq_PQencryptPasswordConn+y} then : @@ -60084,8 +60444,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQencryptPasswordConn" >&5 -printf '%s\n' "$ac_cv_lib_pq_PQencryptPasswordConn" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQencryptPasswordConn" >&5 +printf "%s\n" "$ac_cv_lib_pq_PQencryptPasswordConn" >&6; } if test "x$ac_cv_lib_pq_PQencryptPasswordConn" = xyes then : @@ -60098,8 +60458,8 @@ LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_pq_PQencryptPasswordConn - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "PostgreSQL check failed: libpq 10.0 or later is required. See 'config.log' for more details" "$LINENO" 5; } ;; @@ -60108,8 +60468,8 @@ else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Cannot find libpq-fe.h or pq library (libpq). Please specify the correct PostgreSQL installation path with environment variables PGSQL_CFLAGS and PGSQL_LIBS or provide the PostgreSQL installation directory. @@ -60122,7 +60482,7 @@ -printf '%s\n' "#define HAVE_PGSQL 1" >>confdefs.h +printf "%s\n" "#define HAVE_PGSQL 1" >>confdefs.h @@ -60243,7 +60603,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PQresultMemorySize in -lpq" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQresultMemorySize in -lpq" >&5 printf %s "checking for PQresultMemorySize in -lpq... " >&6; } if test ${ac_cv_lib_pq_PQresultMemorySize+y} then : @@ -60284,15 +60644,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQresultMemorySize" >&5 -printf '%s\n' "$ac_cv_lib_pq_PQresultMemorySize" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQresultMemorySize" >&5 +printf "%s\n" "$ac_cv_lib_pq_PQresultMemorySize" >&6; } if test "x$ac_cv_lib_pq_PQresultMemorySize" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_PG_RESULT_MEMORY_SIZE 1" >>confdefs.h +printf "%s\n" "#define HAVE_PG_RESULT_MEMORY_SIZE 1" >>confdefs.h else case e in #( @@ -60423,7 +60783,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PQchangePassword in -lpq" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQchangePassword in -lpq" >&5 printf %s "checking for PQchangePassword in -lpq... " >&6; } if test ${ac_cv_lib_pq_PQchangePassword+y} then : @@ -60464,15 +60824,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQchangePassword" >&5 -printf '%s\n' "$ac_cv_lib_pq_PQchangePassword" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQchangePassword" >&5 +printf "%s\n" "$ac_cv_lib_pq_PQchangePassword" >&6; } if test "x$ac_cv_lib_pq_PQchangePassword" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_PG_CHANGE_PASSWORD 1" >>confdefs.h +printf "%s\n" "#define HAVE_PG_CHANGE_PASSWORD 1" >>confdefs.h else case e in #( @@ -60603,7 +60963,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PQsocketPoll in -lpq" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQsocketPoll in -lpq" >&5 printf %s "checking for PQsocketPoll in -lpq... " >&6; } if test ${ac_cv_lib_pq_PQsocketPoll+y} then : @@ -60644,15 +61004,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQsocketPoll" >&5 -printf '%s\n' "$ac_cv_lib_pq_PQsocketPoll" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQsocketPoll" >&5 +printf "%s\n" "$ac_cv_lib_pq_PQsocketPoll" >&6; } if test "x$ac_cv_lib_pq_PQsocketPoll" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_PG_SOCKET_POLL 1" >>confdefs.h +printf "%s\n" "#define HAVE_PG_SOCKET_POLL 1" >>confdefs.h else case e in #( @@ -60671,7 +61031,7 @@ ac_fn_check_decl "$LINENO" "PGRES_TUPLES_CHUNK" "ac_cv_have_decl_PGRES_TUPLES_CHUNK" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_PGRES_TUPLES_CHUNK" = xyes then : ac_have_decl=1 @@ -60679,7 +61039,7 @@ e) ac_have_decl=0 ;; esac fi -printf '%s\n' "#define HAVE_DECL_PGRES_TUPLES_CHUNK $ac_have_decl" >>confdefs.h +printf "%s\n" "#define HAVE_DECL_PGRES_TUPLES_CHUNK $ac_have_decl" >>confdefs.h if test $ac_have_decl = 1 then : @@ -60800,7 +61160,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PQsetChunkedRowsMode in -lpq" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQsetChunkedRowsMode in -lpq" >&5 printf %s "checking for PQsetChunkedRowsMode in -lpq... " >&6; } if test ${ac_cv_lib_pq_PQsetChunkedRowsMode+y} then : @@ -60841,15 +61201,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQsetChunkedRowsMode" >&5 -printf '%s\n' "$ac_cv_lib_pq_PQsetChunkedRowsMode" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQsetChunkedRowsMode" >&5 +printf "%s\n" "$ac_cv_lib_pq_PQsetChunkedRowsMode" >&6; } if test "x$ac_cv_lib_pq_PQsetChunkedRowsMode" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_PG_SET_CHUNKED_ROWS_SIZE 1" >>confdefs.h +printf "%s\n" "#define HAVE_PG_SET_CHUNKED_ROWS_SIZE 1" >>confdefs.h else case e in #( @@ -60865,7 +61225,7 @@ fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if PGVerbosity enum has PQERRORS_SQLSTATE" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if PGVerbosity enum has PQERRORS_SQLSTATE" >&5 printf %s "checking if PGVerbosity enum has PQERRORS_SQLSTATE... " >&6; } if test ${php_cv_enum_pgverbosity_pqerrors_sqlstate+y} then : @@ -60892,12 +61252,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_enum_pgverbosity_pqerrors_sqlstate" >&5 -printf '%s\n' "$php_cv_enum_pgverbosity_pqerrors_sqlstate" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_enum_pgverbosity_pqerrors_sqlstate" >&5 +printf "%s\n" "$php_cv_enum_pgverbosity_pqerrors_sqlstate" >&6; } if test "x$php_cv_enum_pgverbosity_pqerrors_sqlstate" = xyes then : -printf '%s\n' "#define HAVE_PQERRORS_SQLSTATE 1" >>confdefs.h +printf "%s\n" "#define HAVE_PQERRORS_SQLSTATE 1" >>confdefs.h fi @@ -61038,7 +61398,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_PGSQL 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_PGSQL 1" >>confdefs.h fi fi @@ -61183,7 +61543,7 @@ php_enable_phar=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for phar archive support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phar archive support" >&5 printf %s "checking for phar archive support... " >&6; } # Check whether --enable-phar was given. if test ${enable_phar+y} @@ -61220,8 +61580,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -61362,7 +61722,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_PHAR 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_PHAR 1" >>confdefs.h fi fi @@ -61481,25 +61841,25 @@ fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for phar openssl support" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phar openssl support" >&5 printf %s "checking for phar openssl support... " >&6; } if test "x$PHP_OPENSSL_SHARED" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no (shared openssl)" >&5 -printf '%s\n' "no (shared openssl)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (shared openssl)" >&5 +printf "%s\n" "no (shared openssl)" >&6; } else case e in #( e) if test "x$PHP_OPENSSL" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } -printf '%s\n' "#define PHAR_HAVE_OPENSSL 1" >>confdefs.h +printf "%s\n" "#define PHAR_HAVE_OPENSSL 1" >>confdefs.h else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi ;; esac @@ -61577,7 +61937,7 @@ php_enable_posix=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable POSIX-like functions" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable POSIX-like functions" >&5 printf %s "checking whether to enable POSIX-like functions... " >&6; } # Check whether --enable-posix was given. if test ${enable_posix+y} @@ -61614,15 +61974,15 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } if test "$PHP_POSIX" = "yes"; then -printf '%s\n' "#define HAVE_POSIX 1" >>confdefs.h +printf "%s\n" "#define HAVE_POSIX 1" >>confdefs.h ext_builddir=ext/posix @@ -61759,7 +62119,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_POSIX 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_POSIX 1" >>confdefs.h fi fi @@ -61881,85 +62241,85 @@ ac_fn_c_check_func "$LINENO" "ctermid" "ac_cv_func_ctermid" if test "x$ac_cv_func_ctermid" = xyes then : - printf '%s\n' "#define HAVE_CTERMID 1" >>confdefs.h + printf "%s\n" "#define HAVE_CTERMID 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "eaccess" "ac_cv_func_eaccess" if test "x$ac_cv_func_eaccess" = xyes then : - printf '%s\n' "#define HAVE_EACCESS 1" >>confdefs.h + printf "%s\n" "#define HAVE_EACCESS 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getgrgid_r" "ac_cv_func_getgrgid_r" if test "x$ac_cv_func_getgrgid_r" = xyes then : - printf '%s\n' "#define HAVE_GETGRGID_R 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETGRGID_R 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getgroups" "ac_cv_func_getgroups" if test "x$ac_cv_func_getgroups" = xyes then : - printf '%s\n' "#define HAVE_GETGROUPS 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETGROUPS 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getpgid" "ac_cv_func_getpgid" if test "x$ac_cv_func_getpgid" = xyes then : - printf '%s\n' "#define HAVE_GETPGID 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETPGID 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getrlimit" "ac_cv_func_getrlimit" if test "x$ac_cv_func_getrlimit" = xyes then : - printf '%s\n' "#define HAVE_GETRLIMIT 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETRLIMIT 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getsid" "ac_cv_func_getsid" if test "x$ac_cv_func_getsid" = xyes then : - printf '%s\n' "#define HAVE_GETSID 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETSID 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "initgroups" "ac_cv_func_initgroups" if test "x$ac_cv_func_initgroups" = xyes then : - printf '%s\n' "#define HAVE_INITGROUPS 1" >>confdefs.h + printf "%s\n" "#define HAVE_INITGROUPS 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "mkfifo" "ac_cv_func_mkfifo" if test "x$ac_cv_func_mkfifo" = xyes then : - printf '%s\n' "#define HAVE_MKFIFO 1" >>confdefs.h + printf "%s\n" "#define HAVE_MKFIFO 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "mknod" "ac_cv_func_mknod" if test "x$ac_cv_func_mknod" = xyes then : - printf '%s\n' "#define HAVE_MKNOD 1" >>confdefs.h + printf "%s\n" "#define HAVE_MKNOD 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "setegid" "ac_cv_func_setegid" if test "x$ac_cv_func_setegid" = xyes then : - printf '%s\n' "#define HAVE_SETEGID 1" >>confdefs.h + printf "%s\n" "#define HAVE_SETEGID 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "seteuid" "ac_cv_func_seteuid" if test "x$ac_cv_func_seteuid" = xyes then : - printf '%s\n' "#define HAVE_SETEUID 1" >>confdefs.h + printf "%s\n" "#define HAVE_SETEUID 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "setrlimit" "ac_cv_func_setrlimit" if test "x$ac_cv_func_setrlimit" = xyes then : - printf '%s\n' "#define HAVE_SETRLIMIT 1" >>confdefs.h + printf "%s\n" "#define HAVE_SETRLIMIT 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "setsid" "ac_cv_func_setsid" if test "x$ac_cv_func_setsid" = xyes then : - printf '%s\n' "#define HAVE_SETSID 1" >>confdefs.h + printf "%s\n" "#define HAVE_SETSID 1" >>confdefs.h fi @@ -61970,7 +62330,7 @@ ac_fn_c_check_func "$LINENO" "makedev" "ac_cv_func_makedev" if test "x$ac_cv_func_makedev" = xyes then : - printf '%s\n' "#define HAVE_MAKEDEV 1" >>confdefs.h + printf "%s\n" "#define HAVE_MAKEDEV 1" >>confdefs.h else case e in #( e) ac_fn_check_decl "$LINENO" "makedev" "ac_cv_have_decl_makedev" " @@ -61981,10 +62341,10 @@ # include #endif -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_makedev" = xyes then : - printf '%s\n' "#define HAVE_MAKEDEV 1" >>confdefs.h + printf "%s\n" "#define HAVE_MAKEDEV 1" >>confdefs.h fi ;; esac @@ -61999,20 +62359,20 @@ e) ac_fn_c_check_func "$LINENO" "pathconf" "ac_cv_func_pathconf" if test "x$ac_cv_func_pathconf" = xyes then : - printf '%s\n' "#define HAVE_PATHCONF 1" >>confdefs.h + printf "%s\n" "#define HAVE_PATHCONF 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "fpathconf" "ac_cv_func_fpathconf" if test "x$ac_cv_func_fpathconf" = xyes then : - printf '%s\n' "#define HAVE_FPATHCONF 1" >>confdefs.h + printf "%s\n" "#define HAVE_FPATHCONF 1" >>confdefs.h fi ;; esac fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working ttyname_r() implementation" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working ttyname_r() implementation" >&5 printf %s "checking for working ttyname_r() implementation... " >&6; } if test ${php_cv_func_ttyname_r+y} then : @@ -62058,16 +62418,16 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_ttyname_r" >&5 -printf '%s\n' "$php_cv_func_ttyname_r" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_ttyname_r" >&5 +printf "%s\n" "$php_cv_func_ttyname_r" >&6; } if test "x$php_cv_func_ttyname_r" = xyes then : -printf '%s\n' "#define HAVE_TTYNAME_R 1" >>confdefs.h +printf "%s\n" "#define HAVE_TTYNAME_R 1" >>confdefs.h else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: posix_ttyname() will be thread-unsafe" >&5 -printf '%s\n' "$as_me: posix_ttyname() will be thread-unsafe" >&6;} ;; + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: posix_ttyname() will be thread-unsafe" >&5 +printf "%s\n" "$as_me: posix_ttyname() will be thread-unsafe" >&6;} ;; esac fi @@ -62081,7 +62441,7 @@ if test "x$ac_cv_member_struct_utsname_domainname" = xyes then : -printf '%s\n' "#define HAVE_STRUCT_UTSNAME_DOMAINNAME 1" >>confdefs.h +printf "%s\n" "#define HAVE_STRUCT_UTSNAME_DOMAINNAME 1" >>confdefs.h fi @@ -62091,11 +62451,11 @@ -ac_fn_check_decl "$LINENO" "arc4random_buf" "ac_cv_have_decl_arc4random_buf" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +ac_fn_check_decl "$LINENO" "arc4random_buf" "ac_cv_have_decl_arc4random_buf" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_arc4random_buf" = xyes then : -printf '%s\n' "#define HAVE_ARC4RANDOM_BUF 1" >>confdefs.h +printf "%s\n" "#define HAVE_ARC4RANDOM_BUF 1" >>confdefs.h fi @@ -62106,7 +62466,7 @@ " if test "x$ac_cv_header_CommonCrypto_CommonRandom_h" = xyes then : - printf '%s\n' "#define HAVE_COMMONCRYPTO_COMMONRANDOM_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_COMMONCRYPTO_COMMONRANDOM_H 1" >>confdefs.h fi @@ -62114,7 +62474,7 @@ ac_fn_c_check_func "$LINENO" "getrandom" "ac_cv_func_getrandom" if test "x$ac_cv_func_getrandom" = xyes then : - printf '%s\n' "#define HAVE_GETRANDOM 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETRANDOM 1" >>confdefs.h fi @@ -62254,7 +62614,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_RANDOM 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_RANDOM 1" >>confdefs.h fi fi @@ -62396,7 +62756,7 @@ php_with_libedit=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libedit readline replacement" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libedit readline replacement" >&5 printf %s "checking for libedit readline replacement... " >&6; } # Check whether --with-libedit was given. @@ -62434,8 +62794,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -62444,7 +62804,7 @@ php_with_readline=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for readline support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline support" >&5 printf %s "checking for readline support... " >&6; } # Check whether --with-readline was given. @@ -62482,8 +62842,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -62540,7 +62900,7 @@ PHP_READLINE_LIBS="" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5 printf %s "checking for tgetent in -lncurses... " >&6; } if test ${ac_cv_lib_ncurses_tgetent+y} then : @@ -62581,8 +62941,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5 -printf '%s\n' "$ac_cv_lib_ncurses_tgetent" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5 +printf "%s\n" "$ac_cv_lib_ncurses_tgetent" >&6; } if test "x$ac_cv_lib_ncurses_tgetent" = xyes then : @@ -62612,7 +62972,7 @@ PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses" else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5 + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5 printf %s "checking for tgetent in -ltermcap... " >&6; } if test ${ac_cv_lib_termcap_tgetent+y} then : @@ -62653,8 +63013,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5 -printf '%s\n' "$ac_cv_lib_termcap_tgetent" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5 +printf "%s\n" "$ac_cv_lib_termcap_tgetent" >&6; } if test "x$ac_cv_lib_termcap_tgetent" = xyes then : @@ -62808,7 +63168,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 printf %s "checking for readline in -lreadline... " >&6; } if test ${ac_cv_lib_readline_readline+y} then : @@ -62849,8 +63209,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5 -printf '%s\n' "$ac_cv_lib_readline_readline" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5 +printf "%s\n" "$ac_cv_lib_readline_readline" >&6; } if test "x$ac_cv_lib_readline_readline" = xyes then : @@ -62967,8 +63327,8 @@ LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_readline_readline - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The readline library not found. See 'config.log' for more details" "$LINENO" 5; } ;; @@ -63094,7 +63454,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -lreadline" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -lreadline" >&5 printf %s "checking for rl_callback_read_char in -lreadline... " >&6; } if test ${ac_cv_lib_readline_rl_callback_read_char+y} then : @@ -63135,14 +63495,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_read_char" >&5 -printf '%s\n' "$ac_cv_lib_readline_rl_callback_read_char" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_read_char" >&5 +printf "%s\n" "$ac_cv_lib_readline_rl_callback_read_char" >&6; } if test "x$ac_cv_lib_readline_rl_callback_read_char" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - printf '%s\n' "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h + printf "%s\n" "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h else case e in #( @@ -63274,7 +63634,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -lreadline" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -lreadline" >&5 printf %s "checking for rl_on_new_line in -lreadline... " >&6; } if test ${ac_cv_lib_readline_rl_on_new_line+y} then : @@ -63315,14 +63675,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_on_new_line" >&5 -printf '%s\n' "$ac_cv_lib_readline_rl_on_new_line" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_on_new_line" >&5 +printf "%s\n" "$ac_cv_lib_readline_rl_on_new_line" >&6; } if test "x$ac_cv_lib_readline_rl_on_new_line" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - printf '%s\n' "#define HAVE_RL_ON_NEW_LINE 1" >>confdefs.h + printf "%s\n" "#define HAVE_RL_ON_NEW_LINE 1" >>confdefs.h else case e in #( @@ -63454,7 +63814,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5 printf %s "checking for rl_completion_matches in -lreadline... " >&6; } if test ${ac_cv_lib_readline_rl_completion_matches+y} then : @@ -63495,14 +63855,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5 -printf '%s\n' "$ac_cv_lib_readline_rl_completion_matches" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5 +printf "%s\n" "$ac_cv_lib_readline_rl_completion_matches" >&6; } if test "x$ac_cv_lib_readline_rl_completion_matches" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared - printf '%s\n' "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h + printf "%s\n" "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h else case e in #( @@ -63527,13 +63887,13 @@ #include #include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_rl_pending_input" = xyes then : else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? " Invalid readline installation detected. Try --with-libedit instead. @@ -63545,20 +63905,20 @@ #include #include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_rl_erase_empty_line" = xyes then : - printf '%s\n' "#define HAVE_ERASE_EMPTY_LINE 1" >>confdefs.h + printf "%s\n" "#define HAVE_ERASE_EMPTY_LINE 1" >>confdefs.h fi CFLAGS=$CFLAGS_SAVE LDFLAGS=$LDFLAGS_SAVE LIBS=$LIBS_SAVE - printf '%s\n' "#define HAVE_HISTORY_LIST 1" >>confdefs.h + printf "%s\n" "#define HAVE_HISTORY_LIST 1" >>confdefs.h -printf '%s\n' "#define HAVE_LIBREADLINE 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBREADLINE 1" >>confdefs.h elif test "$PHP_LIBEDIT" != "no"; then @@ -63566,10 +63926,10 @@ then : else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: The libedit directory argument is not supported anymore, rely on pkg-config. + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The libedit directory argument is not supported anymore, rely on pkg-config. Replace '--with-libedit=$PHP_LIBEDIT' with '--with-libedit' and use environment variables 'PKG_CONFIG_PATH', 'EDIT_LIBS', or 'EDIT_CFLAGS'." >&5 -printf '%s\n' "$as_me: WARNING: The libedit directory argument is not supported anymore, rely on pkg-config. +printf "%s\n" "$as_me: WARNING: The libedit directory argument is not supported anymore, rely on pkg-config. Replace '--with-libedit=$PHP_LIBEDIT' with '--with-libedit' and use environment variables 'PKG_CONFIG_PATH', 'EDIT_LIBS', or 'EDIT_CFLAGS'." >&2;} ;; esac @@ -63577,17 +63937,17 @@ pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libedit" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libedit" >&5 printf %s "checking for libedit... " >&6; } if test -n "$EDIT_CFLAGS"; then pkg_cv_EDIT_CFLAGS="$EDIT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5 ($PKG_CONFIG --exists --print-errors "libedit") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EDIT_CFLAGS=`$PKG_CONFIG --cflags "libedit" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -63601,10 +63961,10 @@ pkg_cv_EDIT_LIBS="$EDIT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5 ($PKG_CONFIG --exists --print-errors "libedit") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EDIT_LIBS=`$PKG_CONFIG --libs "libedit" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -63618,8 +63978,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -63645,10 +64005,10 @@ and EDIT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -63662,8 +64022,8 @@ else EDIT_CFLAGS=$pkg_cv_EDIT_CFLAGS EDIT_LIBS=$pkg_cv_EDIT_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -63822,7 +64182,7 @@ done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5 printf %s "checking for tgetent in -lncurses... " >&6; } if test ${ac_cv_lib_ncurses_tgetent+y} then : @@ -63863,8 +64223,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5 -printf '%s\n' "$ac_cv_lib_ncurses_tgetent" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5 +printf "%s\n" "$ac_cv_lib_ncurses_tgetent" >&6; } if test "x$ac_cv_lib_ncurses_tgetent" = xyes then : @@ -63891,7 +64251,7 @@ else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5 + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5 printf %s "checking for tgetent in -ltermcap... " >&6; } if test ${ac_cv_lib_termcap_tgetent+y} then : @@ -63932,8 +64292,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5 -printf '%s\n' "$ac_cv_lib_termcap_tgetent" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5 +printf "%s\n" "$ac_cv_lib_termcap_tgetent" >&6; } if test "x$ac_cv_lib_termcap_tgetent" = xyes then : @@ -64083,7 +64443,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5 printf %s "checking for readline in -ledit... " >&6; } if test ${ac_cv_lib_edit_readline+y} then : @@ -64124,8 +64484,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5 -printf '%s\n' "$ac_cv_lib_edit_readline" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5 +printf "%s\n" "$ac_cv_lib_edit_readline" >&6; } if test "x$ac_cv_lib_edit_readline" = xyes then : @@ -64138,8 +64498,8 @@ LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_edit_readline - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The edit library required by readline extension not found. See 'config.log' for more details" "$LINENO" 5; } ;; @@ -64265,7 +64625,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -ledit" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -ledit" >&5 printf %s "checking for rl_callback_read_char in -ledit... " >&6; } if test ${ac_cv_lib_edit_rl_callback_read_char+y} then : @@ -64306,15 +64666,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_callback_read_char" >&5 -printf '%s\n' "$ac_cv_lib_edit_rl_callback_read_char" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_callback_read_char" >&5 +printf "%s\n" "$ac_cv_lib_edit_rl_callback_read_char" >&6; } if test "x$ac_cv_lib_edit_rl_callback_read_char" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h +printf "%s\n" "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h else case e in #( @@ -64446,7 +64806,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -ledit" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -ledit" >&5 printf %s "checking for rl_on_new_line in -ledit... " >&6; } if test ${ac_cv_lib_edit_rl_on_new_line+y} then : @@ -64487,15 +64847,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_on_new_line" >&5 -printf '%s\n' "$ac_cv_lib_edit_rl_on_new_line" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_on_new_line" >&5 +printf "%s\n" "$ac_cv_lib_edit_rl_on_new_line" >&6; } if test "x$ac_cv_lib_edit_rl_on_new_line" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_RL_ON_NEW_LINE 1" >>confdefs.h +printf "%s\n" "#define HAVE_RL_ON_NEW_LINE 1" >>confdefs.h else case e in #( @@ -64627,7 +64987,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -ledit" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -ledit" >&5 printf %s "checking for rl_completion_matches in -ledit... " >&6; } if test ${ac_cv_lib_edit_rl_completion_matches+y} then : @@ -64668,15 +65028,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_completion_matches" >&5 -printf '%s\n' "$ac_cv_lib_edit_rl_completion_matches" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_completion_matches" >&5 +printf "%s\n" "$ac_cv_lib_edit_rl_completion_matches" >&6; } if test "x$ac_cv_lib_edit_rl_completion_matches" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h +printf "%s\n" "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h else case e in #( @@ -64808,7 +65168,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for history_list in -ledit" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for history_list in -ledit" >&5 printf %s "checking for history_list in -ledit... " >&6; } if test ${ac_cv_lib_edit_history_list+y} then : @@ -64849,15 +65209,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_history_list" >&5 -printf '%s\n' "$ac_cv_lib_edit_history_list" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_history_list" >&5 +printf "%s\n" "$ac_cv_lib_edit_history_list" >&6; } if test "x$ac_cv_lib_edit_history_list" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_HISTORY_LIST 1" >>confdefs.h +printf "%s\n" "#define HAVE_HISTORY_LIST 1" >>confdefs.h else case e in #( @@ -64876,18 +65236,18 @@ CFLAGS="$CFLAGS $EDIT_CFLAGS" LIBS="$LIBS $EDIT_LIBS" ac_fn_check_decl "$LINENO" "rl_erase_empty_line" "ac_cv_have_decl_rl_erase_empty_line" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_rl_erase_empty_line" = xyes then : -printf '%s\n' "#define HAVE_ERASE_EMPTY_LINE 1" >>confdefs.h +printf "%s\n" "#define HAVE_ERASE_EMPTY_LINE 1" >>confdefs.h fi CFLAGS=$CFLAGS_SAVE LIBS=$LIBS_SAVE -printf '%s\n' "#define HAVE_LIBEDIT 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBEDIT 1" >>confdefs.h fi @@ -65027,7 +65387,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_READLINE 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_READLINE 1" >>confdefs.h fi fi @@ -65288,7 +65648,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_REFLECTION 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_REFLECTION 1" >>confdefs.h fi fi @@ -65413,7 +65773,7 @@ php_enable_session=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable PHP sessions" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable PHP sessions" >&5 printf %s "checking whether to enable PHP sessions... " >&6; } # Check whether --enable-session was given. if test ${enable_session+y} @@ -65450,8 +65810,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -65459,7 +65819,7 @@ php_with_mm=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mm support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mm support" >&5 printf %s "checking for mm support... " >&6; } # Check whether --with-mm was given. @@ -65476,15 +65836,15 @@ ext_output=$PHP_MM -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } if test "$PHP_SESSION" != "no"; then -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether pwrite works" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pwrite works" >&5 printf %s "checking whether pwrite works... " >&6; } if test ${php_cv_func_pwrite+y} then : @@ -65581,8 +65941,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_pwrite" >&5 -printf '%s\n' "$php_cv_func_pwrite" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_pwrite" >&5 +printf "%s\n" "$php_cv_func_pwrite" >&6; } if test "x$php_cv_func_pwrite" = xno then : @@ -65590,12 +65950,12 @@ else case e in #( e) -printf '%s\n' "#define HAVE_PWRITE 1" >>confdefs.h +printf "%s\n" "#define HAVE_PWRITE 1" >>confdefs.h if test "x$php_cv_func_pwrite" = x64 then : -printf '%s\n' "#define PHP_PWRITE_64 1" >>confdefs.h +printf "%s\n" "#define PHP_PWRITE_64 1" >>confdefs.h fi ;; @@ -65603,7 +65963,7 @@ fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether pread works" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pread works" >&5 printf %s "checking whether pread works... " >&6; } if test ${php_cv_func_pread+y} then : @@ -65702,8 +66062,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_pread" >&5 -printf '%s\n' "$php_cv_func_pread" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_pread" >&5 +printf "%s\n" "$php_cv_func_pread" >&6; } if test "x$php_cv_func_pread" = xno then : @@ -65711,12 +66071,12 @@ else case e in #( e) -printf '%s\n' "#define HAVE_PREAD 1" >>confdefs.h +printf "%s\n" "#define HAVE_PREAD 1" >>confdefs.h if test "x$php_cv_func_pread" = x64 then : -printf '%s\n' "#define PHP_PREAD_64 1" >>confdefs.h +printf "%s\n" "#define PHP_PREAD_64 1" >>confdefs.h fi ;; @@ -65858,7 +66218,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_SESSION 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_SESSION 1" >>confdefs.h fi fi @@ -66037,7 +66397,7 @@ -printf '%s\n' "#define HAVE_PHP_SESSION 1" >>confdefs.h +printf "%s\n" "#define HAVE_PHP_SESSION 1" >>confdefs.h if test "x$PHP_MM" = xno @@ -66222,7 +66582,7 @@ -printf '%s\n' "#define HAVE_LIBMM 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBMM 1" >>confdefs.h ;; esac @@ -66235,7 +66595,7 @@ php_enable_shmop=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable shmop support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable shmop support" >&5 printf %s "checking whether to enable shmop support... " >&6; } # Check whether --enable-shmop was given. if test ${enable_shmop+y} @@ -66272,15 +66632,15 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } if test "$PHP_SHMOP" != "no"; then -printf '%s\n' "#define HAVE_SHMOP 1" >>confdefs.h +printf "%s\n" "#define HAVE_SHMOP 1" >>confdefs.h ext_builddir=ext/shmop @@ -66417,7 +66777,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_SHMOP 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_SHMOP 1" >>confdefs.h fi fi @@ -66543,7 +66903,7 @@ php_enable_simplexml=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable SimpleXML support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable SimpleXML support" >&5 printf %s "checking whether to enable SimpleXML support... " >&6; } # Check whether --enable-simplexml was given. if test ${enable_simplexml+y} @@ -66580,8 +66940,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -66590,17 +66950,17 @@ pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.4" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.4" >&5 printf %s "checking for libxml-2.0 >= 2.9.4... " >&6; } if test -n "$LIBXML_CFLAGS"; then pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.4") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -66614,10 +66974,10 @@ pkg_cv_LIBXML_LIBS="$LIBXML_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.4") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -66631,8 +66991,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -66658,10 +67018,10 @@ and LIBXML_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -66675,8 +67035,8 @@ else LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS LIBXML_LIBS=$pkg_cv_LIBXML_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -66836,7 +67196,7 @@ -printf '%s\n' "#define HAVE_SIMPLEXML 1" >>confdefs.h +printf "%s\n" "#define HAVE_SIMPLEXML 1" >>confdefs.h ext_builddir=ext/simplexml @@ -66973,7 +67333,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_SIMPLEXML 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_SIMPLEXML 1" >>confdefs.h fi fi @@ -67159,7 +67519,7 @@ php_with_snmp=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for SNMP support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SNMP support" >&5 printf %s "checking for SNMP support... " >&6; } # Check whether --with-snmp was given. @@ -67197,8 +67557,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -67209,17 +67569,17 @@ then : pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for netsnmp >= 5.3" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for netsnmp >= 5.3" >&5 printf %s "checking for netsnmp >= 5.3... " >&6; } if test -n "$SNMP_CFLAGS"; then pkg_cv_SNMP_CFLAGS="$SNMP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"netsnmp >= 5.3\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"netsnmp >= 5.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "netsnmp >= 5.3") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SNMP_CFLAGS=`$PKG_CONFIG --cflags "netsnmp >= 5.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -67233,10 +67593,10 @@ pkg_cv_SNMP_LIBS="$SNMP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"netsnmp >= 5.3\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"netsnmp >= 5.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "netsnmp >= 5.3") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SNMP_LIBS=`$PKG_CONFIG --libs "netsnmp >= 5.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -67250,8 +67610,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -67268,14 +67628,14 @@ : elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } : else SNMP_CFLAGS=$pkg_cv_SNMP_CFLAGS SNMP_LIBS=$pkg_cv_SNMP_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } snmp_found=yes fi fi @@ -67287,7 +67647,7 @@ then : # Extract the first word of "net-snmp-config", so it can be a program name with args. set dummy net-snmp-config; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_SNMP_CONFIG+y} then : @@ -67311,7 +67671,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_path_SNMP_CONFIG="$as_dir$ac_word$ac_exec_ext" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -67324,11 +67684,11 @@ fi SNMP_CONFIG=$ac_cv_path_SNMP_CONFIG if test -n "$SNMP_CONFIG"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $SNMP_CONFIG" >&5 -printf '%s\n' "$SNMP_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SNMP_CONFIG" >&5 +printf "%s\n" "$SNMP_CONFIG" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -67645,8 +68005,8 @@ esac done - as_ac_Lib=`printf '%s\n' "ac_cv_lib_$SNMP_LIBNAME""_init_snmp" | sed "$as_sed_sh"` -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for init_snmp in -l$SNMP_LIBNAME" >&5 + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$SNMP_LIBNAME""_init_snmp" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for init_snmp in -l$SNMP_LIBNAME" >&5 printf %s "checking for init_snmp in -l$SNMP_LIBNAME... " >&6; } if eval test \${$as_ac_Lib+y} then : @@ -67688,15 +68048,15 @@ esac fi eval ac_res=\$$as_ac_Lib - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_SNMP 1" >>confdefs.h +printf "%s\n" "#define HAVE_SNMP 1" >>confdefs.h else case e in #( @@ -67704,8 +68064,8 @@ LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_$SNMP_LIBNAME_init_snmp - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "SNMP sanity check failed. See 'config.log' for more details" "$LINENO" 5; } ;; @@ -67831,8 +68191,8 @@ esac done - as_ac_Lib=`printf '%s\n' "ac_cv_lib_$SNMP_LIBNAME""_shutdown_snmp_logging" | sed "$as_sed_sh"` -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shutdown_snmp_logging in -l$SNMP_LIBNAME" >&5 + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$SNMP_LIBNAME""_shutdown_snmp_logging" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shutdown_snmp_logging in -l$SNMP_LIBNAME" >&5 printf %s "checking for shutdown_snmp_logging in -l$SNMP_LIBNAME... " >&6; } if eval test \${$as_ac_Lib+y} then : @@ -67874,15 +68234,15 @@ esac fi eval ac_res=\$$as_ac_Lib - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_SHUTDOWN_SNMP_LOGGING 1" >>confdefs.h +printf "%s\n" "#define HAVE_SHUTDOWN_SNMP_LOGGING 1" >>confdefs.h else case e in #( @@ -67905,11 +68265,11 @@ #include #include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_usmHMAC192SHA256AuthProtocol" = xyes then : -printf '%s\n' "#define HAVE_SNMP_SHA256 1" >>confdefs.h +printf "%s\n" "#define HAVE_SNMP_SHA256 1" >>confdefs.h fi @@ -67917,11 +68277,11 @@ #include #include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_usmHMAC384SHA512AuthProtocol" = xyes then : -printf '%s\n' "#define HAVE_SNMP_SHA512 1" >>confdefs.h +printf "%s\n" "#define HAVE_SNMP_SHA512 1" >>confdefs.h fi @@ -68063,7 +68423,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_SNMP 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_SNMP 1" >>confdefs.h fi fi @@ -68211,7 +68571,7 @@ php_enable_soap=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable SOAP support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable SOAP support" >&5 printf %s "checking whether to enable SOAP support... " >&6; } # Check whether --enable-soap was given. if test ${enable_soap+y} @@ -68248,8 +68608,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -68258,17 +68618,17 @@ pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.4" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.4" >&5 printf %s "checking for libxml-2.0 >= 2.9.4... " >&6; } if test -n "$LIBXML_CFLAGS"; then pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.4") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -68282,10 +68642,10 @@ pkg_cv_LIBXML_LIBS="$LIBXML_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.4") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -68299,8 +68659,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -68326,10 +68686,10 @@ and LIBXML_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -68343,8 +68703,8 @@ else LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS LIBXML_LIBS=$pkg_cv_LIBXML_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -68504,7 +68864,7 @@ -printf '%s\n' "#define HAVE_SOAP 1" >>confdefs.h +printf "%s\n" "#define HAVE_SOAP 1" >>confdefs.h ext_builddir=ext/soap @@ -68641,7 +69001,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_SOAP 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_SOAP 1" >>confdefs.h fi fi @@ -68848,7 +69208,7 @@ php_enable_sockets=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable sockets support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable sockets support" >&5 printf %s "checking whether to enable sockets support... " >&6; } # Check whether --enable-sockets was given. if test ${enable_sockets+y} @@ -68885,8 +69245,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -68895,43 +69255,43 @@ ac_fn_c_check_func "$LINENO" "hstrerror" "ac_cv_func_hstrerror" if test "x$ac_cv_func_hstrerror" = xyes then : - printf '%s\n' "#define HAVE_HSTRERROR 1" >>confdefs.h + printf "%s\n" "#define HAVE_HSTRERROR 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex" if test "x$ac_cv_func_if_nametoindex" = xyes then : - printf '%s\n' "#define HAVE_IF_NAMETOINDEX 1" >>confdefs.h + printf "%s\n" "#define HAVE_IF_NAMETOINDEX 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "if_indextoname" "ac_cv_func_if_indextoname" if test "x$ac_cv_func_if_indextoname" = xyes then : - printf '%s\n' "#define HAVE_IF_INDEXTONAME 1" >>confdefs.h + printf "%s\n" "#define HAVE_IF_INDEXTONAME 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "sockatmark" "ac_cv_func_sockatmark" if test "x$ac_cv_func_sockatmark" = xyes then : - printf '%s\n' "#define HAVE_SOCKATMARK 1" >>confdefs.h + printf "%s\n" "#define HAVE_SOCKATMARK 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default" if test "x$ac_cv_header_sys_sockio_h" = xyes then : - printf '%s\n' "#define HAVE_SYS_SOCKIO_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_SOCKIO_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "linux/filter.h" "ac_cv_header_linux_filter_h" "$ac_includes_default" if test "x$ac_cv_header_linux_filter_h" = xyes then : - printf '%s\n' "#define HAVE_LINUX_FILTER_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_LINUX_FILTER_H 1" >>confdefs.h fi -printf '%s\n' "#define HAVE_SOCKETS 1" >>confdefs.h +printf "%s\n" "#define HAVE_SOCKETS 1" >>confdefs.h ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "ss_family" "ac_cv_member_struct_sockaddr_storage_ss_family" "#include @@ -68939,7 +69299,7 @@ if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = xyes then : -printf '%s\n' "#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1" >>confdefs.h +printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1" >>confdefs.h fi @@ -68955,7 +69315,7 @@ if test "x$ac_cv_type_struct_ucred" = xyes then : -printf '%s\n' "#define HAVE_STRUCT_UCRED 1" >>confdefs.h +printf "%s\n" "#define HAVE_STRUCT_UCRED 1" >>confdefs.h fi @@ -68966,7 +69326,7 @@ if test "x$ac_cv_type_struct_cmsgcred" = xyes then : -printf '%s\n' "#define HAVE_STRUCT_CMSGCRED 1" >>confdefs.h +printf "%s\n" "#define HAVE_STRUCT_CMSGCRED 1" >>confdefs.h fi @@ -69115,7 +69475,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_SOCKETS 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_SOCKETS 1" >>confdefs.h fi fi @@ -69258,7 +69618,7 @@ php_with_sodium=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sodium support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sodium support" >&5 printf %s "checking for sodium support... " >&6; } # Check whether --with-sodium was given. @@ -69296,8 +69656,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -69305,17 +69665,17 @@ if test "$PHP_SODIUM" != "no"; then pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libsodium >= 1.0.8" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsodium >= 1.0.8" >&5 printf %s "checking for libsodium >= 1.0.8... " >&6; } if test -n "$LIBSODIUM_CFLAGS"; then pkg_cv_LIBSODIUM_CFLAGS="$LIBSODIUM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsodium >= 1.0.8\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsodium >= 1.0.8\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsodium >= 1.0.8") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBSODIUM_CFLAGS=`$PKG_CONFIG --cflags "libsodium >= 1.0.8" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -69329,10 +69689,10 @@ pkg_cv_LIBSODIUM_LIBS="$LIBSODIUM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsodium >= 1.0.8\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsodium >= 1.0.8\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsodium >= 1.0.8") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBSODIUM_LIBS=`$PKG_CONFIG --libs "libsodium >= 1.0.8" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -69346,8 +69706,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -69373,10 +69733,10 @@ and LIBSODIUM_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -69390,8 +69750,8 @@ else LIBSODIUM_CFLAGS=$pkg_cv_LIBSODIUM_CFLAGS LIBSODIUM_LIBS=$pkg_cv_LIBSODIUM_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -69552,7 +69912,7 @@ -printf '%s\n' "#define HAVE_LIBSODIUMLIB 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBSODIUMLIB 1" >>confdefs.h SODIUM_COMPILER_FLAGS=$LIBSODIUM_CFLAGS @@ -69561,7 +69921,7 @@ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 printf %s "checking size of long... " >&6; } if test ${ac_cv_sizeof_long+y} then : @@ -69571,25 +69931,32 @@ then : else case e in #( - e) ac_cv_sizeof_long=0 ;; + e) if test "$ac_cv_type_long" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long) +See 'config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long=0 + fi ;; esac fi ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -printf '%s\n' "$ac_cv_sizeof_long" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 +printf "%s\n" "$ac_cv_sizeof_long" >&6; } -printf '%s\n' "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h +printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h if test "$ac_cv_sizeof_long" -eq 4 then : SODIUM_COMPILER_FLAGS="$SODIUM_COMPILER_FLAGS -Wno-type-limits" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wno-logical-op" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wno-logical-op" >&5 printf %s "checking whether the C compiler accepts -Wno-logical-op... " >&6; } if test ${ax_cv_check_cflags__Werror__Wno_logical_op+y} then : @@ -69620,8 +69987,8 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_logical_op" >&5 -printf '%s\n' "$ax_cv_check_cflags__Werror__Wno_logical_op" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_logical_op" >&5 +printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_logical_op" >&6; } if test "x$ax_cv_check_cflags__Werror__Wno_logical_op" = xyes then : SODIUM_COMPILER_FLAGS="$SODIUM_COMPILER_FLAGS -Wno-logical-op" @@ -69768,7 +70135,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_SODIUM 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_SODIUM 1" >>confdefs.h fi fi @@ -70046,7 +70413,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_SPL 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_SPL 1" >>confdefs.h fi fi @@ -70242,7 +70609,7 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether flush should be called explicitly after a buffered io" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether flush should be called explicitly after a buffered io" >&5 printf %s "checking whether flush should be called explicitly after a buffered io... " >&6; } if test ${php_cv_have_flush_io+y} then : @@ -70328,19 +70695,19 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_flush_io" >&5 -printf '%s\n' "$php_cv_have_flush_io" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_flush_io" >&5 +printf "%s\n" "$php_cv_have_flush_io" >&6; } if test "x$php_cv_have_flush_io" = xyes then : -printf '%s\n' "#define HAVE_FLUSHIO 1" >>confdefs.h +printf "%s\n" "#define HAVE_FLUSHIO 1" >>confdefs.h fi php_with_external_libcrypt=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for external libcrypt or libxcrypt" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for external libcrypt or libxcrypt" >&5 printf %s "checking for external libcrypt or libxcrypt... " >&6; } # Check whether --with-external-libcrypt was given. @@ -70357,8 +70724,8 @@ ext_output=$PHP_EXTERNAL_LIBCRYPT -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -70369,13 +70736,13 @@ if test "x$PHP_EXTERNAL_LIBCRYPT" = xno then : - printf '%s\n' "#define PHP_USE_PHP_CRYPT_R 1" >>confdefs.h + printf "%s\n" "#define PHP_USE_PHP_CRYPT_R 1" >>confdefs.h php_ext_standard_sources=" crypt_blowfish.c crypt_freesec.c crypt_sha256.c crypt_sha512.c php_crypt_r.c " else case e in #( e) -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5 printf %s "checking for library containing crypt... " >&6; } if test ${ac_cv_search_crypt+y} then : @@ -70433,25 +70800,25 @@ LIBS=$ac_func_search_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt" >&5 -printf '%s\n' "$ac_cv_search_crypt" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt" >&5 +printf "%s\n" "$ac_cv_search_crypt" >&6; } ac_res=$ac_cv_search_crypt if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -printf '%s\n' "#define HAVE_CRYPT 1" >>confdefs.h +printf "%s\n" "#define HAVE_CRYPT 1" >>confdefs.h else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Cannot use external libcrypt as crypt() is missing. See 'config.log' for more details" "$LINENO" 5; } ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing crypt_r" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing crypt_r" >&5 printf %s "checking for library containing crypt_r... " >&6; } if test ${ac_cv_search_crypt_r+y} then : @@ -70509,25 +70876,25 @@ LIBS=$ac_func_search_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt_r" >&5 -printf '%s\n' "$ac_cv_search_crypt_r" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt_r" >&5 +printf "%s\n" "$ac_cv_search_crypt_r" >&6; } ac_res=$ac_cv_search_crypt_r if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -printf '%s\n' "#define HAVE_CRYPT_R 1" >>confdefs.h +printf "%s\n" "#define HAVE_CRYPT_R 1" >>confdefs.h else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Cannot use external libcrypt as crypt_r() is missing. See 'config.log' for more details" "$LINENO" 5; } ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which data struct is used by crypt_r" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which data struct is used by crypt_r" >&5 printf %s "checking which data struct is used by crypt_r... " >&6; } if test ${php_cv_crypt_r_style+y} then : @@ -70640,20 +71007,20 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_crypt_r_style" >&5 -printf '%s\n' "$php_cv_crypt_r_style" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_crypt_r_style" >&5 +printf "%s\n" "$php_cv_crypt_r_style" >&6; } if test "x$php_cv_crypt_r_style" = xcryptd then : -printf '%s\n' "#define CRYPT_R_CRYPTD 1" >>confdefs.h +printf "%s\n" "#define CRYPT_R_CRYPTD 1" >>confdefs.h fi case $php_cv_crypt_r_style in #( struct_crypt_data|struct_crypt_data_gnu_source) : -printf '%s\n' "#define CRYPT_R_STRUCT_CRYPT_DATA 1" >>confdefs.h +printf "%s\n" "#define CRYPT_R_STRUCT_CRYPT_DATA 1" >>confdefs.h ;; #( *) : ;; @@ -70662,14 +71029,14 @@ if test "x$php_cv_crypt_r_style" = xstruct_crypt_data_gnu_source then : -printf '%s\n' "#define CRYPT_R_GNU_SOURCE 1" >>confdefs.h +printf "%s\n" "#define CRYPT_R_GNU_SOURCE 1" >>confdefs.h fi if test "x$php_cv_crypt_r_style" = xnone then : - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Unable to detect data struct used by crypt_r. See 'config.log' for more details" "$LINENO" 5; } fi @@ -70677,12 +71044,12 @@ ac_fn_c_check_header_compile "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default" if test "x$ac_cv_header_crypt_h" = xyes then : - printf '%s\n' "#define HAVE_CRYPT_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_CRYPT_H 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for standard DES crypt" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for standard DES crypt" >&5 printf %s "checking for standard DES crypt... " >&6; } if test ${ac_cv_crypt_des+y} then : @@ -70725,10 +71092,10 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_des" >&5 -printf '%s\n' "$ac_cv_crypt_des" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_des" >&5 +printf "%s\n" "$ac_cv_crypt_des" >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for extended DES crypt" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for extended DES crypt" >&5 printf %s "checking for extended DES crypt... " >&6; } if test ${ac_cv_crypt_ext_des+y} then : @@ -70771,10 +71138,10 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_ext_des" >&5 -printf '%s\n' "$ac_cv_crypt_ext_des" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_ext_des" >&5 +printf "%s\n" "$ac_cv_crypt_ext_des" >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for MD5 crypt" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MD5 crypt" >&5 printf %s "checking for MD5 crypt... " >&6; } if test ${ac_cv_crypt_md5+y} then : @@ -70827,10 +71194,10 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_md5" >&5 -printf '%s\n' "$ac_cv_crypt_md5" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_md5" >&5 +printf "%s\n" "$ac_cv_crypt_md5" >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for Blowfish crypt" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Blowfish crypt" >&5 printf %s "checking for Blowfish crypt... " >&6; } if test ${ac_cv_crypt_blowfish+y} then : @@ -70881,10 +71248,10 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_blowfish" >&5 -printf '%s\n' "$ac_cv_crypt_blowfish" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_blowfish" >&5 +printf "%s\n" "$ac_cv_crypt_blowfish" >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for SHA512 crypt" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SHA512 crypt" >&5 printf %s "checking for SHA512 crypt... " >&6; } if test ${ac_cv_crypt_sha512+y} then : @@ -70933,10 +71300,10 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_sha512" >&5 -printf '%s\n' "$ac_cv_crypt_sha512" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_sha512" >&5 +printf "%s\n" "$ac_cv_crypt_sha512" >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for SHA256 crypt" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SHA256 crypt" >&5 printf %s "checking for SHA256 crypt... " >&6; } if test ${ac_cv_crypt_sha256+y} then : @@ -70985,17 +71352,17 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_sha256" >&5 -printf '%s\n' "$ac_cv_crypt_sha256" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_sha256" >&5 +printf "%s\n" "$ac_cv_crypt_sha256" >&6; } if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_sha512" = "no" || test "$ac_cv_crypt_sha256" = "no"; then - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Cannot use external libcrypt as some algo are missing. See 'config.log' for more details" "$LINENO" 5; } fi - printf '%s\n' "#define PHP_USE_PHP_CRYPT_R 0" >>confdefs.h + printf "%s\n" "#define PHP_USE_PHP_CRYPT_R 0" >>confdefs.h ;; esac @@ -71005,19 +71372,19 @@ then : case $host_alias in #( *linux*) : - printf '%s\n' "#define HAVE_FNMATCH 1" >>confdefs.h + printf "%s\n" "#define HAVE_FNMATCH 1" >>confdefs.h ;; #( *) : ;; esac else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working POSIX fnmatch" >&5 + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working POSIX fnmatch" >&5 printf %s "checking for working POSIX fnmatch... " >&6; } if test ${ac_cv_func_fnmatch_works+y} then : printf %s "(cached) " >&6 else case e in #( - e) # Some versions of Solaris and the GNU C Library + e) # Some versions of Solaris, SCO, and the GNU C Library # have a broken or incompatible fnmatch. # So we run a test program. If we are cross-compiling, take no chance. # Thanks to John Oleynick, François Pinard, and Paul Eggert for this test. @@ -71060,12 +71427,12 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fnmatch_works" >&5 -printf '%s\n' "$ac_cv_func_fnmatch_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fnmatch_works" >&5 +printf "%s\n" "$ac_cv_func_fnmatch_works" >&6; } if test $ac_cv_func_fnmatch_works = yes then : -printf '%s\n' "#define HAVE_FNMATCH 1" >>confdefs.h +printf "%s\n" "#define HAVE_FNMATCH 1" >>confdefs.h fi @@ -71076,12 +71443,12 @@ for ac_func in fork CreateProcess do : - as_ac_var=`printf '%s\n' "ac_cv_func_$ac_func" | sed "$as_sed_sh"` + as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | sed "$as_sed_sh"` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" if eval test \"x\$"$as_ac_var"\" = x"yes" then : cat >>confdefs.h <<_ACEOF -#define `printf '%s\n' "HAVE_$ac_func" | sed "$as_sed_cpp"` 1 +#define `printf "%s\n" "HAVE_$ac_func" | sed "$as_sed_cpp"` 1 _ACEOF php_can_support_proc_open=yes; break; else case e in #( @@ -71090,16 +71457,16 @@ fi done -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if your OS can spawn processes with inherited handles" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if your OS can spawn processes with inherited handles" >&5 printf %s "checking if your OS can spawn processes with inherited handles... " >&6; } if test "x$php_can_support_proc_open" = xyes then : -printf '%s\n' "#define PHP_CAN_SUPPORT_PROC_OPEN 1" >>confdefs.h +printf "%s\n" "#define PHP_CAN_SUPPORT_PROC_OPEN 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_can_support_proc_open" >&5 -printf '%s\n' "$php_can_support_proc_open" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_can_support_proc_open" >&5 +printf "%s\n" "$php_can_support_proc_open" >&6; } PHP_ENABLE_CHROOT_FUNC=no case "$PHP_SAPI" in @@ -71126,7 +71493,7 @@ if test "x$PHP_ENABLE_CHROOT_FUNC" = xyes then : -printf '%s\n' "#define ENABLE_CHROOT_FUNC 1" >>confdefs.h +printf "%s\n" "#define ENABLE_CHROOT_FUNC 1" >>confdefs.h fi @@ -71156,7 +71523,7 @@ case $found in yes) -printf '%s\n' "#define HAVE_RES_NSEARCH 1" >>confdefs.h +printf "%s\n" "#define HAVE_RES_NSEARCH 1" >>confdefs.h ac_cv_func_res_nsearch=yes ;; @@ -71166,7 +71533,7 @@ unset ac_cv_lib_resolv_res_nsearch unset ac_cv_lib_resolv___res_nsearch unset found - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lresolv" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lresolv" >&5 printf %s "checking for res_nsearch in -lresolv... " >&6; } if test ${ac_cv_lib_resolv_res_nsearch+y} then : @@ -71207,14 +71574,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_nsearch" >&5 -printf '%s\n' "$ac_cv_lib_resolv_res_nsearch" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_nsearch" >&5 +printf "%s\n" "$ac_cv_lib_resolv_res_nsearch" >&6; } if test "x$ac_cv_lib_resolv_res_nsearch" = xyes then : found=yes else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lresolv" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lresolv" >&5 printf %s "checking for __res_nsearch in -lresolv... " >&6; } if test ${ac_cv_lib_resolv___res_nsearch+y} then : @@ -71255,8 +71622,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_nsearch" >&5 -printf '%s\n' "$ac_cv_lib_resolv___res_nsearch" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_nsearch" >&5 +printf "%s\n" "$ac_cv_lib_resolv___res_nsearch" >&6; } if test "x$ac_cv_lib_resolv___res_nsearch" = xyes then : found=yes @@ -71317,10 +71684,10 @@ -printf '%s\n' "#define HAVE_RES_NSEARCH 1" >>confdefs.h +printf "%s\n" "#define HAVE_RES_NSEARCH 1" >>confdefs.h -printf '%s\n' "#define HAVE_LIBRESOLV 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h ac_cv_func_res_nsearch=yes else @@ -71329,7 +71696,7 @@ unset ac_cv_lib_socket_res_nsearch unset ac_cv_lib_socket___res_nsearch unset found - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lsocket" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lsocket" >&5 printf %s "checking for res_nsearch in -lsocket... " >&6; } if test ${ac_cv_lib_socket_res_nsearch+y} then : @@ -71370,14 +71737,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_nsearch" >&5 -printf '%s\n' "$ac_cv_lib_socket_res_nsearch" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_nsearch" >&5 +printf "%s\n" "$ac_cv_lib_socket_res_nsearch" >&6; } if test "x$ac_cv_lib_socket_res_nsearch" = xyes then : found=yes else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lsocket" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lsocket" >&5 printf %s "checking for __res_nsearch in -lsocket... " >&6; } if test ${ac_cv_lib_socket___res_nsearch+y} then : @@ -71418,8 +71785,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_nsearch" >&5 -printf '%s\n' "$ac_cv_lib_socket___res_nsearch" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_nsearch" >&5 +printf "%s\n" "$ac_cv_lib_socket___res_nsearch" >&6; } if test "x$ac_cv_lib_socket___res_nsearch" = xyes then : found=yes @@ -71480,10 +71847,10 @@ -printf '%s\n' "#define HAVE_RES_NSEARCH 1" >>confdefs.h +printf "%s\n" "#define HAVE_RES_NSEARCH 1" >>confdefs.h -printf '%s\n' "#define HAVE_LIBSOCKET 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h ac_cv_func_res_nsearch=yes else @@ -71525,7 +71892,7 @@ case $found in yes) -printf '%s\n' "#define HAVE_RES_NDESTROY 1" >>confdefs.h +printf "%s\n" "#define HAVE_RES_NDESTROY 1" >>confdefs.h ac_cv_func_res_ndestroy=yes ;; @@ -71535,7 +71902,7 @@ unset ac_cv_lib_resolv_res_ndestroy unset ac_cv_lib_resolv___res_ndestroy unset found - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lresolv" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lresolv" >&5 printf %s "checking for res_ndestroy in -lresolv... " >&6; } if test ${ac_cv_lib_resolv_res_ndestroy+y} then : @@ -71576,14 +71943,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_ndestroy" >&5 -printf '%s\n' "$ac_cv_lib_resolv_res_ndestroy" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_ndestroy" >&5 +printf "%s\n" "$ac_cv_lib_resolv_res_ndestroy" >&6; } if test "x$ac_cv_lib_resolv_res_ndestroy" = xyes then : found=yes else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lresolv" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lresolv" >&5 printf %s "checking for __res_ndestroy in -lresolv... " >&6; } if test ${ac_cv_lib_resolv___res_ndestroy+y} then : @@ -71624,8 +71991,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_ndestroy" >&5 -printf '%s\n' "$ac_cv_lib_resolv___res_ndestroy" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_ndestroy" >&5 +printf "%s\n" "$ac_cv_lib_resolv___res_ndestroy" >&6; } if test "x$ac_cv_lib_resolv___res_ndestroy" = xyes then : found=yes @@ -71686,10 +72053,10 @@ -printf '%s\n' "#define HAVE_RES_NDESTROY 1" >>confdefs.h +printf "%s\n" "#define HAVE_RES_NDESTROY 1" >>confdefs.h -printf '%s\n' "#define HAVE_LIBRESOLV 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h ac_cv_func_res_ndestroy=yes else @@ -71698,7 +72065,7 @@ unset ac_cv_lib_socket_res_ndestroy unset ac_cv_lib_socket___res_ndestroy unset found - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lsocket" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lsocket" >&5 printf %s "checking for res_ndestroy in -lsocket... " >&6; } if test ${ac_cv_lib_socket_res_ndestroy+y} then : @@ -71739,14 +72106,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_ndestroy" >&5 -printf '%s\n' "$ac_cv_lib_socket_res_ndestroy" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_ndestroy" >&5 +printf "%s\n" "$ac_cv_lib_socket_res_ndestroy" >&6; } if test "x$ac_cv_lib_socket_res_ndestroy" = xyes then : found=yes else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lsocket" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lsocket" >&5 printf %s "checking for __res_ndestroy in -lsocket... " >&6; } if test ${ac_cv_lib_socket___res_ndestroy+y} then : @@ -71787,8 +72154,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_ndestroy" >&5 -printf '%s\n' "$ac_cv_lib_socket___res_ndestroy" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_ndestroy" >&5 +printf "%s\n" "$ac_cv_lib_socket___res_ndestroy" >&6; } if test "x$ac_cv_lib_socket___res_ndestroy" = xyes then : found=yes @@ -71849,10 +72216,10 @@ -printf '%s\n' "#define HAVE_RES_NDESTROY 1" >>confdefs.h +printf "%s\n" "#define HAVE_RES_NDESTROY 1" >>confdefs.h -printf '%s\n' "#define HAVE_LIBSOCKET 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h ac_cv_func_res_ndestroy=yes else @@ -71894,7 +72261,7 @@ case $found in yes) -printf '%s\n' "#define HAVE_DNS_SEARCH 1" >>confdefs.h +printf "%s\n" "#define HAVE_DNS_SEARCH 1" >>confdefs.h ac_cv_func_dns_search=yes ;; @@ -71904,7 +72271,7 @@ unset ac_cv_lib_resolv_dns_search unset ac_cv_lib_resolv___dns_search unset found - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lresolv" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lresolv" >&5 printf %s "checking for dns_search in -lresolv... " >&6; } if test ${ac_cv_lib_resolv_dns_search+y} then : @@ -71945,14 +72312,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dns_search" >&5 -printf '%s\n' "$ac_cv_lib_resolv_dns_search" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dns_search" >&5 +printf "%s\n" "$ac_cv_lib_resolv_dns_search" >&6; } if test "x$ac_cv_lib_resolv_dns_search" = xyes then : found=yes else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lresolv" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lresolv" >&5 printf %s "checking for __dns_search in -lresolv... " >&6; } if test ${ac_cv_lib_resolv___dns_search+y} then : @@ -71993,8 +72360,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dns_search" >&5 -printf '%s\n' "$ac_cv_lib_resolv___dns_search" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dns_search" >&5 +printf "%s\n" "$ac_cv_lib_resolv___dns_search" >&6; } if test "x$ac_cv_lib_resolv___dns_search" = xyes then : found=yes @@ -72055,10 +72422,10 @@ -printf '%s\n' "#define HAVE_DNS_SEARCH 1" >>confdefs.h +printf "%s\n" "#define HAVE_DNS_SEARCH 1" >>confdefs.h -printf '%s\n' "#define HAVE_LIBRESOLV 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h ac_cv_func_dns_search=yes else @@ -72067,7 +72434,7 @@ unset ac_cv_lib_socket_dns_search unset ac_cv_lib_socket___dns_search unset found - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lsocket" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lsocket" >&5 printf %s "checking for dns_search in -lsocket... " >&6; } if test ${ac_cv_lib_socket_dns_search+y} then : @@ -72108,14 +72475,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dns_search" >&5 -printf '%s\n' "$ac_cv_lib_socket_dns_search" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dns_search" >&5 +printf "%s\n" "$ac_cv_lib_socket_dns_search" >&6; } if test "x$ac_cv_lib_socket_dns_search" = xyes then : found=yes else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lsocket" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lsocket" >&5 printf %s "checking for __dns_search in -lsocket... " >&6; } if test ${ac_cv_lib_socket___dns_search+y} then : @@ -72156,8 +72523,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dns_search" >&5 -printf '%s\n' "$ac_cv_lib_socket___dns_search" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dns_search" >&5 +printf "%s\n" "$ac_cv_lib_socket___dns_search" >&6; } if test "x$ac_cv_lib_socket___dns_search" = xyes then : found=yes @@ -72218,10 +72585,10 @@ -printf '%s\n' "#define HAVE_DNS_SEARCH 1" >>confdefs.h +printf "%s\n" "#define HAVE_DNS_SEARCH 1" >>confdefs.h -printf '%s\n' "#define HAVE_LIBSOCKET 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h ac_cv_func_dns_search=yes else @@ -72263,7 +72630,7 @@ case $found in yes) -printf '%s\n' "#define HAVE_DN_EXPAND 1" >>confdefs.h +printf "%s\n" "#define HAVE_DN_EXPAND 1" >>confdefs.h ac_cv_func_dn_expand=yes ;; @@ -72273,7 +72640,7 @@ unset ac_cv_lib_resolv_dn_expand unset ac_cv_lib_resolv___dn_expand unset found - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lresolv" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lresolv" >&5 printf %s "checking for dn_expand in -lresolv... " >&6; } if test ${ac_cv_lib_resolv_dn_expand+y} then : @@ -72314,14 +72681,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_expand" >&5 -printf '%s\n' "$ac_cv_lib_resolv_dn_expand" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_expand" >&5 +printf "%s\n" "$ac_cv_lib_resolv_dn_expand" >&6; } if test "x$ac_cv_lib_resolv_dn_expand" = xyes then : found=yes else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lresolv" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lresolv" >&5 printf %s "checking for __dn_expand in -lresolv... " >&6; } if test ${ac_cv_lib_resolv___dn_expand+y} then : @@ -72362,8 +72729,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_expand" >&5 -printf '%s\n' "$ac_cv_lib_resolv___dn_expand" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_expand" >&5 +printf "%s\n" "$ac_cv_lib_resolv___dn_expand" >&6; } if test "x$ac_cv_lib_resolv___dn_expand" = xyes then : found=yes @@ -72424,10 +72791,10 @@ -printf '%s\n' "#define HAVE_DN_EXPAND 1" >>confdefs.h +printf "%s\n" "#define HAVE_DN_EXPAND 1" >>confdefs.h -printf '%s\n' "#define HAVE_LIBRESOLV 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h ac_cv_func_dn_expand=yes else @@ -72436,7 +72803,7 @@ unset ac_cv_lib_socket_dn_expand unset ac_cv_lib_socket___dn_expand unset found - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lsocket" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lsocket" >&5 printf %s "checking for dn_expand in -lsocket... " >&6; } if test ${ac_cv_lib_socket_dn_expand+y} then : @@ -72477,14 +72844,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_expand" >&5 -printf '%s\n' "$ac_cv_lib_socket_dn_expand" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_expand" >&5 +printf "%s\n" "$ac_cv_lib_socket_dn_expand" >&6; } if test "x$ac_cv_lib_socket_dn_expand" = xyes then : found=yes else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lsocket" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lsocket" >&5 printf %s "checking for __dn_expand in -lsocket... " >&6; } if test ${ac_cv_lib_socket___dn_expand+y} then : @@ -72525,8 +72892,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_expand" >&5 -printf '%s\n' "$ac_cv_lib_socket___dn_expand" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_expand" >&5 +printf "%s\n" "$ac_cv_lib_socket___dn_expand" >&6; } if test "x$ac_cv_lib_socket___dn_expand" = xyes then : found=yes @@ -72587,10 +72954,10 @@ -printf '%s\n' "#define HAVE_DN_EXPAND 1" >>confdefs.h +printf "%s\n" "#define HAVE_DN_EXPAND 1" >>confdefs.h -printf '%s\n' "#define HAVE_LIBSOCKET 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h ac_cv_func_dn_expand=yes else @@ -72632,7 +72999,7 @@ case $found in yes) -printf '%s\n' "#define HAVE_DN_SKIPNAME 1" >>confdefs.h +printf "%s\n" "#define HAVE_DN_SKIPNAME 1" >>confdefs.h ac_cv_func_dn_skipname=yes ;; @@ -72642,7 +73009,7 @@ unset ac_cv_lib_resolv_dn_skipname unset ac_cv_lib_resolv___dn_skipname unset found - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lresolv" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lresolv" >&5 printf %s "checking for dn_skipname in -lresolv... " >&6; } if test ${ac_cv_lib_resolv_dn_skipname+y} then : @@ -72683,14 +73050,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_skipname" >&5 -printf '%s\n' "$ac_cv_lib_resolv_dn_skipname" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_skipname" >&5 +printf "%s\n" "$ac_cv_lib_resolv_dn_skipname" >&6; } if test "x$ac_cv_lib_resolv_dn_skipname" = xyes then : found=yes else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lresolv" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lresolv" >&5 printf %s "checking for __dn_skipname in -lresolv... " >&6; } if test ${ac_cv_lib_resolv___dn_skipname+y} then : @@ -72731,8 +73098,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_skipname" >&5 -printf '%s\n' "$ac_cv_lib_resolv___dn_skipname" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_skipname" >&5 +printf "%s\n" "$ac_cv_lib_resolv___dn_skipname" >&6; } if test "x$ac_cv_lib_resolv___dn_skipname" = xyes then : found=yes @@ -72793,10 +73160,10 @@ -printf '%s\n' "#define HAVE_DN_SKIPNAME 1" >>confdefs.h +printf "%s\n" "#define HAVE_DN_SKIPNAME 1" >>confdefs.h -printf '%s\n' "#define HAVE_LIBRESOLV 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h ac_cv_func_dn_skipname=yes else @@ -72805,7 +73172,7 @@ unset ac_cv_lib_socket_dn_skipname unset ac_cv_lib_socket___dn_skipname unset found - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lsocket" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lsocket" >&5 printf %s "checking for dn_skipname in -lsocket... " >&6; } if test ${ac_cv_lib_socket_dn_skipname+y} then : @@ -72846,14 +73213,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_skipname" >&5 -printf '%s\n' "$ac_cv_lib_socket_dn_skipname" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_skipname" >&5 +printf "%s\n" "$ac_cv_lib_socket_dn_skipname" >&6; } if test "x$ac_cv_lib_socket_dn_skipname" = xyes then : found=yes else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lsocket" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lsocket" >&5 printf %s "checking for __dn_skipname in -lsocket... " >&6; } if test ${ac_cv_lib_socket___dn_skipname+y} then : @@ -72894,8 +73261,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_skipname" >&5 -printf '%s\n' "$ac_cv_lib_socket___dn_skipname" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_skipname" >&5 +printf "%s\n" "$ac_cv_lib_socket___dn_skipname" >&6; } if test "x$ac_cv_lib_socket___dn_skipname" = xyes then : found=yes @@ -72956,10 +73323,10 @@ -printf '%s\n' "#define HAVE_DN_SKIPNAME 1" >>confdefs.h +printf "%s\n" "#define HAVE_DN_SKIPNAME 1" >>confdefs.h -printf '%s\n' "#define HAVE_LIBSOCKET 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h ac_cv_func_dn_skipname=yes else @@ -73003,7 +73370,7 @@ case $found in yes) -printf '%s\n' "#define HAVE_RES_SEARCH 1" >>confdefs.h +printf "%s\n" "#define HAVE_RES_SEARCH 1" >>confdefs.h ac_cv_func_res_search=yes ;; @@ -73013,7 +73380,7 @@ unset ac_cv_lib_resolv_res_search unset ac_cv_lib_resolv___res_search unset found - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5 printf %s "checking for res_search in -lresolv... " >&6; } if test ${ac_cv_lib_resolv_res_search+y} then : @@ -73054,14 +73421,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5 -printf '%s\n' "$ac_cv_lib_resolv_res_search" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5 +printf "%s\n" "$ac_cv_lib_resolv_res_search" >&6; } if test "x$ac_cv_lib_resolv_res_search" = xyes then : found=yes else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lresolv" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lresolv" >&5 printf %s "checking for __res_search in -lresolv... " >&6; } if test ${ac_cv_lib_resolv___res_search+y} then : @@ -73102,8 +73469,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_search" >&5 -printf '%s\n' "$ac_cv_lib_resolv___res_search" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_search" >&5 +printf "%s\n" "$ac_cv_lib_resolv___res_search" >&6; } if test "x$ac_cv_lib_resolv___res_search" = xyes then : found=yes @@ -73164,10 +73531,10 @@ -printf '%s\n' "#define HAVE_RES_SEARCH 1" >>confdefs.h +printf "%s\n" "#define HAVE_RES_SEARCH 1" >>confdefs.h -printf '%s\n' "#define HAVE_LIBRESOLV 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h ac_cv_func_res_search=yes else @@ -73176,7 +73543,7 @@ unset ac_cv_lib_socket_res_search unset ac_cv_lib_socket___res_search unset found - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for res_search in -lsocket" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_search in -lsocket" >&5 printf %s "checking for res_search in -lsocket... " >&6; } if test ${ac_cv_lib_socket_res_search+y} then : @@ -73217,14 +73584,14 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_search" >&5 -printf '%s\n' "$ac_cv_lib_socket_res_search" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_search" >&5 +printf "%s\n" "$ac_cv_lib_socket_res_search" >&6; } if test "x$ac_cv_lib_socket_res_search" = xyes then : found=yes else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lsocket" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lsocket" >&5 printf %s "checking for __res_search in -lsocket... " >&6; } if test ${ac_cv_lib_socket___res_search+y} then : @@ -73265,8 +73632,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_search" >&5 -printf '%s\n' "$ac_cv_lib_socket___res_search" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_search" >&5 +printf "%s\n" "$ac_cv_lib_socket___res_search" >&6; } if test "x$ac_cv_lib_socket___res_search" = xyes then : found=yes @@ -73327,10 +73694,10 @@ -printf '%s\n' "#define HAVE_RES_SEARCH 1" >>confdefs.h +printf "%s\n" "#define HAVE_RES_SEARCH 1" >>confdefs.h -printf '%s\n' "#define HAVE_LIBSOCKET 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h ac_cv_func_res_search=yes else @@ -73350,36 +73717,36 @@ ac_fn_c_check_func "$LINENO" "posix_spawn_file_actions_addchdir" "ac_cv_func_posix_spawn_file_actions_addchdir" if test "x$ac_cv_func_posix_spawn_file_actions_addchdir" = xyes then : - printf '%s\n' "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR 1" >>confdefs.h + printf "%s\n" "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "posix_spawn_file_actions_addchdir_np" "ac_cv_func_posix_spawn_file_actions_addchdir_np" if test "x$ac_cv_func_posix_spawn_file_actions_addchdir_np" = xyes then : - printf '%s\n' "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP 1" >>confdefs.h + printf "%s\n" "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "elf_aux_info" "ac_cv_func_elf_aux_info" if test "x$ac_cv_func_elf_aux_info" = xyes then : - printf '%s\n' "#define HAVE_ELF_AUX_INFO 1" >>confdefs.h + printf "%s\n" "#define HAVE_ELF_AUX_INFO 1" >>confdefs.h fi ac_fn_check_decl "$LINENO" "strptime" "ac_cv_have_decl_strptime" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_strptime" = xyes then : -printf '%s\n' "#define HAVE_DECL_STRPTIME 1" >>confdefs.h +printf "%s\n" "#define HAVE_DECL_STRPTIME 1" >>confdefs.h fi php_with_password_argon2=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for Argon2 support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Argon2 support" >&5 printf %s "checking for Argon2 support... " >&6; } # Check whether --with-password-argon2 was given. @@ -73417,8 +73784,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -73430,17 +73797,17 @@ e) pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libargon2" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libargon2" >&5 printf %s "checking for libargon2... " >&6; } if test -n "$ARGON2_CFLAGS"; then pkg_cv_ARGON2_CFLAGS="$ARGON2_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libargon2") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ARGON2_CFLAGS=`$PKG_CONFIG --cflags "libargon2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -73454,10 +73821,10 @@ pkg_cv_ARGON2_LIBS="$ARGON2_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2\""; } >&5 ($PKG_CONFIG --exists --print-errors "libargon2") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ARGON2_LIBS=`$PKG_CONFIG --libs "libargon2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -73471,8 +73838,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -73498,10 +73865,10 @@ and ARGON2_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -73515,8 +73882,8 @@ else ARGON2_CFLAGS=$pkg_cv_ARGON2_CFLAGS ARGON2_LIBS=$pkg_cv_ARGON2_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -73658,7 +74025,7 @@ -printf '%s\n' "#define HAVE_ARGON2LIB 1" >>confdefs.h +printf "%s\n" "#define HAVE_ARGON2LIB 1" >>confdefs.h ;; esac @@ -73671,12 +74038,12 @@ " if test "x$ac_cv_header_net_if_h" = xyes then : - printf '%s\n' "#define HAVE_NET_IF_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_NET_IF_H 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for usable getifaddrs" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable getifaddrs" >&5 printf %s "checking for usable getifaddrs... " >&6; } if test ${php_cv_func_getifaddrs+y} then : @@ -73712,12 +74079,12 @@ conftest$ac_exeext conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_getifaddrs" >&5 -printf '%s\n' "$php_cv_func_getifaddrs" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_func_getifaddrs" >&5 +printf "%s\n" "$php_cv_func_getifaddrs" >&6; } if test "x$php_cv_func_getifaddrs" = xyes then : -printf '%s\n' "#define HAVE_GETIFADDRS 1" >>confdefs.h +printf "%s\n" "#define HAVE_GETIFADDRS 1" >>confdefs.h fi @@ -73856,7 +74223,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_STANDARD 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_STANDARD 1" >>confdefs.h fi fi @@ -74005,7 +74372,7 @@ php_enable_sysvmsg=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable System V IPC support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable System V IPC support" >&5 printf %s "checking whether to enable System V IPC support... " >&6; } # Check whether --enable-sysvmsg was given. if test ${enable_sysvmsg+y} @@ -74042,8 +74409,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -74054,8 +74421,8 @@ then : else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Cannot enable System V IPC support. Required header file not found. See 'config.log' for more details" "$LINENO" 5; } ;; @@ -74064,7 +74431,7 @@ -printf '%s\n' "#define HAVE_SYSVMSG 1" >>confdefs.h +printf "%s\n" "#define HAVE_SYSVMSG 1" >>confdefs.h ext_builddir=ext/sysvmsg @@ -74201,7 +74568,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_SYSVMSG 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_SYSVMSG 1" >>confdefs.h fi fi @@ -74327,7 +74694,7 @@ php_enable_sysvsem=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable System V semaphore support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable System V semaphore support" >&5 printf %s "checking whether to enable System V semaphore support... " >&6; } # Check whether --enable-sysvsem was given. if test ${enable_sysvsem+y} @@ -74364,8 +74731,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -74506,7 +74873,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_SYSVSEM 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_SYSVSEM 1" >>confdefs.h fi fi @@ -74625,7 +74992,7 @@ fi -printf '%s\n' "#define HAVE_SYSVSEM 1" >>confdefs.h +printf "%s\n" "#define HAVE_SYSVSEM 1" >>confdefs.h ac_fn_c_check_type "$LINENO" "union semun" "ac_cv_type_union_semun" " #include @@ -74636,7 +75003,7 @@ if test "x$ac_cv_type_union_semun" = xyes then : -printf '%s\n' "#define HAVE_UNION_SEMUN 1" >>confdefs.h +printf "%s\n" "#define HAVE_UNION_SEMUN 1" >>confdefs.h fi @@ -74649,7 +75016,7 @@ php_enable_sysvshm=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable System V shared memory support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable System V shared memory support" >&5 printf %s "checking whether to enable System V shared memory support... " >&6; } # Check whether --enable-sysvshm was given. if test ${enable_sysvshm+y} @@ -74686,15 +75053,15 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } if test "$PHP_SYSVSHM" != "no"; then -printf '%s\n' "#define HAVE_SYSVSHM 1" >>confdefs.h +printf "%s\n" "#define HAVE_SYSVSHM 1" >>confdefs.h ext_builddir=ext/sysvshm @@ -74831,7 +75198,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_SYSVSHM 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_SYSVSHM 1" >>confdefs.h fi fi @@ -74957,7 +75324,7 @@ php_with_tidy=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for TIDY support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIDY support" >&5 printf %s "checking for TIDY support... " >&6; } # Check whether --with-tidy was given. @@ -74995,8 +75362,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -75040,7 +75407,7 @@ if test -f "$TIDY_INCDIR/tidybuffio.h" then : -printf '%s\n' "#define HAVE_TIDYBUFFIO_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_TIDYBUFFIO_H 1" >>confdefs.h fi @@ -75048,11 +75415,11 @@ if test "x$TIDY_LIB_NAME" = xtidyp then : -printf '%s\n' "#define HAVE_TIDYP_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_TIDYP_H 1" >>confdefs.h else case e in #( e) -printf '%s\n' "#define HAVE_TIDY_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_TIDY_H 1" >>confdefs.h ;; esac fi @@ -75175,8 +75542,8 @@ esac done - as_ac_Lib=`printf '%s\n' "ac_cv_lib_$TIDY_LIB_NAME""_tidyOptGetDoc" | sed "$as_sed_sh"` -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -l$TIDY_LIB_NAME" >&5 + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$TIDY_LIB_NAME""_tidyOptGetDoc" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -l$TIDY_LIB_NAME" >&5 printf %s "checking for tidyOptGetDoc in -l$TIDY_LIB_NAME... " >&6; } if eval test \${$as_ac_Lib+y} then : @@ -75218,15 +75585,15 @@ esac fi eval ac_res=\$$as_ac_Lib - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_TIDYOPTGETDOC 1" >>confdefs.h +printf "%s\n" "#define HAVE_TIDYOPTGETDOC 1" >>confdefs.h else case e in #( @@ -75352,7 +75719,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -ltidy5" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -ltidy5" >&5 printf %s "checking for tidyOptGetDoc in -ltidy5... " >&6; } if test ${ac_cv_lib_tidy5_tidyOptGetDoc+y} then : @@ -75393,15 +75760,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tidy5_tidyOptGetDoc" >&5 -printf '%s\n' "$ac_cv_lib_tidy5_tidyOptGetDoc" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tidy5_tidyOptGetDoc" >&5 +printf "%s\n" "$ac_cv_lib_tidy5_tidyOptGetDoc" >&6; } if test "x$ac_cv_lib_tidy5_tidyOptGetDoc" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared TIDY_LIB_NAME=tidy5 - printf '%s\n' "#define HAVE_TIDYOPTGETDOC 1" >>confdefs.h + printf "%s\n" "#define HAVE_TIDYOPTGETDOC 1" >>confdefs.h else case e in #( @@ -75537,8 +75904,8 @@ esac done - as_ac_Lib=`printf '%s\n' "ac_cv_lib_$TIDY_LIB_NAME""_tidyReleaseDate" | sed "$as_sed_sh"` -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for tidyReleaseDate in -l$TIDY_LIB_NAME" >&5 + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$TIDY_LIB_NAME""_tidyReleaseDate" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tidyReleaseDate in -l$TIDY_LIB_NAME" >&5 printf %s "checking for tidyReleaseDate in -l$TIDY_LIB_NAME... " >&6; } if eval test \${$as_ac_Lib+y} then : @@ -75580,15 +75947,15 @@ esac fi eval ac_res=\$$as_ac_Lib - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf '%s\n' "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_TIDYRELEASEDATE 1" >>confdefs.h +printf "%s\n" "#define HAVE_TIDYRELEASEDATE 1" >>confdefs.h else case e in #( @@ -75745,7 +76112,7 @@ old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$TIDY_INCDIR - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetCategory" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetCategory" >&5 printf %s "checking for tidyOptGetCategory... " >&6; } if test ${php_ac_cv_have_tidyoptgetcategory+y} then : @@ -75779,12 +76146,12 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_ac_cv_have_tidyoptgetcategory" >&5 -printf '%s\n' "$php_ac_cv_have_tidyoptgetcategory" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_ac_cv_have_tidyoptgetcategory" >&5 +printf "%s\n" "$php_ac_cv_have_tidyoptgetcategory" >&6; } if test "x$php_ac_cv_have_tidyoptgetcategory" = xyes then : -printf '%s\n' "#define HAVE_TIDYOPTGETCATEGORY 1" >>confdefs.h +printf "%s\n" "#define HAVE_TIDYOPTGETCATEGORY 1" >>confdefs.h fi @@ -75925,7 +76292,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_TIDY 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_TIDY 1" >>confdefs.h fi fi @@ -76047,7 +76414,7 @@ PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD" -printf '%s\n' "#define HAVE_TIDY 1" >>confdefs.h +printf "%s\n" "#define HAVE_TIDY 1" >>confdefs.h fi @@ -76057,7 +76424,7 @@ php_enable_tokenizer=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable tokenizer support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable tokenizer support" >&5 printf %s "checking whether to enable tokenizer support... " >&6; } # Check whether --enable-tokenizer was given. if test ${enable_tokenizer+y} @@ -76094,8 +76461,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -76236,7 +76603,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_TOKENIZER 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_TOKENIZER 1" >>confdefs.h fi fi @@ -76367,7 +76734,7 @@ php_enable_xml=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable XML support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable XML support" >&5 printf %s "checking whether to enable XML support... " >&6; } # Check whether --enable-xml was given. if test ${enable_xml+y} @@ -76404,8 +76771,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -76413,7 +76780,7 @@ php_with_expat=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build with Expat support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with Expat support" >&5 printf %s "checking whether to build with Expat support... " >&6; } # Check whether --with-expat was given. @@ -76430,8 +76797,8 @@ ext_output=$PHP_EXPAT -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -76442,17 +76809,17 @@ pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.4" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.4" >&5 printf %s "checking for libxml-2.0 >= 2.9.4... " >&6; } if test -n "$LIBXML_CFLAGS"; then pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.4") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -76466,10 +76833,10 @@ pkg_cv_LIBXML_LIBS="$LIBXML_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.4") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -76483,8 +76850,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -76510,10 +76877,10 @@ and LIBXML_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -76527,8 +76894,8 @@ else LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS LIBXML_LIBS=$pkg_cv_LIBXML_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -76692,17 +77059,17 @@ e) pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for expat" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for expat" >&5 printf %s "checking for expat... " >&6; } if test -n "$EXPAT_CFLAGS"; then pkg_cv_EXPAT_CFLAGS="$EXPAT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5 ($PKG_CONFIG --exists --print-errors "expat") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EXPAT_CFLAGS=`$PKG_CONFIG --cflags "expat" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -76716,10 +77083,10 @@ pkg_cv_EXPAT_LIBS="$EXPAT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5 ($PKG_CONFIG --exists --print-errors "expat") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EXPAT_LIBS=`$PKG_CONFIG --libs "expat" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -76733,8 +77100,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -76760,10 +77127,10 @@ and EXPAT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -76777,8 +77144,8 @@ else EXPAT_CFLAGS=$pkg_cv_EXPAT_CFLAGS EXPAT_LIBS=$pkg_cv_EXPAT_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -76937,7 +77304,7 @@ done -printf '%s\n' "#define HAVE_LIBEXPAT 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBEXPAT 1" >>confdefs.h ;; esac @@ -77078,7 +77445,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_XML 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_XML 1" >>confdefs.h fi fi @@ -77243,7 +77610,7 @@ -printf '%s\n' "#define HAVE_XML 1" >>confdefs.h +printf "%s\n" "#define HAVE_XML 1" >>confdefs.h fi @@ -77253,7 +77620,7 @@ php_enable_xmlreader=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable XMLReader support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable XMLReader support" >&5 printf %s "checking whether to enable XMLReader support... " >&6; } # Check whether --enable-xmlreader was given. if test ${enable_xmlreader+y} @@ -77290,8 +77657,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -77300,17 +77667,17 @@ pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.4" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.4" >&5 printf %s "checking for libxml-2.0 >= 2.9.4... " >&6; } if test -n "$LIBXML_CFLAGS"; then pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.4") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -77324,10 +77691,10 @@ pkg_cv_LIBXML_LIBS="$LIBXML_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.4") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -77341,8 +77708,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -77368,10 +77735,10 @@ and LIBXML_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -77385,8 +77752,8 @@ else LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS LIBXML_LIBS=$pkg_cv_LIBXML_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -77546,7 +77913,7 @@ -printf '%s\n' "#define HAVE_XMLREADER 1" >>confdefs.h +printf "%s\n" "#define HAVE_XMLREADER 1" >>confdefs.h ext_builddir=ext/xmlreader @@ -77683,7 +78050,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_XMLREADER 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_XMLREADER 1" >>confdefs.h fi fi @@ -77852,7 +78219,7 @@ php_enable_xmlwriter=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable XMLWriter support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable XMLWriter support" >&5 printf %s "checking whether to enable XMLWriter support... " >&6; } # Check whether --enable-xmlwriter was given. if test ${enable_xmlwriter+y} @@ -77889,8 +78256,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -77899,17 +78266,17 @@ pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.4" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.4" >&5 printf %s "checking for libxml-2.0 >= 2.9.4... " >&6; } if test -n "$LIBXML_CFLAGS"; then pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.4") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -77923,10 +78290,10 @@ pkg_cv_LIBXML_LIBS="$LIBXML_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.4") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -77940,8 +78307,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -77967,10 +78334,10 @@ and LIBXML_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -77984,8 +78351,8 @@ else LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS LIBXML_LIBS=$pkg_cv_LIBXML_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -78145,7 +78512,7 @@ -printf '%s\n' "#define HAVE_XMLWRITER 1" >>confdefs.h +printf "%s\n" "#define HAVE_XMLWRITER 1" >>confdefs.h ext_builddir=ext/xmlwriter @@ -78282,7 +78649,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_XMLWRITER 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_XMLWRITER 1" >>confdefs.h fi fi @@ -78432,7 +78799,7 @@ php_with_xsl=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build with XSL support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with XSL support" >&5 printf %s "checking whether to build with XSL support... " >&6; } # Check whether --with-xsl was given. @@ -78470,8 +78837,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -78479,17 +78846,17 @@ if test "$PHP_XSL" != "no"; then pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libxslt >= 1.1.0" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxslt >= 1.1.0" >&5 printf %s "checking for libxslt >= 1.1.0... " >&6; } if test -n "$XSL_CFLAGS"; then pkg_cv_XSL_CFLAGS="$XSL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.1.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxslt >= 1.1.0") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XSL_CFLAGS=`$PKG_CONFIG --cflags "libxslt >= 1.1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -78503,10 +78870,10 @@ pkg_cv_XSL_LIBS="$XSL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.1.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libxslt >= 1.1.0") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XSL_LIBS=`$PKG_CONFIG --libs "libxslt >= 1.1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -78520,8 +78887,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -78547,10 +78914,10 @@ and XSL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -78564,8 +78931,8 @@ else XSL_CFLAGS=$pkg_cv_XSL_CFLAGS XSL_LIBS=$pkg_cv_XSL_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -78727,17 +79094,17 @@ pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libexslt" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libexslt" >&5 printf %s "checking for libexslt... " >&6; } if test -n "$EXSLT_CFLAGS"; then pkg_cv_EXSLT_CFLAGS="$EXSLT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5 ($PKG_CONFIG --exists --print-errors "libexslt") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EXSLT_CFLAGS=`$PKG_CONFIG --cflags "libexslt" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -78751,10 +79118,10 @@ pkg_cv_EXSLT_LIBS="$EXSLT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5 ($PKG_CONFIG --exists --print-errors "libexslt") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EXSLT_LIBS=`$PKG_CONFIG --libs "libexslt" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -78768,8 +79135,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -78786,14 +79153,14 @@ : elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } : else EXSLT_CFLAGS=$pkg_cv_EXSLT_CFLAGS EXSLT_LIBS=$pkg_cv_EXSLT_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } for ac_i in $EXSLT_CFLAGS; do @@ -78951,13 +79318,13 @@ done -printf '%s\n' "#define HAVE_XSL_EXSLT 1" >>confdefs.h +printf "%s\n" "#define HAVE_XSL_EXSLT 1" >>confdefs.h fi -printf '%s\n' "#define HAVE_XSL 1" >>confdefs.h +printf "%s\n" "#define HAVE_XSL 1" >>confdefs.h ext_builddir=ext/xsl @@ -79094,7 +79461,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_XSL 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_XSL 1" >>confdefs.h fi fi @@ -79261,7 +79628,7 @@ php_enable_zend_test=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable zend_test extension" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable zend_test extension" >&5 printf %s "checking whether to enable zend_test extension... " >&6; } # Check whether --enable-zend-test was given. if test ${enable_zend_test+y} @@ -79298,8 +79665,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -79440,7 +79807,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_ZEND_TEST 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_ZEND_TEST 1" >>confdefs.h fi fi @@ -79566,7 +79933,7 @@ php_with_zip=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for zip archive read/write support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip archive read/write support" >&5 printf %s "checking for zip archive read/write support... " >&6; } # Check whether --with-zip was given. @@ -79604,8 +79971,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -79613,19 +79980,19 @@ if test "$PHP_ZIP" != "no"; then pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0" >&5 -printf %s "checking for libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0 libzip != 1.12 libzip != 1.12.0" >&5 +printf %s "checking for libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0 libzip != 1.12 libzip != 1.12.0... " >&6; } if test -n "$LIBZIP_CFLAGS"; then pkg_cv_LIBZIP_CFLAGS="$LIBZIP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0 libzip != 1.12 libzip != 1.12.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0 libzip != 1.12 libzip != 1.12.0") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBZIP_CFLAGS=`$PKG_CONFIG --cflags "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0" 2>/dev/null` + pkg_cv_LIBZIP_CFLAGS=`$PKG_CONFIG --cflags "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0 libzip != 1.12 libzip != 1.12.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -79637,12 +80004,12 @@ pkg_cv_LIBZIP_LIBS="$LIBZIP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0 libzip != 1.12 libzip != 1.12.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0 libzip != 1.12 libzip != 1.12.0") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBZIP_LIBS=`$PKG_CONFIG --libs "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0" 2>/dev/null` + pkg_cv_LIBZIP_LIBS=`$PKG_CONFIG --libs "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0 libzip != 1.12 libzip != 1.12.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -79654,8 +80021,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -79663,14 +80030,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0" 2>&1` + LIBZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0 libzip != 1.12 libzip != 1.12.0" 2>&1` else - LIBZIP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0" 2>&1` + LIBZIP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0 libzip != 1.12 libzip != 1.12.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBZIP_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0) were not met: + as_fn_error $? "Package requirements (libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0 libzip != 1.12 libzip != 1.12.0) were not met: $LIBZIP_PKG_ERRORS @@ -79681,10 +80048,10 @@ and LIBZIP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -79698,8 +80065,8 @@ else LIBZIP_CFLAGS=$pkg_cv_LIBZIP_CFLAGS LIBZIP_LIBS=$pkg_cv_LIBZIP_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -79977,7 +80344,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for zip_file_set_mtime in -lzip" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_file_set_mtime in -lzip" >&5 printf %s "checking for zip_file_set_mtime in -lzip... " >&6; } if test ${ac_cv_lib_zip_zip_file_set_mtime+y} then : @@ -80018,15 +80385,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_file_set_mtime" >&5 -printf '%s\n' "$ac_cv_lib_zip_zip_file_set_mtime" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_file_set_mtime" >&5 +printf "%s\n" "$ac_cv_lib_zip_zip_file_set_mtime" >&6; } if test "x$ac_cv_lib_zip_zip_file_set_mtime" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_SET_MTIME 1" >>confdefs.h +printf "%s\n" "#define HAVE_SET_MTIME 1" >>confdefs.h else case e in #( @@ -80034,8 +80401,8 @@ LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_zip_zip_file_set_mtime - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: Libzip >= 1.0.0 needed for setting mtime" >&5 -printf '%s\n' "$as_me: WARNING: Libzip >= 1.0.0 needed for setting mtime" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libzip >= 1.0.0 needed for setting mtime" >&5 +printf "%s\n" "$as_me: WARNING: Libzip >= 1.0.0 needed for setting mtime" >&2;} ;; esac fi @@ -80159,7 +80526,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for zip_file_set_encryption in -lzip" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_file_set_encryption in -lzip" >&5 printf %s "checking for zip_file_set_encryption in -lzip... " >&6; } if test ${ac_cv_lib_zip_zip_file_set_encryption+y} then : @@ -80200,15 +80567,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_file_set_encryption" >&5 -printf '%s\n' "$ac_cv_lib_zip_zip_file_set_encryption" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_file_set_encryption" >&5 +printf "%s\n" "$ac_cv_lib_zip_zip_file_set_encryption" >&6; } if test "x$ac_cv_lib_zip_zip_file_set_encryption" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_ENCRYPTION 1" >>confdefs.h +printf "%s\n" "#define HAVE_ENCRYPTION 1" >>confdefs.h else case e in #( @@ -80216,8 +80583,8 @@ LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared unset ac_cv_lib_zip_zip_file_set_encryption - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: Libzip >= 1.2.0 needed for encryption support" >&5 -printf '%s\n' "$as_me: WARNING: Libzip >= 1.2.0 needed for encryption support" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libzip >= 1.2.0 needed for encryption support" >&5 +printf "%s\n" "$as_me: WARNING: Libzip >= 1.2.0 needed for encryption support" >&2;} ;; esac fi @@ -80341,7 +80708,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for zip_libzip_version in -lzip" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_libzip_version in -lzip" >&5 printf %s "checking for zip_libzip_version in -lzip... " >&6; } if test ${ac_cv_lib_zip_zip_libzip_version+y} then : @@ -80382,15 +80749,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_libzip_version" >&5 -printf '%s\n' "$ac_cv_lib_zip_zip_libzip_version" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_libzip_version" >&5 +printf "%s\n" "$ac_cv_lib_zip_zip_libzip_version" >&6; } if test "x$ac_cv_lib_zip_zip_libzip_version" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_LIBZIP_VERSION 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBZIP_VERSION 1" >>confdefs.h else case e in #( @@ -80522,7 +80889,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for zip_register_progress_callback_with_state in -lzip" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_register_progress_callback_with_state in -lzip" >&5 printf %s "checking for zip_register_progress_callback_with_state in -lzip... " >&6; } if test ${ac_cv_lib_zip_zip_register_progress_callback_with_state+y} then : @@ -80563,15 +80930,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_register_progress_callback_with_state" >&5 -printf '%s\n' "$ac_cv_lib_zip_zip_register_progress_callback_with_state" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_register_progress_callback_with_state" >&5 +printf "%s\n" "$ac_cv_lib_zip_zip_register_progress_callback_with_state" >&6; } if test "x$ac_cv_lib_zip_zip_register_progress_callback_with_state" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_PROGRESS_CALLBACK 1" >>confdefs.h +printf "%s\n" "#define HAVE_PROGRESS_CALLBACK 1" >>confdefs.h else case e in #( @@ -80703,7 +81070,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for zip_register_cancel_callback_with_state in -lzip" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_register_cancel_callback_with_state in -lzip" >&5 printf %s "checking for zip_register_cancel_callback_with_state in -lzip... " >&6; } if test ${ac_cv_lib_zip_zip_register_cancel_callback_with_state+y} then : @@ -80744,15 +81111,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_register_cancel_callback_with_state" >&5 -printf '%s\n' "$ac_cv_lib_zip_zip_register_cancel_callback_with_state" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_register_cancel_callback_with_state" >&5 +printf "%s\n" "$ac_cv_lib_zip_zip_register_cancel_callback_with_state" >&6; } if test "x$ac_cv_lib_zip_zip_register_cancel_callback_with_state" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_CANCEL_CALLBACK 1" >>confdefs.h +printf "%s\n" "#define HAVE_CANCEL_CALLBACK 1" >>confdefs.h else case e in #( @@ -80884,7 +81251,7 @@ esac done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for zip_compression_method_supported in -lzip" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_compression_method_supported in -lzip" >&5 printf %s "checking for zip_compression_method_supported in -lzip... " >&6; } if test ${ac_cv_lib_zip_zip_compression_method_supported+y} then : @@ -80925,15 +81292,15 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_compression_method_supported" >&5 -printf '%s\n' "$ac_cv_lib_zip_zip_compression_method_supported" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_compression_method_supported" >&5 +printf "%s\n" "$ac_cv_lib_zip_zip_compression_method_supported" >&6; } if test "x$ac_cv_lib_zip_zip_compression_method_supported" = xyes then : LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared -printf '%s\n' "#define HAVE_METHOD_SUPPORTED 1" >>confdefs.h +printf "%s\n" "#define HAVE_METHOD_SUPPORTED 1" >>confdefs.h else case e in #( @@ -80948,7 +81315,7 @@ -printf '%s\n' "#define HAVE_ZIP 1" >>confdefs.h +printf "%s\n" "#define HAVE_ZIP 1" >>confdefs.h @@ -81086,7 +81453,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_ZIP 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_ZIP 1" >>confdefs.h fi fi @@ -81235,7 +81602,7 @@ php_enable_mysqlnd=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable mysqlnd" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable mysqlnd" >&5 printf %s "checking whether to enable mysqlnd... " >&6; } # Check whether --enable-mysqlnd was given. if test ${enable_mysqlnd+y} @@ -81272,8 +81639,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -81286,7 +81653,7 @@ php_with_mysqlnd_ssl=$PHP_OPENSSL -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable extended SSL support in mysqlnd" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable extended SSL support in mysqlnd" >&5 printf %s "checking whether to enable extended SSL support in mysqlnd... " >&6; } # Check whether --with-mysqlnd-ssl was given. @@ -81303,8 +81670,8 @@ ext_output=$PHP_MYSQLND_SSL -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -81312,7 +81679,7 @@ php_enable_mysqlnd_compression_support=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable compressed protocol support in mysqlnd" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable compressed protocol support in mysqlnd" >&5 printf %s "checking whether to enable compressed protocol support in mysqlnd... " >&6; } # Check whether --enable-mysqlnd-compression-support was given. if test ${enable_mysqlnd_compression_support+y} @@ -81328,8 +81695,8 @@ ext_output=$PHP_MYSQLND_COMPRESSION_SUPPORT -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -81341,17 +81708,17 @@ else case e in #( e) pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for zlib >= 1.2.11" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zlib >= 1.2.11" >&5 printf %s "checking for zlib >= 1.2.11... " >&6; } if test -n "$ZLIB_CFLAGS"; then pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.11\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.11\""; } >&5 ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.11") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ZLIB_CFLAGS=`$PKG_CONFIG --cflags "zlib >= 1.2.11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -81365,10 +81732,10 @@ pkg_cv_ZLIB_LIBS="$ZLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.11\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.11\""; } >&5 ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.11") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ZLIB_LIBS=`$PKG_CONFIG --libs "zlib >= 1.2.11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -81382,8 +81749,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -81409,10 +81776,10 @@ and ZLIB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -81426,8 +81793,8 @@ else ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS ZLIB_LIBS=$pkg_cv_ZLIB_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } for ac_i in $ZLIB_CFLAGS; do case $ac_i in @@ -81584,14 +81951,14 @@ done -printf '%s\n' "#define MYSQLND_COMPRESSION_ENABLED 1" >>confdefs.h +printf "%s\n" "#define MYSQLND_COMPRESSION_ENABLED 1" >>confdefs.h fi ;; esac fi -printf '%s\n' "#define MYSQLND_SSL_SUPPORTED 1" >>confdefs.h +printf "%s\n" "#define MYSQLND_SSL_SUPPORTED 1" >>confdefs.h @@ -81729,7 +82096,7 @@ EOF -printf '%s\n' "#define COMPILE_DL_MYSQLND 1" >>confdefs.h +printf "%s\n" "#define COMPILE_DL_MYSQLND 1" >>confdefs.h fi fi @@ -81857,17 +82224,17 @@ pkg_failed=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.1.1" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.1.1" >&5 printf %s "checking for openssl >= 1.1.1... " >&6; } if test -n "$OPENSSL_CFLAGS"; then pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.1\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "openssl >= 1.1.1") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.1.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -81881,10 +82248,10 @@ pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.1\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "openssl >= 1.1.1") 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.1.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -81898,8 +82265,8 @@ if test $pkg_failed = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -81925,10 +82292,10 @@ and OPENSSL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -81942,8 +82309,8 @@ else OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } found_openssl=yes fi @@ -82105,7 +82472,7 @@ -printf '%s\n' "#define MYSQLND_HAVE_SSL 1" >>confdefs.h +printf "%s\n" "#define MYSQLND_HAVE_SSL 1" >>confdefs.h am_i_shared=$PHP_MYSQLND_SHARED @@ -82157,7 +82524,7 @@ case $host_alias in #( i[3456]86-*-linux-* | x86_64-*-linux-*) : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking linker support for -zcommon-page-size=2097152" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking linker support for -zcommon-page-size=2097152" >&5 printf %s "checking linker support for -zcommon-page-size=2097152... " >&6; } if test ${php_cv_have_common_page_size+y} then : @@ -82196,13 +82563,13 @@ LDFLAGS=$save_LDFLAGS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_common_page_size" >&5 -printf '%s\n' "$php_cv_have_common_page_size" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_common_page_size" >&5 +printf "%s\n" "$php_cv_have_common_page_size" >&6; } if test "x$php_cv_have_common_page_size" = xyes then : EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM -Wl,-zcommon-page-size=2097152 -Wl,-zmax-page-size=2097152" else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking linker support for -zmax-page-size=2097152" >&5 + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking linker support for -zmax-page-size=2097152" >&5 printf %s "checking linker support for -zmax-page-size=2097152... " >&6; } if test ${php_cv_have_max_page_size+y} then : @@ -82241,8 +82608,8 @@ LDFLAGS=$save_LDFLAGS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_max_page_size" >&5 -printf '%s\n' "$php_cv_have_max_page_size" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_max_page_size" >&5 +printf "%s\n" "$php_cv_have_max_page_size" >&6; } if test "x$php_cv_have_max_page_size" = xyes then : EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM -Wl,-zmax-page-size=2097152" @@ -82292,10 +82659,10 @@ fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5 -printf '%s\n' "" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring PEAR${T_ME}" >&5 -printf '%s\n' "${T_MD}Configuring PEAR${T_ME}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring PEAR${T_ME}" >&5 +printf "%s\n" "${T_MD}Configuring PEAR${T_ME}" >&6; } if test "x$PHP_CLI" = xno @@ -82306,7 +82673,7 @@ php_with_pear=no -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to install PEAR" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to install PEAR" >&5 printf %s "checking whether to install PEAR... " >&6; } # Check whether --with-pear was given. @@ -82344,8 +82711,8 @@ -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 -printf '%s\n' "$ext_output" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 +printf "%s\n" "$ext_output" >&6; } @@ -82355,8 +82722,8 @@ else case e in #( e) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: The --with-pear option is deprecated" >&5 -printf '%s\n' "$as_me: WARNING: The --with-pear option is deprecated" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The --with-pear option is deprecated" >&5 +printf "%s\n" "$as_me: WARNING: The --with-pear option is deprecated" >&2;} if test "x$PHP_XML" = xno then : @@ -82401,10 +82768,10 @@ fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5 -printf '%s\n' "" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring Zend${T_ME}" >&5 -printf '%s\n' "${T_MD}Configuring Zend${T_ME}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring Zend${T_ME}" >&5 +printf "%s\n" "${T_MD}Configuring Zend${T_ME}" >&6; } # Check whether --enable-fiber-asm was given. @@ -82521,7 +82888,7 @@ fiber_asm="no" fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether syscall to create shadow stack exists" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether syscall to create shadow stack exists" >&5 printf %s "checking whether syscall to create shadow stack exists... " >&6; } if test ${php_cv_have_shadow_stack_syscall+y} then : @@ -82562,8 +82929,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_shadow_stack_syscall" >&5 -printf '%s\n' "$php_cv_have_shadow_stack_syscall" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_shadow_stack_syscall" >&5 +printf "%s\n" "$php_cv_have_shadow_stack_syscall" >&6; } if test "x$php_cv_have_shadow_stack_syscall" = xyes then : fiber_asm_cflag="-DSHADOW_STACK_SYSCALL=1" @@ -82573,7 +82940,7 @@ fi if test "$fiber_asm" = 'yes'; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for fiber switching context" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fiber switching context" >&5 printf %s "checking for fiber switching context... " >&6; } @@ -82621,24 +82988,24 @@ done - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $fiber_asm_file" >&5 -printf '%s\n' "$fiber_asm_file" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fiber_asm_file" >&5 +printf "%s\n" "$fiber_asm_file" >&6; } else if test "x$fiber_os" = xmac then : -printf '%s\n' "#define _XOPEN_SOURCE 1" >>confdefs.h +printf "%s\n" "#define _XOPEN_SOURCE 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "ucontext.h" "ac_cv_header_ucontext_h" "$ac_includes_default" if test "x$ac_cv_header_ucontext_h" = xyes then : -printf '%s\n' "#define ZEND_FIBER_UCONTEXT 1" >>confdefs.h +printf "%s\n" "#define ZEND_FIBER_UCONTEXT 1" >>confdefs.h else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "fibers not available on this platform See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -82649,7 +83016,7 @@ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" if test "x$ac_cv_header_dlfcn_h" = xyes then : - printf '%s\n' "#define HAVE_DLFCN_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h fi @@ -82658,13 +83025,13 @@ ac_fn_c_check_header_compile "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "$ac_includes_default" if test "x$ac_cv_header_cpuid_h" = xyes then : - printf '%s\n' "#define HAVE_CPUID_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_CPUID_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "libproc.h" "ac_cv_header_libproc_h" "$ac_includes_default" if test "x$ac_cv_header_libproc_h" = xyes then : - printf '%s\n' "#define HAVE_LIBPROC_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_LIBPROC_H 1" >>confdefs.h fi @@ -82672,55 +83039,55 @@ ac_fn_c_check_func "$LINENO" "getpid" "ac_cv_func_getpid" if test "x$ac_cv_func_getpid" = xyes then : - printf '%s\n' "#define HAVE_GETPID 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETPID 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "gettid" "ac_cv_func_gettid" if test "x$ac_cv_func_gettid" = xyes then : - printf '%s\n' "#define HAVE_GETTID 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETTID 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "kill" "ac_cv_func_kill" if test "x$ac_cv_func_kill" = xyes then : - printf '%s\n' "#define HAVE_KILL 1" >>confdefs.h + printf "%s\n" "#define HAVE_KILL 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "mremap" "ac_cv_func_mremap" if test "x$ac_cv_func_mremap" = xyes then : - printf '%s\n' "#define HAVE_MREMAP 1" >>confdefs.h + printf "%s\n" "#define HAVE_MREMAP 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "pthread_attr_get_np" "ac_cv_func_pthread_attr_get_np" if test "x$ac_cv_func_pthread_attr_get_np" = xyes then : - printf '%s\n' "#define HAVE_PTHREAD_ATTR_GET_NP 1" >>confdefs.h + printf "%s\n" "#define HAVE_PTHREAD_ATTR_GET_NP 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "pthread_attr_getstack" "ac_cv_func_pthread_attr_getstack" if test "x$ac_cv_func_pthread_attr_getstack" = xyes then : - printf '%s\n' "#define HAVE_PTHREAD_ATTR_GETSTACK 1" >>confdefs.h + printf "%s\n" "#define HAVE_PTHREAD_ATTR_GETSTACK 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "pthread_get_stackaddr_np" "ac_cv_func_pthread_get_stackaddr_np" if test "x$ac_cv_func_pthread_get_stackaddr_np" = xyes then : - printf '%s\n' "#define HAVE_PTHREAD_GET_STACKADDR_NP 1" >>confdefs.h + printf "%s\n" "#define HAVE_PTHREAD_GET_STACKADDR_NP 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "pthread_getattr_np" "ac_cv_func_pthread_getattr_np" if test "x$ac_cv_func_pthread_getattr_np" = xyes then : - printf '%s\n' "#define HAVE_PTHREAD_GETATTR_NP 1" >>confdefs.h + printf "%s\n" "#define HAVE_PTHREAD_GETATTR_NP 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "pthread_stackseg_np" "ac_cv_func_pthread_stackseg_np" if test "x$ac_cv_func_pthread_stackseg_np" = xyes then : - printf '%s\n' "#define HAVE_PTHREAD_STACKSEG_NP 1" >>confdefs.h + printf "%s\n" "#define HAVE_PTHREAD_STACKSEG_NP 1" >>confdefs.h fi @@ -82731,13 +83098,13 @@ else case e in #( e) ac_fn_check_decl "$LINENO" "sigsetjmp" "ac_cv_have_decl_sigsetjmp" "#include -" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS" +" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_sigsetjmp" = xyes then : else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "Required sigsetjmp not found. See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -82746,7 +83113,7 @@ fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the stack grows downwards" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the stack grows downwards" >&5 printf %s "checking whether the stack grows downwards... " >&6; } if test ${php_cv_have_stack_limit+y} then : @@ -82805,16 +83172,16 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_stack_limit" >&5 -printf '%s\n' "$php_cv_have_stack_limit" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_stack_limit" >&5 +printf "%s\n" "$php_cv_have_stack_limit" >&6; } if test "x$php_cv_have_stack_limit" = xyes then : -printf '%s\n' "#define ZEND_CHECK_STACK_LIMIT 1" >>confdefs.h +printf "%s\n" "#define ZEND_CHECK_STACK_LIMIT 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for usable _FPU_SETCW" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable _FPU_SETCW" >&5 printf %s "checking for usable _FPU_SETCW... " >&6; } if test ${php_cv_have__fpu_setcw+y} then : @@ -82853,16 +83220,16 @@ conftest$ac_exeext conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have__fpu_setcw" >&5 -printf '%s\n' "$php_cv_have__fpu_setcw" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have__fpu_setcw" >&5 +printf "%s\n" "$php_cv_have__fpu_setcw" >&6; } if test "x$php_cv_have__fpu_setcw" = xyes then : -printf '%s\n' "#define HAVE__FPU_SETCW 1" >>confdefs.h +printf "%s\n" "#define HAVE__FPU_SETCW 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for usable fpsetprec" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable fpsetprec" >&5 printf %s "checking for usable fpsetprec... " >&6; } if test ${php_cv_have_fpsetprec+y} then : @@ -82900,16 +83267,16 @@ conftest$ac_exeext conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_fpsetprec" >&5 -printf '%s\n' "$php_cv_have_fpsetprec" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_fpsetprec" >&5 +printf "%s\n" "$php_cv_have_fpsetprec" >&6; } if test "x$php_cv_have_fpsetprec" = xyes then : -printf '%s\n' "#define HAVE_FPSETPREC 1" >>confdefs.h +printf "%s\n" "#define HAVE_FPSETPREC 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for usable _controlfp" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable _controlfp" >&5 printf %s "checking for usable _controlfp... " >&6; } if test ${php_cv_have__controlfp+y} then : @@ -82947,16 +83314,16 @@ conftest$ac_exeext conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have__controlfp" >&5 -printf '%s\n' "$php_cv_have__controlfp" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have__controlfp" >&5 +printf "%s\n" "$php_cv_have__controlfp" >&6; } if test "x$php_cv_have__controlfp" = xyes then : -printf '%s\n' "#define HAVE__CONTROLFP 1" >>confdefs.h +printf "%s\n" "#define HAVE__CONTROLFP 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for usable _controlfp_s" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable _controlfp_s" >&5 printf %s "checking for usable _controlfp_s... " >&6; } if test ${php_cv_have__controlfp_s+y} then : @@ -82995,16 +83362,16 @@ conftest$ac_exeext conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have__controlfp_s" >&5 -printf '%s\n' "$php_cv_have__controlfp_s" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have__controlfp_s" >&5 +printf "%s\n" "$php_cv_have__controlfp_s" >&6; } if test "x$php_cv_have__controlfp_s" = xyes then : -printf '%s\n' "#define HAVE__CONTROLFP_S 1" >>confdefs.h +printf "%s\n" "#define HAVE__CONTROLFP_S 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether FPU control word can be manipulated by inline assembler" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether FPU control word can be manipulated by inline assembler" >&5 printf %s "checking whether FPU control word can be manipulated by inline assembler... " >&6; } if test ${php_cv_have_fpu_inline_asm_x86+y} then : @@ -83043,16 +83410,16 @@ conftest$ac_exeext conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_fpu_inline_asm_x86" >&5 -printf '%s\n' "$php_cv_have_fpu_inline_asm_x86" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_fpu_inline_asm_x86" >&5 +printf "%s\n" "$php_cv_have_fpu_inline_asm_x86" >&6; } if test "x$php_cv_have_fpu_inline_asm_x86" = xyes then : -printf '%s\n' "#define HAVE_FPU_INLINE_ASM_X86 1" >>confdefs.h +printf "%s\n" "#define HAVE_FPU_INLINE_ASM_X86 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether dlsym() requires a leading underscore in symbol names" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether dlsym() requires a leading underscore in symbol names" >&5 printf %s "checking whether dlsym() requires a leading underscore in symbol names... " >&6; } if test "$cross_compiling" = yes; then : @@ -83060,7 +83427,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 (eval $ac_link) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in - x$lt_dlno_uscore) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + x$lt_dlno_uscore) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; x$lt_dlneed_uscore) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } -printf '%s\n' "#define DLSYM_NEEDS_UNDERSCORE 1" >>confdefs.h +printf "%s\n" "#define DLSYM_NEEDS_UNDERSCORE 1" >>confdefs.h ;; - x$lt_dlunknown|x*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } ;; + x$lt_dlunknown|x*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac else : # compilation failed - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi rm -fr conftest* @@ -83163,7 +83530,7 @@ then : else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether system supports global register variables" >&5 + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether system supports global register variables" >&5 printf %s "checking whether system supports global register variables... " >&6; } if test ${php_cv_have_global_register_vars+y} then : @@ -83230,12 +83597,12 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_global_register_vars" >&5 -printf '%s\n' "$php_cv_have_global_register_vars" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have_global_register_vars" >&5 +printf "%s\n" "$php_cv_have_global_register_vars" >&6; } if test "x$php_cv_have_global_register_vars" = xyes then : -printf '%s\n' "#define HAVE_GCC_GLOBAL_REGS 1" >>confdefs.h +printf "%s\n" "#define HAVE_GCC_GLOBAL_REGS 1" >>confdefs.h else case e in #( e) ZEND_GCC_GLOBAL_REGS=no ;; @@ -83244,12 +83611,12 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable global register variables support" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable global register variables support" >&5 printf %s "checking whether to enable global register variables support... " >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ZEND_GCC_GLOBAL_REGS" >&5 -printf '%s\n' "$ZEND_GCC_GLOBAL_REGS" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_GCC_GLOBAL_REGS" >&5 +printf "%s\n" "$ZEND_GCC_GLOBAL_REGS" >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether __cpuid_count is available" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __cpuid_count is available" >&5 printf %s "checking whether __cpuid_count is available... " >&6; } if test ${php_cv_have___cpuid_count+y} then : @@ -83279,44 +83646,44 @@ conftest$ac_exeext conftest.$ac_ext ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___cpuid_count" >&5 -printf '%s\n' "$php_cv_have___cpuid_count" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_have___cpuid_count" >&5 +printf "%s\n" "$php_cv_have___cpuid_count" >&6; } if test "x$php_cv_have___cpuid_count" = xyes then : -printf '%s\n' "#define HAVE_CPUID_COUNT 1" >>confdefs.h +printf "%s\n" "#define HAVE_CPUID_COUNT 1" >>confdefs.h fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable thread safety" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable thread safety" >&5 printf %s "checking whether to enable thread safety... " >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ZEND_ZTS" >&5 -printf '%s\n' "$ZEND_ZTS" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_ZTS" >&5 +printf "%s\n" "$ZEND_ZTS" >&6; } if test "x$ZEND_ZTS" = xyes then : -printf '%s\n' "#define ZTS 1" >>confdefs.h +printf "%s\n" "#define ZTS 1" >>confdefs.h as_fn_append CFLAGS " -DZTS" fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend debugging" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend debugging" >&5 printf %s "checking whether to enable Zend debugging... " >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ZEND_DEBUG" >&5 -printf '%s\n' "$ZEND_DEBUG" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_DEBUG" >&5 +printf "%s\n" "$ZEND_DEBUG" >&6; } if test "x$ZEND_DEBUG" = xyes then : - printf '%s\n' "#define ZEND_DEBUG 1" >>confdefs.h + printf "%s\n" "#define ZEND_DEBUG 1" >>confdefs.h echo " $CFLAGS" | grep ' -g' >/dev/null || CFLAGS="$CFLAGS -g" else case e in #( - e) printf '%s\n' "#define ZEND_DEBUG 0" >>confdefs.h + e) printf "%s\n" "#define ZEND_DEBUG 0" >>confdefs.h ;; esac fi @@ -83326,7 +83693,7 @@ CFLAGS="-Wall -Wextra -Wno-unused-parameter -Wno-sign-compare $CFLAGS" fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wno-clobbered" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wno-clobbered" >&5 printf %s "checking whether the C compiler accepts -Wno-clobbered... " >&6; } if test ${ax_cv_check_cflags__Werror__Wno_clobbered+y} then : @@ -83357,8 +83724,8 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_clobbered" >&5 -printf '%s\n' "$ax_cv_check_cflags__Werror__Wno_clobbered" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_clobbered" >&5 +printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_clobbered" >&6; } if test "x$ax_cv_check_cflags__Werror__Wno_clobbered" = xyes then : CFLAGS="-Wno-clobbered $CFLAGS" @@ -83367,7 +83734,7 @@ esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wimplicit-fallthrough=1" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wimplicit-fallthrough=1" >&5 printf %s "checking whether the C compiler accepts -Wimplicit-fallthrough=1... " >&6; } if test ${ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1+y} then : @@ -83398,8 +83765,8 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" >&5 -printf '%s\n' "$ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" >&5 +printf "%s\n" "$ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" >&6; } if test "x$ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" = xyes then : CFLAGS="$CFLAGS -Wimplicit-fallthrough=1" @@ -83408,7 +83775,7 @@ esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wduplicated-cond" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wduplicated-cond" >&5 printf %s "checking whether the C compiler accepts -Wduplicated-cond... " >&6; } if test ${ax_cv_check_cflags__Werror__Wduplicated_cond+y} then : @@ -83439,8 +83806,8 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wduplicated_cond" >&5 -printf '%s\n' "$ax_cv_check_cflags__Werror__Wduplicated_cond" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wduplicated_cond" >&5 +printf "%s\n" "$ax_cv_check_cflags__Werror__Wduplicated_cond" >&6; } if test "x$ax_cv_check_cflags__Werror__Wduplicated_cond" = xyes then : CFLAGS="-Wduplicated-cond $CFLAGS" @@ -83449,7 +83816,7 @@ esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wlogical-op" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wlogical-op" >&5 printf %s "checking whether the C compiler accepts -Wlogical-op... " >&6; } if test ${ax_cv_check_cflags__Werror__Wlogical_op+y} then : @@ -83480,8 +83847,8 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wlogical_op" >&5 -printf '%s\n' "$ax_cv_check_cflags__Werror__Wlogical_op" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wlogical_op" >&5 +printf "%s\n" "$ax_cv_check_cflags__Werror__Wlogical_op" >&6; } if test "x$ax_cv_check_cflags__Werror__Wlogical_op" = xyes then : CFLAGS="-Wlogical-op $CFLAGS" @@ -83490,7 +83857,7 @@ esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wformat-truncation" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wformat-truncation" >&5 printf %s "checking whether the C compiler accepts -Wformat-truncation... " >&6; } if test ${ax_cv_check_cflags__Werror__Wformat_truncation+y} then : @@ -83521,8 +83888,8 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wformat_truncation" >&5 -printf '%s\n' "$ax_cv_check_cflags__Werror__Wformat_truncation" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wformat_truncation" >&5 +printf "%s\n" "$ax_cv_check_cflags__Werror__Wformat_truncation" >&6; } if test "x$ax_cv_check_cflags__Werror__Wformat_truncation" = xyes then : CFLAGS="-Wformat-truncation $CFLAGS" @@ -83531,7 +83898,7 @@ esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wstrict-prototypes" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -Wstrict-prototypes" >&5 printf %s "checking whether the C compiler accepts -Wstrict-prototypes... " >&6; } if test ${ax_cv_check_cflags__Werror__Wstrict_prototypes+y} then : @@ -83562,8 +83929,8 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wstrict_prototypes" >&5 -printf '%s\n' "$ax_cv_check_cflags__Werror__Wstrict_prototypes" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wstrict_prototypes" >&5 +printf "%s\n" "$ax_cv_check_cflags__Werror__Wstrict_prototypes" >&6; } if test "x$ax_cv_check_cflags__Werror__Wstrict_prototypes" = xyes then : CFLAGS="-Wstrict-prototypes $CFLAGS" @@ -83572,7 +83939,7 @@ esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -fno-common" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -fno-common" >&5 printf %s "checking whether the C compiler accepts -fno-common... " >&6; } if test ${ax_cv_check_cflags__Werror__fno_common+y} then : @@ -83603,8 +83970,8 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__fno_common" >&5 -printf '%s\n' "$ax_cv_check_cflags__Werror__fno_common" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__fno_common" >&5 +printf "%s\n" "$ax_cv_check_cflags__Werror__fno_common" >&6; } if test "x$ax_cv_check_cflags__Werror__fno_common" = xyes then : CFLAGS="-fno-common $CFLAGS" @@ -83614,7 +83981,7 @@ fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for Zend memory manager alignment and log values" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Zend memory manager alignment and log values" >&5 printf %s "checking for Zend memory manager alignment and log values... " >&6; } if test ${php_cv_align_mm+y} then : @@ -83676,12 +84043,12 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_align_mm" >&5 -printf '%s\n' "$php_cv_align_mm" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_align_mm" >&5 +printf "%s\n" "$php_cv_align_mm" >&6; } if test "x$php_cv_align_mm" = xfailed then : - { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "ZEND_MM alignment defines failed. See 'config.log' for more details" "$LINENO" 5; } else case e in #( @@ -83689,13 +84056,13 @@ zend_mm_alignment_log2=$(echo $php_cv_align_mm | cut -d ' ' -f 2) zend_mm_8byte_realign=$(echo $php_cv_align_mm | cut -d ' ' -f 3) -printf '%s\n' "#define ZEND_MM_ALIGNMENT $zend_mm_alignment" >>confdefs.h +printf "%s\n" "#define ZEND_MM_ALIGNMENT $zend_mm_alignment" >>confdefs.h -printf '%s\n' "#define ZEND_MM_ALIGNMENT_LOG2 $zend_mm_alignment_log2" >>confdefs.h +printf "%s\n" "#define ZEND_MM_ALIGNMENT_LOG2 $zend_mm_alignment_log2" >>confdefs.h -printf '%s\n' "#define ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT $zend_mm_8byte_realign" >>confdefs.h +printf "%s\n" "#define ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT $zend_mm_8byte_realign" >>confdefs.h ;; esac @@ -83717,7 +84084,7 @@ ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" if test "x$ac_cv_func_sigaction" = xyes then : - printf '%s\n' "#define HAVE_SIGACTION 1" >>confdefs.h + printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h else case e in #( e) ZEND_SIGNALS=no ;; @@ -83728,15 +84095,15 @@ if test "x$ZEND_SIGNALS" = xyes then : -printf '%s\n' "#define ZEND_SIGNALS 1" >>confdefs.h +printf "%s\n" "#define ZEND_SIGNALS 1" >>confdefs.h as_fn_append CFLAGS " -DZEND_SIGNALS" fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend signal handling" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend signal handling" >&5 printf %s "checking whether to enable Zend signal handling... " >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ZEND_SIGNALS" >&5 -printf '%s\n' "$ZEND_SIGNALS" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_SIGNALS" >&5 +printf "%s\n" "$ZEND_SIGNALS" >&6; } # Check whether --enable-zend-max-execution-timers was given. if test ${enable_zend_max_execution_timers+y} @@ -83757,7 +84124,7 @@ if test "x$ZEND_MAX_EXECUTION_TIMERS" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing timer_create" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing timer_create" >&5 printf %s "checking for library containing timer_create... " >&6; } if test ${ac_cv_search_timer_create+y} then : @@ -83815,8 +84182,8 @@ LIBS=$ac_func_search_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_timer_create" >&5 -printf '%s\n' "$ac_cv_search_timer_create" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_timer_create" >&5 +printf "%s\n" "$ac_cv_search_timer_create" >&6; } ac_res=$ac_cv_search_timer_create if test "$ac_res" != no then : @@ -83832,15 +84199,15 @@ if test "x$ZEND_MAX_EXECUTION_TIMERS" = xyes then : -printf '%s\n' "#define ZEND_MAX_EXECUTION_TIMERS 1" >>confdefs.h +printf "%s\n" "#define ZEND_MAX_EXECUTION_TIMERS 1" >>confdefs.h as_fn_append CFLAGS " -DZEND_MAX_EXECUTION_TIMERS" fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend max execution timers" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend max execution timers" >&5 printf %s "checking whether to enable Zend max execution timers... " >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ZEND_MAX_EXECUTION_TIMERS" >&5 -printf '%s\n' "$ZEND_MAX_EXECUTION_TIMERS" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_MAX_EXECUTION_TIMERS" >&5 +printf "%s\n" "$ZEND_MAX_EXECUTION_TIMERS" >&6; } @@ -84132,7 +84499,7 @@ # Double any \ or $. # By default was 's,x,x', remove it if useless. ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`printf '%s\n' "$program_transform_name" | sed "$ac_script"` +program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"` if test "x$prefix" = xNONE @@ -84312,12 +84679,12 @@ PHP_UNAME=$(uname -a | xargs) fi -printf '%s\n' "#define PHP_UNAME \"$PHP_UNAME\"" >>confdefs.h +printf "%s\n" "#define PHP_UNAME \"$PHP_UNAME\"" >>confdefs.h PHP_OS=$(uname | xargs) -printf '%s\n' "#define PHP_OS \"$PHP_OS\"" >>confdefs.h +printf "%s\n" "#define PHP_OS \"$PHP_OS\"" >>confdefs.h @@ -84326,7 +84693,7 @@ PHP_BUILD_SYSTEM=$PHP_UNAME fi -printf '%s\n' "#define PHP_BUILD_SYSTEM \"$PHP_BUILD_SYSTEM\"" >>confdefs.h +printf "%s\n" "#define PHP_BUILD_SYSTEM \"$PHP_BUILD_SYSTEM\"" >>confdefs.h @@ -84335,7 +84702,7 @@ else case e in #( e) -printf '%s\n' "#define PHP_BUILD_PROVIDER \"$PHP_BUILD_PROVIDER\"" >>confdefs.h +printf "%s\n" "#define PHP_BUILD_PROVIDER \"$PHP_BUILD_PROVIDER\"" >>confdefs.h ;; esac fi @@ -84346,7 +84713,7 @@ else case e in #( e) -printf '%s\n' "#define PHP_BUILD_COMPILER \"$PHP_BUILD_COMPILER\"" >>confdefs.h +printf "%s\n" "#define PHP_BUILD_COMPILER \"$PHP_BUILD_COMPILER\"" >>confdefs.h ;; esac fi @@ -84357,7 +84724,7 @@ else case e in #( e) -printf '%s\n' "#define PHP_BUILD_ARCH \"$PHP_BUILD_ARCH\"" >>confdefs.h +printf "%s\n" "#define PHP_BUILD_ARCH \"$PHP_BUILD_ARCH\"" >>confdefs.h ;; esac fi @@ -84548,7 +84915,7 @@ if test "x$PHP_MEMORY_SANITIZER" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -fsanitize=memory -fsanitize-memory-track-origins" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -fsanitize=memory -fsanitize-memory-track-origins" >&5 printf %s "checking whether the C compiler accepts -fsanitize=memory -fsanitize-memory-track-origins... " >&6; } if test ${ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins+y} then : @@ -84579,8 +84946,8 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" >&5 -printf '%s\n' "$ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" >&5 +printf "%s\n" "$ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" >&6; } if test "x$ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" = xyes then : @@ -84607,7 +84974,7 @@ esac fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -fsanitize=address" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -fsanitize=address" >&5 printf %s "checking whether the C compiler accepts -fsanitize=address... " >&6; } if test ${ax_cv_check_cflags___fsanitize_address+y} then : @@ -84638,8 +85005,8 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_address" >&5 -printf '%s\n' "$ax_cv_check_cflags___fsanitize_address" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_address" >&5 +printf "%s\n" "$ax_cv_check_cflags___fsanitize_address" >&6; } if test "x$ax_cv_check_cflags___fsanitize_address" = xyes then : @@ -84656,7 +85023,7 @@ if test "x$PHP_UNDEFINED_SANITIZER" = xyes then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -fsanitize=undefined" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -fsanitize=undefined" >&5 printf %s "checking whether the C compiler accepts -fsanitize=undefined... " >&6; } if test ${ax_cv_check_cflags___fsanitize_undefined+y} then : @@ -84687,14 +85054,14 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_undefined" >&5 -printf '%s\n' "$ax_cv_check_cflags___fsanitize_undefined" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_undefined" >&5 +printf "%s\n" "$ax_cv_check_cflags___fsanitize_undefined" >&6; } if test "x$ax_cv_check_cflags___fsanitize_undefined" = xyes then : CFLAGS="$CFLAGS -fsanitize=undefined -fno-sanitize-recover=undefined" CXXFLAGS="$CXXFLAGS -fsanitize=undefined -fno-sanitize-recover=undefined" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -fno-sanitize=object-size" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts -fno-sanitize=object-size" >&5 printf %s "checking whether the C compiler accepts -fno-sanitize=object-size... " >&6; } if test ${ax_cv_check_cflags___fno_sanitize_object_size+y} then : @@ -84725,8 +85092,8 @@ CFLAGS=$ax_check_save_flags ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fno_sanitize_object_size" >&5 -printf '%s\n' "$ax_cv_check_cflags___fno_sanitize_object_size" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fno_sanitize_object_size" >&5 +printf "%s\n" "$ax_cv_check_cflags___fno_sanitize_object_size" >&6; } if test "x$ax_cv_check_cflags___fno_sanitize_object_size" = xyes then : @@ -84741,7 +85108,7 @@ OLD_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -fno-sanitize-recover=undefined" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to add -fno-sanitize=function" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to add -fno-sanitize=function" >&5 printf %s "checking whether to add -fno-sanitize=function... " >&6; } if test ${php_cv_ubsan_no_function+y} then : @@ -84776,8 +85143,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $php_cv_ubsan_no_function" >&5 -printf '%s\n' "$php_cv_ubsan_no_function" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_ubsan_no_function" >&5 +printf "%s\n" "$php_cv_ubsan_no_function" >&6; } CFLAGS=$OLD_CFLAGS if test "x$php_cv_ubsan_no_function" = xyes then : @@ -84810,10 +85177,10 @@ fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5 -printf '%s\n' "" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring libtool${T_ME}" >&5 -printf '%s\n' "${T_MD}Configuring libtool${T_ME}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring libtool${T_ME}" >&5 +printf "%s\n" "${T_MD}Configuring libtool${T_ME}" >&6; } AR_FLAGS=cr @@ -84898,7 +85265,7 @@ fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 printf %s "checking for a sed that does not truncate output... " >&6; } if test ${lt_cv_path_SED+y} then : @@ -84954,8 +85321,8 @@ fi SED=$lt_cv_path_SED -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 -printf '%s\n' "$SED" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 +printf "%s\n" "$SED" >&6; } # Check whether --with-gnu-ld was given. @@ -84970,7 +85337,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 printf %s "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) @@ -85000,10 +85367,10 @@ ;; esac elif test "$with_gnu_ld" = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 printf %s "checking for GNU ld... " >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 printf %s "checking for non-GNU ld... " >&6; } fi if test ${lt_cv_path_LD+y} @@ -85039,14 +85406,14 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -printf '%s\n' "$LD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +printf "%s\n" "$LD" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 printf %s "checking if the linker ($LD) is GNU ld... " >&6; } if test ${lt_cv_prog_gnu_ld+y} then : @@ -85063,12 +85430,12 @@ esac ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 -printf '%s\n' "$lt_cv_prog_gnu_ld" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 printf %s "checking for $LD option to reload object files... " >&6; } if test ${lt_cv_ld_reload_flag+y} then : @@ -85077,8 +85444,8 @@ e) lt_cv_ld_reload_flag='-r' ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -printf '%s\n' "$lt_cv_ld_reload_flag" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +printf "%s\n" "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -85095,7 +85462,7 @@ ;; esac -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm" >&5 printf %s "checking for BSD-compatible nm... " >&6; } if test ${lt_cv_path_NM+y} then : @@ -85146,11 +85513,11 @@ fi ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -printf '%s\n' "$lt_cv_path_NM" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +printf "%s\n" "$lt_cv_path_NM" >&6; } NM="$lt_cv_path_NM" -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 printf %s "checking how to recognize dependent libraries... " >&6; } if test ${lt_cv_deplibs_check_method+y} then : @@ -85338,8 +85705,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -printf '%s\n' "$lt_cv_deplibs_check_method" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +printf "%s\n" "$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -85369,7 +85736,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) @@ -85384,11 +85751,11 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 85387 "configure"' > conftest.$ac_ext + echo '#line 85754 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in @@ -85426,7 +85793,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *32-bit*) @@ -85482,7 +85849,7 @@ # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 printf %s "checking whether the C compiler needs -belf... " >&6; } if test ${lt_cv_cc_needs_belf+y} then : @@ -85522,8 +85889,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -printf '%s\n' "$lt_cv_cc_needs_belf" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +printf "%s\n" "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" @@ -85535,7 +85902,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *64-bit*) @@ -85569,7 +85936,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 printf %s "checking how to run the C++ preprocessor... " >&6; } if test -z "$CXXCPP"; then if test ${ac_cv_prog_CXXCPP+y} @@ -85636,8 +86003,8 @@ else ac_cv_prog_CXXCPP=$CXXCPP fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -printf '%s\n' "$CXXCPP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +printf "%s\n" "$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -85685,8 +86052,8 @@ then : else case e in #( - e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;} + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check See 'config.log' for more details" "$LINENO" 5; } ;; esac @@ -85703,7 +86070,7 @@ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! # find the maximum length of command line arguments -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 printf %s "checking the maximum length of command line arguments... " >&6; } if test ${lt_cv_sys_max_cmd_len+y} then : @@ -85817,11 +86184,11 @@ fi if test -n $lt_cv_sys_max_cmd_len ; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -printf '%s\n' "$lt_cv_sys_max_cmd_len" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none" >&5 -printf '%s\n' "none" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 +printf "%s\n" "none" >&6; } fi @@ -85829,7 +86196,7 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 printf %s "checking command to parse $NM output from $compiler object... " >&6; } if test ${lt_cv_sys_global_symbol_pipe+y} then : @@ -85938,14 +86305,14 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -86000,7 +86367,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -86036,14 +86403,14 @@ lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -printf '%s\n' "failed" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +printf "%s\n" "failed" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -printf '%s\n' "ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +printf "%s\n" "ok" >&6; } fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 printf %s "checking for objdir... " >&6; } if test ${lt_cv_objdir+y} then : @@ -86060,8 +86427,8 @@ rmdir .libs 2>/dev/null ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -printf '%s\n' "$lt_cv_objdir" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +printf "%s\n" "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -86112,7 +86479,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_AR+y} then : @@ -86133,7 +86500,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AR="${ac_tool_prefix}ar" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -86145,11 +86512,11 @@ fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -printf '%s\n' "$AR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +printf "%s\n" "$AR" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -86158,7 +86525,7 @@ ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_AR+y} then : @@ -86179,7 +86546,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="ar" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -86191,11 +86558,11 @@ fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -printf '%s\n' "$ac_ct_AR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +printf "%s\n" "$ac_ct_AR" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_AR" = x; then @@ -86203,8 +86570,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -86216,7 +86583,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_RANLIB+y} then : @@ -86237,7 +86604,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -86249,11 +86616,11 @@ fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -printf '%s\n' "$RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +printf "%s\n" "$RANLIB" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -86262,7 +86629,7 @@ ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_RANLIB+y} then : @@ -86283,7 +86650,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -86295,11 +86662,11 @@ fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -printf '%s\n' "$ac_ct_RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +printf "%s\n" "$ac_ct_RANLIB" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -86307,8 +86674,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -86320,7 +86687,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_STRIP+y} then : @@ -86341,7 +86708,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -86353,11 +86720,11 @@ fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -printf '%s\n' "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -86366,7 +86733,7 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_STRIP+y} then : @@ -86387,7 +86754,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -86399,11 +86766,11 @@ fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -printf '%s\n' "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -86411,8 +86778,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -86475,7 +86842,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 printf %s "checking for ${ac_tool_prefix}file... " >&6; } if test ${lt_cv_path_MAGIC_CMD+y} then : @@ -86530,16 +86897,16 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -printf '%s\n' "$MAGIC_CMD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +printf "%s\n" "$MAGIC_CMD" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for file" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5 printf %s "checking for file... " >&6; } if test ${lt_cv_path_MAGIC_CMD+y} then : @@ -86594,11 +86961,11 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -printf '%s\n' "$MAGIC_CMD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +printf "%s\n" "$MAGIC_CMD" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi else @@ -86616,7 +86983,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_DSYMUTIL+y} then : @@ -86637,7 +87004,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -86649,11 +87016,11 @@ fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -printf '%s\n' "$DSYMUTIL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +printf "%s\n" "$DSYMUTIL" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -86662,7 +87029,7 @@ ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_DSYMUTIL+y} then : @@ -86683,7 +87050,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -86695,11 +87062,11 @@ fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -printf '%s\n' "$ac_ct_DSYMUTIL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +printf "%s\n" "$ac_ct_DSYMUTIL" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_DSYMUTIL" = x; then @@ -86707,8 +87074,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DSYMUTIL=$ac_ct_DSYMUTIL @@ -86720,7 +87087,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_NMEDIT+y} then : @@ -86741,7 +87108,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -86753,11 +87120,11 @@ fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -printf '%s\n' "$NMEDIT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +printf "%s\n" "$NMEDIT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -86766,7 +87133,7 @@ ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_NMEDIT+y} then : @@ -86787,7 +87154,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -86799,11 +87166,11 @@ fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -printf '%s\n' "$ac_ct_NMEDIT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +printf "%s\n" "$ac_ct_NMEDIT" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_NMEDIT" = x; then @@ -86811,8 +87178,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac NMEDIT=$ac_ct_NMEDIT @@ -86822,7 +87189,7 @@ fi - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 printf %s "checking for -single_module linker flag... " >&6; } if test ${lt_cv_apple_cc_single_mod+y} then : @@ -86845,9 +87212,9 @@ fi ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -printf '%s\n' "$lt_cv_apple_cc_single_mod" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 printf %s "checking for -exported_symbols_list linker flag... " >&6; } if test ${lt_cv_ld_exported_symbols_list+y} then : @@ -86859,7 +87226,7 @@ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" cat > conftest.$ac_ext <&5 (eval $ac_link) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext}; then lt_cv_ld_exported_symbols_list=yes rm -rf conftest* @@ -86882,8 +87249,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -printf '%s\n' "$lt_cv_ld_exported_symbols_list" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; } case $host_os in rhapsody* | darwin1.[0123]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -87002,7 +87369,7 @@ lt_prog_compiler_no_builtin_flag=' -fno-builtin' -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } if test ${lt_cv_prog_compiler_rtti_exceptions+y} then : @@ -87021,11 +87388,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:87024: $lt_compile\"" >&5) + (eval echo "\"configure:87391: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "configure:87028: \$? = $ac_status" >&5 + echo "configure:87395: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -87039,8 +87406,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -printf '%s\n' "$lt_cv_prog_compiler_rtti_exceptions" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -87054,7 +87421,7 @@ lt_prog_compiler_pic= lt_prog_compiler_static= -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 printf %s "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then @@ -87294,15 +87661,15 @@ esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 -printf '%s\n' "$lt_prog_compiler_pic" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 +printf "%s\n" "$lt_prog_compiler_pic" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } if test ${lt_cv_prog_compiler_pic_works+y} then : @@ -87321,11 +87688,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:87324: $lt_compile\"" >&5) + (eval echo "\"configure:87691: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "configure:87328: \$? = $ac_status" >&5 + echo "configure:87695: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -87339,8 +87706,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in @@ -87367,7 +87734,7 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } if test ${lt_cv_prog_compiler_static_works+y} then : @@ -87397,8 +87764,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then : @@ -87407,7 +87774,7 @@ fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } if test ${lt_cv_prog_compiler_c_o+y} then : @@ -87429,11 +87796,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:87432: $lt_compile\"" >&5) + (eval echo "\"configure:87799: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "configure:87436: \$? = $ac_status" >&5 + echo "configure:87803: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -87456,14 +87823,14 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 printf %s "checking if we can lock with hard links... " >&6; } hard_links=yes $rm conftest* @@ -87471,18 +87838,18 @@ touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -printf '%s\n' "$hard_links" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +printf "%s\n" "$hard_links" >&6; } if test "$hard_links" = no; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 -printf '%s\n' "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else need_locks=no fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= @@ -87894,7 +88261,7 @@ # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext <&5 (eval $ac_link) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext}; then lt_aix_libpath_sed=' @@ -87936,7 +88303,7 @@ # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext <&5 (eval $ac_link) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext}; then lt_aix_libpath_sed=' @@ -88410,8 +88777,8 @@ esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -printf '%s\n' "$ld_shlibs" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +printf "%s\n" "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no # @@ -88431,7 +88798,7 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 printf %s "checking whether -lc should be explicitly linked in... " >&6; } $rm conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -88439,7 +88806,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest @@ -88457,7 +88824,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then archive_cmds_need_lc=no @@ -88469,15 +88836,15 @@ cat conftest.err 1>&5 fi $rm conftest* - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 -printf '%s\n' "$archive_cmds_need_lc" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 +printf "%s\n" "$archive_cmds_need_lc" >&6; } ;; esac fi ;; esac -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 printf %s "checking dynamic linker characteristics... " >&6; } library_names_spec= libname_spec='lib$name' @@ -89086,8 +89453,8 @@ dynamic_linker=no ;; esac -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -printf '%s\n' "$dynamic_linker" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +printf "%s\n" "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no if test ${lt_cv_sys_lib_search_path_spec+y} @@ -89114,7 +89481,7 @@ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 printf %s "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ @@ -89139,8 +89506,8 @@ # directories. hardcode_action=unsupported fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -printf '%s\n' "$hardcode_action" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +printf "%s\n" "$hardcode_action" >&6; } if test "$hardcode_action" = relink; then # Fast installation is not supported @@ -89153,13 +89520,13 @@ striplib= old_striplib= -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 printf %s "checking whether stripping libraries is possible... " >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in @@ -89167,16 +89534,16 @@ if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf '%s\n' "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi ;; *) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi @@ -89208,7 +89575,7 @@ darwin*) # if libdl is installed we need to link against it - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 printf %s "checking for dlopen in -ldl... " >&6; } if test ${ac_cv_lib_dl_dlopen+y} then : @@ -89249,8 +89616,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" @@ -89271,7 +89638,7 @@ then : lt_cv_dlopen="shl_load" else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 printf %s "checking for shl_load in -ldld... " >&6; } if test ${ac_cv_lib_dld_shl_load+y} then : @@ -89312,8 +89679,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -printf '%s\n' "$ac_cv_lib_dld_shl_load" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; } if test "x$ac_cv_lib_dld_shl_load" = xyes then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" @@ -89323,7 +89690,7 @@ then : lt_cv_dlopen="dlopen" else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 printf %s "checking for dlopen in -ldl... " >&6; } if test ${ac_cv_lib_dl_dlopen+y} then : @@ -89364,13 +89731,13 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 printf %s "checking for dlopen in -lsvld... " >&6; } if test ${ac_cv_lib_svld_dlopen+y} then : @@ -89411,13 +89778,13 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -printf '%s\n' "$ac_cv_lib_svld_dlopen" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; } if test "x$ac_cv_lib_svld_dlopen" = xyes then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else case e in #( - e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 printf %s "checking for dld_link in -ldld... " >&6; } if test ${ac_cv_lib_dld_dld_link+y} then : @@ -89458,8 +89825,8 @@ LIBS=$ac_check_lib_save_LIBS ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 -printf '%s\n' "$ac_cv_lib_dld_dld_link" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; } if test "x$ac_cv_lib_dld_dld_link" = xyes then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" @@ -89505,7 +89872,7 @@ save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 printf %s "checking whether a program can dlopen itself... " >&6; } if test ${lt_cv_dlopen_self+y} then : @@ -89517,7 +89884,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 (eval $ac_link) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -89599,12 +89966,12 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 -printf '%s\n' "$lt_cv_dlopen_self" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +printf "%s\n" "$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 printf %s "checking whether a statically linked program can dlopen itself... " >&6; } if test ${lt_cv_dlopen_self_static+y} then : @@ -89616,7 +89983,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 (eval $ac_link) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -89698,8 +90065,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -printf '%s\n' "$lt_cv_dlopen_self_static" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +printf "%s\n" "$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -89721,12 +90088,12 @@ # Report which library types will actually be built -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 printf %s "checking if libtool supports shared libraries... " >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -printf '%s\n' "$can_build_shared" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +printf "%s\n" "$can_build_shared" >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 printf %s "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no @@ -89747,15 +90114,15 @@ fi ;; esac -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -printf '%s\n' "$enable_shared" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +printf "%s\n" "$enable_shared" >&6; } -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 printf %s "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -printf '%s\n' "$enable_static" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +printf "%s\n" "$enable_static" >&6; } # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -89848,9 +90215,9 @@ cfgfile="${ofile}T" trap "$rm \"$cfgfile\"; exit 1" 1 2 15 $rm -f "$cfgfile" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: creating $ofile" >&5 -printf '%s\n' " +printf "%s\n" " creating $ofile" >&6; } cat <<__EOF__ >> "$cfgfile" @@ -90264,18 +90631,18 @@ if test -f "$ltmain" && test -n "$tagnames"; then if test ! -f "${ofile}"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: output file '$ofile' does not exist" >&5 -printf '%s\n' "$as_me: WARNING: output file '$ofile' does not exist" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: output file '$ofile' does not exist" >&5 +printf "%s\n" "$as_me: WARNING: output file '$ofile' does not exist" >&2;} fi if test -z "$LTCC"; then eval "`$SHELL ${ofile} --config | grep '^LTCC='`" if test -z "$LTCC"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: output file '$ofile' does not look like a libtool script" >&5 -printf '%s\n' "$as_me: WARNING: output file '$ofile' does not look like a libtool script" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: output file '$ofile' does not look like a libtool script" >&5 +printf "%s\n" "$as_me: WARNING: output file '$ofile' does not look like a libtool script" >&2;} else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using 'LTCC=$LTCC', extracted from '$ofile'" >&5 -printf '%s\n' "$as_me: WARNING: using 'LTCC=$LTCC', extracted from '$ofile'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using 'LTCC=$LTCC', extracted from '$ofile'" >&5 +printf "%s\n" "$as_me: WARNING: using 'LTCC=$LTCC', extracted from '$ofile'" >&2;} fi fi if test -z "$LTCFLAGS"; then @@ -90442,7 +90809,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 printf %s "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) @@ -90472,10 +90839,10 @@ ;; esac elif test "$with_gnu_ld" = yes; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 printf %s "checking for GNU ld... " >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 printf %s "checking for non-GNU ld... " >&6; } fi if test ${lt_cv_path_LD+y} @@ -90511,14 +90878,14 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -printf '%s\n' "$LD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +printf "%s\n" "$LD" >&6; } else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf '%s\n' "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 printf %s "checking if the linker ($LD) is GNU ld... " >&6; } if test ${lt_cv_prog_gnu_ld+y} then : @@ -90535,8 +90902,8 @@ esac ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 -printf '%s\n' "$lt_cv_prog_gnu_ld" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -90586,7 +90953,7 @@ fi # PORTME: fill in a description of your system's C++ link characteristics -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ld_shlibs_CXX=yes case $host_os in @@ -90685,7 +91052,7 @@ # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext <&5 (eval $ac_link) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext}; then lt_aix_libpath_sed=' @@ -90728,7 +91095,7 @@ # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext <&5 (eval $ac_link) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext}; then lt_aix_libpath_sed=' @@ -91484,8 +91851,8 @@ ld_shlibs_CXX=no ;; esac -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -printf '%s\n' "$ld_shlibs_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +printf "%s\n" "$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no GCC_CXX="$GXX" @@ -91508,7 +91875,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then # Parse the compiler output and extract the necessary # objects, libraries and library flags. @@ -91664,7 +92031,7 @@ lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 printf %s "checking for $compiler option to produce PIC... " >&6; } # C++ specific cases for pic, static, wl, etc. @@ -91954,15 +92321,15 @@ esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 -printf '%s\n' "$lt_prog_compiler_pic_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 +printf "%s\n" "$lt_prog_compiler_pic_CXX" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } if test ${lt_cv_prog_compiler_pic_works_CXX+y} then : @@ -91981,11 +92348,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:91984: $lt_compile\"" >&5) + (eval echo "\"configure:92351: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "configure:91988: \$? = $ac_status" >&5 + echo "configure:92355: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -91999,8 +92366,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -printf '%s\n' "$lt_cv_prog_compiler_pic_works_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic_works_CXX" >&6; } if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in @@ -92027,7 +92394,7 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } if test ${lt_cv_prog_compiler_static_works_CXX+y} then : @@ -92057,8 +92424,8 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -printf '%s\n' "$lt_cv_prog_compiler_static_works_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +printf "%s\n" "$lt_cv_prog_compiler_static_works_CXX" >&6; } if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then : @@ -92067,7 +92434,7 @@ fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } if test ${lt_cv_prog_compiler_c_o_CXX+y} then : @@ -92089,11 +92456,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:92092: $lt_compile\"" >&5) + (eval echo "\"configure:92459: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "configure:92096: \$? = $ac_status" >&5 + echo "configure:92463: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -92116,14 +92483,14 @@ ;; esac fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -printf '%s\n' "$lt_cv_prog_compiler_c_o_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 printf %s "checking if we can lock with hard links... " >&6; } hard_links=yes $rm conftest* @@ -92131,18 +92498,18 @@ touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -printf '%s\n' "$hard_links" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +printf "%s\n" "$hard_links" >&6; } if test "$hard_links" = no; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 -printf '%s\n' "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else need_locks=no fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -92168,8 +92535,8 @@ esac exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -printf '%s\n' "$ld_shlibs_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +printf "%s\n" "$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no # @@ -92189,7 +92556,7 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 printf %s "checking whether -lc should be explicitly linked in... " >&6; } $rm conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -92197,7 +92564,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest @@ -92215,7 +92582,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then archive_cmds_need_lc_CXX=no @@ -92227,15 +92594,15 @@ cat conftest.err 1>&5 fi $rm conftest* - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5 -printf '%s\n' "$archive_cmds_need_lc_CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5 +printf "%s\n" "$archive_cmds_need_lc_CXX" >&6; } ;; esac fi ;; esac -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 printf %s "checking dynamic linker characteristics... " >&6; } library_names_spec= libname_spec='lib$name' @@ -92792,8 +93159,8 @@ dynamic_linker=no ;; esac -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -printf '%s\n' "$dynamic_linker" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +printf "%s\n" "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no if test ${lt_cv_sys_lib_search_path_spec+y} @@ -92820,7 +93187,7 @@ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 printf %s "checking how to hardcode library paths into programs... " >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || \ @@ -92845,8 +93212,8 @@ # directories. hardcode_action_CXX=unsupported fi -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 -printf '%s\n' "$hardcode_action_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 +printf "%s\n" "$hardcode_action_CXX" >&6; } if test "$hardcode_action_CXX" = relink; then # Fast installation is not supported @@ -93358,10 +93725,10 @@ - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5 -printf '%s\n' "" >&6; } - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Generating files${T_ME}" >&5 -printf '%s\n' "${T_MD}Generating files${T_ME}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Generating files${T_ME}" >&5 +printf "%s\n" "${T_MD}Generating files${T_ME}" >&6; } CXXFLAGS_CLEAN=$CXXFLAGS @@ -93815,7 +94182,7 @@ -printf '%s\n' "#define HAVE_BUILD_DEFS_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_BUILD_DEFS_H 1" >>confdefs.h as_fn_append BUILD_DIR " main main/streams scripts scripts/man1 TSRM Zend Zend/asm Zend/Optimizer" @@ -93853,7 +94220,44 @@ _ACEOF -ac_cache_dump | +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # 'set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # 'set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | sed ' /^ac_cv_env_/b end t clear @@ -93865,8 +94269,8 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -printf '%s\n' "$as_me: updating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -93880,8 +94284,8 @@ fi fi else - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -printf '%s\n' "$as_me: not updating unwritable cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -93898,7 +94302,7 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`printf '%s\n' "$ac_i" | sed "$ac_script"` + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -93916,13 +94320,13 @@ PHP_VAR_SUBST="$PHP_VAR_SUBST phplibdir" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating build directories" >&5 -printf '%s\n' "$as_me: creating build directories" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating build directories" >&5 +printf "%s\n" "$as_me: creating build directories" >&6;} $php_shtool mkdir -p $BUILD_DIR - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating Makefile" >&5 -printf '%s\n' "$as_me: creating Makefile" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating Makefile" >&5 +printf "%s\n" "$as_me: creating Makefile" >&6;} cat >Makefile <&5 -printf '%s\n' "$as_me: patching main/php_config.h.in" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: patching main/php_config.h.in" >&5 +printf "%s\n" "$as_me: patching main/php_config.h.in" >&6;} $SED -e 's/^#undef PACKAGE_[^ ]*/\/\* & \*\//g' < $srcdir/main/php_config.h.in \ > $srcdir/main/php_config.h.in.tmp && mv $srcdir/main/php_config.h.in.tmp $srcdir/main/php_config.h.in : "${CONFIG_STATUS=./config.status}" -case $CONFIG_STATUS in #( - -*) : - CONFIG_STATUS=./$CONFIG_STATUS ;; #( - */*) : - ;; #( - *) : - CONFIG_STATUS=./$CONFIG_STATUS ;; -esac - ac_write_fail=0 -ac_clean_CONFIG_STATUS='"$CONFIG_STATUS"' -{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -printf '%s\n' "$as_me: creating $CONFIG_STATUS" >&6;} +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 -cat >"$CONFIG_STATUS" <<_ASEOF || as_write_fail=1 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -93973,7 +94369,7 @@ SHELL=\${CONFIG_SHELL-$SHELL} export SHELL _ASEOF -cat >>"$CONFIG_STATUS" <<\_ASEOF || as_write_fail=1 +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 ## -------------------- ## ## M4sh Initialization. ## ## -------------------- ## @@ -93985,7 +94381,7 @@ emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # contradicts POSIX and common usage. Disable this. + # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else case e in #( @@ -94072,7 +94468,7 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi @@ -94088,9 +94484,9 @@ as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - printf '%s\n' "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -94185,7 +94581,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -printf '%s\n' X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -94207,6 +94603,29 @@ as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -94248,7 +94667,7 @@ as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -94257,7 +94676,7 @@ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -printf '%s\n' X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -94310,19 +94729,19 @@ exec 6>&1 -## ------------------------------------- ## -## Main body of "$CONFIG_STATUS" script. ## -## ------------------------------------- ## +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## _ASEOF -test $as_write_fail = 0 && chmod +x "$CONFIG_STATUS" || ac_write_fail=1 +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by PHP $as_me 8.4.27, which was -generated by GNU Autoconf 2.73. Invocation command line was +This file was extended by PHP $as_me 8.4.28, which was +generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -94344,7 +94763,7 @@ esac -cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" @@ -94352,7 +94771,7 @@ _ACEOF -cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ '$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files @@ -94385,29 +94804,25 @@ PHP home page: ." _ACEOF -ac_cs_config=`printf '%s\n' "$ac_configure_args" | sed "$ac_safe_unquote"` -ac_cs_config_escaped=`printf '%s\n' "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` -cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1 +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -PHP config.status 8.4.27 -configured by $0, generated by GNU Autoconf 2.73, +PHP config.status 8.4.28 +configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" -Copyright (C) 2026 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' -test -n "\$AWK" || { - awk '' >"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # The default lists apply if the user does not specify any file. ac_need_defaults=: while test $# != 0 @@ -94435,15 +94850,15 @@ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - printf '%s\n' "$ac_cs_version"; exit ;; + printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - printf '%s\n' "$ac_cs_config"; exit ;; + printf "%s\n" "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -94451,7 +94866,7 @@ --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -94460,7 +94875,7 @@ as_fn_error $? "ambiguous option: '$1' Try '$0 --help' for more information.";; --help | --hel | -h ) - printf '%s\n' "$ac_cs_usage"; exit ;; + printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -94484,29 +94899,29 @@ fi _ACEOF -cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \printf '%s\n' "running CONFIG_SHELL=$SHELL \$*" >&6 + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" fi _ACEOF -cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 exec 5>>config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - printf '%s\n' "$ac_log" + printf "%s\n" "$ac_log" } >&5 _ACEOF -cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # @@ -94524,7 +94939,7 @@ _ACEOF -cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # Handling of arguments. for ac_config_target in $ac_config_targets @@ -94625,13 +95040,13 @@ echo "_ACEOF" } >conf$$subs.sh || as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | sed -n '$='` +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | sed -n '$='` + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then @@ -94642,7 +95057,7 @@ done rm -f conf$$subs.sh -cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' @@ -94687,9 +95102,9 @@ N s/\n// } -' >>"$CONFIG_STATUS" || ac_write_fail=1 +' >>$CONFIG_STATUS || ac_write_fail=1 rm -f conf$$subs.awk -cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 @@ -94718,7 +95133,7 @@ _ACAWK _ACEOF -cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else @@ -94750,7 +95165,7 @@ }' fi -cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" # Set up the scripts for CONFIG_HEADERS section. @@ -94821,9 +95236,9 @@ b cont ' >"$CONFIG_STATUS" || ac_write_fail=1 +"/g' >>$CONFIG_STATUS || ac_write_fail=1 -cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 for (key in D) D_is_set[key] = 1 FS = "" } @@ -94841,12 +95256,8 @@ macro = mac2[1] prefix = substr(line, 1, index(line, defundef) - 1) if (D_is_set[macro]) { - suffix = P[macro] D[macro] - while (suffix ~ /[\t ]$/) { - suffix = substr(suffix, 1, length(suffix) - 1) - } # Preserve the white space surrounding the "#". - print prefix "define", macro suffix + print prefix "define", macro P[macro] D[macro] next } else { # Replace #undef with comments. This is necessary, for example, @@ -94861,7 +95272,7 @@ { print } _ACAWK _ACEOF -cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -94905,7 +95316,7 @@ esac || as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`printf '%s\n' "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -94913,17 +95324,17 @@ # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - printf '%s\n' "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -printf '%s\n' "$as_me: creating $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`printf '%s\n' "$configure_input" | + ac_sed_conf_input=`printf "%s\n" "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -94940,7 +95351,7 @@ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -printf '%s\n' X"$ac_file" | +printf "%s\n" X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -94964,9 +95375,9 @@ case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -95002,7 +95413,7 @@ _ACEOF -cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= @@ -95019,10 +95430,10 @@ case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -printf '%s\n' "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF -cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g @@ -95036,11 +95447,11 @@ # Neutralize VPATH when '$srcdir' = '.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? -cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_sed_extra="$ac_vpsub $extrasub _ACEOF -cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s|@configure_input@|$ac_sed_conf_input|;t t @@ -95062,9 +95473,9 @@ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf '%s\n' "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -95080,27 +95491,27 @@ # if test x"$ac_file" != x-; then { - printf '%s\n' "/* $configure_input */" >&1 \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -printf '%s\n' "$as_me: $ac_file is unchanged" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - printf '%s\n' "/* $configure_input */" >&1 \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi ;; - :C) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -printf '%s\n' "$as_me: executing $ac_file commands" >&6;} + :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +printf "%s\n" "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -95112,7 +95523,7 @@ else case e in #( e) if test "x$APACHE_THREADED_MPM" = xno then : - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: +--------------------------------------------------------------------+ | *** WARNING *** | | | @@ -95121,7 +95532,7 @@ | PHP with --enable-zts | +--------------------------------------------------------------------+ " >&5 -printf '%s\n' "$as_me: WARNING: +printf "%s\n" "$as_me: WARNING: +--------------------------------------------------------------------+ | *** WARNING *** | | | @@ -95161,7 +95572,7 @@ as_fn_exit 0 _ACEOF -ac_clean_CONFIG_STATUS= +ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 @@ -95177,26 +95588,19 @@ # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: - case $CONFIG_STATUS in #( - -*) : - ac_no_opts=-- ;; #( - *) : - ac_no_opts= ;; -esac ac_config_status_args= test "$silent" = yes && ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $ac_no_opts "$CONFIG_STATUS" $ac_config_status_args || - ac_cs_success=false + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi diff -Nru php8.4-8.4.27/configure.ac php8.4-8.4.28/configure.ac --- php8.4-8.4.27/configure.ac 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/configure.ac 2026-11-17 20:29:32.000000000 +0000 @@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------- AC_PREREQ([2.68]) -AC_INIT([PHP],[8.4.27],[https://github.com/php/php-src/issues],[php],[https://www.php.net]) +AC_INIT([PHP],[8.4.28],[https://github.com/php/php-src/issues],[php],[https://www.php.net]) AC_CONFIG_SRCDIR([main/php_version.h]) AC_CONFIG_AUX_DIR([build]) AC_PRESERVE_HELP_ORDER diff -Nru php8.4-8.4.27/debian/changelog php8.4-8.4.28/debian/changelog --- php8.4-8.4.27/debian/changelog 2026-10-21 07:53:46.000000000 +0000 +++ php8.4-8.4.28/debian/changelog 2026-11-18 10:55:31.000000000 +0000 @@ -1,3 +1,33 @@ +php8.4 (8.4.28-1~deb13u1) trixie-security; urgency=high + + * New upstream version 8.4.28 + + [CVE-2026-129538] PHP-CGI out-of-bounds read and write during + PATH_INFO correction. + + [CVE-2026-129496] Timezone cache use-after-free can lead to remote + code execution. + + [CVE-2026-129289] PHP-FPM request smuggling through an unread HTTP + request body. + + [CVE-2026-129292] PHP-FPM status endpoint XSS via unescaped user and + script fields. + + [CVE-2026-129291] PHP-FPM epoll use-after-free can lead to local + privilege escalation. + + [CVE-2026-128090] PHAR OpenSSL signature bypass via algorithm + downgrade. + + [CVE-2026-126714] Partially overwritten session files can lead to + remote code execution. + + [CVE-2026-115560] Session serializer mismatch can lead to remote code + execution. + + [CVE-2026-15353] SOAP information disclosure through malformed array + dimensions. + + [CVE-2026-129506] SOAP use-after-free when processing DTD entity + references. + + [CVE-2026-128064] Mixed-case HTTPS and FTPS URLs can expose data in + plaintext. + + [CVE-2026-127960] Denial of service through folded HTTP response + headers. + + -- Ondřej Surý Wed, 18 Nov 2026 11:55:31 +0100 + php8.4 (8.4.27-1~deb13u1) trixie-security; urgency=high * New upstream version 8.4.27 diff -Nru php8.4-8.4.27/ext/com_dotnet/com_typeinfo.c php8.4-8.4.28/ext/com_dotnet/com_typeinfo.c --- php8.4-8.4.27/ext/com_dotnet/com_typeinfo.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/com_dotnet/com_typeinfo.c 2026-11-17 20:29:32.000000000 +0000 @@ -302,6 +302,39 @@ return TL; } +static ITypeInfo *php_com_find_impl_typeinfo(ITypeInfo *coinfo, const GUID *iid) +{ + ITypeInfo *found = NULL; + TYPEATTR *coattr; + + if (FAILED(ITypeInfo_GetTypeAttr(coinfo, &coattr))) { + return NULL; + } + + for (unsigned int i = 0; i < coattr->cImplTypes && !found; i++) { + HREFTYPE rt; + ITypeInfo *implinfo; + TYPEATTR *implattr; + + if (FAILED(ITypeInfo_GetRefTypeOfImplType(coinfo, i, &rt)) || + FAILED(ITypeInfo_GetRefTypeInfo(coinfo, rt, &implinfo))) { + continue; + } + if (SUCCEEDED(ITypeInfo_GetTypeAttr(implinfo, &implattr))) { + if (IsEqualGUID(&implattr->guid, iid)) { + found = implinfo; + } + ITypeInfo_ReleaseTypeAttr(implinfo, implattr); + } + if (!found) { + ITypeInfo_Release(implinfo); + } + } + + ITypeInfo_ReleaseTypeAttr(coinfo, coattr); + return found; +} + ITypeInfo *php_com_locate_typeinfo(zend_string *type_lib_name, php_com_dotnet_object *obj, zend_string *dispatch_name, bool sink) { @@ -318,6 +351,14 @@ if (SUCCEEDED(IDispatch_QueryInterface(V_DISPATCH(&obj->v), &IID_IProvideClassInfo2, (void**)&pci2))) { gotguid = SUCCEEDED(IProvideClassInfo2_GetGUID(pci2, GUIDKIND_DEFAULT_SOURCE_DISP_IID, &iid)); + if (gotguid) { + ITypeInfo *coinfo; + + if (SUCCEEDED(IProvideClassInfo2_GetClassInfo(pci2, &coinfo))) { + typeinfo = php_com_find_impl_typeinfo(coinfo, &iid); + ITypeInfo_Release(coinfo); + } + } IProvideClassInfo2_Release(pci2); } if (!gotguid && SUCCEEDED(IDispatch_QueryInterface(V_DISPATCH(&obj->v), &IID_IProvideClassInfo, (void**)&pci))) { @@ -408,8 +449,6 @@ efree(olename); - } else if (gotguid) { - ITypeLib_GetTypeInfoOfGuid(typelib, &iid, &typeinfo); } if (typelib) { @@ -639,6 +678,8 @@ } } else { zend_throw_error(NULL, "Type kind must be dispatchable, %08x given", attr->typekind); + ITypeInfo_ReleaseTypeAttr(typeinfo, attr); + return false; } ITypeInfo_ReleaseTypeAttr(typeinfo, attr); diff -Nru php8.4-8.4.27/ext/com_dotnet/tests/gh25008.phpt php8.4-8.4.28/ext/com_dotnet/tests/gh25008.phpt --- php8.4-8.4.27/ext/com_dotnet/tests/gh25008.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/com_dotnet/tests/gh25008.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,58 @@ +--TEST-- +GH-25008 (com_event_sink and com_print_typeinfo crash on a NULL source typelib) +--EXTENSIONS-- +com_dotnet +--INI-- +com.autoregister_typelib=0 +--SKIPIF-- + +--FILE-- +getMessage(), "\n"; +} + +ob_start(); +$events = com_print_typeinfo($o, null, true); +$events_dump = ob_get_clean(); +echo 'events: '; +var_dump($events); +echo (str_contains($events_dump, 'class IWinHttpRequestEvents') + && str_contains($events_dump, '{F97F4E15-B787-4212-80D1-D380CBBF982E}') + && str_contains($events_dump, 'function OnResponseStart')) + ? "events interface\n" : "events missing\n"; + +ob_start(); +$request = com_print_typeinfo($o, null, false); +$request_dump = ob_get_clean(); +echo 'request: '; +var_dump($request); +echo (str_contains($request_dump, 'class IWinHttpRequest') + && str_contains($request_dump, '{016FE2EC-B2C8-45F8-B23B-39E53A75396B}')) + ? "request interface\n" : "request missing\n"; + +$d = new COM('Scripting.Dictionary'); +echo 'dictionary: '; +var_dump(com_event_sink($d, new stdClass)); +?> +--EXPECTF-- +sink: Error: Type kind must be dispatchable, 00000003 given +events: bool(true) +events interface +request: bool(true) +request interface +dictionary: +Warning: com_event_sink(): IProvideClassInfo: this code not yet written! in %s on line %d +bool(false) diff -Nru php8.4-8.4.27/ext/curl/config.w32 php8.4-8.4.28/ext/curl/config.w32 --- php8.4-8.4.27/ext/curl/config.w32 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/curl/config.w32 2026-11-17 20:29:32.000000000 +0000 @@ -19,8 +19,8 @@ SETUP_OPENSSL("curl", PHP_CURL) > 0 && CHECK_LIB("winmm.lib", "curl", PHP_CURL) && CHECK_LIB("wldap32.lib", "curl", PHP_CURL) && - (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "curl", PHP_CURL))) || - (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "curl", PHP_CURL)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) && + (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib;zs.lib;z.lib", "curl", PHP_CURL))) || + (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib;zs.lib;z.lib", "curl", PHP_CURL)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) && !isNaN(ver_num) && (ver_num <= parseInt("0x073b00") || ver_num > parseInt("0x073b00") && CHECK_LIB("normaliz.lib", "curl", PHP_CURL) && diff -Nru php8.4-8.4.27/ext/curl/interface.c php8.4-8.4.28/ext/curl/interface.c --- php8.4-8.4.27/ext/curl/interface.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/curl/interface.c 2026-11-17 20:29:32.000000000 +0000 @@ -813,6 +813,10 @@ php_curl *ch = (php_curl *)clientp; int rval = CURLKHMATCH_MISMATCH; /* cancel connection in case of an exception */ + if (!ZEND_FCC_INITIALIZED(ch->handlers.sshhostkey)) { + return rval; + } + #if PHP_CURL_DEBUG fprintf(stderr, "curl_ssh_hostkeyfunction() called\n"); fprintf(stderr, "clientp = %x, keytype = %d, key = %s, keylen = %zu\n", clientp, keytype, key, keylen); @@ -1284,8 +1288,11 @@ { if (ZEND_FCC_INITIALIZED(*source_fcc)) { zend_fcc_dup(target_fcc, source_fcc); - curl_easy_setopt(ch->cp, option, (void *) ch); } + + /* The callback data (i.e. pointer to the curl handle) stays even if a user callback + * is reset to NULL. Ensure the data pointer always points to the new handle. */ + curl_easy_setopt(ch->cp, option, (void *) ch); } void _php_setup_easy_copy_handlers(php_curl *ch, php_curl *source) @@ -1305,6 +1312,10 @@ Z_ADDREF(source->handlers.write_header->stream); } ch->handlers.write_header->stream = source->handlers.write_header->stream; + if (!Z_ISUNDEF(source->handlers.std_err)) { + Z_ADDREF(source->handlers.std_err); + } + ch->handlers.std_err = source->handlers.std_err; ch->handlers.write->fp = source->handlers.write->fp; ch->handlers.write_header->fp = source->handlers.write_header->fp; @@ -1325,7 +1336,6 @@ curl_easy_setopt(ch->cp, CURLOPT_FILE, (void *) ch); curl_easy_setopt(ch->cp, CURLOPT_INFILE, (void *) ch); curl_easy_setopt(ch->cp, CURLOPT_WRITEHEADER, (void *) ch); - curl_easy_setopt(ch->cp, CURLOPT_DEBUGDATA, (void *) ch); php_curl_copy_fcc_with_option(ch, CURLOPT_PROGRESSDATA, &ch->handlers.progress, &source->handlers.progress); php_curl_copy_fcc_with_option(ch, CURLOPT_XFERINFODATA, &ch->handlers.xferinfo, &source->handlers.xferinfo); diff -Nru php8.4-8.4.27/ext/curl/tests/curl_copy_handle_progress_null_uaf.phpt php8.4-8.4.28/ext/curl/tests/curl_copy_handle_progress_null_uaf.phpt --- php8.4-8.4.27/ext/curl/tests/curl_copy_handle_progress_null_uaf.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/curl/tests/curl_copy_handle_progress_null_uaf.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,27 @@ +--TEST-- +Cloning a curl handle whose CURLOPT_PROGRESSFUNCTION was reset to null must not reference the source handle +--EXTENSIONS-- +curl +--FILE-- + 0); +curl_setopt($ch1, CURLOPT_PROGRESSFUNCTION, null); + +$ch2 = clone $ch1; +unset($ch1); + +var_dump(curl_exec($ch2)); +?> +--CLEAN-- + +--EXPECT-- +string(5) "Test." diff -Nru php8.4-8.4.27/ext/curl/tests/curl_copy_handle_stderr_uaf.phpt php8.4-8.4.28/ext/curl/tests/curl_copy_handle_stderr_uaf.phpt --- php8.4-8.4.27/ext/curl/tests/curl_copy_handle_stderr_uaf.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/curl/tests/curl_copy_handle_stderr_uaf.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,38 @@ +--TEST-- +Cloning a curl handle keeps CURLOPT_STDERR tracked so a closed stream is detected on the clone too +--EXTENSIONS-- +curl +--FILE-- + +--CLEAN-- + +--EXPECTF-- +Warning: curl_exec(): CURLOPT_STDERR resource has gone away, resetting to stderr in %s on line %d +%A +string(5) "Test." + +Warning: curl_exec(): CURLOPT_STDERR resource has gone away, resetting to stderr in %s on line %d +%A +string(5) "Test." diff -Nru php8.4-8.4.27/ext/date/lib/timezonedb.h php8.4-8.4.28/ext/date/lib/timezonedb.h --- php8.4-8.4.27/ext/date/lib/timezonedb.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/date/lib/timezonedb.h 2026-11-17 20:29:32.000000000 +0000 @@ -132,481 +132,481 @@ { (char*) "America/Guyana" , 0x00F05D }, { (char*) "America/Halifax" , 0x00F11E }, { (char*) "America/Havana" , 0x00F7D0 }, - { (char*) "America/Hermosillo" , 0x00FC39 }, - { (char*) "America/Indiana/Indianapolis" , 0x00FD4D }, - { (char*) "America/Indiana/Knox" , 0x00FF85 }, - { (char*) "America/Indiana/Marengo" , 0x01039E }, - { (char*) "America/Indiana/Petersburg" , 0x0105F8 }, - { (char*) "America/Indiana/Tell_City" , 0x0108C2 }, - { (char*) "America/Indiana/Vevay" , 0x010AEC }, - { (char*) "America/Indiana/Vincennes" , 0x010C83 }, - { (char*) "America/Indiana/Winamac" , 0x010ED9 }, - { (char*) "America/Indianapolis" , 0x011156 }, - { (char*) "America/Inuvik" , 0x011375 }, - { (char*) "America/Iqaluit" , 0x011818 }, - { (char*) "America/Jamaica" , 0x011B94 }, - { (char*) "America/Jujuy" , 0x011CF3 }, - { (char*) "America/Juneau" , 0x011FB1 }, - { (char*) "America/Kentucky/Louisville" , 0x012397 }, - { (char*) "America/Kentucky/Monticello" , 0x01289B }, - { (char*) "America/Knox_IN" , 0x012C87 }, - { (char*) "America/Kralendijk" , 0x01308B }, - { (char*) "America/La_Paz" , 0x013148 }, - { (char*) "America/Lima" , 0x0131FE }, - { (char*) "America/Los_Angeles" , 0x013325 }, - { (char*) "America/Louisville" , 0x013846 }, - { (char*) "America/Lower_Princes" , 0x013D2C }, - { (char*) "America/Maceio" , 0x013DE9 }, - { (char*) "America/Managua" , 0x013FFB }, - { (char*) "America/Manaus" , 0x01412E }, - { (char*) "America/Marigot" , 0x0142E5 }, - { (char*) "America/Martinique" , 0x0143A2 }, - { (char*) "America/Matamoros" , 0x014460 }, - { (char*) "America/Mazatlan" , 0x01464D }, - { (char*) "America/Mendoza" , 0x01493D }, - { (char*) "America/Menominee" , 0x014C0D }, - { (char*) "America/Merida" , 0x014FCD }, - { (char*) "America/Metlakatla" , 0x015278 }, - { (char*) "America/Mexico_City" , 0x0154E5 }, - { (char*) "America/Miquelon" , 0x015804 }, - { (char*) "America/Moncton" , 0x015A36 }, - { (char*) "America/Monterrey" , 0x01602F }, - { (char*) "America/Montevideo" , 0x016336 }, - { (char*) "America/Montreal" , 0x01670B }, - { (char*) "America/Montserrat" , 0x016DCC }, - { (char*) "America/Nassau" , 0x016E5A }, - { (char*) "America/New_York" , 0x017254 }, - { (char*) "America/Nipigon" , 0x017944 }, - { (char*) "America/Nome" , 0x018005 }, - { (char*) "America/Noronha" , 0x0183ED }, - { (char*) "America/North_Dakota/Beulah" , 0x0185ED }, - { (char*) "America/North_Dakota/Center" , 0x018A21 }, - { (char*) "America/North_Dakota/New_Salem" , 0x018E20 }, - { (char*) "America/Nuuk" , 0x019225 }, - { (char*) "America/Ojinaga" , 0x019607 }, - { (char*) "America/Panama" , 0x0198FD }, - { (char*) "America/Pangnirtung" , 0x01999E }, - { (char*) "America/Paramaribo" , 0x019D01 }, - { (char*) "America/Phoenix" , 0x019DC8 }, - { (char*) "America/Port-au-Prince" , 0x019EDC }, - { (char*) "America/Port_of_Spain" , 0x01A11D }, - { (char*) "America/Porto_Acre" , 0x01A1AB }, - { (char*) "America/Porto_Velho" , 0x01A359 }, - { (char*) "America/Puerto_Rico" , 0x01A4F7 }, - { (char*) "America/Punta_Arenas" , 0x01A5B4 }, - { (char*) "America/Rainy_River" , 0x01AA93 }, - { (char*) "America/Rankin_Inlet" , 0x01B104 }, - { (char*) "America/Recife" , 0x01B44D }, - { (char*) "America/Regina" , 0x01B647 }, - { (char*) "America/Resolute" , 0x01B8E6 }, - { (char*) "America/Rio_Branco" , 0x01BC30 }, - { (char*) "America/Rosario" , 0x01BDE2 }, - { (char*) "America/Santa_Isabel" , 0x01C0B2 }, - { (char*) "America/Santarem" , 0x01C615 }, - { (char*) "America/Santiago" , 0x01C7C5 }, - { (char*) "America/Santo_Domingo" , 0x01CD28 }, - { (char*) "America/Sao_Paulo" , 0x01CE71 }, - { (char*) "America/Scoresbysund" , 0x01D26B }, - { (char*) "America/Shiprock" , 0x01D66C }, - { (char*) "America/Sitka" , 0x01DA8A }, - { (char*) "America/St_Barthelemy" , 0x01DE65 }, - { (char*) "America/St_Johns" , 0x01DF22 }, - { (char*) "America/St_Kitts" , 0x01E69F }, - { (char*) "America/St_Lucia" , 0x01E72D }, - { (char*) "America/St_Thomas" , 0x01E7CE }, - { (char*) "America/St_Vincent" , 0x01E85C }, - { (char*) "America/Swift_Current" , 0x01E8FD }, - { (char*) "America/Tegucigalpa" , 0x01EA8B }, - { (char*) "America/Thule" , 0x01EB59 }, - { (char*) "America/Thunder_Bay" , 0x01ED3A }, - { (char*) "America/Tijuana" , 0x01F3FB }, - { (char*) "America/Toronto" , 0x01F96D }, - { (char*) "America/Tortola" , 0x02004C }, - { (char*) "America/Vancouver" , 0x0200DA }, - { (char*) "America/Virgin" , 0x020784 }, - { (char*) "America/Whitehorse" , 0x020841 }, - { (char*) "America/Winnipeg" , 0x020C64 }, - { (char*) "America/Yakutat" , 0x0212F3 }, - { (char*) "America/Yellowknife" , 0x0216C1 }, - { (char*) "Antarctica/Casey" , 0x021BEE }, - { (char*) "Antarctica/Davis" , 0x021D1E }, - { (char*) "Antarctica/DumontDUrville" , 0x021DF4 }, - { (char*) "Antarctica/Macquarie" , 0x021EA8 }, - { (char*) "Antarctica/Mawson" , 0x022294 }, - { (char*) "Antarctica/McMurdo" , 0x02233E }, - { (char*) "Antarctica/Palmer" , 0x022670 }, - { (char*) "Antarctica/Rothera" , 0x0229F9 }, - { (char*) "Antarctica/South_Pole" , 0x022A90 }, - { (char*) "Antarctica/Syowa" , 0x022EAF }, - { (char*) "Antarctica/Troll" , 0x022F45 }, - { (char*) "Antarctica/Vostok" , 0x022FF4 }, - { (char*) "Arctic/Longyearbyen" , 0x0230B0 }, - { (char*) "Asia/Aden" , 0x02337D }, - { (char*) "Asia/Almaty" , 0x02340E }, - { (char*) "Asia/Amman" , 0x023696 }, - { (char*) "Asia/Anadyr" , 0x023A42 }, - { (char*) "Asia/Aqtau" , 0x023D48 }, - { (char*) "Asia/Aqtobe" , 0x023FC7 }, - { (char*) "Asia/Ashgabat" , 0x024247 }, - { (char*) "Asia/Ashkhabad" , 0x0243CA }, - { (char*) "Asia/Atyrau" , 0x02454D }, - { (char*) "Asia/Baghdad" , 0x0247D6 }, - { (char*) "Asia/Bahrain" , 0x024A58 }, - { (char*) "Asia/Baku" , 0x024B11 }, - { (char*) "Asia/Bangkok" , 0x024E05 }, - { (char*) "Asia/Barnaul" , 0x024EA9 }, - { (char*) "Asia/Beirut" , 0x0251B4 }, - { (char*) "Asia/Bishkek" , 0x02549C }, - { (char*) "Asia/Brunei" , 0x025712 }, - { (char*) "Asia/Calcutta" , 0x0257B8 }, - { (char*) "Asia/Chita" , 0x0258A0 }, - { (char*) "Asia/Choibalsan" , 0x025BAE }, - { (char*) "Asia/Chongqing" , 0x025E0C }, - { (char*) "Asia/Chungking" , 0x025FA1 }, - { (char*) "Asia/Colombo" , 0x026136 }, - { (char*) "Asia/Dacca" , 0x026239 }, - { (char*) "Asia/Damascus" , 0x02632C }, - { (char*) "Asia/Dhaka" , 0x02680A }, - { (char*) "Asia/Dili" , 0x0268FD }, - { (char*) "Asia/Dubai" , 0x0269B3 }, - { (char*) "Asia/Dushanbe" , 0x026A44 }, - { (char*) "Asia/Famagusta" , 0x026BBE }, - { (char*) "Asia/Gaza" , 0x026F85 }, - { (char*) "Asia/Harbin" , 0x027B21 }, - { (char*) "Asia/Hebron" , 0x027CB6 }, - { (char*) "Asia/Ho_Chi_Minh" , 0x028863 }, - { (char*) "Asia/Hong_Kong" , 0x028957 }, - { (char*) "Asia/Hovd" , 0x028C6A }, - { (char*) "Asia/Irkutsk" , 0x028EDE }, - { (char*) "Asia/Istanbul" , 0x0291FC }, - { (char*) "Asia/Jakarta" , 0x0296B8 }, - { (char*) "Asia/Jayapura" , 0x0297C9 }, - { (char*) "Asia/Jerusalem" , 0x0298B6 }, - { (char*) "Asia/Kabul" , 0x029CF4 }, - { (char*) "Asia/Kamchatka" , 0x029D9F }, - { (char*) "Asia/Karachi" , 0x02A094 }, - { (char*) "Asia/Kashgar" , 0x02A1AA }, - { (char*) "Asia/Kathmandu" , 0x02A23B }, - { (char*) "Asia/Katmandu" , 0x02A2E8 }, - { (char*) "Asia/Khandyga" , 0x02A395 }, - { (char*) "Asia/Kolkata" , 0x02A6C6 }, - { (char*) "Asia/Krasnoyarsk" , 0x02A7AE }, - { (char*) "Asia/Kuala_Lumpur" , 0x02AAB8 }, - { (char*) "Asia/Kuching" , 0x02ABD8 }, - { (char*) "Asia/Kuwait" , 0x02AD32 }, - { (char*) "Asia/Macao" , 0x02ADC3 }, - { (char*) "Asia/Macau" , 0x02B0E6 }, - { (char*) "Asia/Magadan" , 0x02B409 }, - { (char*) "Asia/Makassar" , 0x02B714 }, - { (char*) "Asia/Manila" , 0x02B827 }, - { (char*) "Asia/Muscat" , 0x02B945 }, - { (char*) "Asia/Nicosia" , 0x02B9D6 }, - { (char*) "Asia/Novokuznetsk" , 0x02BC45 }, - { (char*) "Asia/Novosibirsk" , 0x02BF38 }, - { (char*) "Asia/Omsk" , 0x02C249 }, - { (char*) "Asia/Oral" , 0x02C547 }, - { (char*) "Asia/Phnom_Penh" , 0x02C7D3 }, - { (char*) "Asia/Pontianak" , 0x02C8A3 }, - { (char*) "Asia/Pyongyang" , 0x02C9BC }, - { (char*) "Asia/Qatar" , 0x02CA7F }, - { (char*) "Asia/Qostanay" , 0x02CB23 }, - { (char*) "Asia/Qyzylorda" , 0x02CDB9 }, - { (char*) "Asia/Rangoon" , 0x02D052 }, - { (char*) "Asia/Riyadh" , 0x02D119 }, - { (char*) "Asia/Saigon" , 0x02D1AA }, - { (char*) "Asia/Sakhalin" , 0x02D29E }, - { (char*) "Asia/Samarkand" , 0x02D5B5 }, - { (char*) "Asia/Seoul" , 0x02D740 }, - { (char*) "Asia/Shanghai" , 0x02D8EB }, - { (char*) "Asia/Singapore" , 0x02DA8C }, - { (char*) "Asia/Srednekolymsk" , 0x02DB98 }, - { (char*) "Asia/Taipei" , 0x02DEA8 }, - { (char*) "Asia/Tashkent" , 0x02E0B3 }, - { (char*) "Asia/Tbilisi" , 0x02E23E }, - { (char*) "Asia/Tehran" , 0x02E4B6 }, - { (char*) "Asia/Tel_Aviv" , 0x02E7EE }, - { (char*) "Asia/Thimbu" , 0x02EC2C }, - { (char*) "Asia/Thimphu" , 0x02ECD2 }, - { (char*) "Asia/Tokyo" , 0x02ED78 }, - { (char*) "Asia/Tomsk" , 0x02EE59 }, - { (char*) "Asia/Ujung_Pandang" , 0x02F164 }, - { (char*) "Asia/Ulaanbaatar" , 0x02F22E }, - { (char*) "Asia/Ulan_Bator" , 0x02F49C }, - { (char*) "Asia/Urumqi" , 0x02F6FA }, - { (char*) "Asia/Ust-Nera" , 0x02F798 }, - { (char*) "Asia/Vientiane" , 0x02FABB }, - { (char*) "Asia/Vladivostok" , 0x02FB9D }, - { (char*) "Asia/Yakutsk" , 0x02FEA2 }, - { (char*) "Asia/Yangon" , 0x0301A6 }, - { (char*) "Asia/Yekaterinburg" , 0x03026D }, - { (char*) "Asia/Yerevan" , 0x03057F }, - { (char*) "Atlantic/Azores" , 0x03084F }, - { (char*) "Atlantic/Bermuda" , 0x030DDA }, - { (char*) "Atlantic/Canary" , 0x0311E6 }, - { (char*) "Atlantic/Cape_Verde" , 0x0313DE }, - { (char*) "Atlantic/Faeroe" , 0x031499 }, - { (char*) "Atlantic/Faroe" , 0x03165E }, - { (char*) "Atlantic/Jan_Mayen" , 0x031823 }, - { (char*) "Atlantic/Madeira" , 0x031AF0 }, - { (char*) "Atlantic/Reykjavik" , 0x032067 }, - { (char*) "Atlantic/South_Georgia" , 0x032364 }, - { (char*) "Atlantic/St_Helena" , 0x0323F4 }, - { (char*) "Atlantic/Stanley" , 0x032495 }, - { (char*) "Australia/ACT" , 0x0327B6 }, - { (char*) "Australia/Adelaide" , 0x032B4A }, - { (char*) "Australia/Brisbane" , 0x032EFE }, - { (char*) "Australia/Broken_Hill" , 0x033042 }, - { (char*) "Australia/Canberra" , 0x033417 }, - { (char*) "Australia/Currie" , 0x0337AB }, - { (char*) "Australia/Darwin" , 0x033BA2 }, - { (char*) "Australia/Eucla" , 0x033CAA }, - { (char*) "Australia/Hobart" , 0x033E09 }, - { (char*) "Australia/LHI" , 0x034208 }, - { (char*) "Australia/Lindeman" , 0x0344C8 }, - { (char*) "Australia/Lord_Howe" , 0x034638 }, - { (char*) "Australia/Melbourne" , 0x034908 }, - { (char*) "Australia/North" , 0x034CA4 }, - { (char*) "Australia/NSW" , 0x034D9A }, - { (char*) "Australia/Perth" , 0x03512E }, - { (char*) "Australia/Queensland" , 0x03528A }, - { (char*) "Australia/South" , 0x0353B7 }, - { (char*) "Australia/Sydney" , 0x03575C }, - { (char*) "Australia/Tasmania" , 0x035B0C }, - { (char*) "Australia/Victoria" , 0x035F03 }, - { (char*) "Australia/West" , 0x036297 }, - { (char*) "Australia/Yancowinna" , 0x0363D5 }, - { (char*) "Brazil/Acre" , 0x03678E }, - { (char*) "Brazil/DeNoronha" , 0x03693C }, - { (char*) "Brazil/East" , 0x036B2C }, - { (char*) "Brazil/West" , 0x036EF0 }, - { (char*) "Canada/Atlantic" , 0x037098 }, - { (char*) "Canada/Central" , 0x03772C }, - { (char*) "Canada/Eastern" , 0x037D9D }, - { (char*) "Canada/Mountain" , 0x03845E }, - { (char*) "Canada/Newfoundland" , 0x03898B }, - { (char*) "Canada/Pacific" , 0x0390ED }, - { (char*) "Canada/Saskatchewan" , 0x039782 }, - { (char*) "Canada/Yukon" , 0x039A0C }, - { (char*) "CET" , 0x039E1D }, - { (char*) "Chile/Continental" , 0x03A278 }, - { (char*) "Chile/EasterIsland" , 0x03A7CE }, - { (char*) "CST6CDT" , 0x03AC70 }, - { (char*) "Cuba" , 0x03B016 }, - { (char*) "EET" , 0x03B47F }, - { (char*) "Egypt" , 0x03B735 }, - { (char*) "Eire" , 0x03BC5E }, - { (char*) "EST" , 0x03C242 }, - { (char*) "EST5EDT" , 0x03C2E3 }, - { (char*) "Etc/GMT" , 0x03C689 }, - { (char*) "Etc/GMT+0" , 0x03C704 }, - { (char*) "Etc/GMT+1" , 0x03C77F }, - { (char*) "Etc/GMT+10" , 0x03C7FC }, - { (char*) "Etc/GMT+11" , 0x03C87A }, - { (char*) "Etc/GMT+12" , 0x03C8F8 }, - { (char*) "Etc/GMT+2" , 0x03C976 }, - { (char*) "Etc/GMT+3" , 0x03C9F3 }, - { (char*) "Etc/GMT+4" , 0x03CA70 }, - { (char*) "Etc/GMT+5" , 0x03CAED }, - { (char*) "Etc/GMT+6" , 0x03CB6A }, - { (char*) "Etc/GMT+7" , 0x03CBE7 }, - { (char*) "Etc/GMT+8" , 0x03CC64 }, - { (char*) "Etc/GMT+9" , 0x03CCE1 }, - { (char*) "Etc/GMT-0" , 0x03CD5E }, - { (char*) "Etc/GMT-1" , 0x03CDD9 }, - { (char*) "Etc/GMT-10" , 0x03CE57 }, - { (char*) "Etc/GMT-11" , 0x03CED6 }, - { (char*) "Etc/GMT-12" , 0x03CF55 }, - { (char*) "Etc/GMT-13" , 0x03CFD4 }, - { (char*) "Etc/GMT-14" , 0x03D053 }, - { (char*) "Etc/GMT-2" , 0x03D0D2 }, - { (char*) "Etc/GMT-3" , 0x03D150 }, - { (char*) "Etc/GMT-4" , 0x03D1CE }, - { (char*) "Etc/GMT-5" , 0x03D24C }, - { (char*) "Etc/GMT-6" , 0x03D2CA }, - { (char*) "Etc/GMT-7" , 0x03D348 }, - { (char*) "Etc/GMT-8" , 0x03D3C6 }, - { (char*) "Etc/GMT-9" , 0x03D444 }, - { (char*) "Etc/GMT0" , 0x03D4C2 }, - { (char*) "Etc/Greenwich" , 0x03D53D }, - { (char*) "Etc/UCT" , 0x03D5B8 }, - { (char*) "Etc/Universal" , 0x03D633 }, - { (char*) "Etc/UTC" , 0x03D6AE }, - { (char*) "Etc/Zulu" , 0x03D729 }, - { (char*) "Europe/Amsterdam" , 0x03D7A4 }, - { (char*) "Europe/Andorra" , 0x03DBDF }, - { (char*) "Europe/Astrakhan" , 0x03DD70 }, - { (char*) "Europe/Athens" , 0x03E064 }, - { (char*) "Europe/Belfast" , 0x03E31A }, - { (char*) "Europe/Belgrade" , 0x03E965 }, - { (char*) "Europe/Berlin" , 0x03EB4F }, - { (char*) "Europe/Bratislava" , 0x03EE2B }, - { (char*) "Europe/Brussels" , 0x03F10A }, - { (char*) "Europe/Bucharest" , 0x03F565 }, - { (char*) "Europe/Budapest" , 0x03F806 }, - { (char*) "Europe/Busingen" , 0x03FB10 }, - { (char*) "Europe/Chisinau" , 0x03FD15 }, - { (char*) "Europe/Copenhagen" , 0x0401D8 }, - { (char*) "Europe/Dublin" , 0x040453 }, - { (char*) "Europe/Gibraltar" , 0x040A37 }, - { (char*) "Europe/Guernsey" , 0x040F07 }, - { (char*) "Europe/Helsinki" , 0x04155E }, - { (char*) "Europe/Isle_of_Man" , 0x04174B }, - { (char*) "Europe/Istanbul" , 0x041D96 }, - { (char*) "Europe/Jersey" , 0x042252 }, - { (char*) "Europe/Kaliningrad" , 0x0428A9 }, - { (char*) "Europe/Kiev" , 0x042C51 }, - { (char*) "Europe/Kirov" , 0x042E8B }, - { (char*) "Europe/Kyiv" , 0x043184 }, - { (char*) "Europe/Lisbon" , 0x0433CD }, - { (char*) "Europe/Ljubljana" , 0x0439A3 }, - { (char*) "Europe/London" , 0x043B8D }, - { (char*) "Europe/Luxembourg" , 0x0441D8 }, - { (char*) "Europe/Madrid" , 0x044623 }, - { (char*) "Europe/Malta" , 0x0449C0 }, - { (char*) "Europe/Mariehamn" , 0x044D6C }, - { (char*) "Europe/Minsk" , 0x044F59 }, - { (char*) "Europe/Monaco" , 0x04528D }, - { (char*) "Europe/Moscow" , 0x0456F3 }, - { (char*) "Europe/Nicosia" , 0x045A9F }, - { (char*) "Europe/Oslo" , 0x045D00 }, - { (char*) "Europe/Paris" , 0x045FB0 }, - { (char*) "Europe/Podgorica" , 0x04640D }, - { (char*) "Europe/Prague" , 0x0465F7 }, - { (char*) "Europe/Riga" , 0x0468D6 }, - { (char*) "Europe/Rome" , 0x046B98 }, - { (char*) "Europe/Samara" , 0x046F57 }, - { (char*) "Europe/San_Marino" , 0x047258 }, - { (char*) "Europe/Sarajevo" , 0x047617 }, - { (char*) "Europe/Saratov" , 0x047801 }, - { (char*) "Europe/Simferopol" , 0x047AF3 }, - { (char*) "Europe/Skopje" , 0x047E66 }, - { (char*) "Europe/Sofia" , 0x048050 }, - { (char*) "Europe/Stockholm" , 0x0482AC }, - { (char*) "Europe/Tallinn" , 0x0484A9 }, - { (char*) "Europe/Tirane" , 0x048758 }, - { (char*) "Europe/Tiraspol" , 0x0489C0 }, - { (char*) "Europe/Ulyanovsk" , 0x048E83 }, - { (char*) "Europe/Uzhgorod" , 0x049199 }, - { (char*) "Europe/Vaduz" , 0x0493D3 }, - { (char*) "Europe/Vatican" , 0x0495BD }, - { (char*) "Europe/Vienna" , 0x04997C }, - { (char*) "Europe/Vilnius" , 0x049C1A }, - { (char*) "Europe/Volgograd" , 0x049ECA }, - { (char*) "Europe/Warsaw" , 0x04A1D9 }, - { (char*) "Europe/Zagreb" , 0x04A580 }, - { (char*) "Europe/Zaporozhye" , 0x04A76A }, - { (char*) "Europe/Zurich" , 0x04A9A4 }, - { (char*) "Factory" , 0x04ABA1 }, - { (char*) "GB" , 0x04AC1E }, - { (char*) "GB-Eire" , 0x04B269 }, - { (char*) "GMT" , 0x04B8B4 }, - { (char*) "GMT+0" , 0x04B92F }, - { (char*) "GMT-0" , 0x04B9AA }, - { (char*) "GMT0" , 0x04BA25 }, - { (char*) "Greenwich" , 0x04BAA0 }, - { (char*) "Hongkong" , 0x04BB1B }, - { (char*) "HST" , 0x04BE2E }, - { (char*) "Iceland" , 0x04BF17 }, - { (char*) "Indian/Antananarivo" , 0x04BFA5 }, - { (char*) "Indian/Chagos" , 0x04C051 }, - { (char*) "Indian/Christmas" , 0x04C0F5 }, - { (char*) "Indian/Cocos" , 0x04C186 }, - { (char*) "Indian/Comoro" , 0x04C21E }, - { (char*) "Indian/Kerguelen" , 0x04C2AD }, - { (char*) "Indian/Mahe" , 0x04C33E }, - { (char*) "Indian/Maldives" , 0x04C3CF }, - { (char*) "Indian/Mauritius" , 0x04C473 }, - { (char*) "Indian/Mayotte" , 0x04C532 }, - { (char*) "Indian/Reunion" , 0x04C5C1 }, - { (char*) "Iran" , 0x04C652 }, - { (char*) "Israel" , 0x04C98A }, - { (char*) "Jamaica" , 0x04CDC8 }, - { (char*) "Japan" , 0x04CF27 }, - { (char*) "Kwajalein" , 0x04D008 }, - { (char*) "Libya" , 0x04D0EF }, - { (char*) "MET" , 0x04D2AA }, - { (char*) "Mexico/BajaNorte" , 0x04D705 }, - { (char*) "Mexico/BajaSur" , 0x04DC68 }, - { (char*) "Mexico/General" , 0x04DF26 }, - { (char*) "MST" , 0x04E237 }, - { (char*) "MST7MDT" , 0x04E333 }, - { (char*) "Navajo" , 0x04E6D9 }, - { (char*) "NZ" , 0x04EAF7 }, - { (char*) "NZ-CHAT" , 0x04EF16 }, - { (char*) "Pacific/Apia" , 0x04F24A }, - { (char*) "Pacific/Auckland" , 0x04F3ED }, - { (char*) "Pacific/Bougainville" , 0x04F81F }, - { (char*) "Pacific/Chatham" , 0x04F900 }, - { (char*) "Pacific/Chuuk" , 0x04FC43 }, - { (char*) "Pacific/Easter" , 0x04FD21 }, - { (char*) "Pacific/Efate" , 0x0501D0 }, - { (char*) "Pacific/Enderbury" , 0x050332 }, - { (char*) "Pacific/Fakaofo" , 0x0503EA }, - { (char*) "Pacific/Fiji" , 0x05048F }, - { (char*) "Pacific/Funafuti" , 0x050627 }, - { (char*) "Pacific/Galapagos" , 0x0506B9 }, - { (char*) "Pacific/Gambier" , 0x050785 }, - { (char*) "Pacific/Guadalcanal" , 0x050824 }, - { (char*) "Pacific/Guam" , 0x0508B6 }, - { (char*) "Pacific/Honolulu" , 0x050A20 }, - { (char*) "Pacific/Johnston" , 0x050B0F }, - { (char*) "Pacific/Kanton" , 0x050BF8 }, - { (char*) "Pacific/Kiritimati" , 0x050CBF }, - { (char*) "Pacific/Kosrae" , 0x050D85 }, - { (char*) "Pacific/Kwajalein" , 0x050E89 }, - { (char*) "Pacific/Majuro" , 0x050F79 }, - { (char*) "Pacific/Marquesas" , 0x051077 }, - { (char*) "Pacific/Midway" , 0x05111F }, - { (char*) "Pacific/Nauru" , 0x0511E2 }, - { (char*) "Pacific/Niue" , 0x0512A5 }, - { (char*) "Pacific/Norfolk" , 0x05134B }, - { (char*) "Pacific/Noumea" , 0x051444 }, - { (char*) "Pacific/Pago_Pago" , 0x051516 }, - { (char*) "Pacific/Palau" , 0x0515B4 }, - { (char*) "Pacific/Pitcairn" , 0x051654 }, - { (char*) "Pacific/Pohnpei" , 0x0516F9 }, - { (char*) "Pacific/Ponape" , 0x0517E9 }, - { (char*) "Pacific/Port_Moresby" , 0x05187B }, - { (char*) "Pacific/Rarotonga" , 0x051939 }, - { (char*) "Pacific/Saipan" , 0x051ADB }, - { (char*) "Pacific/Samoa" , 0x051C3C }, - { (char*) "Pacific/Tahiti" , 0x051CDA }, - { (char*) "Pacific/Tarawa" , 0x051D7A }, - { (char*) "Pacific/Tongatapu" , 0x051E1B }, - { (char*) "Pacific/Truk" , 0x051F14 }, - { (char*) "Pacific/Wake" , 0x051FBA }, - { (char*) "Pacific/Wallis" , 0x052057 }, - { (char*) "Pacific/Yap" , 0x0520E9 }, - { (char*) "Poland" , 0x05218F }, - { (char*) "Portugal" , 0x052536 }, - { (char*) "PRC" , 0x052AF9 }, - { (char*) "PST8PDT" , 0x052C8E }, - { (char*) "ROC" , 0x053034 }, - { (char*) "ROK" , 0x05323F }, - { (char*) "Singapore" , 0x0533EA }, - { (char*) "Turkey" , 0x0534F6 }, - { (char*) "UCT" , 0x0539B2 }, - { (char*) "Universal" , 0x053A2D }, - { (char*) "US/Alaska" , 0x053AA8 }, - { (char*) "US/Aleutian" , 0x053E85 }, - { (char*) "US/Arizona" , 0x05425A }, - { (char*) "US/Central" , 0x054356 }, - { (char*) "US/East-Indiana" , 0x054A3C }, - { (char*) "US/Eastern" , 0x054C5B }, - { (char*) "US/Hawaii" , 0x055337 }, - { (char*) "US/Indiana-Starke" , 0x055420 }, - { (char*) "US/Michigan" , 0x055824 }, - { (char*) "US/Mountain" , 0x055BB3 }, - { (char*) "US/Pacific" , 0x055FD1 }, - { (char*) "US/Samoa" , 0x0564EB }, - { (char*) "UTC" , 0x056589 }, - { (char*) "W-SU" , 0x056604 }, - { (char*) "WET" , 0x05699C }, - { (char*) "Zulu" , 0x056F5F }, + { (char*) "America/Hermosillo" , 0x00FD35 }, + { (char*) "America/Indiana/Indianapolis" , 0x00FE49 }, + { (char*) "America/Indiana/Knox" , 0x010081 }, + { (char*) "America/Indiana/Marengo" , 0x01049A }, + { (char*) "America/Indiana/Petersburg" , 0x0106F4 }, + { (char*) "America/Indiana/Tell_City" , 0x0109BE }, + { (char*) "America/Indiana/Vevay" , 0x010BE8 }, + { (char*) "America/Indiana/Vincennes" , 0x010D7F }, + { (char*) "America/Indiana/Winamac" , 0x010FD5 }, + { (char*) "America/Indianapolis" , 0x011252 }, + { (char*) "America/Inuvik" , 0x011471 }, + { (char*) "America/Iqaluit" , 0x011914 }, + { (char*) "America/Jamaica" , 0x011C90 }, + { (char*) "America/Jujuy" , 0x011DEF }, + { (char*) "America/Juneau" , 0x0120AD }, + { (char*) "America/Kentucky/Louisville" , 0x012493 }, + { (char*) "America/Kentucky/Monticello" , 0x012997 }, + { (char*) "America/Knox_IN" , 0x012D83 }, + { (char*) "America/Kralendijk" , 0x013187 }, + { (char*) "America/La_Paz" , 0x013244 }, + { (char*) "America/Lima" , 0x0132FA }, + { (char*) "America/Los_Angeles" , 0x013421 }, + { (char*) "America/Louisville" , 0x013942 }, + { (char*) "America/Lower_Princes" , 0x013E28 }, + { (char*) "America/Maceio" , 0x013EE5 }, + { (char*) "America/Managua" , 0x0140F7 }, + { (char*) "America/Manaus" , 0x01422A }, + { (char*) "America/Marigot" , 0x0143E1 }, + { (char*) "America/Martinique" , 0x01449E }, + { (char*) "America/Matamoros" , 0x01455C }, + { (char*) "America/Mazatlan" , 0x014749 }, + { (char*) "America/Mendoza" , 0x014A39 }, + { (char*) "America/Menominee" , 0x014D09 }, + { (char*) "America/Merida" , 0x0150C9 }, + { (char*) "America/Metlakatla" , 0x015374 }, + { (char*) "America/Mexico_City" , 0x0155E1 }, + { (char*) "America/Miquelon" , 0x015900 }, + { (char*) "America/Moncton" , 0x015B32 }, + { (char*) "America/Monterrey" , 0x01612B }, + { (char*) "America/Montevideo" , 0x016432 }, + { (char*) "America/Montreal" , 0x016807 }, + { (char*) "America/Montserrat" , 0x016EC8 }, + { (char*) "America/Nassau" , 0x016F56 }, + { (char*) "America/New_York" , 0x017350 }, + { (char*) "America/Nipigon" , 0x017A40 }, + { (char*) "America/Nome" , 0x018101 }, + { (char*) "America/Noronha" , 0x0184E9 }, + { (char*) "America/North_Dakota/Beulah" , 0x0186E9 }, + { (char*) "America/North_Dakota/Center" , 0x018B1D }, + { (char*) "America/North_Dakota/New_Salem" , 0x018F1C }, + { (char*) "America/Nuuk" , 0x019321 }, + { (char*) "America/Ojinaga" , 0x019703 }, + { (char*) "America/Panama" , 0x0199F9 }, + { (char*) "America/Pangnirtung" , 0x019A9A }, + { (char*) "America/Paramaribo" , 0x019DFD }, + { (char*) "America/Phoenix" , 0x019EC4 }, + { (char*) "America/Port-au-Prince" , 0x019FD8 }, + { (char*) "America/Port_of_Spain" , 0x01A219 }, + { (char*) "America/Porto_Acre" , 0x01A2A7 }, + { (char*) "America/Porto_Velho" , 0x01A455 }, + { (char*) "America/Puerto_Rico" , 0x01A5F3 }, + { (char*) "America/Punta_Arenas" , 0x01A6B0 }, + { (char*) "America/Rainy_River" , 0x01AB8F }, + { (char*) "America/Rankin_Inlet" , 0x01B200 }, + { (char*) "America/Recife" , 0x01B549 }, + { (char*) "America/Regina" , 0x01B743 }, + { (char*) "America/Resolute" , 0x01B9E2 }, + { (char*) "America/Rio_Branco" , 0x01BD2C }, + { (char*) "America/Rosario" , 0x01BEDE }, + { (char*) "America/Santa_Isabel" , 0x01C1AE }, + { (char*) "America/Santarem" , 0x01C711 }, + { (char*) "America/Santiago" , 0x01C8C1 }, + { (char*) "America/Santo_Domingo" , 0x01CE24 }, + { (char*) "America/Sao_Paulo" , 0x01CF6D }, + { (char*) "America/Scoresbysund" , 0x01D367 }, + { (char*) "America/Shiprock" , 0x01D768 }, + { (char*) "America/Sitka" , 0x01DB86 }, + { (char*) "America/St_Barthelemy" , 0x01DF61 }, + { (char*) "America/St_Johns" , 0x01E01E }, + { (char*) "America/St_Kitts" , 0x01E79B }, + { (char*) "America/St_Lucia" , 0x01E829 }, + { (char*) "America/St_Thomas" , 0x01E8CA }, + { (char*) "America/St_Vincent" , 0x01E958 }, + { (char*) "America/Swift_Current" , 0x01E9F9 }, + { (char*) "America/Tegucigalpa" , 0x01EB87 }, + { (char*) "America/Thule" , 0x01EC55 }, + { (char*) "America/Thunder_Bay" , 0x01EE36 }, + { (char*) "America/Tijuana" , 0x01F4F7 }, + { (char*) "America/Toronto" , 0x01FA69 }, + { (char*) "America/Tortola" , 0x020148 }, + { (char*) "America/Vancouver" , 0x0201D6 }, + { (char*) "America/Virgin" , 0x020880 }, + { (char*) "America/Whitehorse" , 0x02093D }, + { (char*) "America/Winnipeg" , 0x020D60 }, + { (char*) "America/Yakutat" , 0x0213EF }, + { (char*) "America/Yellowknife" , 0x0217BD }, + { (char*) "Antarctica/Casey" , 0x021CEA }, + { (char*) "Antarctica/Davis" , 0x021E1A }, + { (char*) "Antarctica/DumontDUrville" , 0x021EF0 }, + { (char*) "Antarctica/Macquarie" , 0x021FA4 }, + { (char*) "Antarctica/Mawson" , 0x022390 }, + { (char*) "Antarctica/McMurdo" , 0x02243A }, + { (char*) "Antarctica/Palmer" , 0x02276C }, + { (char*) "Antarctica/Rothera" , 0x022AF5 }, + { (char*) "Antarctica/South_Pole" , 0x022B8C }, + { (char*) "Antarctica/Syowa" , 0x022FAB }, + { (char*) "Antarctica/Troll" , 0x023041 }, + { (char*) "Antarctica/Vostok" , 0x0230F0 }, + { (char*) "Arctic/Longyearbyen" , 0x0231AC }, + { (char*) "Asia/Aden" , 0x023479 }, + { (char*) "Asia/Almaty" , 0x02350A }, + { (char*) "Asia/Amman" , 0x023792 }, + { (char*) "Asia/Anadyr" , 0x023B3E }, + { (char*) "Asia/Aqtau" , 0x023E44 }, + { (char*) "Asia/Aqtobe" , 0x0240C3 }, + { (char*) "Asia/Ashgabat" , 0x024343 }, + { (char*) "Asia/Ashkhabad" , 0x0244C6 }, + { (char*) "Asia/Atyrau" , 0x024649 }, + { (char*) "Asia/Baghdad" , 0x0248D2 }, + { (char*) "Asia/Bahrain" , 0x024B54 }, + { (char*) "Asia/Baku" , 0x024C0D }, + { (char*) "Asia/Bangkok" , 0x024F01 }, + { (char*) "Asia/Barnaul" , 0x024FA5 }, + { (char*) "Asia/Beirut" , 0x0252B0 }, + { (char*) "Asia/Bishkek" , 0x025598 }, + { (char*) "Asia/Brunei" , 0x02580E }, + { (char*) "Asia/Calcutta" , 0x0258B4 }, + { (char*) "Asia/Chita" , 0x02599C }, + { (char*) "Asia/Choibalsan" , 0x025CAA }, + { (char*) "Asia/Chongqing" , 0x025F08 }, + { (char*) "Asia/Chungking" , 0x02609D }, + { (char*) "Asia/Colombo" , 0x026232 }, + { (char*) "Asia/Dacca" , 0x026335 }, + { (char*) "Asia/Damascus" , 0x026428 }, + { (char*) "Asia/Dhaka" , 0x026906 }, + { (char*) "Asia/Dili" , 0x0269F9 }, + { (char*) "Asia/Dubai" , 0x026AAF }, + { (char*) "Asia/Dushanbe" , 0x026B40 }, + { (char*) "Asia/Famagusta" , 0x026CBA }, + { (char*) "Asia/Gaza" , 0x027081 }, + { (char*) "Asia/Harbin" , 0x027C1D }, + { (char*) "Asia/Hebron" , 0x027DB2 }, + { (char*) "Asia/Ho_Chi_Minh" , 0x02895F }, + { (char*) "Asia/Hong_Kong" , 0x028A53 }, + { (char*) "Asia/Hovd" , 0x028D66 }, + { (char*) "Asia/Irkutsk" , 0x028FDA }, + { (char*) "Asia/Istanbul" , 0x0292F8 }, + { (char*) "Asia/Jakarta" , 0x0297B4 }, + { (char*) "Asia/Jayapura" , 0x0298C5 }, + { (char*) "Asia/Jerusalem" , 0x0299B2 }, + { (char*) "Asia/Kabul" , 0x029DF0 }, + { (char*) "Asia/Kamchatka" , 0x029E9B }, + { (char*) "Asia/Karachi" , 0x02A190 }, + { (char*) "Asia/Kashgar" , 0x02A2A6 }, + { (char*) "Asia/Kathmandu" , 0x02A337 }, + { (char*) "Asia/Katmandu" , 0x02A3E4 }, + { (char*) "Asia/Khandyga" , 0x02A491 }, + { (char*) "Asia/Kolkata" , 0x02A7C2 }, + { (char*) "Asia/Krasnoyarsk" , 0x02A8AA }, + { (char*) "Asia/Kuala_Lumpur" , 0x02ABB4 }, + { (char*) "Asia/Kuching" , 0x02ACD4 }, + { (char*) "Asia/Kuwait" , 0x02AE2E }, + { (char*) "Asia/Macao" , 0x02AEBF }, + { (char*) "Asia/Macau" , 0x02B1E2 }, + { (char*) "Asia/Magadan" , 0x02B505 }, + { (char*) "Asia/Makassar" , 0x02B810 }, + { (char*) "Asia/Manila" , 0x02B923 }, + { (char*) "Asia/Muscat" , 0x02BA41 }, + { (char*) "Asia/Nicosia" , 0x02BAD2 }, + { (char*) "Asia/Novokuznetsk" , 0x02BD41 }, + { (char*) "Asia/Novosibirsk" , 0x02C034 }, + { (char*) "Asia/Omsk" , 0x02C345 }, + { (char*) "Asia/Oral" , 0x02C643 }, + { (char*) "Asia/Phnom_Penh" , 0x02C8CF }, + { (char*) "Asia/Pontianak" , 0x02C99F }, + { (char*) "Asia/Pyongyang" , 0x02CAB8 }, + { (char*) "Asia/Qatar" , 0x02CB7B }, + { (char*) "Asia/Qostanay" , 0x02CC1F }, + { (char*) "Asia/Qyzylorda" , 0x02CEB5 }, + { (char*) "Asia/Rangoon" , 0x02D14E }, + { (char*) "Asia/Riyadh" , 0x02D215 }, + { (char*) "Asia/Saigon" , 0x02D2A6 }, + { (char*) "Asia/Sakhalin" , 0x02D39A }, + { (char*) "Asia/Samarkand" , 0x02D6B1 }, + { (char*) "Asia/Seoul" , 0x02D83C }, + { (char*) "Asia/Shanghai" , 0x02D9E7 }, + { (char*) "Asia/Singapore" , 0x02DB88 }, + { (char*) "Asia/Srednekolymsk" , 0x02DC94 }, + { (char*) "Asia/Taipei" , 0x02DFA4 }, + { (char*) "Asia/Tashkent" , 0x02E1AF }, + { (char*) "Asia/Tbilisi" , 0x02E33A }, + { (char*) "Asia/Tehran" , 0x02E5B2 }, + { (char*) "Asia/Tel_Aviv" , 0x02E8EA }, + { (char*) "Asia/Thimbu" , 0x02ED28 }, + { (char*) "Asia/Thimphu" , 0x02EDCE }, + { (char*) "Asia/Tokyo" , 0x02EE74 }, + { (char*) "Asia/Tomsk" , 0x02EF55 }, + { (char*) "Asia/Ujung_Pandang" , 0x02F260 }, + { (char*) "Asia/Ulaanbaatar" , 0x02F32A }, + { (char*) "Asia/Ulan_Bator" , 0x02F598 }, + { (char*) "Asia/Urumqi" , 0x02F7F6 }, + { (char*) "Asia/Ust-Nera" , 0x02F894 }, + { (char*) "Asia/Vientiane" , 0x02FBB7 }, + { (char*) "Asia/Vladivostok" , 0x02FC99 }, + { (char*) "Asia/Yakutsk" , 0x02FF9E }, + { (char*) "Asia/Yangon" , 0x0302A2 }, + { (char*) "Asia/Yekaterinburg" , 0x030369 }, + { (char*) "Asia/Yerevan" , 0x03067B }, + { (char*) "Atlantic/Azores" , 0x03094B }, + { (char*) "Atlantic/Bermuda" , 0x030ED6 }, + { (char*) "Atlantic/Canary" , 0x0312E2 }, + { (char*) "Atlantic/Cape_Verde" , 0x0314DA }, + { (char*) "Atlantic/Faeroe" , 0x031595 }, + { (char*) "Atlantic/Faroe" , 0x03175A }, + { (char*) "Atlantic/Jan_Mayen" , 0x03191F }, + { (char*) "Atlantic/Madeira" , 0x031BEC }, + { (char*) "Atlantic/Reykjavik" , 0x032163 }, + { (char*) "Atlantic/South_Georgia" , 0x032460 }, + { (char*) "Atlantic/St_Helena" , 0x0324F0 }, + { (char*) "Atlantic/Stanley" , 0x032591 }, + { (char*) "Australia/ACT" , 0x0328B2 }, + { (char*) "Australia/Adelaide" , 0x032C46 }, + { (char*) "Australia/Brisbane" , 0x032FFA }, + { (char*) "Australia/Broken_Hill" , 0x03313E }, + { (char*) "Australia/Canberra" , 0x033513 }, + { (char*) "Australia/Currie" , 0x0338A7 }, + { (char*) "Australia/Darwin" , 0x033C9E }, + { (char*) "Australia/Eucla" , 0x033DA6 }, + { (char*) "Australia/Hobart" , 0x033F05 }, + { (char*) "Australia/LHI" , 0x034304 }, + { (char*) "Australia/Lindeman" , 0x0345C4 }, + { (char*) "Australia/Lord_Howe" , 0x034734 }, + { (char*) "Australia/Melbourne" , 0x034A04 }, + { (char*) "Australia/North" , 0x034DA0 }, + { (char*) "Australia/NSW" , 0x034E96 }, + { (char*) "Australia/Perth" , 0x03522A }, + { (char*) "Australia/Queensland" , 0x035386 }, + { (char*) "Australia/South" , 0x0354B3 }, + { (char*) "Australia/Sydney" , 0x035858 }, + { (char*) "Australia/Tasmania" , 0x035C08 }, + { (char*) "Australia/Victoria" , 0x035FFF }, + { (char*) "Australia/West" , 0x036393 }, + { (char*) "Australia/Yancowinna" , 0x0364D1 }, + { (char*) "Brazil/Acre" , 0x03688A }, + { (char*) "Brazil/DeNoronha" , 0x036A38 }, + { (char*) "Brazil/East" , 0x036C28 }, + { (char*) "Brazil/West" , 0x036FEC }, + { (char*) "Canada/Atlantic" , 0x037194 }, + { (char*) "Canada/Central" , 0x037828 }, + { (char*) "Canada/Eastern" , 0x037E99 }, + { (char*) "Canada/Mountain" , 0x03855A }, + { (char*) "Canada/Newfoundland" , 0x038A87 }, + { (char*) "Canada/Pacific" , 0x0391E9 }, + { (char*) "Canada/Saskatchewan" , 0x03987E }, + { (char*) "Canada/Yukon" , 0x039B08 }, + { (char*) "CET" , 0x039F19 }, + { (char*) "Chile/Continental" , 0x03A374 }, + { (char*) "Chile/EasterIsland" , 0x03A8CA }, + { (char*) "CST6CDT" , 0x03AD6C }, + { (char*) "Cuba" , 0x03B112 }, + { (char*) "EET" , 0x03B677 }, + { (char*) "Egypt" , 0x03B92D }, + { (char*) "Eire" , 0x03BE56 }, + { (char*) "EST" , 0x03C43A }, + { (char*) "EST5EDT" , 0x03C4DB }, + { (char*) "Etc/GMT" , 0x03C881 }, + { (char*) "Etc/GMT+0" , 0x03C8FC }, + { (char*) "Etc/GMT+1" , 0x03C977 }, + { (char*) "Etc/GMT+10" , 0x03C9F4 }, + { (char*) "Etc/GMT+11" , 0x03CA72 }, + { (char*) "Etc/GMT+12" , 0x03CAF0 }, + { (char*) "Etc/GMT+2" , 0x03CB6E }, + { (char*) "Etc/GMT+3" , 0x03CBEB }, + { (char*) "Etc/GMT+4" , 0x03CC68 }, + { (char*) "Etc/GMT+5" , 0x03CCE5 }, + { (char*) "Etc/GMT+6" , 0x03CD62 }, + { (char*) "Etc/GMT+7" , 0x03CDDF }, + { (char*) "Etc/GMT+8" , 0x03CE5C }, + { (char*) "Etc/GMT+9" , 0x03CED9 }, + { (char*) "Etc/GMT-0" , 0x03CF56 }, + { (char*) "Etc/GMT-1" , 0x03CFD1 }, + { (char*) "Etc/GMT-10" , 0x03D04F }, + { (char*) "Etc/GMT-11" , 0x03D0CE }, + { (char*) "Etc/GMT-12" , 0x03D14D }, + { (char*) "Etc/GMT-13" , 0x03D1CC }, + { (char*) "Etc/GMT-14" , 0x03D24B }, + { (char*) "Etc/GMT-2" , 0x03D2CA }, + { (char*) "Etc/GMT-3" , 0x03D348 }, + { (char*) "Etc/GMT-4" , 0x03D3C6 }, + { (char*) "Etc/GMT-5" , 0x03D444 }, + { (char*) "Etc/GMT-6" , 0x03D4C2 }, + { (char*) "Etc/GMT-7" , 0x03D540 }, + { (char*) "Etc/GMT-8" , 0x03D5BE }, + { (char*) "Etc/GMT-9" , 0x03D63C }, + { (char*) "Etc/GMT0" , 0x03D6BA }, + { (char*) "Etc/Greenwich" , 0x03D735 }, + { (char*) "Etc/UCT" , 0x03D7B0 }, + { (char*) "Etc/Universal" , 0x03D82B }, + { (char*) "Etc/UTC" , 0x03D8A6 }, + { (char*) "Etc/Zulu" , 0x03D921 }, + { (char*) "Europe/Amsterdam" , 0x03D99C }, + { (char*) "Europe/Andorra" , 0x03DDD7 }, + { (char*) "Europe/Astrakhan" , 0x03DF68 }, + { (char*) "Europe/Athens" , 0x03E25C }, + { (char*) "Europe/Belfast" , 0x03E512 }, + { (char*) "Europe/Belgrade" , 0x03EB5D }, + { (char*) "Europe/Berlin" , 0x03ED47 }, + { (char*) "Europe/Bratislava" , 0x03F023 }, + { (char*) "Europe/Brussels" , 0x03F302 }, + { (char*) "Europe/Bucharest" , 0x03F75D }, + { (char*) "Europe/Budapest" , 0x03F9FE }, + { (char*) "Europe/Busingen" , 0x03FD08 }, + { (char*) "Europe/Chisinau" , 0x03FF0D }, + { (char*) "Europe/Copenhagen" , 0x0403D0 }, + { (char*) "Europe/Dublin" , 0x04064B }, + { (char*) "Europe/Gibraltar" , 0x040C2F }, + { (char*) "Europe/Guernsey" , 0x0410FF }, + { (char*) "Europe/Helsinki" , 0x041756 }, + { (char*) "Europe/Isle_of_Man" , 0x041943 }, + { (char*) "Europe/Istanbul" , 0x041F8E }, + { (char*) "Europe/Jersey" , 0x04244A }, + { (char*) "Europe/Kaliningrad" , 0x042AA1 }, + { (char*) "Europe/Kiev" , 0x042E49 }, + { (char*) "Europe/Kirov" , 0x043083 }, + { (char*) "Europe/Kyiv" , 0x04337C }, + { (char*) "Europe/Lisbon" , 0x0435C5 }, + { (char*) "Europe/Ljubljana" , 0x043B9B }, + { (char*) "Europe/London" , 0x043D85 }, + { (char*) "Europe/Luxembourg" , 0x0443D0 }, + { (char*) "Europe/Madrid" , 0x04481B }, + { (char*) "Europe/Malta" , 0x044BB8 }, + { (char*) "Europe/Mariehamn" , 0x044F64 }, + { (char*) "Europe/Minsk" , 0x045151 }, + { (char*) "Europe/Monaco" , 0x045485 }, + { (char*) "Europe/Moscow" , 0x0458EB }, + { (char*) "Europe/Nicosia" , 0x045C97 }, + { (char*) "Europe/Oslo" , 0x045EF8 }, + { (char*) "Europe/Paris" , 0x0461A8 }, + { (char*) "Europe/Podgorica" , 0x046605 }, + { (char*) "Europe/Prague" , 0x0467EF }, + { (char*) "Europe/Riga" , 0x046ACE }, + { (char*) "Europe/Rome" , 0x046D90 }, + { (char*) "Europe/Samara" , 0x04714F }, + { (char*) "Europe/San_Marino" , 0x047450 }, + { (char*) "Europe/Sarajevo" , 0x04780F }, + { (char*) "Europe/Saratov" , 0x0479F9 }, + { (char*) "Europe/Simferopol" , 0x047CEB }, + { (char*) "Europe/Skopje" , 0x04805E }, + { (char*) "Europe/Sofia" , 0x048248 }, + { (char*) "Europe/Stockholm" , 0x0484A4 }, + { (char*) "Europe/Tallinn" , 0x0486A1 }, + { (char*) "Europe/Tirane" , 0x048950 }, + { (char*) "Europe/Tiraspol" , 0x048BB8 }, + { (char*) "Europe/Ulyanovsk" , 0x04907B }, + { (char*) "Europe/Uzhgorod" , 0x049391 }, + { (char*) "Europe/Vaduz" , 0x0495CB }, + { (char*) "Europe/Vatican" , 0x0497B5 }, + { (char*) "Europe/Vienna" , 0x049B74 }, + { (char*) "Europe/Vilnius" , 0x049E12 }, + { (char*) "Europe/Volgograd" , 0x04A0C2 }, + { (char*) "Europe/Warsaw" , 0x04A3D1 }, + { (char*) "Europe/Zagreb" , 0x04A778 }, + { (char*) "Europe/Zaporozhye" , 0x04A962 }, + { (char*) "Europe/Zurich" , 0x04AB9C }, + { (char*) "Factory" , 0x04AD99 }, + { (char*) "GB" , 0x04AE16 }, + { (char*) "GB-Eire" , 0x04B461 }, + { (char*) "GMT" , 0x04BAAC }, + { (char*) "GMT+0" , 0x04BB27 }, + { (char*) "GMT-0" , 0x04BBA2 }, + { (char*) "GMT0" , 0x04BC1D }, + { (char*) "Greenwich" , 0x04BC98 }, + { (char*) "Hongkong" , 0x04BD13 }, + { (char*) "HST" , 0x04C026 }, + { (char*) "Iceland" , 0x04C10F }, + { (char*) "Indian/Antananarivo" , 0x04C19D }, + { (char*) "Indian/Chagos" , 0x04C249 }, + { (char*) "Indian/Christmas" , 0x04C2ED }, + { (char*) "Indian/Cocos" , 0x04C37E }, + { (char*) "Indian/Comoro" , 0x04C416 }, + { (char*) "Indian/Kerguelen" , 0x04C4A5 }, + { (char*) "Indian/Mahe" , 0x04C536 }, + { (char*) "Indian/Maldives" , 0x04C5C7 }, + { (char*) "Indian/Mauritius" , 0x04C66B }, + { (char*) "Indian/Mayotte" , 0x04C72A }, + { (char*) "Indian/Reunion" , 0x04C7B9 }, + { (char*) "Iran" , 0x04C84A }, + { (char*) "Israel" , 0x04CB82 }, + { (char*) "Jamaica" , 0x04CFC0 }, + { (char*) "Japan" , 0x04D11F }, + { (char*) "Kwajalein" , 0x04D200 }, + { (char*) "Libya" , 0x04D2E7 }, + { (char*) "MET" , 0x04D4A2 }, + { (char*) "Mexico/BajaNorte" , 0x04D8FD }, + { (char*) "Mexico/BajaSur" , 0x04DE60 }, + { (char*) "Mexico/General" , 0x04E11E }, + { (char*) "MST" , 0x04E42F }, + { (char*) "MST7MDT" , 0x04E52B }, + { (char*) "Navajo" , 0x04E8D1 }, + { (char*) "NZ" , 0x04ECEF }, + { (char*) "NZ-CHAT" , 0x04F10E }, + { (char*) "Pacific/Apia" , 0x04F442 }, + { (char*) "Pacific/Auckland" , 0x04F5E5 }, + { (char*) "Pacific/Bougainville" , 0x04FA17 }, + { (char*) "Pacific/Chatham" , 0x04FAF8 }, + { (char*) "Pacific/Chuuk" , 0x04FE3B }, + { (char*) "Pacific/Easter" , 0x04FF19 }, + { (char*) "Pacific/Efate" , 0x0503C8 }, + { (char*) "Pacific/Enderbury" , 0x05052A }, + { (char*) "Pacific/Fakaofo" , 0x0505E2 }, + { (char*) "Pacific/Fiji" , 0x050687 }, + { (char*) "Pacific/Funafuti" , 0x05081F }, + { (char*) "Pacific/Galapagos" , 0x0508B1 }, + { (char*) "Pacific/Gambier" , 0x05097D }, + { (char*) "Pacific/Guadalcanal" , 0x050A1C }, + { (char*) "Pacific/Guam" , 0x050AAE }, + { (char*) "Pacific/Honolulu" , 0x050C18 }, + { (char*) "Pacific/Johnston" , 0x050D07 }, + { (char*) "Pacific/Kanton" , 0x050DF0 }, + { (char*) "Pacific/Kiritimati" , 0x050EB7 }, + { (char*) "Pacific/Kosrae" , 0x050F7D }, + { (char*) "Pacific/Kwajalein" , 0x051081 }, + { (char*) "Pacific/Majuro" , 0x051171 }, + { (char*) "Pacific/Marquesas" , 0x05126F }, + { (char*) "Pacific/Midway" , 0x051317 }, + { (char*) "Pacific/Nauru" , 0x0513DA }, + { (char*) "Pacific/Niue" , 0x05149D }, + { (char*) "Pacific/Norfolk" , 0x051543 }, + { (char*) "Pacific/Noumea" , 0x05163C }, + { (char*) "Pacific/Pago_Pago" , 0x05170E }, + { (char*) "Pacific/Palau" , 0x0517AC }, + { (char*) "Pacific/Pitcairn" , 0x05184C }, + { (char*) "Pacific/Pohnpei" , 0x0518F1 }, + { (char*) "Pacific/Ponape" , 0x0519E1 }, + { (char*) "Pacific/Port_Moresby" , 0x051A73 }, + { (char*) "Pacific/Rarotonga" , 0x051B31 }, + { (char*) "Pacific/Saipan" , 0x051CD3 }, + { (char*) "Pacific/Samoa" , 0x051E34 }, + { (char*) "Pacific/Tahiti" , 0x051ED2 }, + { (char*) "Pacific/Tarawa" , 0x051F72 }, + { (char*) "Pacific/Tongatapu" , 0x052013 }, + { (char*) "Pacific/Truk" , 0x05210C }, + { (char*) "Pacific/Wake" , 0x0521B2 }, + { (char*) "Pacific/Wallis" , 0x05224F }, + { (char*) "Pacific/Yap" , 0x0522E1 }, + { (char*) "Poland" , 0x052387 }, + { (char*) "Portugal" , 0x05272E }, + { (char*) "PRC" , 0x052CF1 }, + { (char*) "PST8PDT" , 0x052E86 }, + { (char*) "ROC" , 0x05322C }, + { (char*) "ROK" , 0x053437 }, + { (char*) "Singapore" , 0x0535E2 }, + { (char*) "Turkey" , 0x0536EE }, + { (char*) "UCT" , 0x053BAA }, + { (char*) "Universal" , 0x053C25 }, + { (char*) "US/Alaska" , 0x053CA0 }, + { (char*) "US/Aleutian" , 0x05407D }, + { (char*) "US/Arizona" , 0x054452 }, + { (char*) "US/Central" , 0x05454E }, + { (char*) "US/East-Indiana" , 0x054C34 }, + { (char*) "US/Eastern" , 0x054E53 }, + { (char*) "US/Hawaii" , 0x05552F }, + { (char*) "US/Indiana-Starke" , 0x055618 }, + { (char*) "US/Michigan" , 0x055A1C }, + { (char*) "US/Mountain" , 0x055DAB }, + { (char*) "US/Pacific" , 0x0561C9 }, + { (char*) "US/Samoa" , 0x0566E3 }, + { (char*) "UTC" , 0x056781 }, + { (char*) "W-SU" , 0x0567FC }, + { (char*) "WET" , 0x056B94 }, + { (char*) "Zulu" , 0x057157 }, }; -const unsigned char timelib_timezone_db_data_builtin[356314] = { +const unsigned char timelib_timezone_db_data_builtin[356818] = { /* Africa/Abidjan */ 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1809,8 +1809,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x9A, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x33, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x97, 0xFF, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x5E, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x1E, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xC5, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x70, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xF8, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x06, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x7D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x8E, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xD7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x35, 0xB0, 0x00, @@ -2650,8 +2650,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x9A, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x33, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x97, 0xFF, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x5E, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x1E, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xC5, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x70, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xF8, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x06, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x7D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x8E, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xD7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x35, 0xB0, 0x00, @@ -2765,8 +2765,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x9A, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x33, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x97, 0xFF, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x5E, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x1E, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xC5, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x70, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xF8, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x06, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x7D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x8E, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xD7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x35, 0xB0, 0x00, @@ -2881,8 +2881,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xEC, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xA8, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x41, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x0D, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x6C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x72, 0x40, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x2C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x7E, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x06, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x14, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x8B, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x9C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xE5, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x43, 0xC0, 0x00, @@ -3102,8 +3102,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xEC, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xA8, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x41, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x0D, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x6C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x72, 0x40, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x2C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x7E, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x06, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x14, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x8B, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x9C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xE5, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x43, 0xC0, 0x00, @@ -3687,8 +3687,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xEC, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xA8, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x41, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x0D, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x6C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x72, 0x40, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x2C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x7E, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x06, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x14, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x8B, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x9C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xE5, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x43, 0xC0, 0x00, @@ -4141,8 +4141,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xFA, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xB6, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x4F, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x1B, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x7A, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x80, 0x50, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x3A, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x48, 0x50, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xEE, 0xD0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x8C, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x48, 0x50, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xEF, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xEE, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x14, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x22, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x99, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0xAA, 0x50, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xF3, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x51, 0xD0, 0x00, @@ -4406,8 +4406,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x9A, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x33, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x97, 0xFF, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x5E, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x1E, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xC5, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x70, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xF8, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x06, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x7D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x8E, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xD7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x35, 0xB0, 0x00, @@ -4898,7 +4898,7 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6A, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x69, 0x87, 0x28, 0xB8, 0xFF, 0xFF, 0xFF, 0xFF, 0xAC, 0x62, 0xC2, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0xD3, 0x94, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x74, 0x5D, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x5B, 0x66, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0xD3, 0x51, 0x40, 0xFF, @@ -4951,19 +4951,35 @@ 0x00, 0x00, 0x00, 0x49, 0xB3, 0x50, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xDB, 0x50, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0x6D, 0x50, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xF7, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x85, 0x89, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xBF, 0x4E, 0xD0, 0x00, -0x00, 0x00, 0x00, 0x4F, 0x77, 0xE0, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x95, 0xF6, 0x50, 0x01, +0x00, 0x00, 0x00, 0x4F, 0x77, 0xE0, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x95, 0xF6, 0x50, 0x00, +0x00, 0x00, 0x00, 0x51, 0x3C, 0x13, 0x50, 0x00, 0x00, 0x00, 0x00, 0x52, 0x75, 0xD8, 0x50, 0x00, +0x00, 0x00, 0x00, 0x53, 0x1B, 0xF5, 0x50, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xBA, 0x50, 0x00, +0x00, 0x00, 0x00, 0x54, 0xFB, 0xD7, 0x50, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0x9C, 0x50, 0x00, +0x00, 0x00, 0x00, 0x56, 0xE4, 0xF3, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xB8, 0xD0, 0x00, +0x00, 0x00, 0x00, 0x58, 0xC4, 0xD5, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0x9A, 0xD0, 0x00, +0x00, 0x00, 0x00, 0x5A, 0xA4, 0xB7, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0x7C, 0xD0, 0x00, +0x00, 0x00, 0x00, 0x5C, 0x84, 0x99, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x5E, 0xD0, 0x00, +0x00, 0x00, 0x00, 0x5E, 0x64, 0x7B, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x40, 0xD0, 0x00, +0x00, 0x00, 0x00, 0x60, 0x4D, 0x98, 0x50, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x5D, 0x50, 0x00, +0x00, 0x00, 0x00, 0x62, 0x2D, 0x7A, 0x50, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x3F, 0x50, 0x00, +0x00, 0x00, 0x00, 0x64, 0x0D, 0x5C, 0x50, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x21, 0x50, 0x00, +0x00, 0x00, 0x00, 0x65, 0xED, 0x3E, 0x50, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x03, 0x50, 0x00, +0x00, 0x00, 0x00, 0x67, 0xCD, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, 0x69, 0x06, 0xE5, 0x50, 0x00, +0x00, 0x00, 0x00, 0x69, 0xAD, 0x02, 0x50, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xCF, 0xE3, 0xD0, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, -0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0xFF, 0xFF, 0xB2, 0xC8, 0x00, 0x00, 0xFF, -0xFF, 0xB2, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, -0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, -0x00, 0x0A, 0x43, 0x53, 0x54, 0x35, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, -0x2F, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x2F, 0x31, 0x0A, 0x00, 0xAC, 0xA0, -0xB5, 0x00, 0x94, 0xFA, 0x05, 0x00, 0x00, 0x00, 0x00, +0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, +0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, +0x03, 0x02, 0x03, 0x02, 0x03, 0xFF, 0xFF, 0xB2, 0xC8, 0x00, 0x00, 0xFF, 0xFF, 0xB2, 0xC0, 0x00, +0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0x4C, 0x4D, 0x54, +0x00, 0x48, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x0A, 0x43, 0x53, +0x54, 0x35, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2F, 0x30, 0x2C, 0x4D, +0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x2F, 0x31, 0x0A, 0x00, 0xAC, 0xA0, 0xB5, 0x00, 0x94, 0xFA, +0x05, 0x00, 0x00, 0x00, 0x00, /* America/Hermosillo */ 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -6090,8 +6106,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x9A, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x33, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x97, 0xFF, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x5E, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x1E, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xC5, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x70, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xF8, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x06, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x7D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x8E, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xD7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x35, 0xB0, 0x00, @@ -6148,8 +6164,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xEC, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xA8, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x41, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x0D, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x6C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x72, 0x40, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x2C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x7E, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x06, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x14, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x8B, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x9C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xE5, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x43, 0xC0, 0x00, @@ -7267,8 +7283,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xD0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x8C, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x25, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x97, 0xF1, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x50, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x56, 0x20, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x10, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x1E, 0x20, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xB7, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xC4, 0xA0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x62, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x1E, 0x20, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xC5, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xC4, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xEA, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEB, 0xF8, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x6F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x80, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x27, 0xA0, 0x00, @@ -7775,8 +7791,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xFA, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xB6, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x4F, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x1B, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x7A, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x80, 0x50, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x3A, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x48, 0x50, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xEE, 0xD0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x8C, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x48, 0x50, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xEF, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xEE, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x14, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x22, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x99, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0xAA, 0x50, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xF3, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x51, 0xD0, 0x00, @@ -7804,8 +7820,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xEC, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xA8, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x41, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x0D, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x6C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x72, 0x40, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x2C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x7E, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x06, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x14, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x8B, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x9C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xE5, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x43, 0xC0, 0x00, @@ -8087,8 +8103,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x9A, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x33, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x97, 0xFF, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x5E, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x1E, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xC5, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x70, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xF8, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x06, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x7D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x8E, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xD7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x35, 0xB0, 0x00, @@ -8220,8 +8236,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xFA, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xB6, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x4F, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x1B, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x7A, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x80, 0x50, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x3A, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x48, 0x50, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xEE, 0xD0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x8C, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x48, 0x50, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xEF, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xEE, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x14, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x22, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x99, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0xAA, 0x50, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xF3, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x51, 0xD0, 0x00, @@ -8387,8 +8403,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xEC, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xA8, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x41, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x0D, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x6C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x72, 0x40, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x2C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x7E, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x06, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x14, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x8B, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x9C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xE5, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x43, 0xC0, 0x00, @@ -8529,8 +8545,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x9A, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x33, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x5A, 0x09, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x5E, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x1E, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xC5, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x70, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xF8, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x06, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x7D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x8E, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xD7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x35, 0xB0, 0x00, @@ -15506,8 +15522,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xFA, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xB6, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x4F, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x1B, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x7A, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x80, 0x50, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x3A, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x48, 0x50, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xEE, 0xD0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x8C, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x48, 0x50, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xEF, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xEE, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x14, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x22, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x99, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0xAA, 0x50, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xF3, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x51, 0xD0, 0x00, @@ -15535,8 +15551,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xD0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x8C, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x25, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x97, 0xF1, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x50, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x56, 0x20, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x10, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x1E, 0x20, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xB7, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xC4, 0xA0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x62, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x1E, 0x20, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xC5, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xC4, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xEA, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEB, 0xF8, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x6F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x80, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x27, 0xA0, 0x00, @@ -15569,8 +15585,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x9A, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x33, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x5A, 0x09, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x5E, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x1E, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xC5, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x70, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xF8, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x06, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x7D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x8E, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xD7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x35, 0xB0, 0x00, @@ -15632,8 +15648,8 @@ 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xEC, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xA8, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x41, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x0D, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x6C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x72, 0x40, 0xFF, -0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x2C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, +0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x7E, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x06, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x14, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x8B, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x9C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xE5, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x43, 0xC0, 0x00, @@ -16700,7 +16716,7 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6A, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x69, 0x87, 0x28, 0xB8, 0xFF, 0xFF, 0xFF, 0xFF, 0xAC, 0x62, 0xC2, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0xD3, 0x94, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x74, 0x5D, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x5B, 0x66, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0xD3, 0x51, 0x40, 0xFF, @@ -16753,19 +16769,35 @@ 0x00, 0x00, 0x00, 0x49, 0xB3, 0x50, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xDB, 0x50, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0x6D, 0x50, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xF7, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x85, 0x89, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xBF, 0x4E, 0xD0, 0x00, -0x00, 0x00, 0x00, 0x4F, 0x77, 0xE0, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x95, 0xF6, 0x50, 0x01, +0x00, 0x00, 0x00, 0x4F, 0x77, 0xE0, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x95, 0xF6, 0x50, 0x00, +0x00, 0x00, 0x00, 0x51, 0x3C, 0x13, 0x50, 0x00, 0x00, 0x00, 0x00, 0x52, 0x75, 0xD8, 0x50, 0x00, +0x00, 0x00, 0x00, 0x53, 0x1B, 0xF5, 0x50, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xBA, 0x50, 0x00, +0x00, 0x00, 0x00, 0x54, 0xFB, 0xD7, 0x50, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0x9C, 0x50, 0x00, +0x00, 0x00, 0x00, 0x56, 0xE4, 0xF3, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xB8, 0xD0, 0x00, +0x00, 0x00, 0x00, 0x58, 0xC4, 0xD5, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0x9A, 0xD0, 0x00, +0x00, 0x00, 0x00, 0x5A, 0xA4, 0xB7, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0x7C, 0xD0, 0x00, +0x00, 0x00, 0x00, 0x5C, 0x84, 0x99, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x5E, 0xD0, 0x00, +0x00, 0x00, 0x00, 0x5E, 0x64, 0x7B, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x40, 0xD0, 0x00, +0x00, 0x00, 0x00, 0x60, 0x4D, 0x98, 0x50, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x5D, 0x50, 0x00, +0x00, 0x00, 0x00, 0x62, 0x2D, 0x7A, 0x50, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x3F, 0x50, 0x00, +0x00, 0x00, 0x00, 0x64, 0x0D, 0x5C, 0x50, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x21, 0x50, 0x00, +0x00, 0x00, 0x00, 0x65, 0xED, 0x3E, 0x50, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x03, 0x50, 0x00, +0x00, 0x00, 0x00, 0x67, 0xCD, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, 0x69, 0x06, 0xE5, 0x50, 0x00, +0x00, 0x00, 0x00, 0x69, 0xAD, 0x02, 0x50, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xCF, 0xE3, 0xD0, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, -0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0xFF, 0xFF, 0xB2, 0xC8, 0x00, 0x00, 0xFF, -0xFF, 0xB2, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, -0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, -0x00, 0x0A, 0x43, 0x53, 0x54, 0x35, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, -0x2F, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x2F, 0x31, 0x0A, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, +0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, +0x03, 0x02, 0x03, 0x02, 0x03, 0xFF, 0xFF, 0xB2, 0xC8, 0x00, 0x00, 0xFF, 0xFF, 0xB2, 0xC0, 0x00, +0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0x4C, 0x4D, 0x54, +0x00, 0x48, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x0A, 0x43, 0x53, +0x54, 0x35, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2F, 0x30, 0x2C, 0x4D, +0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x2F, 0x31, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, /* EET */ 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -24504,481 +24536,481 @@ { (char*) "America/Guyana" , 0x0192B4 }, { (char*) "America/Halifax" , 0x0193B8 }, { (char*) "America/Havana" , 0x01A142 }, - { (char*) "America/Hermosillo" , 0x01AABE }, - { (char*) "America/Indiana/Indianapolis" , 0x01AC54 }, - { (char*) "America/Indiana/Knox" , 0x01B30B }, - { (char*) "America/Indiana/Marengo" , 0x01BCB8 }, - { (char*) "America/Indiana/Petersburg" , 0x01C3A5 }, - { (char*) "America/Indiana/Tell_City" , 0x01CB44 }, - { (char*) "America/Indiana/Vevay" , 0x01D208 }, - { (char*) "America/Indiana/Vincennes" , 0x01D7C4 }, - { (char*) "America/Indiana/Winamac" , 0x01DE9A }, - { (char*) "America/Indianapolis" , 0x01E5BE }, - { (char*) "America/Inuvik" , 0x01EC5C }, - { (char*) "America/Iqaluit" , 0x01F35F }, - { (char*) "America/Jamaica" , 0x01FC1E }, - { (char*) "America/Jujuy" , 0x01FE0C }, - { (char*) "America/Juneau" , 0x020222 }, - { (char*) "America/Kentucky/Louisville" , 0x020B73 }, - { (char*) "America/Kentucky/Monticello" , 0x021681 }, - { (char*) "America/Knox_IN" , 0x021FE1 }, - { (char*) "America/Kralendijk" , 0x022979 }, - { (char*) "America/La_Paz" , 0x022A7B }, - { (char*) "America/Lima" , 0x022B61 }, - { (char*) "America/Los_Angeles" , 0x022CF5 }, - { (char*) "America/Louisville" , 0x02382C }, - { (char*) "America/Lower_Princes" , 0x02431C }, - { (char*) "America/Maceio" , 0x02441E }, - { (char*) "America/Managua" , 0x024714 }, - { (char*) "America/Manaus" , 0x0248CE }, - { (char*) "America/Marigot" , 0x024B37 }, - { (char*) "America/Martinique" , 0x024C39 }, - { (char*) "America/Matamoros" , 0x024D2D }, - { (char*) "America/Mazatlan" , 0x0252EF }, - { (char*) "America/Mendoza" , 0x025751 }, - { (char*) "America/Menominee" , 0x025B83 }, - { (char*) "America/Merida" , 0x026490 }, - { (char*) "America/Metlakatla" , 0x026899 }, - { (char*) "America/Mexico_City" , 0x026E4B }, - { (char*) "America/Miquelon" , 0x02732B }, - { (char*) "America/Moncton" , 0x0279AB }, - { (char*) "America/Monterrey" , 0x028621 }, - { (char*) "America/Montevideo" , 0x028ABD }, - { (char*) "America/Montreal" , 0x0290A1 }, - { (char*) "America/Montserrat" , 0x029E53 }, - { (char*) "America/Nassau" , 0x029EF3 }, - { (char*) "America/New_York" , 0x02A853 }, - { (char*) "America/Nipigon" , 0x02B653 }, - { (char*) "America/Nome" , 0x02C405 }, - { (char*) "America/Noronha" , 0x02CD5D }, - { (char*) "America/North_Dakota/Beulah" , 0x02D037 }, - { (char*) "America/North_Dakota/Center" , 0x02D9B4 }, - { (char*) "America/North_Dakota/New_Salem" , 0x02E331 }, - { (char*) "America/Nuuk" , 0x02ECB4 }, - { (char*) "America/Ojinaga" , 0x02F432 }, - { (char*) "America/Panama" , 0x02FA4E }, - { (char*) "America/Pangnirtung" , 0x02FB10 }, - { (char*) "America/Paramaribo" , 0x0303B6 }, - { (char*) "America/Phoenix" , 0x0304BA }, - { (char*) "America/Port-au-Prince" , 0x030646 }, - { (char*) "America/Port_of_Spain" , 0x030BEC }, - { (char*) "America/Porto_Acre" , 0x030C8C }, - { (char*) "America/Porto_Velho" , 0x030EFE }, - { (char*) "America/Puerto_Rico" , 0x031144 }, - { (char*) "America/Punta_Arenas" , 0x031246 }, - { (char*) "America/Rainy_River" , 0x0319D1 }, - { (char*) "America/Rankin_Inlet" , 0x0323E3 }, - { (char*) "America/Recife" , 0x032C17 }, - { (char*) "America/Regina" , 0x032EEB }, - { (char*) "America/Resolute" , 0x0332E0 }, - { (char*) "America/Rio_Branco" , 0x033B15 }, - { (char*) "America/Rosario" , 0x033D8B }, - { (char*) "America/Santa_Isabel" , 0x0341BD }, - { (char*) "America/Santarem" , 0x034D23 }, - { (char*) "America/Santiago" , 0x034F86 }, - { (char*) "America/Santo_Domingo" , 0x035972 }, - { (char*) "America/Sao_Paulo" , 0x035B48 }, - { (char*) "America/Scoresbysund" , 0x036120 }, - { (char*) "America/Shiprock" , 0x0368D8 }, - { (char*) "America/Sitka" , 0x037280 }, - { (char*) "America/St_Barthelemy" , 0x037BB8 }, - { (char*) "America/St_Johns" , 0x037CBA }, - { (char*) "America/St_Kitts" , 0x038B28 }, - { (char*) "America/St_Lucia" , 0x038BC8 }, - { (char*) "America/St_Thomas" , 0x038C8A }, - { (char*) "America/St_Vincent" , 0x038D2A }, - { (char*) "America/Swift_Current" , 0x038DEC }, - { (char*) "America/Tegucigalpa" , 0x03903A }, - { (char*) "America/Thule" , 0x039142 }, - { (char*) "America/Thunder_Bay" , 0x03973A }, - { (char*) "America/Tijuana" , 0x03A4EC }, - { (char*) "America/Toronto" , 0x03B061 }, - { (char*) "America/Tortola" , 0x03BE31 }, - { (char*) "America/Vancouver" , 0x03BED1 }, - { (char*) "America/Virgin" , 0x03C910 }, - { (char*) "America/Whitehorse" , 0x03CA12 }, - { (char*) "America/Winnipeg" , 0x03D07E }, - { (char*) "America/Yakutat" , 0x03DAAE }, - { (char*) "America/Yellowknife" , 0x03E3CB }, - { (char*) "Antarctica/Casey" , 0x03EBC5 }, - { (char*) "Antarctica/Davis" , 0x03ED7D }, - { (char*) "Antarctica/DumontDUrville" , 0x03EEA9 }, - { (char*) "Antarctica/Macquarie" , 0x03EF79 }, - { (char*) "Antarctica/Mawson" , 0x03F869 }, - { (char*) "Antarctica/McMurdo" , 0x03F934 }, - { (char*) "Antarctica/Palmer" , 0x04012F }, - { (char*) "Antarctica/Rothera" , 0x0406BD }, - { (char*) "Antarctica/South_Pole" , 0x040766 }, - { (char*) "Antarctica/Syowa" , 0x0410F7 }, - { (char*) "Antarctica/Troll" , 0x04119F }, - { (char*) "Antarctica/Vostok" , 0x04162C }, - { (char*) "Arctic/Longyearbyen" , 0x041713 }, - { (char*) "Asia/Aden" , 0x042019 }, - { (char*) "Asia/Almaty" , 0x0420BC }, - { (char*) "Asia/Amman" , 0x0424B1 }, - { (char*) "Asia/Anadyr" , 0x042A56 }, - { (char*) "Asia/Aqtau" , 0x042F0B }, - { (char*) "Asia/Aqtobe" , 0x0432F5 }, - { (char*) "Asia/Ashgabat" , 0x0436F3 }, - { (char*) "Asia/Ashkhabad" , 0x04395C }, - { (char*) "Asia/Atyrau" , 0x043BC5 }, - { (char*) "Asia/Baghdad" , 0x043FB7 }, - { (char*) "Asia/Bahrain" , 0x04438C }, - { (char*) "Asia/Baku" , 0x044477 }, - { (char*) "Asia/Bangkok" , 0x044940 }, - { (char*) "Asia/Barnaul" , 0x044A05 }, - { (char*) "Asia/Beirut" , 0x044ED6 }, - { (char*) "Asia/Bishkek" , 0x04574C }, - { (char*) "Asia/Brunei" , 0x045B21 }, - { (char*) "Asia/Calcutta" , 0x045BEA }, - { (char*) "Asia/Chita" , 0x045D13 }, - { (char*) "Asia/Choibalsan" , 0x0461EA }, - { (char*) "Asia/Chongqing" , 0x046563 }, - { (char*) "Asia/Chungking" , 0x0467A0 }, - { (char*) "Asia/Colombo" , 0x0469DD }, - { (char*) "Asia/Dacca" , 0x046B4F }, - { (char*) "Asia/Damascus" , 0x046C9E }, - { (char*) "Asia/Dhaka" , 0x0473FB }, - { (char*) "Asia/Dili" , 0x04754A }, - { (char*) "Asia/Dubai" , 0x047657 }, - { (char*) "Asia/Dushanbe" , 0x0476FA }, - { (char*) "Asia/Famagusta" , 0x047947 }, - { (char*) "Asia/Gaza" , 0x04814E }, - { (char*) "Asia/Harbin" , 0x049068 }, - { (char*) "Asia/Hebron" , 0x0492A5 }, - { (char*) "Asia/Ho_Chi_Minh" , 0x04A1DA }, - { (char*) "Asia/Hong_Kong" , 0x04A32F }, - { (char*) "Asia/Hovd" , 0x04A80C }, - { (char*) "Asia/Irkutsk" , 0x04AB9B }, - { (char*) "Asia/Istanbul" , 0x04B08E }, - { (char*) "Asia/Jakarta" , 0x04B827 }, - { (char*) "Asia/Jayapura" , 0x04B9BF }, - { (char*) "Asia/Jerusalem" , 0x04BADE }, - { (char*) "Asia/Kabul" , 0x04C43E }, - { (char*) "Asia/Kamchatka" , 0x04C50C }, - { (char*) "Asia/Karachi" , 0x04C9AA }, - { (char*) "Asia/Kashgar" , 0x04CB31 }, - { (char*) "Asia/Kathmandu" , 0x04CBD4 }, - { (char*) "Asia/Katmandu" , 0x04CCA6 }, - { (char*) "Asia/Khandyga" , 0x04CD78 }, - { (char*) "Asia/Kolkata" , 0x04D28B }, - { (char*) "Asia/Krasnoyarsk" , 0x04D3B4 }, - { (char*) "Asia/Kuala_Lumpur" , 0x04D882 }, - { (char*) "Asia/Kuching" , 0x04DA33 }, - { (char*) "Asia/Kuwait" , 0x04DC22 }, - { (char*) "Asia/Macao" , 0x04DCC5 }, - { (char*) "Asia/Macau" , 0x04E19C }, - { (char*) "Asia/Magadan" , 0x04E673 }, - { (char*) "Asia/Makassar" , 0x04EB47 }, - { (char*) "Asia/Manila" , 0x04EC9A }, - { (char*) "Asia/Muscat" , 0x04EE4C }, - { (char*) "Asia/Nicosia" , 0x04EEEF }, - { (char*) "Asia/Novokuznetsk" , 0x04F6DB }, - { (char*) "Asia/Novosibirsk" , 0x04FB77 }, - { (char*) "Asia/Omsk" , 0x05004E }, - { (char*) "Asia/Oral" , 0x050510 }, - { (char*) "Asia/Phnom_Penh" , 0x05090A }, - { (char*) "Asia/Pontianak" , 0x050A27 }, - { (char*) "Asia/Pyongyang" , 0x050BAA }, - { (char*) "Asia/Qatar" , 0x050CA3 }, - { (char*) "Asia/Qostanay" , 0x050D68 }, - { (char*) "Asia/Qyzylorda" , 0x05118F }, - { (char*) "Asia/Rangoon" , 0x0515AB }, - { (char*) "Asia/Riyadh" , 0x0516B5 }, - { (char*) "Asia/Saigon" , 0x051758 }, - { (char*) "Asia/Sakhalin" , 0x0518AD }, - { (char*) "Asia/Samarkand" , 0x051D75 }, - { (char*) "Asia/Seoul" , 0x051FC5 }, - { (char*) "Asia/Shanghai" , 0x05223A }, - { (char*) "Asia/Singapore" , 0x052483 }, - { (char*) "Asia/Srednekolymsk" , 0x052620 }, - { (char*) "Asia/Taipei" , 0x052AF4 }, - { (char*) "Asia/Tashkent" , 0x052DF9 }, - { (char*) "Asia/Tbilisi" , 0x053057 }, - { (char*) "Asia/Tehran" , 0x053452 }, - { (char*) "Asia/Tel_Aviv" , 0x05393E }, - { (char*) "Asia/Thimbu" , 0x05429E }, - { (char*) "Asia/Thimphu" , 0x054367 }, - { (char*) "Asia/Tokyo" , 0x054430 }, - { (char*) "Asia/Tomsk" , 0x054571 }, - { (char*) "Asia/Ujung_Pandang" , 0x054A42 }, - { (char*) "Asia/Ulaanbaatar" , 0x054B4C }, - { (char*) "Asia/Ulan_Bator" , 0x054ED5 }, - { (char*) "Asia/Urumqi" , 0x05524E }, - { (char*) "Asia/Ust-Nera" , 0x0552FE }, - { (char*) "Asia/Vientiane" , 0x0557F4 }, - { (char*) "Asia/Vladivostok" , 0x05592D }, - { (char*) "Asia/Yakutsk" , 0x055DF6 }, - { (char*) "Asia/Yangon" , 0x0562BE }, - { (char*) "Asia/Yekaterinburg" , 0x0563C8 }, - { (char*) "Asia/Yerevan" , 0x0568AF }, - { (char*) "Atlantic/Azores" , 0x056D2C }, - { (char*) "Atlantic/Bermuda" , 0x057AB0 }, - { (char*) "Atlantic/Canary" , 0x058418 }, - { (char*) "Atlantic/Cape_Verde" , 0x058B9B }, - { (char*) "Atlantic/Faeroe" , 0x058CA7 }, - { (char*) "Atlantic/Faroe" , 0x0593CA }, - { (char*) "Atlantic/Jan_Mayen" , 0x059AED }, - { (char*) "Atlantic/Madeira" , 0x05A3F3 }, - { (char*) "Atlantic/Reykjavik" , 0x05B13F }, - { (char*) "Atlantic/South_Georgia" , 0x05B5D5 }, - { (char*) "Atlantic/St_Helena" , 0x05B677 }, - { (char*) "Atlantic/Stanley" , 0x05B739 }, - { (char*) "Australia/ACT" , 0x05BBF5 }, - { (char*) "Australia/Adelaide" , 0x05C48F }, - { (char*) "Australia/Brisbane" , 0x05CD4A }, - { (char*) "Australia/Broken_Hill" , 0x05CF10 }, - { (char*) "Australia/Canberra" , 0x05D7ED }, - { (char*) "Australia/Currie" , 0x05E087 }, - { (char*) "Australia/Darwin" , 0x05E9C9 }, - { (char*) "Australia/Eucla" , 0x05EB2C }, - { (char*) "Australia/Hobart" , 0x05ED19 }, - { (char*) "Australia/LHI" , 0x05F663 }, - { (char*) "Australia/Lindeman" , 0x05FDA5 }, - { (char*) "Australia/Lord_Howe" , 0x05FFAB }, - { (char*) "Australia/Melbourne" , 0x0606FD }, - { (char*) "Australia/North" , 0x060F9F }, - { (char*) "Australia/NSW" , 0x0610F0 }, - { (char*) "Australia/Perth" , 0x06198A }, - { (char*) "Australia/Queensland" , 0x061B72 }, - { (char*) "Australia/South" , 0x061D21 }, - { (char*) "Australia/Sydney" , 0x0625CD }, - { (char*) "Australia/Tasmania" , 0x062E83 }, - { (char*) "Australia/Victoria" , 0x0637C5 }, - { (char*) "Australia/West" , 0x06405F }, - { (char*) "Australia/Yancowinna" , 0x064229 }, - { (char*) "Brazil/Acre" , 0x064AEA }, - { (char*) "Brazil/DeNoronha" , 0x064D5C }, - { (char*) "Brazil/East" , 0x065026 }, - { (char*) "Brazil/West" , 0x0655C8 }, - { (char*) "Canada/Atlantic" , 0x065822 }, - { (char*) "Canada/Central" , 0x06658E }, - { (char*) "Canada/Eastern" , 0x066FA0 }, - { (char*) "Canada/Mountain" , 0x067D52 }, - { (char*) "Canada/Newfoundland" , 0x06854C }, - { (char*) "Canada/Pacific" , 0x06939F }, - { (char*) "Canada/Saskatchewan" , 0x069DC9 }, - { (char*) "Canada/Yukon" , 0x06A1A9 }, - { (char*) "CET" , 0x06A803 }, - { (char*) "Chile/Continental" , 0x06B384 }, - { (char*) "Chile/EasterIsland" , 0x06BD63 }, - { (char*) "CST6CDT" , 0x06C61A }, - { (char*) "Cuba" , 0x06CEEE }, - { (char*) "EET" , 0x06D86A }, - { (char*) "Egypt" , 0x06E14C }, - { (char*) "Eire" , 0x06EAB7 }, - { (char*) "EST" , 0x06F867 }, - { (char*) "EST5EDT" , 0x06F929 }, - { (char*) "Etc/GMT" , 0x0701FD }, - { (char*) "Etc/GMT+0" , 0x07027B }, - { (char*) "Etc/GMT+1" , 0x0702F9 }, - { (char*) "Etc/GMT+10" , 0x070379 }, - { (char*) "Etc/GMT+11" , 0x0703FA }, - { (char*) "Etc/GMT+12" , 0x07047B }, - { (char*) "Etc/GMT+2" , 0x0704FC }, - { (char*) "Etc/GMT+3" , 0x07057C }, - { (char*) "Etc/GMT+4" , 0x0705FC }, - { (char*) "Etc/GMT+5" , 0x07067C }, - { (char*) "Etc/GMT+6" , 0x0706FC }, - { (char*) "Etc/GMT+7" , 0x07077C }, - { (char*) "Etc/GMT+8" , 0x0707FC }, - { (char*) "Etc/GMT+9" , 0x07087C }, - { (char*) "Etc/GMT-0" , 0x0708FC }, - { (char*) "Etc/GMT-1" , 0x07097A }, - { (char*) "Etc/GMT-10" , 0x0709FB }, - { (char*) "Etc/GMT-11" , 0x070A7D }, - { (char*) "Etc/GMT-12" , 0x070AFF }, - { (char*) "Etc/GMT-13" , 0x070B81 }, - { (char*) "Etc/GMT-14" , 0x070C03 }, - { (char*) "Etc/GMT-2" , 0x070C85 }, - { (char*) "Etc/GMT-3" , 0x070D06 }, - { (char*) "Etc/GMT-4" , 0x070D87 }, - { (char*) "Etc/GMT-5" , 0x070E08 }, - { (char*) "Etc/GMT-6" , 0x070E89 }, - { (char*) "Etc/GMT-7" , 0x070F0A }, - { (char*) "Etc/GMT-8" , 0x070F8B }, - { (char*) "Etc/GMT-9" , 0x07100C }, - { (char*) "Etc/GMT0" , 0x07108D }, - { (char*) "Etc/Greenwich" , 0x07110B }, - { (char*) "Etc/UCT" , 0x071189 }, - { (char*) "Etc/Universal" , 0x071207 }, - { (char*) "Etc/UTC" , 0x071285 }, - { (char*) "Etc/Zulu" , 0x071303 }, - { (char*) "Europe/Amsterdam" , 0x071381 }, - { (char*) "Europe/Andorra" , 0x071EEB }, - { (char*) "Europe/Astrakhan" , 0x0725C5 }, - { (char*) "Europe/Athens" , 0x072A62 }, - { (char*) "Europe/Belfast" , 0x073344 }, - { (char*) "Europe/Belgrade" , 0x0741A0 }, - { (char*) "Europe/Berlin" , 0x07492C }, - { (char*) "Europe/Bratislava" , 0x075241 }, - { (char*) "Europe/Brussels" , 0x075B4A }, - { (char*) "Europe/Bucharest" , 0x0766CB }, - { (char*) "Europe/Budapest" , 0x076F5F }, - { (char*) "Europe/Busingen" , 0x0778AB }, - { (char*) "Europe/Chisinau" , 0x078034 }, - { (char*) "Europe/Copenhagen" , 0x0789B8 }, - { (char*) "Europe/Dublin" , 0x07921D }, - { (char*) "Europe/Gibraltar" , 0x079FCD }, - { (char*) "Europe/Guernsey" , 0x07ABD5 }, - { (char*) "Europe/Helsinki" , 0x07BA75 }, - { (char*) "Europe/Isle_of_Man" , 0x07C1ED }, - { (char*) "Europe/Istanbul" , 0x07D039 }, - { (char*) "Europe/Jersey" , 0x07D7D2 }, - { (char*) "Europe/Kaliningrad" , 0x07E672 }, - { (char*) "Europe/Kiev" , 0x07EC67 }, - { (char*) "Europe/Kirov" , 0x07F4BB }, - { (char*) "Europe/Kyiv" , 0x07F976 }, - { (char*) "Europe/Lisbon" , 0x0801D9 }, - { (char*) "Europe/Ljubljana" , 0x080FBF }, - { (char*) "Europe/London" , 0x08174B }, - { (char*) "Europe/Luxembourg" , 0x0825A7 }, - { (char*) "Europe/Madrid" , 0x083135 }, - { (char*) "Europe/Malta" , 0x083B87 }, - { (char*) "Europe/Mariehamn" , 0x0845CF }, - { (char*) "Europe/Minsk" , 0x084D47 }, - { (char*) "Europe/Monaco" , 0x08526E }, - { (char*) "Europe/Moscow" , 0x085DFA }, - { (char*) "Europe/Nicosia" , 0x086419 }, - { (char*) "Europe/Oslo" , 0x086BF7 }, - { (char*) "Europe/Paris" , 0x0874B7 }, - { (char*) "Europe/Podgorica" , 0x088055 }, - { (char*) "Europe/Prague" , 0x0887E1 }, - { (char*) "Europe/Riga" , 0x0890EA }, - { (char*) "Europe/Rome" , 0x08998C }, - { (char*) "Europe/Samara" , 0x08A3E9 }, - { (char*) "Europe/San_Marino" , 0x08A8BF }, - { (char*) "Europe/Sarajevo" , 0x08B31C }, - { (char*) "Europe/Saratov" , 0x08BAA8 }, - { (char*) "Europe/Simferopol" , 0x08BF55 }, - { (char*) "Europe/Skopje" , 0x08C524 }, - { (char*) "Europe/Sofia" , 0x08CCB0 }, - { (char*) "Europe/Stockholm" , 0x08D4D9 }, - { (char*) "Europe/Tallinn" , 0x08DC5A }, - { (char*) "Europe/Tirane" , 0x08E4CA }, - { (char*) "Europe/Tiraspol" , 0x08ECFA }, - { (char*) "Europe/Ulyanovsk" , 0x08F67E }, - { (char*) "Europe/Uzhgorod" , 0x08FB81 }, - { (char*) "Europe/Vaduz" , 0x0903D5 }, - { (char*) "Europe/Vatican" , 0x090B41 }, - { (char*) "Europe/Vienna" , 0x09159E }, - { (char*) "Europe/Vilnius" , 0x091E42 }, - { (char*) "Europe/Volgograd" , 0x0926C0 }, - { (char*) "Europe/Warsaw" , 0x092B87 }, - { (char*) "Europe/Zagreb" , 0x0935F1 }, - { (char*) "Europe/Zaporozhye" , 0x093D7D }, - { (char*) "Europe/Zurich" , 0x0945D1 }, - { (char*) "Factory" , 0x094D52 }, - { (char*) "GB" , 0x094DD2 }, - { (char*) "GB-Eire" , 0x095C2E }, - { (char*) "GMT" , 0x096A8A }, - { (char*) "GMT+0" , 0x096B08 }, - { (char*) "GMT-0" , 0x096B86 }, - { (char*) "GMT0" , 0x096C04 }, - { (char*) "Greenwich" , 0x096C82 }, - { (char*) "Hongkong" , 0x096D00 }, - { (char*) "HST" , 0x0971DD }, - { (char*) "Iceland" , 0x097332 }, - { (char*) "Indian/Antananarivo" , 0x0973D2 }, - { (char*) "Indian/Chagos" , 0x0974B9 }, - { (char*) "Indian/Christmas" , 0x09757E }, - { (char*) "Indian/Cocos" , 0x097621 }, - { (char*) "Indian/Comoro" , 0x0976CD }, - { (char*) "Indian/Kerguelen" , 0x09776E }, - { (char*) "Indian/Mahe" , 0x097811 }, - { (char*) "Indian/Maldives" , 0x0978B4 }, - { (char*) "Indian/Mauritius" , 0x097979 }, - { (char*) "Indian/Mayotte" , 0x097A68 }, - { (char*) "Indian/Reunion" , 0x097B09 }, - { (char*) "Iran" , 0x097BAC }, - { (char*) "Israel" , 0x098098 }, - { (char*) "Jamaica" , 0x0989F8 }, - { (char*) "Japan" , 0x098BE6 }, - { (char*) "Kwajalein" , 0x098D27 }, - { (char*) "Libya" , 0x098E61 }, - { (char*) "MET" , 0x0990DE }, - { (char*) "Mexico/BajaNorte" , 0x099C5F }, - { (char*) "Mexico/BajaSur" , 0x09A7C5 }, - { (char*) "Mexico/General" , 0x09ABF5 }, - { (char*) "MST" , 0x09B0C7 }, - { (char*) "MST7MDT" , 0x09B23B }, - { (char*) "Navajo" , 0x09BB0F }, - { (char*) "NZ" , 0x09C4B7 }, - { (char*) "NZ-CHAT" , 0x09CE48 }, - { (char*) "Pacific/Apia" , 0x09D65A }, - { (char*) "Pacific/Auckland" , 0x09D8BC }, - { (char*) "Pacific/Bougainville" , 0x09E260 }, - { (char*) "Pacific/Chatham" , 0x09E376 }, - { (char*) "Pacific/Chuuk" , 0x09EB97 }, - { (char*) "Pacific/Easter" , 0x09ECB1 }, - { (char*) "Pacific/Efate" , 0x09F575 }, - { (char*) "Pacific/Enderbury" , 0x09F78D }, - { (char*) "Pacific/Fakaofo" , 0x09F875 }, - { (char*) "Pacific/Fiji" , 0x09F93B }, - { (char*) "Pacific/Funafuti" , 0x09FB7B }, - { (char*) "Pacific/Galapagos" , 0x09FC1F }, - { (char*) "Pacific/Gambier" , 0x09FD1C }, - { (char*) "Pacific/Guadalcanal" , 0x09FDCD }, - { (char*) "Pacific/Guam" , 0x09FE71 }, - { (char*) "Pacific/Honolulu" , 0x0A006B }, - { (char*) "Pacific/Johnston" , 0x0A01C6 }, - { (char*) "Pacific/Kanton" , 0x0A031B }, - { (char*) "Pacific/Kiritimati" , 0x0A0412 }, - { (char*) "Pacific/Kosrae" , 0x0A050A }, - { (char*) "Pacific/Kwajalein" , 0x0A066D }, - { (char*) "Pacific/Majuro" , 0x0A07B0 }, - { (char*) "Pacific/Marquesas" , 0x0A08FC }, - { (char*) "Pacific/Midway" , 0x0A09B8 }, - { (char*) "Pacific/Nauru" , 0x0A0AAB }, - { (char*) "Pacific/Niue" , 0x0A0BA5 }, - { (char*) "Pacific/Norfolk" , 0x0A0C6E }, - { (char*) "Pacific/Noumea" , 0x0A0FDC }, - { (char*) "Pacific/Pago_Pago" , 0x0A110A }, - { (char*) "Pacific/Palau" , 0x0A11C5 }, - { (char*) "Pacific/Pitcairn" , 0x0A1277 }, - { (char*) "Pacific/Pohnpei" , 0x0A133F }, - { (char*) "Pacific/Ponape" , 0x0A147A }, - { (char*) "Pacific/Port_Moresby" , 0x0A151E }, - { (char*) "Pacific/Rarotonga" , 0x0A15EE }, - { (char*) "Pacific/Saipan" , 0x0A1847 }, - { (char*) "Pacific/Samoa" , 0x0A1A33 }, - { (char*) "Pacific/Tahiti" , 0x0A1AEE }, - { (char*) "Pacific/Tarawa" , 0x0A1BA0 }, - { (char*) "Pacific/Tongatapu" , 0x0A1C53 }, - { (char*) "Pacific/Truk" , 0x0A1DC5 }, - { (char*) "Pacific/Wake" , 0x0A1E7D }, - { (char*) "Pacific/Wallis" , 0x0A1F2C }, - { (char*) "Pacific/Yap" , 0x0A1FD0 }, - { (char*) "Poland" , 0x0A2088 }, - { (char*) "Portugal" , 0x0A2AF2 }, - { (char*) "PRC" , 0x0A38C5 }, - { (char*) "PST8PDT" , 0x0A3B02 }, - { (char*) "ROC" , 0x0A43D6 }, - { (char*) "ROK" , 0x0A46DB }, - { (char*) "Singapore" , 0x0A4950 }, - { (char*) "Turkey" , 0x0A4AED }, - { (char*) "UCT" , 0x0A5286 }, - { (char*) "Universal" , 0x0A5304 }, - { (char*) "US/Alaska" , 0x0A5382 }, - { (char*) "US/Aleutian" , 0x0A5CD1 }, - { (char*) "US/Arizona" , 0x0A6611 }, - { (char*) "US/Central" , 0x0A6785 }, - { (char*) "US/East-Indiana" , 0x0A7599 }, - { (char*) "US/Eastern" , 0x0A7C37 }, - { (char*) "US/Hawaii" , 0x0A8A23 }, - { (char*) "US/Indiana-Starke" , 0x0A8B78 }, - { (char*) "US/Michigan" , 0x0A9510 }, - { (char*) "US/Mountain" , 0x0A9DD2 }, - { (char*) "US/Pacific" , 0x0AA77A }, - { (char*) "US/Samoa" , 0x0AB2AA }, - { (char*) "UTC" , 0x0AB365 }, - { (char*) "W-SU" , 0x0AB3E3 }, - { (char*) "WET" , 0x0AB9EE }, - { (char*) "Zulu" , 0x0AC7C1 }, + { (char*) "America/Hermosillo" , 0x01AAA2 }, + { (char*) "America/Indiana/Indianapolis" , 0x01AC38 }, + { (char*) "America/Indiana/Knox" , 0x01B2EF }, + { (char*) "America/Indiana/Marengo" , 0x01BC9C }, + { (char*) "America/Indiana/Petersburg" , 0x01C389 }, + { (char*) "America/Indiana/Tell_City" , 0x01CB28 }, + { (char*) "America/Indiana/Vevay" , 0x01D1EC }, + { (char*) "America/Indiana/Vincennes" , 0x01D7A8 }, + { (char*) "America/Indiana/Winamac" , 0x01DE7E }, + { (char*) "America/Indianapolis" , 0x01E5A2 }, + { (char*) "America/Inuvik" , 0x01EC40 }, + { (char*) "America/Iqaluit" , 0x01F343 }, + { (char*) "America/Jamaica" , 0x01FC02 }, + { (char*) "America/Jujuy" , 0x01FDF0 }, + { (char*) "America/Juneau" , 0x020206 }, + { (char*) "America/Kentucky/Louisville" , 0x020B57 }, + { (char*) "America/Kentucky/Monticello" , 0x021665 }, + { (char*) "America/Knox_IN" , 0x021FC5 }, + { (char*) "America/Kralendijk" , 0x02295D }, + { (char*) "America/La_Paz" , 0x022A5F }, + { (char*) "America/Lima" , 0x022B45 }, + { (char*) "America/Los_Angeles" , 0x022CD9 }, + { (char*) "America/Louisville" , 0x023810 }, + { (char*) "America/Lower_Princes" , 0x024300 }, + { (char*) "America/Maceio" , 0x024402 }, + { (char*) "America/Managua" , 0x0246F8 }, + { (char*) "America/Manaus" , 0x0248B2 }, + { (char*) "America/Marigot" , 0x024B1B }, + { (char*) "America/Martinique" , 0x024C1D }, + { (char*) "America/Matamoros" , 0x024D11 }, + { (char*) "America/Mazatlan" , 0x0252D3 }, + { (char*) "America/Mendoza" , 0x025735 }, + { (char*) "America/Menominee" , 0x025B67 }, + { (char*) "America/Merida" , 0x026474 }, + { (char*) "America/Metlakatla" , 0x02687D }, + { (char*) "America/Mexico_City" , 0x026E2F }, + { (char*) "America/Miquelon" , 0x02730F }, + { (char*) "America/Moncton" , 0x02798F }, + { (char*) "America/Monterrey" , 0x028605 }, + { (char*) "America/Montevideo" , 0x028AA1 }, + { (char*) "America/Montreal" , 0x029085 }, + { (char*) "America/Montserrat" , 0x029E37 }, + { (char*) "America/Nassau" , 0x029ED7 }, + { (char*) "America/New_York" , 0x02A837 }, + { (char*) "America/Nipigon" , 0x02B637 }, + { (char*) "America/Nome" , 0x02C3E9 }, + { (char*) "America/Noronha" , 0x02CD41 }, + { (char*) "America/North_Dakota/Beulah" , 0x02D01B }, + { (char*) "America/North_Dakota/Center" , 0x02D998 }, + { (char*) "America/North_Dakota/New_Salem" , 0x02E315 }, + { (char*) "America/Nuuk" , 0x02EC98 }, + { (char*) "America/Ojinaga" , 0x02F416 }, + { (char*) "America/Panama" , 0x02FA32 }, + { (char*) "America/Pangnirtung" , 0x02FAF4 }, + { (char*) "America/Paramaribo" , 0x03039A }, + { (char*) "America/Phoenix" , 0x03049E }, + { (char*) "America/Port-au-Prince" , 0x03062A }, + { (char*) "America/Port_of_Spain" , 0x030BD0 }, + { (char*) "America/Porto_Acre" , 0x030C70 }, + { (char*) "America/Porto_Velho" , 0x030EE2 }, + { (char*) "America/Puerto_Rico" , 0x031128 }, + { (char*) "America/Punta_Arenas" , 0x03122A }, + { (char*) "America/Rainy_River" , 0x0319B5 }, + { (char*) "America/Rankin_Inlet" , 0x0323C7 }, + { (char*) "America/Recife" , 0x032BFB }, + { (char*) "America/Regina" , 0x032ECF }, + { (char*) "America/Resolute" , 0x0332C4 }, + { (char*) "America/Rio_Branco" , 0x033AF9 }, + { (char*) "America/Rosario" , 0x033D6F }, + { (char*) "America/Santa_Isabel" , 0x0341A1 }, + { (char*) "America/Santarem" , 0x034D07 }, + { (char*) "America/Santiago" , 0x034F6A }, + { (char*) "America/Santo_Domingo" , 0x035956 }, + { (char*) "America/Sao_Paulo" , 0x035B2C }, + { (char*) "America/Scoresbysund" , 0x036104 }, + { (char*) "America/Shiprock" , 0x0368BC }, + { (char*) "America/Sitka" , 0x037264 }, + { (char*) "America/St_Barthelemy" , 0x037B9C }, + { (char*) "America/St_Johns" , 0x037C9E }, + { (char*) "America/St_Kitts" , 0x038B0C }, + { (char*) "America/St_Lucia" , 0x038BAC }, + { (char*) "America/St_Thomas" , 0x038C6E }, + { (char*) "America/St_Vincent" , 0x038D0E }, + { (char*) "America/Swift_Current" , 0x038DD0 }, + { (char*) "America/Tegucigalpa" , 0x03901E }, + { (char*) "America/Thule" , 0x039126 }, + { (char*) "America/Thunder_Bay" , 0x03971E }, + { (char*) "America/Tijuana" , 0x03A4D0 }, + { (char*) "America/Toronto" , 0x03B045 }, + { (char*) "America/Tortola" , 0x03BE15 }, + { (char*) "America/Vancouver" , 0x03BEB5 }, + { (char*) "America/Virgin" , 0x03C8F4 }, + { (char*) "America/Whitehorse" , 0x03C9F6 }, + { (char*) "America/Winnipeg" , 0x03D062 }, + { (char*) "America/Yakutat" , 0x03DA92 }, + { (char*) "America/Yellowknife" , 0x03E3AF }, + { (char*) "Antarctica/Casey" , 0x03EBA9 }, + { (char*) "Antarctica/Davis" , 0x03ED61 }, + { (char*) "Antarctica/DumontDUrville" , 0x03EE8D }, + { (char*) "Antarctica/Macquarie" , 0x03EF5D }, + { (char*) "Antarctica/Mawson" , 0x03F84D }, + { (char*) "Antarctica/McMurdo" , 0x03F918 }, + { (char*) "Antarctica/Palmer" , 0x040113 }, + { (char*) "Antarctica/Rothera" , 0x0406A1 }, + { (char*) "Antarctica/South_Pole" , 0x04074A }, + { (char*) "Antarctica/Syowa" , 0x0410DB }, + { (char*) "Antarctica/Troll" , 0x041183 }, + { (char*) "Antarctica/Vostok" , 0x041610 }, + { (char*) "Arctic/Longyearbyen" , 0x0416F7 }, + { (char*) "Asia/Aden" , 0x041FFD }, + { (char*) "Asia/Almaty" , 0x0420A0 }, + { (char*) "Asia/Amman" , 0x042495 }, + { (char*) "Asia/Anadyr" , 0x042A3A }, + { (char*) "Asia/Aqtau" , 0x042EEF }, + { (char*) "Asia/Aqtobe" , 0x0432D9 }, + { (char*) "Asia/Ashgabat" , 0x0436D7 }, + { (char*) "Asia/Ashkhabad" , 0x043940 }, + { (char*) "Asia/Atyrau" , 0x043BA9 }, + { (char*) "Asia/Baghdad" , 0x043F9B }, + { (char*) "Asia/Bahrain" , 0x044370 }, + { (char*) "Asia/Baku" , 0x04445B }, + { (char*) "Asia/Bangkok" , 0x044924 }, + { (char*) "Asia/Barnaul" , 0x0449E9 }, + { (char*) "Asia/Beirut" , 0x044EBA }, + { (char*) "Asia/Bishkek" , 0x045730 }, + { (char*) "Asia/Brunei" , 0x045B05 }, + { (char*) "Asia/Calcutta" , 0x045BCE }, + { (char*) "Asia/Chita" , 0x045CF7 }, + { (char*) "Asia/Choibalsan" , 0x0461CE }, + { (char*) "Asia/Chongqing" , 0x046547 }, + { (char*) "Asia/Chungking" , 0x046784 }, + { (char*) "Asia/Colombo" , 0x0469C1 }, + { (char*) "Asia/Dacca" , 0x046B33 }, + { (char*) "Asia/Damascus" , 0x046C82 }, + { (char*) "Asia/Dhaka" , 0x0473DF }, + { (char*) "Asia/Dili" , 0x04752E }, + { (char*) "Asia/Dubai" , 0x04763B }, + { (char*) "Asia/Dushanbe" , 0x0476DE }, + { (char*) "Asia/Famagusta" , 0x04792B }, + { (char*) "Asia/Gaza" , 0x048132 }, + { (char*) "Asia/Harbin" , 0x04904C }, + { (char*) "Asia/Hebron" , 0x049289 }, + { (char*) "Asia/Ho_Chi_Minh" , 0x04A1BE }, + { (char*) "Asia/Hong_Kong" , 0x04A313 }, + { (char*) "Asia/Hovd" , 0x04A7F0 }, + { (char*) "Asia/Irkutsk" , 0x04AB7F }, + { (char*) "Asia/Istanbul" , 0x04B072 }, + { (char*) "Asia/Jakarta" , 0x04B80B }, + { (char*) "Asia/Jayapura" , 0x04B9A3 }, + { (char*) "Asia/Jerusalem" , 0x04BAC2 }, + { (char*) "Asia/Kabul" , 0x04C422 }, + { (char*) "Asia/Kamchatka" , 0x04C4F0 }, + { (char*) "Asia/Karachi" , 0x04C98E }, + { (char*) "Asia/Kashgar" , 0x04CB15 }, + { (char*) "Asia/Kathmandu" , 0x04CBB8 }, + { (char*) "Asia/Katmandu" , 0x04CC8A }, + { (char*) "Asia/Khandyga" , 0x04CD5C }, + { (char*) "Asia/Kolkata" , 0x04D26F }, + { (char*) "Asia/Krasnoyarsk" , 0x04D398 }, + { (char*) "Asia/Kuala_Lumpur" , 0x04D866 }, + { (char*) "Asia/Kuching" , 0x04DA17 }, + { (char*) "Asia/Kuwait" , 0x04DC06 }, + { (char*) "Asia/Macao" , 0x04DCA9 }, + { (char*) "Asia/Macau" , 0x04E180 }, + { (char*) "Asia/Magadan" , 0x04E657 }, + { (char*) "Asia/Makassar" , 0x04EB2B }, + { (char*) "Asia/Manila" , 0x04EC7E }, + { (char*) "Asia/Muscat" , 0x04EE30 }, + { (char*) "Asia/Nicosia" , 0x04EED3 }, + { (char*) "Asia/Novokuznetsk" , 0x04F6BF }, + { (char*) "Asia/Novosibirsk" , 0x04FB5B }, + { (char*) "Asia/Omsk" , 0x050032 }, + { (char*) "Asia/Oral" , 0x0504F4 }, + { (char*) "Asia/Phnom_Penh" , 0x0508EE }, + { (char*) "Asia/Pontianak" , 0x050A0B }, + { (char*) "Asia/Pyongyang" , 0x050B8E }, + { (char*) "Asia/Qatar" , 0x050C87 }, + { (char*) "Asia/Qostanay" , 0x050D4C }, + { (char*) "Asia/Qyzylorda" , 0x051173 }, + { (char*) "Asia/Rangoon" , 0x05158F }, + { (char*) "Asia/Riyadh" , 0x051699 }, + { (char*) "Asia/Saigon" , 0x05173C }, + { (char*) "Asia/Sakhalin" , 0x051891 }, + { (char*) "Asia/Samarkand" , 0x051D59 }, + { (char*) "Asia/Seoul" , 0x051FA9 }, + { (char*) "Asia/Shanghai" , 0x05221E }, + { (char*) "Asia/Singapore" , 0x052467 }, + { (char*) "Asia/Srednekolymsk" , 0x052604 }, + { (char*) "Asia/Taipei" , 0x052AD8 }, + { (char*) "Asia/Tashkent" , 0x052DDD }, + { (char*) "Asia/Tbilisi" , 0x05303B }, + { (char*) "Asia/Tehran" , 0x053436 }, + { (char*) "Asia/Tel_Aviv" , 0x053922 }, + { (char*) "Asia/Thimbu" , 0x054282 }, + { (char*) "Asia/Thimphu" , 0x05434B }, + { (char*) "Asia/Tokyo" , 0x054414 }, + { (char*) "Asia/Tomsk" , 0x054555 }, + { (char*) "Asia/Ujung_Pandang" , 0x054A26 }, + { (char*) "Asia/Ulaanbaatar" , 0x054B30 }, + { (char*) "Asia/Ulan_Bator" , 0x054EB9 }, + { (char*) "Asia/Urumqi" , 0x055232 }, + { (char*) "Asia/Ust-Nera" , 0x0552E2 }, + { (char*) "Asia/Vientiane" , 0x0557D8 }, + { (char*) "Asia/Vladivostok" , 0x055911 }, + { (char*) "Asia/Yakutsk" , 0x055DDA }, + { (char*) "Asia/Yangon" , 0x0562A2 }, + { (char*) "Asia/Yekaterinburg" , 0x0563AC }, + { (char*) "Asia/Yerevan" , 0x056893 }, + { (char*) "Atlantic/Azores" , 0x056D10 }, + { (char*) "Atlantic/Bermuda" , 0x057A94 }, + { (char*) "Atlantic/Canary" , 0x0583FC }, + { (char*) "Atlantic/Cape_Verde" , 0x058B7F }, + { (char*) "Atlantic/Faeroe" , 0x058C8B }, + { (char*) "Atlantic/Faroe" , 0x0593AE }, + { (char*) "Atlantic/Jan_Mayen" , 0x059AD1 }, + { (char*) "Atlantic/Madeira" , 0x05A3D7 }, + { (char*) "Atlantic/Reykjavik" , 0x05B123 }, + { (char*) "Atlantic/South_Georgia" , 0x05B5B9 }, + { (char*) "Atlantic/St_Helena" , 0x05B65B }, + { (char*) "Atlantic/Stanley" , 0x05B71D }, + { (char*) "Australia/ACT" , 0x05BBD9 }, + { (char*) "Australia/Adelaide" , 0x05C473 }, + { (char*) "Australia/Brisbane" , 0x05CD2E }, + { (char*) "Australia/Broken_Hill" , 0x05CEF4 }, + { (char*) "Australia/Canberra" , 0x05D7D1 }, + { (char*) "Australia/Currie" , 0x05E06B }, + { (char*) "Australia/Darwin" , 0x05E9AD }, + { (char*) "Australia/Eucla" , 0x05EB10 }, + { (char*) "Australia/Hobart" , 0x05ECFD }, + { (char*) "Australia/LHI" , 0x05F647 }, + { (char*) "Australia/Lindeman" , 0x05FD89 }, + { (char*) "Australia/Lord_Howe" , 0x05FF8F }, + { (char*) "Australia/Melbourne" , 0x0606E1 }, + { (char*) "Australia/North" , 0x060F83 }, + { (char*) "Australia/NSW" , 0x0610D4 }, + { (char*) "Australia/Perth" , 0x06196E }, + { (char*) "Australia/Queensland" , 0x061B56 }, + { (char*) "Australia/South" , 0x061D05 }, + { (char*) "Australia/Sydney" , 0x0625B1 }, + { (char*) "Australia/Tasmania" , 0x062E67 }, + { (char*) "Australia/Victoria" , 0x0637A9 }, + { (char*) "Australia/West" , 0x064043 }, + { (char*) "Australia/Yancowinna" , 0x06420D }, + { (char*) "Brazil/Acre" , 0x064ACE }, + { (char*) "Brazil/DeNoronha" , 0x064D40 }, + { (char*) "Brazil/East" , 0x06500A }, + { (char*) "Brazil/West" , 0x0655AC }, + { (char*) "Canada/Atlantic" , 0x065806 }, + { (char*) "Canada/Central" , 0x066572 }, + { (char*) "Canada/Eastern" , 0x066F84 }, + { (char*) "Canada/Mountain" , 0x067D36 }, + { (char*) "Canada/Newfoundland" , 0x068530 }, + { (char*) "Canada/Pacific" , 0x069383 }, + { (char*) "Canada/Saskatchewan" , 0x069DAD }, + { (char*) "Canada/Yukon" , 0x06A18D }, + { (char*) "CET" , 0x06A7E7 }, + { (char*) "Chile/Continental" , 0x06B368 }, + { (char*) "Chile/EasterIsland" , 0x06BD47 }, + { (char*) "CST6CDT" , 0x06C5FE }, + { (char*) "Cuba" , 0x06CED2 }, + { (char*) "EET" , 0x06D832 }, + { (char*) "Egypt" , 0x06E114 }, + { (char*) "Eire" , 0x06EA7F }, + { (char*) "EST" , 0x06F82F }, + { (char*) "EST5EDT" , 0x06F8F1 }, + { (char*) "Etc/GMT" , 0x0701C5 }, + { (char*) "Etc/GMT+0" , 0x070243 }, + { (char*) "Etc/GMT+1" , 0x0702C1 }, + { (char*) "Etc/GMT+10" , 0x070341 }, + { (char*) "Etc/GMT+11" , 0x0703C2 }, + { (char*) "Etc/GMT+12" , 0x070443 }, + { (char*) "Etc/GMT+2" , 0x0704C4 }, + { (char*) "Etc/GMT+3" , 0x070544 }, + { (char*) "Etc/GMT+4" , 0x0705C4 }, + { (char*) "Etc/GMT+5" , 0x070644 }, + { (char*) "Etc/GMT+6" , 0x0706C4 }, + { (char*) "Etc/GMT+7" , 0x070744 }, + { (char*) "Etc/GMT+8" , 0x0707C4 }, + { (char*) "Etc/GMT+9" , 0x070844 }, + { (char*) "Etc/GMT-0" , 0x0708C4 }, + { (char*) "Etc/GMT-1" , 0x070942 }, + { (char*) "Etc/GMT-10" , 0x0709C3 }, + { (char*) "Etc/GMT-11" , 0x070A45 }, + { (char*) "Etc/GMT-12" , 0x070AC7 }, + { (char*) "Etc/GMT-13" , 0x070B49 }, + { (char*) "Etc/GMT-14" , 0x070BCB }, + { (char*) "Etc/GMT-2" , 0x070C4D }, + { (char*) "Etc/GMT-3" , 0x070CCE }, + { (char*) "Etc/GMT-4" , 0x070D4F }, + { (char*) "Etc/GMT-5" , 0x070DD0 }, + { (char*) "Etc/GMT-6" , 0x070E51 }, + { (char*) "Etc/GMT-7" , 0x070ED2 }, + { (char*) "Etc/GMT-8" , 0x070F53 }, + { (char*) "Etc/GMT-9" , 0x070FD4 }, + { (char*) "Etc/GMT0" , 0x071055 }, + { (char*) "Etc/Greenwich" , 0x0710D3 }, + { (char*) "Etc/UCT" , 0x071151 }, + { (char*) "Etc/Universal" , 0x0711CF }, + { (char*) "Etc/UTC" , 0x07124D }, + { (char*) "Etc/Zulu" , 0x0712CB }, + { (char*) "Europe/Amsterdam" , 0x071349 }, + { (char*) "Europe/Andorra" , 0x071EB3 }, + { (char*) "Europe/Astrakhan" , 0x07258D }, + { (char*) "Europe/Athens" , 0x072A2A }, + { (char*) "Europe/Belfast" , 0x07330C }, + { (char*) "Europe/Belgrade" , 0x074168 }, + { (char*) "Europe/Berlin" , 0x0748F4 }, + { (char*) "Europe/Bratislava" , 0x075209 }, + { (char*) "Europe/Brussels" , 0x075B12 }, + { (char*) "Europe/Bucharest" , 0x076693 }, + { (char*) "Europe/Budapest" , 0x076F27 }, + { (char*) "Europe/Busingen" , 0x077873 }, + { (char*) "Europe/Chisinau" , 0x077FFC }, + { (char*) "Europe/Copenhagen" , 0x078980 }, + { (char*) "Europe/Dublin" , 0x0791E5 }, + { (char*) "Europe/Gibraltar" , 0x079F95 }, + { (char*) "Europe/Guernsey" , 0x07AB9D }, + { (char*) "Europe/Helsinki" , 0x07BA3D }, + { (char*) "Europe/Isle_of_Man" , 0x07C1B5 }, + { (char*) "Europe/Istanbul" , 0x07D001 }, + { (char*) "Europe/Jersey" , 0x07D79A }, + { (char*) "Europe/Kaliningrad" , 0x07E63A }, + { (char*) "Europe/Kiev" , 0x07EC2F }, + { (char*) "Europe/Kirov" , 0x07F483 }, + { (char*) "Europe/Kyiv" , 0x07F93E }, + { (char*) "Europe/Lisbon" , 0x0801A1 }, + { (char*) "Europe/Ljubljana" , 0x080F87 }, + { (char*) "Europe/London" , 0x081713 }, + { (char*) "Europe/Luxembourg" , 0x08256F }, + { (char*) "Europe/Madrid" , 0x0830FD }, + { (char*) "Europe/Malta" , 0x083B4F }, + { (char*) "Europe/Mariehamn" , 0x084597 }, + { (char*) "Europe/Minsk" , 0x084D0F }, + { (char*) "Europe/Monaco" , 0x085236 }, + { (char*) "Europe/Moscow" , 0x085DC2 }, + { (char*) "Europe/Nicosia" , 0x0863E1 }, + { (char*) "Europe/Oslo" , 0x086BBF }, + { (char*) "Europe/Paris" , 0x08747F }, + { (char*) "Europe/Podgorica" , 0x08801D }, + { (char*) "Europe/Prague" , 0x0887A9 }, + { (char*) "Europe/Riga" , 0x0890B2 }, + { (char*) "Europe/Rome" , 0x089954 }, + { (char*) "Europe/Samara" , 0x08A3B1 }, + { (char*) "Europe/San_Marino" , 0x08A887 }, + { (char*) "Europe/Sarajevo" , 0x08B2E4 }, + { (char*) "Europe/Saratov" , 0x08BA70 }, + { (char*) "Europe/Simferopol" , 0x08BF1D }, + { (char*) "Europe/Skopje" , 0x08C4EC }, + { (char*) "Europe/Sofia" , 0x08CC78 }, + { (char*) "Europe/Stockholm" , 0x08D4A1 }, + { (char*) "Europe/Tallinn" , 0x08DC22 }, + { (char*) "Europe/Tirane" , 0x08E492 }, + { (char*) "Europe/Tiraspol" , 0x08ECC2 }, + { (char*) "Europe/Ulyanovsk" , 0x08F646 }, + { (char*) "Europe/Uzhgorod" , 0x08FB49 }, + { (char*) "Europe/Vaduz" , 0x09039D }, + { (char*) "Europe/Vatican" , 0x090B09 }, + { (char*) "Europe/Vienna" , 0x091566 }, + { (char*) "Europe/Vilnius" , 0x091E0A }, + { (char*) "Europe/Volgograd" , 0x092688 }, + { (char*) "Europe/Warsaw" , 0x092B4F }, + { (char*) "Europe/Zagreb" , 0x0935B9 }, + { (char*) "Europe/Zaporozhye" , 0x093D45 }, + { (char*) "Europe/Zurich" , 0x094599 }, + { (char*) "Factory" , 0x094D1A }, + { (char*) "GB" , 0x094D9A }, + { (char*) "GB-Eire" , 0x095BF6 }, + { (char*) "GMT" , 0x096A52 }, + { (char*) "GMT+0" , 0x096AD0 }, + { (char*) "GMT-0" , 0x096B4E }, + { (char*) "GMT0" , 0x096BCC }, + { (char*) "Greenwich" , 0x096C4A }, + { (char*) "Hongkong" , 0x096CC8 }, + { (char*) "HST" , 0x0971A5 }, + { (char*) "Iceland" , 0x0972FA }, + { (char*) "Indian/Antananarivo" , 0x09739A }, + { (char*) "Indian/Chagos" , 0x097481 }, + { (char*) "Indian/Christmas" , 0x097546 }, + { (char*) "Indian/Cocos" , 0x0975E9 }, + { (char*) "Indian/Comoro" , 0x097695 }, + { (char*) "Indian/Kerguelen" , 0x097736 }, + { (char*) "Indian/Mahe" , 0x0977D9 }, + { (char*) "Indian/Maldives" , 0x09787C }, + { (char*) "Indian/Mauritius" , 0x097941 }, + { (char*) "Indian/Mayotte" , 0x097A30 }, + { (char*) "Indian/Reunion" , 0x097AD1 }, + { (char*) "Iran" , 0x097B74 }, + { (char*) "Israel" , 0x098060 }, + { (char*) "Jamaica" , 0x0989C0 }, + { (char*) "Japan" , 0x098BAE }, + { (char*) "Kwajalein" , 0x098CEF }, + { (char*) "Libya" , 0x098E29 }, + { (char*) "MET" , 0x0990A6 }, + { (char*) "Mexico/BajaNorte" , 0x099C27 }, + { (char*) "Mexico/BajaSur" , 0x09A78D }, + { (char*) "Mexico/General" , 0x09ABBD }, + { (char*) "MST" , 0x09B08F }, + { (char*) "MST7MDT" , 0x09B203 }, + { (char*) "Navajo" , 0x09BAD7 }, + { (char*) "NZ" , 0x09C47F }, + { (char*) "NZ-CHAT" , 0x09CE10 }, + { (char*) "Pacific/Apia" , 0x09D622 }, + { (char*) "Pacific/Auckland" , 0x09D884 }, + { (char*) "Pacific/Bougainville" , 0x09E228 }, + { (char*) "Pacific/Chatham" , 0x09E33E }, + { (char*) "Pacific/Chuuk" , 0x09EB5F }, + { (char*) "Pacific/Easter" , 0x09EC79 }, + { (char*) "Pacific/Efate" , 0x09F53D }, + { (char*) "Pacific/Enderbury" , 0x09F755 }, + { (char*) "Pacific/Fakaofo" , 0x09F83D }, + { (char*) "Pacific/Fiji" , 0x09F903 }, + { (char*) "Pacific/Funafuti" , 0x09FB43 }, + { (char*) "Pacific/Galapagos" , 0x09FBE7 }, + { (char*) "Pacific/Gambier" , 0x09FCE4 }, + { (char*) "Pacific/Guadalcanal" , 0x09FD95 }, + { (char*) "Pacific/Guam" , 0x09FE39 }, + { (char*) "Pacific/Honolulu" , 0x0A0033 }, + { (char*) "Pacific/Johnston" , 0x0A018E }, + { (char*) "Pacific/Kanton" , 0x0A02E3 }, + { (char*) "Pacific/Kiritimati" , 0x0A03DA }, + { (char*) "Pacific/Kosrae" , 0x0A04D2 }, + { (char*) "Pacific/Kwajalein" , 0x0A0635 }, + { (char*) "Pacific/Majuro" , 0x0A0778 }, + { (char*) "Pacific/Marquesas" , 0x0A08C4 }, + { (char*) "Pacific/Midway" , 0x0A0980 }, + { (char*) "Pacific/Nauru" , 0x0A0A73 }, + { (char*) "Pacific/Niue" , 0x0A0B6D }, + { (char*) "Pacific/Norfolk" , 0x0A0C36 }, + { (char*) "Pacific/Noumea" , 0x0A0FA4 }, + { (char*) "Pacific/Pago_Pago" , 0x0A10D2 }, + { (char*) "Pacific/Palau" , 0x0A118D }, + { (char*) "Pacific/Pitcairn" , 0x0A123F }, + { (char*) "Pacific/Pohnpei" , 0x0A1307 }, + { (char*) "Pacific/Ponape" , 0x0A1442 }, + { (char*) "Pacific/Port_Moresby" , 0x0A14E6 }, + { (char*) "Pacific/Rarotonga" , 0x0A15B6 }, + { (char*) "Pacific/Saipan" , 0x0A180F }, + { (char*) "Pacific/Samoa" , 0x0A19FB }, + { (char*) "Pacific/Tahiti" , 0x0A1AB6 }, + { (char*) "Pacific/Tarawa" , 0x0A1B68 }, + { (char*) "Pacific/Tongatapu" , 0x0A1C1B }, + { (char*) "Pacific/Truk" , 0x0A1D8D }, + { (char*) "Pacific/Wake" , 0x0A1E45 }, + { (char*) "Pacific/Wallis" , 0x0A1EF4 }, + { (char*) "Pacific/Yap" , 0x0A1F98 }, + { (char*) "Poland" , 0x0A2050 }, + { (char*) "Portugal" , 0x0A2ABA }, + { (char*) "PRC" , 0x0A388D }, + { (char*) "PST8PDT" , 0x0A3ACA }, + { (char*) "ROC" , 0x0A439E }, + { (char*) "ROK" , 0x0A46A3 }, + { (char*) "Singapore" , 0x0A4918 }, + { (char*) "Turkey" , 0x0A4AB5 }, + { (char*) "UCT" , 0x0A524E }, + { (char*) "Universal" , 0x0A52CC }, + { (char*) "US/Alaska" , 0x0A534A }, + { (char*) "US/Aleutian" , 0x0A5C99 }, + { (char*) "US/Arizona" , 0x0A65D9 }, + { (char*) "US/Central" , 0x0A674D }, + { (char*) "US/East-Indiana" , 0x0A7561 }, + { (char*) "US/Eastern" , 0x0A7BFF }, + { (char*) "US/Hawaii" , 0x0A89EB }, + { (char*) "US/Indiana-Starke" , 0x0A8B40 }, + { (char*) "US/Michigan" , 0x0A94D8 }, + { (char*) "US/Mountain" , 0x0A9D9A }, + { (char*) "US/Pacific" , 0x0AA742 }, + { (char*) "US/Samoa" , 0x0AB272 }, + { (char*) "UTC" , 0x0AB32D }, + { (char*) "W-SU" , 0x0AB3AB }, + { (char*) "WET" , 0x0AB9B6 }, + { (char*) "Zulu" , 0x0AC789 }, }; -const unsigned char timelib_timezone_db_data_builtin[706623] = { +const unsigned char timelib_timezone_db_data_builtin[706567] = { /* Africa/Abidjan */ 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -26790,8 +26822,8 @@ 0xB8, 0x0F, 0x49, 0xE0, 0xB8, 0xFD, 0x40, 0xA0, 0xB9, 0xF1, 0x34, 0x30, 0xBA, 0xDE, 0x74, 0x20, 0xDA, 0x38, 0xAE, 0x30, 0xDA, 0xEB, 0xFA, 0x30, 0xDC, 0x19, 0xE1, 0xB0, 0xDC, 0xB9, 0x59, 0x20, 0xDD, 0xFB, 0x15, 0x30, 0xDE, 0x9B, 0xDE, 0x20, 0xDF, 0xDD, 0x9A, 0x30, 0xE0, 0x54, 0x33, 0x20, -0xF4, 0x97, 0xFF, 0xB0, 0xF5, 0x05, 0x5E, 0x20, 0xF6, 0xC0, 0x64, 0x30, 0xF7, 0x0E, 0x1E, 0xA0, -0xF8, 0x51, 0x2C, 0x30, 0xF8, 0xC7, 0xC5, 0x20, 0xFA, 0x0A, 0xD2, 0xB0, 0xFA, 0xA8, 0xF8, 0xA0, +0xF4, 0x97, 0xFF, 0xB0, 0xF5, 0x05, 0x5E, 0x20, 0xF6, 0xC0, 0x64, 0x30, 0xF7, 0x0F, 0x70, 0x20, +0xF8, 0x51, 0x2C, 0x30, 0xF8, 0xC7, 0xD3, 0x30, 0xFA, 0x0A, 0xD2, 0xB0, 0xFA, 0xA8, 0xF8, 0xA0, 0xFB, 0xEC, 0x06, 0x30, 0xFC, 0x8B, 0x7D, 0xA0, 0x1D, 0xC9, 0x8E, 0x30, 0x1E, 0x78, 0xD7, 0xA0, 0x1F, 0xA0, 0x35, 0xB0, 0x20, 0x33, 0xCF, 0xA0, 0x21, 0x81, 0x69, 0x30, 0x22, 0x0B, 0xC8, 0xA0, 0x23, 0x58, 0x10, 0xB0, 0x23, 0xE2, 0x70, 0x20, 0x25, 0x37, 0xF2, 0xB0, 0x25, 0xD4, 0xC7, 0x20, @@ -26815,8 +26847,8 @@ 0xFF, 0xDD, 0xFB, 0x15, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x9A, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x33, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x97, 0xFF, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x5E, 0x20, 0xFF, 0xFF, 0xFF, -0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x1E, 0xA0, 0xFF, 0xFF, 0xFF, -0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xC5, 0x20, 0xFF, 0xFF, 0xFF, +0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x70, 0x20, 0xFF, 0xFF, 0xFF, +0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xF8, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x06, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x7D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x8E, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xD7, 0xA0, 0x00, 0x00, 0x00, @@ -28067,8 +28099,8 @@ 0xB8, 0x0F, 0x49, 0xE0, 0xB8, 0xFD, 0x40, 0xA0, 0xB9, 0xF1, 0x34, 0x30, 0xBA, 0xDE, 0x74, 0x20, 0xDA, 0x38, 0xAE, 0x30, 0xDA, 0xEB, 0xFA, 0x30, 0xDC, 0x19, 0xE1, 0xB0, 0xDC, 0xB9, 0x59, 0x20, 0xDD, 0xFB, 0x15, 0x30, 0xDE, 0x9B, 0xDE, 0x20, 0xDF, 0xDD, 0x9A, 0x30, 0xE0, 0x54, 0x33, 0x20, -0xF4, 0x97, 0xFF, 0xB0, 0xF5, 0x05, 0x5E, 0x20, 0xF6, 0xC0, 0x64, 0x30, 0xF7, 0x0E, 0x1E, 0xA0, -0xF8, 0x51, 0x2C, 0x30, 0xF8, 0xC7, 0xC5, 0x20, 0xFA, 0x0A, 0xD2, 0xB0, 0xFA, 0xA8, 0xF8, 0xA0, +0xF4, 0x97, 0xFF, 0xB0, 0xF5, 0x05, 0x5E, 0x20, 0xF6, 0xC0, 0x64, 0x30, 0xF7, 0x0F, 0x70, 0x20, +0xF8, 0x51, 0x2C, 0x30, 0xF8, 0xC7, 0xD3, 0x30, 0xFA, 0x0A, 0xD2, 0xB0, 0xFA, 0xA8, 0xF8, 0xA0, 0xFB, 0xEC, 0x06, 0x30, 0xFC, 0x8B, 0x7D, 0xA0, 0x1D, 0xC9, 0x8E, 0x30, 0x1E, 0x78, 0xD7, 0xA0, 0x1F, 0xA0, 0x35, 0xB0, 0x20, 0x33, 0xCF, 0xA0, 0x21, 0x81, 0x69, 0x30, 0x22, 0x0B, 0xC8, 0xA0, 0x23, 0x58, 0x10, 0xB0, 0x23, 0xE2, 0x70, 0x20, 0x25, 0x37, 0xF2, 0xB0, 0x25, 0xD4, 0xC7, 0x20, @@ -28095,8 +28127,8 @@ 0xFF, 0xFF, 0xFF, 0xDD, 0xFB, 0x15, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x9A, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x33, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x97, 0xFF, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x5E, 0x20, 0xFF, -0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x1E, 0xA0, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xC5, 0x20, 0xFF, +0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x70, 0x20, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xF8, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x06, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x7D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x8E, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xD7, 0xA0, 0x00, @@ -28238,8 +28270,8 @@ 0xB8, 0x0F, 0x49, 0xE0, 0xB8, 0xFD, 0x40, 0xA0, 0xB9, 0xF1, 0x34, 0x30, 0xBA, 0xDE, 0x74, 0x20, 0xDA, 0x38, 0xAE, 0x30, 0xDA, 0xEB, 0xFA, 0x30, 0xDC, 0x19, 0xE1, 0xB0, 0xDC, 0xB9, 0x59, 0x20, 0xDD, 0xFB, 0x15, 0x30, 0xDE, 0x9B, 0xDE, 0x20, 0xDF, 0xDD, 0x9A, 0x30, 0xE0, 0x54, 0x33, 0x20, -0xF4, 0x97, 0xFF, 0xB0, 0xF5, 0x05, 0x5E, 0x20, 0xF6, 0xC0, 0x64, 0x30, 0xF7, 0x0E, 0x1E, 0xA0, -0xF8, 0x51, 0x2C, 0x30, 0xF8, 0xC7, 0xC5, 0x20, 0xFA, 0x0A, 0xD2, 0xB0, 0xFA, 0xA8, 0xF8, 0xA0, +0xF4, 0x97, 0xFF, 0xB0, 0xF5, 0x05, 0x5E, 0x20, 0xF6, 0xC0, 0x64, 0x30, 0xF7, 0x0F, 0x70, 0x20, +0xF8, 0x51, 0x2C, 0x30, 0xF8, 0xC7, 0xD3, 0x30, 0xFA, 0x0A, 0xD2, 0xB0, 0xFA, 0xA8, 0xF8, 0xA0, 0xFB, 0xEC, 0x06, 0x30, 0xFC, 0x8B, 0x7D, 0xA0, 0x1D, 0xC9, 0x8E, 0x30, 0x1E, 0x78, 0xD7, 0xA0, 0x1F, 0xA0, 0x35, 0xB0, 0x20, 0x33, 0xCF, 0xA0, 0x21, 0x81, 0x69, 0x30, 0x22, 0x0B, 0xC8, 0xA0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, @@ -28256,8 +28288,8 @@ 0xFF, 0xFF, 0xFF, 0xDD, 0xFB, 0x15, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x9A, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x33, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x97, 0xFF, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x5E, 0x20, 0xFF, -0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x1E, 0xA0, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xC5, 0x20, 0xFF, +0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x70, 0x20, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xF8, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x06, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x7D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x8E, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xD7, 0xA0, 0x00, @@ -28406,8 +28438,8 @@ 0xB8, 0x0F, 0x57, 0xF0, 0xB8, 0xFD, 0x4E, 0xB0, 0xB9, 0xF1, 0x42, 0x40, 0xBA, 0xDE, 0x82, 0x30, 0xDA, 0x38, 0xBC, 0x40, 0xDA, 0xEC, 0x08, 0x40, 0xDC, 0x19, 0xEF, 0xC0, 0xDC, 0xB9, 0x67, 0x30, 0xDD, 0xFB, 0x23, 0x40, 0xDE, 0x9B, 0xEC, 0x30, 0xDF, 0xDD, 0xA8, 0x40, 0xE0, 0x54, 0x41, 0x30, -0xF4, 0x98, 0x0D, 0xC0, 0xF5, 0x05, 0x6C, 0x30, 0xF6, 0xC0, 0x72, 0x40, 0xF7, 0x0E, 0x2C, 0xB0, -0xF8, 0x51, 0x3A, 0x40, 0xF8, 0xC7, 0xD3, 0x30, 0xFA, 0x0A, 0xE0, 0xC0, 0xFA, 0xA9, 0x06, 0xB0, +0xF4, 0x98, 0x0D, 0xC0, 0xF5, 0x05, 0x6C, 0x30, 0xF6, 0xC0, 0x72, 0x40, 0xF7, 0x0F, 0x7E, 0x30, +0xF8, 0x51, 0x3A, 0x40, 0xF8, 0xC7, 0xE1, 0x40, 0xFA, 0x0A, 0xE0, 0xC0, 0xFA, 0xA9, 0x06, 0xB0, 0xFB, 0xEC, 0x14, 0x40, 0xFC, 0x8B, 0x8B, 0xB0, 0x1D, 0xC9, 0x9C, 0x40, 0x1E, 0x78, 0xE5, 0xB0, 0x1F, 0xA0, 0x43, 0xC0, 0x20, 0x33, 0xDD, 0xB0, 0x21, 0x81, 0x77, 0x40, 0x22, 0x0B, 0xD6, 0xB0, 0x37, 0xF6, 0xD4, 0xC0, 0x38, 0xB8, 0x93, 0x30, 0x39, 0xDF, 0xF1, 0x40, 0x39, 0xE9, 0x1D, 0xB0, @@ -28426,8 +28458,8 @@ 0x9B, 0xEC, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xA8, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x41, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x0D, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x6C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x72, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, -0x0E, 0x2C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, -0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, +0x0F, 0x7E, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, +0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x06, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x14, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x8B, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x9C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xE5, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x43, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x20, @@ -28837,8 +28869,8 @@ 0xB8, 0x0F, 0x57, 0xF0, 0xB8, 0xFD, 0x4E, 0xB0, 0xB9, 0xF1, 0x42, 0x40, 0xBA, 0xDE, 0x82, 0x30, 0xDA, 0x38, 0xBC, 0x40, 0xDA, 0xEC, 0x08, 0x40, 0xDC, 0x19, 0xEF, 0xC0, 0xDC, 0xB9, 0x67, 0x30, 0xDD, 0xFB, 0x23, 0x40, 0xDE, 0x9B, 0xEC, 0x30, 0xDF, 0xDD, 0xA8, 0x40, 0xE0, 0x54, 0x41, 0x30, -0xF4, 0x98, 0x0D, 0xC0, 0xF5, 0x05, 0x6C, 0x30, 0xF6, 0xC0, 0x72, 0x40, 0xF7, 0x0E, 0x2C, 0xB0, -0xF8, 0x51, 0x3A, 0x40, 0xF8, 0xC7, 0xD3, 0x30, 0xFA, 0x0A, 0xE0, 0xC0, 0xFA, 0xA9, 0x06, 0xB0, +0xF4, 0x98, 0x0D, 0xC0, 0xF5, 0x05, 0x6C, 0x30, 0xF6, 0xC0, 0x72, 0x40, 0xF7, 0x0F, 0x7E, 0x30, +0xF8, 0x51, 0x3A, 0x40, 0xF8, 0xC7, 0xE1, 0x40, 0xFA, 0x0A, 0xE0, 0xC0, 0xFA, 0xA9, 0x06, 0xB0, 0xFB, 0xEC, 0x14, 0x40, 0xFC, 0x8B, 0x8B, 0xB0, 0x1D, 0xC9, 0x9C, 0x40, 0x1E, 0x78, 0xE5, 0xB0, 0x1F, 0xA0, 0x43, 0xC0, 0x20, 0x33, 0xDD, 0xB0, 0x21, 0x81, 0x77, 0x40, 0x22, 0x0B, 0xD6, 0xB0, 0x23, 0x58, 0x1E, 0xC0, 0x23, 0xE2, 0x7E, 0x30, 0x25, 0x38, 0x00, 0xC0, 0x25, 0xD4, 0xD5, 0x30, @@ -28875,8 +28907,8 @@ 0xFF, 0xDE, 0x9B, 0xEC, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xA8, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x41, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x0D, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x6C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x72, 0x40, 0xFF, 0xFF, 0xFF, -0xFF, 0xF7, 0x0E, 0x2C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, 0xFF, 0xFF, -0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, 0xFF, 0xFF, +0xFF, 0xF7, 0x0F, 0x7E, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, 0xFF, 0xFF, +0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x06, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x14, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x8B, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x9C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xE5, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x43, 0xC0, 0x00, 0x00, 0x00, @@ -29774,8 +29806,8 @@ 0xB8, 0x0F, 0x57, 0xF0, 0xB8, 0xFD, 0x4E, 0xB0, 0xB9, 0xF1, 0x42, 0x40, 0xBA, 0xDE, 0x82, 0x30, 0xDA, 0x38, 0xBC, 0x40, 0xDA, 0xEC, 0x08, 0x40, 0xDC, 0x19, 0xEF, 0xC0, 0xDC, 0xB9, 0x67, 0x30, 0xDD, 0xFB, 0x23, 0x40, 0xDE, 0x9B, 0xEC, 0x30, 0xDF, 0xDD, 0xA8, 0x40, 0xE0, 0x54, 0x41, 0x30, -0xF4, 0x98, 0x0D, 0xC0, 0xF5, 0x05, 0x6C, 0x30, 0xF6, 0xC0, 0x72, 0x40, 0xF7, 0x0E, 0x2C, 0xB0, -0xF8, 0x51, 0x3A, 0x40, 0xF8, 0xC7, 0xD3, 0x30, 0xFA, 0x0A, 0xE0, 0xC0, 0xFA, 0xA9, 0x06, 0xB0, +0xF4, 0x98, 0x0D, 0xC0, 0xF5, 0x05, 0x6C, 0x30, 0xF6, 0xC0, 0x72, 0x40, 0xF7, 0x0F, 0x7E, 0x30, +0xF8, 0x51, 0x3A, 0x40, 0xF8, 0xC7, 0xE1, 0x40, 0xFA, 0x0A, 0xE0, 0xC0, 0xFA, 0xA9, 0x06, 0xB0, 0xFB, 0xEC, 0x14, 0x40, 0xFC, 0x8B, 0x8B, 0xB0, 0x1D, 0xC9, 0x9C, 0x40, 0x1E, 0x78, 0xE5, 0xB0, 0x1F, 0xA0, 0x43, 0xC0, 0x20, 0x33, 0xDD, 0xB0, 0x21, 0x81, 0x77, 0x40, 0x22, 0x0B, 0xD6, 0xB0, 0x23, 0x58, 0x1E, 0xC0, 0x23, 0xE2, 0x7E, 0x30, 0x25, 0x38, 0x00, 0xC0, 0x25, 0xD4, 0xD5, 0x30, @@ -29811,8 +29843,8 @@ 0xFB, 0x23, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xEC, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xA8, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x41, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x0D, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x6C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, -0xC0, 0x72, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x2C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, -0x51, 0x3A, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, +0xC0, 0x72, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x7E, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, +0x51, 0x3A, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x06, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x14, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x8B, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x9C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xE5, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1F, @@ -30553,8 +30585,8 @@ 0xB8, 0x0F, 0x66, 0x00, 0xB8, 0xFD, 0x5C, 0xC0, 0xB9, 0xF1, 0x50, 0x50, 0xBA, 0xDE, 0x90, 0x40, 0xDA, 0x38, 0xCA, 0x50, 0xDA, 0xEC, 0x16, 0x50, 0xDC, 0x19, 0xFD, 0xD0, 0xDC, 0xB9, 0x75, 0x40, 0xDD, 0xFB, 0x31, 0x50, 0xDE, 0x9B, 0xFA, 0x40, 0xDF, 0xDD, 0xB6, 0x50, 0xE0, 0x54, 0x4F, 0x40, -0xF4, 0x98, 0x1B, 0xD0, 0xF5, 0x05, 0x7A, 0x40, 0xF6, 0xC0, 0x80, 0x50, 0xF7, 0x0E, 0x3A, 0xC0, -0xF8, 0x51, 0x48, 0x50, 0xF8, 0xC7, 0xE1, 0x40, 0xFA, 0x0A, 0xEE, 0xD0, 0xFA, 0xA9, 0x14, 0xC0, +0xF4, 0x98, 0x1B, 0xD0, 0xF5, 0x05, 0x7A, 0x40, 0xF6, 0xC0, 0x80, 0x50, 0xF7, 0x0F, 0x8C, 0x40, +0xF8, 0x51, 0x48, 0x50, 0xF8, 0xC7, 0xEF, 0x50, 0xFA, 0x0A, 0xEE, 0xD0, 0xFA, 0xA9, 0x14, 0xC0, 0xFB, 0xEC, 0x22, 0x50, 0xFC, 0x8B, 0x99, 0xC0, 0x1D, 0xC9, 0xAA, 0x50, 0x1E, 0x78, 0xF3, 0xC0, 0x1F, 0xA0, 0x51, 0xD0, 0x20, 0x33, 0xEB, 0xC0, 0x21, 0x81, 0x85, 0x50, 0x22, 0x0B, 0xE4, 0xC0, 0x2C, 0xC0, 0xD1, 0x50, 0x2D, 0x66, 0xE0, 0x40, 0x48, 0x60, 0x7F, 0x50, 0x52, 0x7F, 0x04, 0xC0, @@ -30573,8 +30605,8 @@ 0xFF, 0xFF, 0xFF, 0xDD, 0xFB, 0x31, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xFA, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xB6, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x4F, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x1B, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x7A, 0x40, 0xFF, -0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x80, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x3A, 0xC0, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x48, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, +0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x80, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x8C, 0x40, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x48, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xEF, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xEE, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x14, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x22, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x99, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0xAA, 0x50, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xF3, 0xC0, 0x00, @@ -31052,8 +31084,8 @@ 0xB8, 0x0F, 0x49, 0xE0, 0xB8, 0xFD, 0x40, 0xA0, 0xB9, 0xF1, 0x34, 0x30, 0xBA, 0xDE, 0x74, 0x20, 0xDA, 0x38, 0xAE, 0x30, 0xDA, 0xEB, 0xFA, 0x30, 0xDC, 0x19, 0xE1, 0xB0, 0xDC, 0xB9, 0x59, 0x20, 0xDD, 0xFB, 0x15, 0x30, 0xDE, 0x9B, 0xDE, 0x20, 0xDF, 0xDD, 0x9A, 0x30, 0xE0, 0x54, 0x33, 0x20, -0xF4, 0x97, 0xFF, 0xB0, 0xF5, 0x05, 0x5E, 0x20, 0xF6, 0xC0, 0x64, 0x30, 0xF7, 0x0E, 0x1E, 0xA0, -0xF8, 0x51, 0x2C, 0x30, 0xF8, 0xC7, 0xC5, 0x20, 0xFA, 0x0A, 0xD2, 0xB0, 0xFA, 0xA8, 0xF8, 0xA0, +0xF4, 0x97, 0xFF, 0xB0, 0xF5, 0x05, 0x5E, 0x20, 0xF6, 0xC0, 0x64, 0x30, 0xF7, 0x0F, 0x70, 0x20, +0xF8, 0x51, 0x2C, 0x30, 0xF8, 0xC7, 0xD3, 0x30, 0xFA, 0x0A, 0xD2, 0xB0, 0xFA, 0xA8, 0xF8, 0xA0, 0xFB, 0xEC, 0x06, 0x30, 0xFC, 0x8B, 0x7D, 0xA0, 0x1D, 0xC9, 0x8E, 0x30, 0x1E, 0x78, 0xD7, 0xA0, 0x1F, 0xA0, 0x35, 0xB0, 0x20, 0x33, 0xCF, 0xA0, 0x21, 0x81, 0x69, 0x30, 0x22, 0x0B, 0xC8, 0xA0, 0x23, 0x58, 0x10, 0xB0, 0x23, 0xE2, 0x70, 0x20, 0x25, 0x37, 0xF2, 0xB0, 0x25, 0xD4, 0xC7, 0x20, @@ -31073,9 +31105,9 @@ 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xFB, 0x15, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x9A, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x33, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x97, 0xFF, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x5E, -0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x1E, -0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xC5, -0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xF8, +0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x70, +0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, +0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xF8, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x06, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x7D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x8E, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xD7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x35, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x20, 0x33, 0xCF, @@ -31989,7 +32021,7 @@ /* America/Havana */ 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x9C, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x9A, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0x00, 0xAC, 0x62, 0xC2, 0x80, 0xB1, 0xD3, 0x94, 0x50, 0xB2, 0x74, 0x5D, 0x40, 0xC8, 0x5B, 0x66, 0xD0, 0xC8, 0xD3, 0x51, 0x40, 0xCA, 0x3B, 0x48, 0xD0, 0xCA, 0xBC, 0x6D, 0xC0, 0xCC, 0x24, 0x65, 0x50, 0xCC, 0x9C, 0x4F, 0xC0, 0xD1, 0xC4, 0x0B, 0x50, 0xD2, 0x3B, 0xF5, 0xC0, 0xD3, 0xA3, 0xED, 0x50, @@ -32023,122 +32055,121 @@ 0x5F, 0x9E, 0x40, 0xD0, 0x60, 0x4D, 0x98, 0x50, 0x61, 0x87, 0x5D, 0x50, 0x62, 0x2D, 0x7A, 0x50, 0x63, 0x67, 0x3F, 0x50, 0x64, 0x0D, 0x5C, 0x50, 0x65, 0x47, 0x21, 0x50, 0x65, 0xED, 0x3E, 0x50, 0x67, 0x27, 0x03, 0x50, 0x67, 0xCD, 0x20, 0x50, 0x69, 0x06, 0xE5, 0x50, 0x69, 0xAD, 0x02, 0x50, -0x6A, 0xE6, 0xC7, 0x50, 0x6B, 0x96, 0x1E, 0xD0, 0x6C, 0xCF, 0xE3, 0xD0, 0x6D, 0x76, 0x00, 0xD0, -0x6E, 0xAF, 0xC5, 0xD0, 0x6F, 0x55, 0xE2, 0xD0, 0x70, 0x8F, 0xA7, 0xD0, 0x71, 0x35, 0xC4, 0xD0, -0x72, 0x6F, 0x89, 0xD0, 0x73, 0x15, 0xA6, 0xD0, 0x74, 0x4F, 0x6B, 0xD0, 0x74, 0xFE, 0xC3, 0x50, -0x76, 0x38, 0x88, 0x50, 0x76, 0xDE, 0xA5, 0x50, 0x78, 0x18, 0x6A, 0x50, 0x78, 0xBE, 0x87, 0x50, -0x79, 0xF8, 0x4C, 0x50, 0x7A, 0x9E, 0x69, 0x50, 0x7B, 0xD8, 0x2E, 0x50, 0x7C, 0x7E, 0x4B, 0x50, -0x7D, 0xB8, 0x10, 0x50, 0x7E, 0x5E, 0x2D, 0x50, 0x7F, 0x97, 0xF2, 0x50, 0x01, 0x03, 0x02, 0x03, +0x6C, 0xCF, 0xE3, 0xD0, 0x6D, 0x76, 0x00, 0xD0, 0x6E, 0xAF, 0xC5, 0xD0, 0x6F, 0x55, 0xE2, 0xD0, +0x70, 0x8F, 0xA7, 0xD0, 0x71, 0x35, 0xC4, 0xD0, 0x72, 0x6F, 0x89, 0xD0, 0x73, 0x15, 0xA6, 0xD0, +0x74, 0x4F, 0x6B, 0xD0, 0x74, 0xFE, 0xC3, 0x50, 0x76, 0x38, 0x88, 0x50, 0x76, 0xDE, 0xA5, 0x50, +0x78, 0x18, 0x6A, 0x50, 0x78, 0xBE, 0x87, 0x50, 0x79, 0xF8, 0x4C, 0x50, 0x7A, 0x9E, 0x69, 0x50, +0x7B, 0xD8, 0x2E, 0x50, 0x7C, 0x7E, 0x4B, 0x50, 0x7D, 0xB8, 0x10, 0x50, 0x7E, 0x5E, 0x2D, 0x50, +0x7F, 0x97, 0xF2, 0x50, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, -0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x04, -0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x05, 0x04, 0x05, 0x04, -0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, +0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, +0x02, 0x04, 0x02, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, -0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0xFF, 0xFF, 0xB2, 0xC8, 0x00, 0x00, 0xFF, 0xFF, -0xB2, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, -0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0x4C, 0x4D, 0x54, 0x00, -0x48, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, -0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x9C, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, -0xFF, 0xFF, 0x69, 0x87, 0x28, 0xB8, 0xFF, 0xFF, 0xFF, 0xFF, 0xAC, 0x62, 0xC2, 0x80, 0xFF, 0xFF, -0xFF, 0xFF, 0xB1, 0xD3, 0x94, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x74, 0x5D, 0x40, 0xFF, 0xFF, -0xFF, 0xFF, 0xC8, 0x5B, 0x66, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0xD3, 0x51, 0x40, 0xFF, 0xFF, -0xFF, 0xFF, 0xCA, 0x3B, 0x48, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xBC, 0x6D, 0xC0, 0xFF, 0xFF, -0xFF, 0xFF, 0xCC, 0x24, 0x65, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x9C, 0x4F, 0xC0, 0xFF, 0xFF, -0xFF, 0xFF, 0xD1, 0xC4, 0x0B, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x3B, 0xF5, 0xC0, 0xFF, 0xFF, -0xFF, 0xFF, 0xD3, 0xA3, 0xED, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x1B, 0xD7, 0xC0, 0xFF, 0xFF, -0xFF, 0xFF, 0xF7, 0x60, 0x05, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0xFF, 0x7D, 0x40, 0xFF, 0xFF, -0xFF, 0xFF, 0xF9, 0x3D, 0x44, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x53, 0xC0, 0xFF, 0xFF, -0xFF, 0xFF, 0xFA, 0xDB, 0x3B, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xA7, 0x86, 0x40, 0xFF, 0xFF, -0xFF, 0xFF, 0xFC, 0xC5, 0xA9, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0x87, 0x68, 0x40, 0xFF, 0xFF, -0xFF, 0xFF, 0xFE, 0xB8, 0x00, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0xE3, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x00, 0x97, 0xE2, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xC5, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x02, 0x77, 0xC4, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x03, 0x70, 0xE2, 0x40, 0x00, 0x00, -0x00, 0x00, 0x04, 0x60, 0xE1, 0x50, 0x00, 0x00, 0x00, 0x00, 0x05, 0x35, 0x14, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x06, 0x40, 0xC3, 0x50, 0x00, 0x00, 0x00, 0x00, 0x07, 0x16, 0x48, 0x40, 0x00, 0x00, -0x00, 0x00, 0x08, 0x20, 0xA5, 0x50, 0x00, 0x00, 0x00, 0x00, 0x08, 0xF7, 0x7B, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x0A, 0x00, 0x87, 0x50, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0x6A, 0x40, 0x00, 0x00, -0x00, 0x00, 0x0B, 0xE0, 0x69, 0x50, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0x86, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x0D, 0xC0, 0x4B, 0x50, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0x68, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x0F, 0xB2, 0xA2, 0x50, 0x00, 0x00, 0x00, 0x00, 0x10, 0x7D, 0x9B, 0x40, 0x00, 0x00, -0x00, 0x00, 0x11, 0x51, 0xEA, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x12, 0x66, 0xB7, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x13, 0x31, 0xCC, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x14, 0x46, 0x99, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x15, 0x5B, 0x82, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x26, 0x7B, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x17, 0x3B, 0x64, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x18, 0x06, 0x5D, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x19, 0x1B, 0x46, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x19, 0xE6, 0x3F, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x1A, 0xFB, 0x28, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xCF, 0x5C, 0x40, 0x00, 0x00, -0x00, 0x00, 0x1C, 0xDB, 0x0A, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xAF, 0x3E, 0x40, 0x00, 0x00, -0x00, 0x00, 0x1E, 0x7A, 0x53, 0x50, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x8F, 0x20, 0x40, 0x00, 0x00, -0x00, 0x00, 0x20, 0x5A, 0x35, 0x50, 0x00, 0x00, 0x00, 0x00, 0x21, 0x6F, 0x02, 0x40, 0x00, 0x00, -0x00, 0x00, 0x22, 0x43, 0x51, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x23, 0x4E, 0xE4, 0x40, 0x00, 0x00, -0x00, 0x00, 0x24, 0x23, 0x33, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x25, 0x2E, 0xC6, 0x40, 0x00, 0x00, -0x00, 0x00, 0x26, 0x15, 0x8A, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x27, 0x17, 0xE2, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x27, 0xFE, 0xA7, 0x50, 0x00, 0x00, 0x00, 0x00, 0x28, 0xF7, 0xD2, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x29, 0xDE, 0x89, 0x50, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xD7, 0xB4, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x2B, 0xBE, 0x6B, 0x50, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xB7, 0x96, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x2D, 0x9E, 0x4D, 0x50, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x97, 0x78, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x2F, 0x7E, 0x2F, 0x50, 0x00, 0x00, 0x00, 0x00, 0x30, 0x77, 0x5A, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x31, 0x67, 0x4B, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x32, 0x57, 0x3C, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x33, 0x47, 0x2D, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x34, 0x40, 0x59, 0x50, 0x00, 0x00, -0x00, 0x00, 0x35, 0x1D, 0xD5, 0x50, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xB0, 0x50, 0x00, 0x00, -0x00, 0x00, 0x36, 0xFD, 0xB7, 0x50, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xCC, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x38, 0xE6, 0xD3, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xAE, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x3A, 0xC6, 0xB5, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x90, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x3C, 0xAF, 0xD2, 0x50, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x72, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x3E, 0x8F, 0xB4, 0x50, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x54, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x40, 0x66, 0x5B, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x35, 0x50, 0x00, 0x00, -0x00, 0x00, 0x45, 0xF3, 0x8C, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x17, 0x50, 0x00, 0x00, -0x00, 0x00, 0x47, 0xDC, 0xA9, 0x50, 0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xF9, 0x50, 0x00, 0x00, -0x00, 0x00, 0x49, 0xB3, 0x50, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xDB, 0x50, 0x00, 0x00, -0x00, 0x00, 0x4B, 0x9C, 0x6D, 0x50, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xF7, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x4D, 0x85, 0x89, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xBF, 0x4E, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x4F, 0x77, 0xE0, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x95, 0xF6, 0x50, 0x00, 0x00, -0x00, 0x00, 0x51, 0x3C, 0x13, 0x50, 0x00, 0x00, 0x00, 0x00, 0x52, 0x75, 0xD8, 0x50, 0x00, 0x00, -0x00, 0x00, 0x53, 0x1B, 0xF5, 0x50, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xBA, 0x50, 0x00, 0x00, -0x00, 0x00, 0x54, 0xFB, 0xD7, 0x50, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0x9C, 0x50, 0x00, 0x00, -0x00, 0x00, 0x56, 0xE4, 0xF3, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xB8, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x58, 0xC4, 0xD5, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0x9A, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x5A, 0xA4, 0xB7, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0x7C, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x5C, 0x84, 0x99, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x5E, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x5E, 0x64, 0x7B, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x40, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x60, 0x4D, 0x98, 0x50, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x5D, 0x50, 0x00, 0x00, -0x00, 0x00, 0x62, 0x2D, 0x7A, 0x50, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x3F, 0x50, 0x00, 0x00, -0x00, 0x00, 0x64, 0x0D, 0x5C, 0x50, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x21, 0x50, 0x00, 0x00, -0x00, 0x00, 0x65, 0xED, 0x3E, 0x50, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x03, 0x50, 0x00, 0x00, -0x00, 0x00, 0x67, 0xCD, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, 0x69, 0x06, 0xE5, 0x50, 0x00, 0x00, -0x00, 0x00, 0x69, 0xAD, 0x02, 0x50, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xC7, 0x50, 0x00, 0x00, -0x00, 0x00, 0x6B, 0x96, 0x1E, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xCF, 0xE3, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x6D, 0x76, 0x00, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xC5, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x6F, 0x55, 0xE2, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xA7, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x71, 0x35, 0xC4, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0x89, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x73, 0x15, 0xA6, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0x6B, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x74, 0xFE, 0xC3, 0x50, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0x88, 0x50, 0x00, 0x00, -0x00, 0x00, 0x76, 0xDE, 0xA5, 0x50, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0x6A, 0x50, 0x00, 0x00, -0x00, 0x00, 0x78, 0xBE, 0x87, 0x50, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x4C, 0x50, 0x00, 0x00, -0x00, 0x00, 0x7A, 0x9E, 0x69, 0x50, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x2E, 0x50, 0x00, 0x00, -0x00, 0x00, 0x7C, 0x7E, 0x4B, 0x50, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x10, 0x50, 0x00, 0x00, -0x00, 0x00, 0x7E, 0x5E, 0x2D, 0x50, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x97, 0xF2, 0x50, 0x01, 0x03, -0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, +0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0xFF, 0xFF, +0xB2, 0xC8, 0x00, 0x00, 0xFF, 0xFF, 0xB2, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, +0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, +0x01, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, +0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A, 0x00, 0x00, 0x00, 0x06, +0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x69, 0x87, 0x28, 0xB8, 0xFF, 0xFF, 0xFF, 0xFF, +0xAC, 0x62, 0xC2, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0xD3, 0x94, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, +0xB2, 0x74, 0x5D, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x5B, 0x66, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, +0xC8, 0xD3, 0x51, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0x3B, 0x48, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, +0xCA, 0xBC, 0x6D, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x24, 0x65, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, +0xCC, 0x9C, 0x4F, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0xC4, 0x0B, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, +0xD2, 0x3B, 0xF5, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0xA3, 0xED, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, +0xD4, 0x1B, 0xD7, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x60, 0x05, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, +0xF7, 0xFF, 0x7D, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0x3D, 0x44, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, +0xF9, 0xE3, 0x53, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xDB, 0x3B, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, +0xFB, 0xA7, 0x86, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xC5, 0xA9, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, +0xFD, 0x87, 0x68, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x00, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, +0xFF, 0xA7, 0xE3, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x97, 0xE2, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x01, 0x87, 0xC5, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x02, 0x77, 0xC4, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x03, 0x70, 0xE2, 0x40, 0x00, 0x00, 0x00, 0x00, 0x04, 0x60, 0xE1, 0x50, 0x00, 0x00, 0x00, 0x00, +0x05, 0x35, 0x14, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xC3, 0x50, 0x00, 0x00, 0x00, 0x00, +0x07, 0x16, 0x48, 0x40, 0x00, 0x00, 0x00, 0x00, 0x08, 0x20, 0xA5, 0x50, 0x00, 0x00, 0x00, 0x00, +0x08, 0xF7, 0x7B, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x87, 0x50, 0x00, 0x00, 0x00, 0x00, +0x0A, 0xF0, 0x6A, 0x40, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x69, 0x50, 0x00, 0x00, 0x00, 0x00, +0x0C, 0xD9, 0x86, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x4B, 0x50, 0x00, 0x00, 0x00, 0x00, +0x0E, 0xB9, 0x68, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xB2, 0xA2, 0x50, 0x00, 0x00, 0x00, 0x00, +0x10, 0x7D, 0x9B, 0x40, 0x00, 0x00, 0x00, 0x00, 0x11, 0x51, 0xEA, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x12, 0x66, 0xB7, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x31, 0xCC, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x14, 0x46, 0x99, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x5B, 0x82, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x16, 0x26, 0x7B, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x3B, 0x64, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x18, 0x06, 0x5D, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x19, 0x1B, 0x46, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x19, 0xE6, 0x3F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xFB, 0x28, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x1B, 0xCF, 0x5C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xDB, 0x0A, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x1D, 0xAF, 0x3E, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x7A, 0x53, 0x50, 0x00, 0x00, 0x00, 0x00, +0x1F, 0x8F, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00, 0x20, 0x5A, 0x35, 0x50, 0x00, 0x00, 0x00, 0x00, +0x21, 0x6F, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00, 0x22, 0x43, 0x51, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x23, 0x4E, 0xE4, 0x40, 0x00, 0x00, 0x00, 0x00, 0x24, 0x23, 0x33, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x25, 0x2E, 0xC6, 0x40, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0x8A, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x27, 0x17, 0xE2, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xA7, 0x50, 0x00, 0x00, 0x00, 0x00, +0x28, 0xF7, 0xD2, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0x89, 0x50, 0x00, 0x00, 0x00, 0x00, +0x2A, 0xD7, 0xB4, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x6B, 0x50, 0x00, 0x00, 0x00, 0x00, +0x2C, 0xB7, 0x96, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x4D, 0x50, 0x00, 0x00, 0x00, 0x00, +0x2E, 0x97, 0x78, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x2F, 0x50, 0x00, 0x00, 0x00, 0x00, +0x30, 0x77, 0x5A, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x4B, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x32, 0x57, 0x3C, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x2D, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x34, 0x40, 0x59, 0x50, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0xD5, 0x50, 0x00, 0x00, 0x00, 0x00, +0x36, 0x32, 0xB0, 0x50, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0xB7, 0x50, 0x00, 0x00, 0x00, 0x00, +0x38, 0x1B, 0xCC, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xD3, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x39, 0xFB, 0xAE, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xB5, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x3B, 0xDB, 0x90, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xD2, 0x50, 0x00, 0x00, 0x00, 0x00, +0x3D, 0xBB, 0x72, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xB4, 0x50, 0x00, 0x00, 0x00, 0x00, +0x3F, 0x9B, 0x54, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x5B, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x45, 0x44, 0x35, 0x50, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0x8C, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x47, 0x24, 0x17, 0x50, 0x00, 0x00, 0x00, 0x00, 0x47, 0xDC, 0xA9, 0x50, 0x00, 0x00, 0x00, 0x00, +0x49, 0x03, 0xF9, 0x50, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x50, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x4A, 0xE3, 0xDB, 0x50, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0x6D, 0x50, 0x00, 0x00, 0x00, 0x00, +0x4C, 0xCC, 0xF7, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x85, 0x89, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x4E, 0xBF, 0x4E, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x77, 0xE0, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x50, 0x95, 0xF6, 0x50, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x13, 0x50, 0x00, 0x00, 0x00, 0x00, +0x52, 0x75, 0xD8, 0x50, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1B, 0xF5, 0x50, 0x00, 0x00, 0x00, 0x00, +0x54, 0x55, 0xBA, 0x50, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFB, 0xD7, 0x50, 0x00, 0x00, 0x00, 0x00, +0x56, 0x35, 0x9C, 0x50, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE4, 0xF3, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x58, 0x1E, 0xB8, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC4, 0xD5, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x59, 0xFE, 0x9A, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xB7, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x5B, 0xDE, 0x7C, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0x99, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x5D, 0xBE, 0x5E, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0x7B, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x5F, 0x9E, 0x40, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0x98, 0x50, 0x00, 0x00, 0x00, 0x00, +0x61, 0x87, 0x5D, 0x50, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0x7A, 0x50, 0x00, 0x00, 0x00, 0x00, +0x63, 0x67, 0x3F, 0x50, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x5C, 0x50, 0x00, 0x00, 0x00, 0x00, +0x65, 0x47, 0x21, 0x50, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x3E, 0x50, 0x00, 0x00, 0x00, 0x00, +0x67, 0x27, 0x03, 0x50, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, +0x69, 0x06, 0xE5, 0x50, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x02, 0x50, 0x00, 0x00, 0x00, 0x00, +0x6C, 0xCF, 0xE3, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x00, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x6E, 0xAF, 0xC5, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x55, 0xE2, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x70, 0x8F, 0xA7, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xC4, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x72, 0x6F, 0x89, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xA6, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x74, 0x4F, 0x6B, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xC3, 0x50, 0x00, 0x00, 0x00, 0x00, +0x76, 0x38, 0x88, 0x50, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xA5, 0x50, 0x00, 0x00, 0x00, 0x00, +0x78, 0x18, 0x6A, 0x50, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0x87, 0x50, 0x00, 0x00, 0x00, 0x00, +0x79, 0xF8, 0x4C, 0x50, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0x69, 0x50, 0x00, 0x00, 0x00, 0x00, +0x7B, 0xD8, 0x2E, 0x50, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x4B, 0x50, 0x00, 0x00, 0x00, 0x00, +0x7D, 0xB8, 0x10, 0x50, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x2D, 0x50, 0x00, 0x00, 0x00, 0x00, +0x7F, 0x97, 0xF2, 0x50, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, -0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x05, 0x04, +0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, +0x02, 0x04, 0x02, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, -0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, -0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0xFF, 0xFF, 0xB2, 0xC8, 0x00, 0x00, -0xFF, 0xFF, 0xB2, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, -0x00, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0x4C, 0x4D, -0x54, 0x00, 0x48, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, -0x00, 0x00, 0x01, 0x01, 0x0A, 0x43, 0x53, 0x54, 0x35, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, -0x32, 0x2E, 0x30, 0x2F, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x2F, 0x31, 0x0A, -0x00, 0xAC, 0xA0, 0xB5, 0x00, 0x94, 0xFA, 0x05, 0x00, 0x00, 0x00, 0x00, +0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0xFF, 0xFF, +0xB2, 0xC8, 0x00, 0x00, 0xFF, 0xFF, 0xB2, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, +0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, +0x01, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, +0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0A, 0x43, 0x53, 0x54, 0x35, 0x43, 0x44, 0x54, +0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2F, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, +0x30, 0x2F, 0x31, 0x0A, 0x00, 0xAC, 0xA0, 0xB5, 0x00, 0x94, 0xFA, 0x05, 0x00, 0x00, 0x00, 0x00, + /* America/Hermosillo */ 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -34662,8 +34693,8 @@ 0xB8, 0x0F, 0x49, 0xE0, 0xB8, 0xFD, 0x40, 0xA0, 0xB9, 0xF1, 0x34, 0x30, 0xBA, 0xDE, 0x74, 0x20, 0xDA, 0x38, 0xAE, 0x30, 0xDA, 0xEB, 0xFA, 0x30, 0xDC, 0x19, 0xE1, 0xB0, 0xDC, 0xB9, 0x59, 0x20, 0xDD, 0xFB, 0x15, 0x30, 0xDE, 0x9B, 0xDE, 0x20, 0xDF, 0xDD, 0x9A, 0x30, 0xE0, 0x54, 0x33, 0x20, -0xF4, 0x97, 0xFF, 0xB0, 0xF5, 0x05, 0x5E, 0x20, 0xF6, 0xC0, 0x64, 0x30, 0xF7, 0x0E, 0x1E, 0xA0, -0xF8, 0x51, 0x2C, 0x30, 0xF8, 0xC7, 0xC5, 0x20, 0xFA, 0x0A, 0xD2, 0xB0, 0xFA, 0xA8, 0xF8, 0xA0, +0xF4, 0x97, 0xFF, 0xB0, 0xF5, 0x05, 0x5E, 0x20, 0xF6, 0xC0, 0x64, 0x30, 0xF7, 0x0F, 0x70, 0x20, +0xF8, 0x51, 0x2C, 0x30, 0xF8, 0xC7, 0xD3, 0x30, 0xFA, 0x0A, 0xD2, 0xB0, 0xFA, 0xA8, 0xF8, 0xA0, 0xFB, 0xEC, 0x06, 0x30, 0xFC, 0x8B, 0x7D, 0xA0, 0x1D, 0xC9, 0x8E, 0x30, 0x1E, 0x78, 0xD7, 0xA0, 0x1F, 0xA0, 0x35, 0xB0, 0x20, 0x33, 0xCF, 0xA0, 0x21, 0x81, 0x69, 0x30, 0x22, 0x0B, 0xC8, 0xA0, 0x23, 0x58, 0x10, 0xB0, 0x23, 0xE2, 0x70, 0x20, 0x25, 0x37, 0xF2, 0xB0, 0x25, 0xD4, 0xC7, 0x20, @@ -34684,8 +34715,8 @@ 0xFB, 0x15, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x9A, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x33, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x97, 0xFF, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x5E, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, -0xC0, 0x64, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x1E, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, -0x51, 0x2C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xC5, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, +0xC0, 0x64, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x70, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, +0x51, 0x2C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xF8, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x06, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x7D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x8E, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xD7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, @@ -34742,8 +34773,8 @@ 0xB8, 0x0F, 0x57, 0xF0, 0xB8, 0xFD, 0x4E, 0xB0, 0xB9, 0xF1, 0x42, 0x40, 0xBA, 0xDE, 0x82, 0x30, 0xDA, 0x38, 0xBC, 0x40, 0xDA, 0xEC, 0x08, 0x40, 0xDC, 0x19, 0xEF, 0xC0, 0xDC, 0xB9, 0x67, 0x30, 0xDD, 0xFB, 0x23, 0x40, 0xDE, 0x9B, 0xEC, 0x30, 0xDF, 0xDD, 0xA8, 0x40, 0xE0, 0x54, 0x41, 0x30, -0xF4, 0x98, 0x0D, 0xC0, 0xF5, 0x05, 0x6C, 0x30, 0xF6, 0xC0, 0x72, 0x40, 0xF7, 0x0E, 0x2C, 0xB0, -0xF8, 0x51, 0x3A, 0x40, 0xF8, 0xC7, 0xD3, 0x30, 0xFA, 0x0A, 0xE0, 0xC0, 0xFA, 0xA9, 0x06, 0xB0, +0xF4, 0x98, 0x0D, 0xC0, 0xF5, 0x05, 0x6C, 0x30, 0xF6, 0xC0, 0x72, 0x40, 0xF7, 0x0F, 0x7E, 0x30, +0xF8, 0x51, 0x3A, 0x40, 0xF8, 0xC7, 0xE1, 0x40, 0xFA, 0x0A, 0xE0, 0xC0, 0xFA, 0xA9, 0x06, 0xB0, 0xFB, 0xEC, 0x14, 0x40, 0xFC, 0x8B, 0x8B, 0xB0, 0x1D, 0xC9, 0x9C, 0x40, 0x1E, 0x78, 0xE5, 0xB0, 0x1F, 0xA0, 0x43, 0xC0, 0x20, 0x33, 0xDD, 0xB0, 0x21, 0x81, 0x77, 0x40, 0x22, 0x0B, 0xD6, 0xB0, 0x2C, 0xC0, 0xC3, 0x40, 0x2D, 0x66, 0xD2, 0x30, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, @@ -34761,8 +34792,8 @@ 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xEC, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xA8, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x41, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x0D, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x6C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x72, -0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x2C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, -0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, +0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x7E, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, +0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x06, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x14, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x8B, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x9C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xE5, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x43, @@ -36918,8 +36949,8 @@ 0xB8, 0x0F, 0x3B, 0xD0, 0xB8, 0xFD, 0x32, 0x90, 0xB9, 0xF1, 0x26, 0x20, 0xBA, 0xDE, 0x66, 0x10, 0xDA, 0x38, 0xA0, 0x20, 0xDA, 0xEB, 0xEC, 0x20, 0xDC, 0x19, 0xD3, 0xA0, 0xDC, 0xB9, 0x4B, 0x10, 0xDD, 0xFB, 0x07, 0x20, 0xDE, 0x9B, 0xD0, 0x10, 0xDF, 0xDD, 0x8C, 0x20, 0xE0, 0x54, 0x25, 0x10, -0xF4, 0x97, 0xF1, 0xA0, 0xF5, 0x05, 0x50, 0x10, 0xF6, 0xC0, 0x56, 0x20, 0xF7, 0x0E, 0x10, 0x90, -0xF8, 0x51, 0x1E, 0x20, 0xF8, 0xC7, 0xB7, 0x10, 0xFA, 0x0A, 0xC4, 0xA0, 0xFA, 0xA8, 0xEA, 0x90, +0xF4, 0x97, 0xF1, 0xA0, 0xF5, 0x05, 0x50, 0x10, 0xF6, 0xC0, 0x56, 0x20, 0xF7, 0x0F, 0x62, 0x10, +0xF8, 0x51, 0x1E, 0x20, 0xF8, 0xC7, 0xC5, 0x20, 0xFA, 0x0A, 0xC4, 0xA0, 0xFA, 0xA8, 0xEA, 0x90, 0xFB, 0xEB, 0xF8, 0x20, 0xFC, 0x8B, 0x6F, 0x90, 0x1D, 0xC9, 0x80, 0x20, 0x1E, 0x78, 0xC9, 0x90, 0x1F, 0xA0, 0x27, 0xA0, 0x20, 0x33, 0xC1, 0x90, 0x21, 0x81, 0x5B, 0x20, 0x22, 0x0B, 0xBA, 0x90, 0x23, 0x58, 0x02, 0xA0, 0x23, 0xE2, 0x62, 0x10, 0x25, 0x37, 0xE4, 0xA0, 0x25, 0xD4, 0xB9, 0x10, @@ -36939,9 +36970,9 @@ 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xFB, 0x07, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xD0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x8C, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x25, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x97, 0xF1, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x50, -0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x56, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x10, -0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x1E, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xB7, -0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xC4, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xEA, +0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x56, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x62, +0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x1E, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xC5, +0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xC4, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xEA, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEB, 0xF8, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x6F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x80, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x27, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x20, 0x33, 0xC1, @@ -37959,8 +37990,8 @@ 0xB8, 0x0F, 0x66, 0x00, 0xB8, 0xFD, 0x5C, 0xC0, 0xB9, 0xF1, 0x50, 0x50, 0xBA, 0xDE, 0x90, 0x40, 0xDA, 0x38, 0xCA, 0x50, 0xDA, 0xEC, 0x16, 0x50, 0xDC, 0x19, 0xFD, 0xD0, 0xDC, 0xB9, 0x75, 0x40, 0xDD, 0xFB, 0x31, 0x50, 0xDE, 0x9B, 0xFA, 0x40, 0xDF, 0xDD, 0xB6, 0x50, 0xE0, 0x54, 0x4F, 0x40, -0xF4, 0x98, 0x1B, 0xD0, 0xF5, 0x05, 0x7A, 0x40, 0xF6, 0xC0, 0x80, 0x50, 0xF7, 0x0E, 0x3A, 0xC0, -0xF8, 0x51, 0x48, 0x50, 0xF8, 0xC7, 0xE1, 0x40, 0xFA, 0x0A, 0xEE, 0xD0, 0xFA, 0xA9, 0x14, 0xC0, +0xF4, 0x98, 0x1B, 0xD0, 0xF5, 0x05, 0x7A, 0x40, 0xF6, 0xC0, 0x80, 0x50, 0xF7, 0x0F, 0x8C, 0x40, +0xF8, 0x51, 0x48, 0x50, 0xF8, 0xC7, 0xEF, 0x50, 0xFA, 0x0A, 0xEE, 0xD0, 0xFA, 0xA9, 0x14, 0xC0, 0xFB, 0xEC, 0x22, 0x50, 0xFC, 0x8B, 0x99, 0xC0, 0x1D, 0xC9, 0xAA, 0x50, 0x1E, 0x78, 0xF3, 0xC0, 0x1F, 0xA0, 0x51, 0xD0, 0x20, 0x33, 0xEB, 0xC0, 0x21, 0x81, 0x85, 0x50, 0x22, 0x0B, 0xE4, 0xC0, 0x48, 0x60, 0x7F, 0x50, 0x52, 0x7F, 0x04, 0xC0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, @@ -37979,8 +38010,8 @@ 0xFF, 0xDE, 0x9B, 0xFA, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xB6, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x4F, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x1B, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x7A, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x80, 0x50, 0xFF, 0xFF, 0xFF, -0xFF, 0xF7, 0x0E, 0x3A, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x48, 0x50, 0xFF, 0xFF, 0xFF, -0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xEE, 0xD0, 0xFF, 0xFF, 0xFF, +0xFF, 0xF7, 0x0F, 0x8C, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x48, 0x50, 0xFF, 0xFF, 0xFF, +0xFF, 0xF8, 0xC7, 0xEF, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xEE, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x14, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x22, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x99, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0xAA, 0x50, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xF3, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x51, 0xD0, 0x00, 0x00, 0x00, @@ -38001,8 +38032,8 @@ 0xB8, 0x0F, 0x57, 0xF0, 0xB8, 0xFD, 0x4E, 0xB0, 0xB9, 0xF1, 0x42, 0x40, 0xBA, 0xDE, 0x82, 0x30, 0xDA, 0x38, 0xBC, 0x40, 0xDA, 0xEC, 0x08, 0x40, 0xDC, 0x19, 0xEF, 0xC0, 0xDC, 0xB9, 0x67, 0x30, 0xDD, 0xFB, 0x23, 0x40, 0xDE, 0x9B, 0xEC, 0x30, 0xDF, 0xDD, 0xA8, 0x40, 0xE0, 0x54, 0x41, 0x30, -0xF4, 0x98, 0x0D, 0xC0, 0xF5, 0x05, 0x6C, 0x30, 0xF6, 0xC0, 0x72, 0x40, 0xF7, 0x0E, 0x2C, 0xB0, -0xF8, 0x51, 0x3A, 0x40, 0xF8, 0xC7, 0xD3, 0x30, 0xFA, 0x0A, 0xE0, 0xC0, 0xFA, 0xA9, 0x06, 0xB0, +0xF4, 0x98, 0x0D, 0xC0, 0xF5, 0x05, 0x6C, 0x30, 0xF6, 0xC0, 0x72, 0x40, 0xF7, 0x0F, 0x7E, 0x30, +0xF8, 0x51, 0x3A, 0x40, 0xF8, 0xC7, 0xE1, 0x40, 0xFA, 0x0A, 0xE0, 0xC0, 0xFA, 0xA9, 0x06, 0xB0, 0xFB, 0xEC, 0x14, 0x40, 0xFC, 0x8B, 0x8B, 0xB0, 0x1D, 0xC9, 0x9C, 0x40, 0x1E, 0x78, 0xE5, 0xB0, 0x1F, 0xA0, 0x43, 0xC0, 0x20, 0x33, 0xDD, 0xB0, 0x21, 0x81, 0x77, 0x40, 0x22, 0x0B, 0xD6, 0xB0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, @@ -38019,8 +38050,8 @@ 0xFF, 0xFF, 0xFF, 0xDD, 0xFB, 0x23, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xEC, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xA8, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x41, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x0D, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x6C, 0x30, 0xFF, -0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x72, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x2C, 0xB0, 0xFF, -0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, +0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x72, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x7E, 0x30, 0xFF, +0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x06, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x14, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x8B, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x9C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xE5, 0xB0, 0x00, @@ -38480,8 +38511,8 @@ 0xB8, 0x0F, 0x49, 0xE0, 0xB8, 0xFD, 0x40, 0xA0, 0xB9, 0xF1, 0x34, 0x30, 0xBA, 0xDE, 0x74, 0x20, 0xDA, 0x38, 0xAE, 0x30, 0xDA, 0xEB, 0xFA, 0x30, 0xDC, 0x19, 0xE1, 0xB0, 0xDC, 0xB9, 0x59, 0x20, 0xDD, 0xFB, 0x15, 0x30, 0xDE, 0x9B, 0xDE, 0x20, 0xDF, 0xDD, 0x9A, 0x30, 0xE0, 0x54, 0x33, 0x20, -0xF4, 0x97, 0xFF, 0xB0, 0xF5, 0x05, 0x5E, 0x20, 0xF6, 0xC0, 0x64, 0x30, 0xF7, 0x0E, 0x1E, 0xA0, -0xF8, 0x51, 0x2C, 0x30, 0xF8, 0xC7, 0xC5, 0x20, 0xFA, 0x0A, 0xD2, 0xB0, 0xFA, 0xA8, 0xF8, 0xA0, +0xF4, 0x97, 0xFF, 0xB0, 0xF5, 0x05, 0x5E, 0x20, 0xF6, 0xC0, 0x64, 0x30, 0xF7, 0x0F, 0x70, 0x20, +0xF8, 0x51, 0x2C, 0x30, 0xF8, 0xC7, 0xD3, 0x30, 0xFA, 0x0A, 0xD2, 0xB0, 0xFA, 0xA8, 0xF8, 0xA0, 0xFB, 0xEC, 0x06, 0x30, 0xFC, 0x8B, 0x7D, 0xA0, 0x1D, 0xC9, 0x8E, 0x30, 0x1E, 0x78, 0xD7, 0xA0, 0x1F, 0xA0, 0x35, 0xB0, 0x20, 0x33, 0xCF, 0xA0, 0x21, 0x81, 0x69, 0x30, 0x22, 0x0B, 0xC8, 0xA0, 0x23, 0x58, 0x10, 0xB0, 0x23, 0xE2, 0x70, 0x20, 0x25, 0x37, 0xF2, 0xB0, 0x25, 0xD4, 0xC7, 0x20, @@ -38501,9 +38532,9 @@ 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xFB, 0x15, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x9A, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x33, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x97, 0xFF, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x5E, -0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x1E, -0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xC5, -0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xF8, +0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x70, +0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, +0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xF8, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x06, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x7D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x8E, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xD7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x35, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x20, 0x33, 0xCF, @@ -38728,8 +38759,8 @@ 0xB8, 0x0F, 0x66, 0x00, 0xB8, 0xFD, 0x5C, 0xC0, 0xB9, 0xF1, 0x50, 0x50, 0xBA, 0xDE, 0x90, 0x40, 0xDA, 0x38, 0xCA, 0x50, 0xDA, 0xEC, 0x16, 0x50, 0xDC, 0x19, 0xFD, 0xD0, 0xDC, 0xB9, 0x75, 0x40, 0xDD, 0xFB, 0x31, 0x50, 0xDE, 0x9B, 0xFA, 0x40, 0xDF, 0xDD, 0xB6, 0x50, 0xE0, 0x54, 0x4F, 0x40, -0xF4, 0x98, 0x1B, 0xD0, 0xF5, 0x05, 0x7A, 0x40, 0xF6, 0xC0, 0x80, 0x50, 0xF7, 0x0E, 0x3A, 0xC0, -0xF8, 0x51, 0x48, 0x50, 0xF8, 0xC7, 0xE1, 0x40, 0xFA, 0x0A, 0xEE, 0xD0, 0xFA, 0xA9, 0x14, 0xC0, +0xF4, 0x98, 0x1B, 0xD0, 0xF5, 0x05, 0x7A, 0x40, 0xF6, 0xC0, 0x80, 0x50, 0xF7, 0x0F, 0x8C, 0x40, +0xF8, 0x51, 0x48, 0x50, 0xF8, 0xC7, 0xEF, 0x50, 0xFA, 0x0A, 0xEE, 0xD0, 0xFA, 0xA9, 0x14, 0xC0, 0xFB, 0xEC, 0x22, 0x50, 0xFC, 0x8B, 0x99, 0xC0, 0x1D, 0xC9, 0xAA, 0x50, 0x1E, 0x78, 0xF3, 0xC0, 0x1F, 0xA0, 0x51, 0xD0, 0x20, 0x33, 0xEB, 0xC0, 0x21, 0x81, 0x85, 0x50, 0x22, 0x0B, 0xE4, 0xC0, 0x48, 0x60, 0x7F, 0x50, 0x52, 0x7F, 0x04, 0xC0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, @@ -38748,8 +38779,8 @@ 0xFF, 0xDE, 0x9B, 0xFA, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xB6, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x4F, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x1B, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x7A, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x80, 0x50, 0xFF, 0xFF, 0xFF, -0xFF, 0xF7, 0x0E, 0x3A, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x48, 0x50, 0xFF, 0xFF, 0xFF, -0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xEE, 0xD0, 0xFF, 0xFF, 0xFF, +0xFF, 0xF7, 0x0F, 0x8C, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x48, 0x50, 0xFF, 0xFF, 0xFF, +0xFF, 0xF8, 0xC7, 0xEF, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xEE, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x14, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x22, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x99, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0xAA, 0x50, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xF3, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x51, 0xD0, 0x00, 0x00, 0x00, @@ -39025,8 +39056,8 @@ 0xB8, 0x0F, 0x57, 0xF0, 0xB8, 0xFD, 0x4E, 0xB0, 0xB9, 0xF1, 0x42, 0x40, 0xBA, 0xDE, 0x82, 0x30, 0xDA, 0x38, 0xBC, 0x40, 0xDA, 0xEC, 0x08, 0x40, 0xDC, 0x19, 0xEF, 0xC0, 0xDC, 0xB9, 0x67, 0x30, 0xDD, 0xFB, 0x23, 0x40, 0xDE, 0x9B, 0xEC, 0x30, 0xDF, 0xDD, 0xA8, 0x40, 0xE0, 0x54, 0x41, 0x30, -0xF4, 0x98, 0x0D, 0xC0, 0xF5, 0x05, 0x6C, 0x30, 0xF6, 0xC0, 0x72, 0x40, 0xF7, 0x0E, 0x2C, 0xB0, -0xF8, 0x51, 0x3A, 0x40, 0xF8, 0xC7, 0xD3, 0x30, 0xFA, 0x0A, 0xE0, 0xC0, 0xFA, 0xA9, 0x06, 0xB0, +0xF4, 0x98, 0x0D, 0xC0, 0xF5, 0x05, 0x6C, 0x30, 0xF6, 0xC0, 0x72, 0x40, 0xF7, 0x0F, 0x7E, 0x30, +0xF8, 0x51, 0x3A, 0x40, 0xF8, 0xC7, 0xE1, 0x40, 0xFA, 0x0A, 0xE0, 0xC0, 0xFA, 0xA9, 0x06, 0xB0, 0xFB, 0xEC, 0x14, 0x40, 0xFC, 0x8B, 0x8B, 0xB0, 0x1D, 0xC9, 0x9C, 0x40, 0x1E, 0x78, 0xE5, 0xB0, 0x1F, 0xA0, 0x43, 0xC0, 0x20, 0x33, 0xDD, 0xB0, 0x21, 0x81, 0x77, 0x40, 0x22, 0x0B, 0xD6, 0xB0, 0x48, 0x60, 0x71, 0x40, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, @@ -39044,8 +39075,8 @@ 0x23, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xEC, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xA8, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x41, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x0D, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x6C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, -0x72, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x2C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, -0x3A, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, +0x72, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x7E, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, +0x3A, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x06, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x14, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x8B, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x9C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xE5, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, @@ -39259,8 +39290,8 @@ 0xB8, 0x0F, 0x49, 0xE0, 0xB8, 0xFD, 0x40, 0xA0, 0xB9, 0xF1, 0x34, 0x30, 0xBA, 0xDE, 0x74, 0x20, 0xDA, 0x38, 0xAE, 0x30, 0xDA, 0xEB, 0xFA, 0x30, 0xDC, 0x19, 0xE1, 0xB0, 0xDC, 0xB9, 0x59, 0x20, 0xDD, 0xFB, 0x15, 0x30, 0xDE, 0x9B, 0xDE, 0x20, 0xDF, 0xDD, 0x9A, 0x30, 0xE0, 0x54, 0x33, 0x20, -0xF4, 0x5A, 0x09, 0x30, 0xF5, 0x05, 0x5E, 0x20, 0xF6, 0xC0, 0x64, 0x30, 0xF7, 0x0E, 0x1E, 0xA0, -0xF8, 0x51, 0x2C, 0x30, 0xF8, 0xC7, 0xC5, 0x20, 0xFA, 0x0A, 0xD2, 0xB0, 0xFA, 0xA8, 0xF8, 0xA0, +0xF4, 0x5A, 0x09, 0x30, 0xF5, 0x05, 0x5E, 0x20, 0xF6, 0xC0, 0x64, 0x30, 0xF7, 0x0F, 0x70, 0x20, +0xF8, 0x51, 0x2C, 0x30, 0xF8, 0xC7, 0xD3, 0x30, 0xFA, 0x0A, 0xD2, 0xB0, 0xFA, 0xA8, 0xF8, 0xA0, 0xFB, 0xEC, 0x06, 0x30, 0xFC, 0x8B, 0x7D, 0xA0, 0x1D, 0xC9, 0x8E, 0x30, 0x1E, 0x78, 0xD7, 0xA0, 0x1F, 0xA0, 0x35, 0xB0, 0x20, 0x33, 0xCF, 0xA0, 0x21, 0x81, 0x69, 0x30, 0x22, 0x0B, 0xC8, 0xA0, 0x23, 0x58, 0x10, 0xB0, 0x23, 0xE2, 0x70, 0x20, 0x25, 0x37, 0xF2, 0xB0, 0x25, 0xD4, 0xC7, 0x20, @@ -39297,8 +39328,8 @@ 0xFF, 0xDE, 0x9B, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x9A, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x33, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x5A, 0x09, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x5E, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, 0xFF, 0xFF, -0xFF, 0xF7, 0x0E, 0x1E, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, 0xFF, 0xFF, -0xFF, 0xF8, 0xC7, 0xC5, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, +0xFF, 0xF7, 0x0F, 0x70, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, 0xFF, 0xFF, +0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xF8, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x06, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x7D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x8E, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xD7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x35, 0xB0, 0x00, 0x00, 0x00, @@ -51718,8 +51749,8 @@ 0xB8, 0x0F, 0x66, 0x00, 0xB8, 0xFD, 0x5C, 0xC0, 0xB9, 0xF1, 0x50, 0x50, 0xBA, 0xDE, 0x90, 0x40, 0xDA, 0x38, 0xCA, 0x50, 0xDA, 0xEC, 0x16, 0x50, 0xDC, 0x19, 0xFD, 0xD0, 0xDC, 0xB9, 0x75, 0x40, 0xDD, 0xFB, 0x31, 0x50, 0xDE, 0x9B, 0xFA, 0x40, 0xDF, 0xDD, 0xB6, 0x50, 0xE0, 0x54, 0x4F, 0x40, -0xF4, 0x98, 0x1B, 0xD0, 0xF5, 0x05, 0x7A, 0x40, 0xF6, 0xC0, 0x80, 0x50, 0xF7, 0x0E, 0x3A, 0xC0, -0xF8, 0x51, 0x48, 0x50, 0xF8, 0xC7, 0xE1, 0x40, 0xFA, 0x0A, 0xEE, 0xD0, 0xFA, 0xA9, 0x14, 0xC0, +0xF4, 0x98, 0x1B, 0xD0, 0xF5, 0x05, 0x7A, 0x40, 0xF6, 0xC0, 0x80, 0x50, 0xF7, 0x0F, 0x8C, 0x40, +0xF8, 0x51, 0x48, 0x50, 0xF8, 0xC7, 0xEF, 0x50, 0xFA, 0x0A, 0xEE, 0xD0, 0xFA, 0xA9, 0x14, 0xC0, 0xFB, 0xEC, 0x22, 0x50, 0xFC, 0x8B, 0x99, 0xC0, 0x1D, 0xC9, 0xAA, 0x50, 0x1E, 0x78, 0xF3, 0xC0, 0x1F, 0xA0, 0x51, 0xD0, 0x20, 0x33, 0xEB, 0xC0, 0x21, 0x81, 0x85, 0x50, 0x22, 0x0B, 0xE4, 0xC0, 0x48, 0x60, 0x7F, 0x50, 0x52, 0x7F, 0x04, 0xC0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, @@ -51738,8 +51769,8 @@ 0xFF, 0xDE, 0x9B, 0xFA, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xB6, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x4F, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x1B, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x7A, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x80, 0x50, 0xFF, 0xFF, 0xFF, -0xFF, 0xF7, 0x0E, 0x3A, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x48, 0x50, 0xFF, 0xFF, 0xFF, -0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xEE, 0xD0, 0xFF, 0xFF, 0xFF, +0xFF, 0xF7, 0x0F, 0x8C, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x48, 0x50, 0xFF, 0xFF, 0xFF, +0xFF, 0xF8, 0xC7, 0xEF, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xEE, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x14, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x22, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x99, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0xAA, 0x50, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xF3, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x51, 0xD0, 0x00, 0x00, 0x00, @@ -51760,8 +51791,8 @@ 0xB8, 0x0F, 0x3B, 0xD0, 0xB8, 0xFD, 0x32, 0x90, 0xB9, 0xF1, 0x26, 0x20, 0xBA, 0xDE, 0x66, 0x10, 0xDA, 0x38, 0xA0, 0x20, 0xDA, 0xEB, 0xEC, 0x20, 0xDC, 0x19, 0xD3, 0xA0, 0xDC, 0xB9, 0x4B, 0x10, 0xDD, 0xFB, 0x07, 0x20, 0xDE, 0x9B, 0xD0, 0x10, 0xDF, 0xDD, 0x8C, 0x20, 0xE0, 0x54, 0x25, 0x10, -0xF4, 0x97, 0xF1, 0xA0, 0xF5, 0x05, 0x50, 0x10, 0xF6, 0xC0, 0x56, 0x20, 0xF7, 0x0E, 0x10, 0x90, -0xF8, 0x51, 0x1E, 0x20, 0xF8, 0xC7, 0xB7, 0x10, 0xFA, 0x0A, 0xC4, 0xA0, 0xFA, 0xA8, 0xEA, 0x90, +0xF4, 0x97, 0xF1, 0xA0, 0xF5, 0x05, 0x50, 0x10, 0xF6, 0xC0, 0x56, 0x20, 0xF7, 0x0F, 0x62, 0x10, +0xF8, 0x51, 0x1E, 0x20, 0xF8, 0xC7, 0xC5, 0x20, 0xFA, 0x0A, 0xC4, 0xA0, 0xFA, 0xA8, 0xEA, 0x90, 0xFB, 0xEB, 0xF8, 0x20, 0xFC, 0x8B, 0x6F, 0x90, 0x1D, 0xC9, 0x80, 0x20, 0x1E, 0x78, 0xC9, 0x90, 0x1F, 0xA0, 0x27, 0xA0, 0x20, 0x33, 0xC1, 0x90, 0x21, 0x81, 0x5B, 0x20, 0x22, 0x0B, 0xBA, 0x90, 0x23, 0x58, 0x02, 0xA0, 0x23, 0xE2, 0x62, 0x10, 0x25, 0x37, 0xE4, 0xA0, 0x25, 0xD4, 0xB9, 0x10, @@ -51781,9 +51812,9 @@ 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xFB, 0x07, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xD0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x8C, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x25, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x97, 0xF1, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x50, -0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x56, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x10, -0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x1E, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xB7, -0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xC4, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xEA, +0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x56, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x62, +0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x1E, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xC5, +0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xC4, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xEA, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEB, 0xF8, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x6F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x80, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x27, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x20, 0x33, 0xC1, @@ -51807,8 +51838,8 @@ 0xB8, 0x0F, 0x49, 0xE0, 0xB8, 0xFD, 0x40, 0xA0, 0xB9, 0xF1, 0x34, 0x30, 0xBA, 0xDE, 0x74, 0x20, 0xDA, 0x38, 0xAE, 0x30, 0xDA, 0xEB, 0xFA, 0x30, 0xDC, 0x19, 0xE1, 0xB0, 0xDC, 0xB9, 0x59, 0x20, 0xDD, 0xFB, 0x15, 0x30, 0xDE, 0x9B, 0xDE, 0x20, 0xDF, 0xDD, 0x9A, 0x30, 0xE0, 0x54, 0x33, 0x20, -0xF4, 0x5A, 0x09, 0x30, 0xF5, 0x05, 0x5E, 0x20, 0xF6, 0xC0, 0x64, 0x30, 0xF7, 0x0E, 0x1E, 0xA0, -0xF8, 0x51, 0x2C, 0x30, 0xF8, 0xC7, 0xC5, 0x20, 0xFA, 0x0A, 0xD2, 0xB0, 0xFA, 0xA8, 0xF8, 0xA0, +0xF4, 0x5A, 0x09, 0x30, 0xF5, 0x05, 0x5E, 0x20, 0xF6, 0xC0, 0x64, 0x30, 0xF7, 0x0F, 0x70, 0x20, +0xF8, 0x51, 0x2C, 0x30, 0xF8, 0xC7, 0xD3, 0x30, 0xFA, 0x0A, 0xD2, 0xB0, 0xFA, 0xA8, 0xF8, 0xA0, 0xFB, 0xEC, 0x06, 0x30, 0xFC, 0x8B, 0x7D, 0xA0, 0x1D, 0xC9, 0x8E, 0x30, 0x1E, 0x78, 0xD7, 0xA0, 0x1F, 0xA0, 0x35, 0xB0, 0x20, 0x33, 0xCF, 0xA0, 0x21, 0x81, 0x69, 0x30, 0x22, 0x0B, 0xC8, 0xA0, 0x23, 0x58, 0x10, 0xB0, 0x23, 0xE2, 0x70, 0x20, 0x25, 0x37, 0xF2, 0xB0, 0x25, 0xD4, 0xC7, 0x20, @@ -51845,8 +51876,8 @@ 0xFF, 0xDE, 0x9B, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0x9A, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x33, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x5A, 0x09, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x5E, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x64, 0x30, 0xFF, 0xFF, 0xFF, -0xFF, 0xF7, 0x0E, 0x1E, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, 0xFF, 0xFF, -0xFF, 0xF8, 0xC7, 0xC5, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, +0xFF, 0xF7, 0x0F, 0x70, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x2C, 0x30, 0xFF, 0xFF, 0xFF, +0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xD2, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA8, 0xF8, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x06, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x7D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x8E, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xD7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x35, 0xB0, 0x00, 0x00, 0x00, @@ -51900,8 +51931,8 @@ 0xB8, 0x0F, 0x57, 0xF0, 0xB8, 0xFD, 0x4E, 0xB0, 0xB9, 0xF1, 0x42, 0x40, 0xBA, 0xDE, 0x82, 0x30, 0xDA, 0x38, 0xBC, 0x40, 0xDA, 0xEC, 0x08, 0x40, 0xDC, 0x19, 0xEF, 0xC0, 0xDC, 0xB9, 0x67, 0x30, 0xDD, 0xFB, 0x23, 0x40, 0xDE, 0x9B, 0xEC, 0x30, 0xDF, 0xDD, 0xA8, 0x40, 0xE0, 0x54, 0x41, 0x30, -0xF4, 0x98, 0x0D, 0xC0, 0xF5, 0x05, 0x6C, 0x30, 0xF6, 0xC0, 0x72, 0x40, 0xF7, 0x0E, 0x2C, 0xB0, -0xF8, 0x51, 0x3A, 0x40, 0xF8, 0xC7, 0xD3, 0x30, 0xFA, 0x0A, 0xE0, 0xC0, 0xFA, 0xA9, 0x06, 0xB0, +0xF4, 0x98, 0x0D, 0xC0, 0xF5, 0x05, 0x6C, 0x30, 0xF6, 0xC0, 0x72, 0x40, 0xF7, 0x0F, 0x7E, 0x30, +0xF8, 0x51, 0x3A, 0x40, 0xF8, 0xC7, 0xE1, 0x40, 0xFA, 0x0A, 0xE0, 0xC0, 0xFA, 0xA9, 0x06, 0xB0, 0xFB, 0xEC, 0x14, 0x40, 0xFC, 0x8B, 0x8B, 0xB0, 0x1D, 0xC9, 0x9C, 0x40, 0x1E, 0x78, 0xE5, 0xB0, 0x1F, 0xA0, 0x43, 0xC0, 0x20, 0x33, 0xDD, 0xB0, 0x21, 0x81, 0x77, 0x40, 0x22, 0x0B, 0xD6, 0xB0, 0x2C, 0xC0, 0xC3, 0x40, 0x2D, 0x66, 0xD2, 0x30, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, @@ -51919,8 +51950,8 @@ 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0x9B, 0xEC, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xDD, 0xA8, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x54, 0x41, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x98, 0x0D, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x05, 0x6C, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0xC0, 0x72, -0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0E, 0x2C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, -0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xD3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, +0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x0F, 0x7E, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x51, 0x3A, +0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC7, 0xE1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x0A, 0xE0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xA9, 0x06, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xEC, 0x14, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x8B, 0x8B, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC9, 0x9C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0xE5, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA0, 0x43, @@ -53868,7 +53899,7 @@ /* Cuba */ 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x9C, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x9A, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0x00, 0xAC, 0x62, 0xC2, 0x80, 0xB1, 0xD3, 0x94, 0x50, 0xB2, 0x74, 0x5D, 0x40, 0xC8, 0x5B, 0x66, 0xD0, 0xC8, 0xD3, 0x51, 0x40, 0xCA, 0x3B, 0x48, 0xD0, 0xCA, 0xBC, 0x6D, 0xC0, 0xCC, 0x24, 0x65, 0x50, 0xCC, 0x9C, 0x4F, 0xC0, 0xD1, 0xC4, 0x0B, 0x50, 0xD2, 0x3B, 0xF5, 0xC0, 0xD3, 0xA3, 0xED, 0x50, @@ -53902,122 +53933,121 @@ 0x5F, 0x9E, 0x40, 0xD0, 0x60, 0x4D, 0x98, 0x50, 0x61, 0x87, 0x5D, 0x50, 0x62, 0x2D, 0x7A, 0x50, 0x63, 0x67, 0x3F, 0x50, 0x64, 0x0D, 0x5C, 0x50, 0x65, 0x47, 0x21, 0x50, 0x65, 0xED, 0x3E, 0x50, 0x67, 0x27, 0x03, 0x50, 0x67, 0xCD, 0x20, 0x50, 0x69, 0x06, 0xE5, 0x50, 0x69, 0xAD, 0x02, 0x50, -0x6A, 0xE6, 0xC7, 0x50, 0x6B, 0x96, 0x1E, 0xD0, 0x6C, 0xCF, 0xE3, 0xD0, 0x6D, 0x76, 0x00, 0xD0, -0x6E, 0xAF, 0xC5, 0xD0, 0x6F, 0x55, 0xE2, 0xD0, 0x70, 0x8F, 0xA7, 0xD0, 0x71, 0x35, 0xC4, 0xD0, -0x72, 0x6F, 0x89, 0xD0, 0x73, 0x15, 0xA6, 0xD0, 0x74, 0x4F, 0x6B, 0xD0, 0x74, 0xFE, 0xC3, 0x50, -0x76, 0x38, 0x88, 0x50, 0x76, 0xDE, 0xA5, 0x50, 0x78, 0x18, 0x6A, 0x50, 0x78, 0xBE, 0x87, 0x50, -0x79, 0xF8, 0x4C, 0x50, 0x7A, 0x9E, 0x69, 0x50, 0x7B, 0xD8, 0x2E, 0x50, 0x7C, 0x7E, 0x4B, 0x50, -0x7D, 0xB8, 0x10, 0x50, 0x7E, 0x5E, 0x2D, 0x50, 0x7F, 0x97, 0xF2, 0x50, 0x01, 0x03, 0x02, 0x03, +0x6C, 0xCF, 0xE3, 0xD0, 0x6D, 0x76, 0x00, 0xD0, 0x6E, 0xAF, 0xC5, 0xD0, 0x6F, 0x55, 0xE2, 0xD0, +0x70, 0x8F, 0xA7, 0xD0, 0x71, 0x35, 0xC4, 0xD0, 0x72, 0x6F, 0x89, 0xD0, 0x73, 0x15, 0xA6, 0xD0, +0x74, 0x4F, 0x6B, 0xD0, 0x74, 0xFE, 0xC3, 0x50, 0x76, 0x38, 0x88, 0x50, 0x76, 0xDE, 0xA5, 0x50, +0x78, 0x18, 0x6A, 0x50, 0x78, 0xBE, 0x87, 0x50, 0x79, 0xF8, 0x4C, 0x50, 0x7A, 0x9E, 0x69, 0x50, +0x7B, 0xD8, 0x2E, 0x50, 0x7C, 0x7E, 0x4B, 0x50, 0x7D, 0xB8, 0x10, 0x50, 0x7E, 0x5E, 0x2D, 0x50, +0x7F, 0x97, 0xF2, 0x50, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, -0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x04, -0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x05, 0x04, 0x05, 0x04, +0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, +0x02, 0x04, 0x02, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, -0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, -0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0xFF, 0xFF, 0xB2, 0xC8, 0x00, 0x00, 0xFF, 0xFF, -0xB2, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, -0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0x4C, 0x4D, 0x54, 0x00, -0x48, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, -0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x9C, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, -0xFF, 0xFF, 0x69, 0x87, 0x28, 0xB8, 0xFF, 0xFF, 0xFF, 0xFF, 0xAC, 0x62, 0xC2, 0x80, 0xFF, 0xFF, -0xFF, 0xFF, 0xB1, 0xD3, 0x94, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x74, 0x5D, 0x40, 0xFF, 0xFF, -0xFF, 0xFF, 0xC8, 0x5B, 0x66, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0xD3, 0x51, 0x40, 0xFF, 0xFF, -0xFF, 0xFF, 0xCA, 0x3B, 0x48, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xBC, 0x6D, 0xC0, 0xFF, 0xFF, -0xFF, 0xFF, 0xCC, 0x24, 0x65, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x9C, 0x4F, 0xC0, 0xFF, 0xFF, -0xFF, 0xFF, 0xD1, 0xC4, 0x0B, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x3B, 0xF5, 0xC0, 0xFF, 0xFF, -0xFF, 0xFF, 0xD3, 0xA3, 0xED, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x1B, 0xD7, 0xC0, 0xFF, 0xFF, -0xFF, 0xFF, 0xF7, 0x60, 0x05, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0xFF, 0x7D, 0x40, 0xFF, 0xFF, -0xFF, 0xFF, 0xF9, 0x3D, 0x44, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x53, 0xC0, 0xFF, 0xFF, -0xFF, 0xFF, 0xFA, 0xDB, 0x3B, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xA7, 0x86, 0x40, 0xFF, 0xFF, -0xFF, 0xFF, 0xFC, 0xC5, 0xA9, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0x87, 0x68, 0x40, 0xFF, 0xFF, -0xFF, 0xFF, 0xFE, 0xB8, 0x00, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0xE3, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x00, 0x97, 0xE2, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xC5, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x02, 0x77, 0xC4, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x03, 0x70, 0xE2, 0x40, 0x00, 0x00, -0x00, 0x00, 0x04, 0x60, 0xE1, 0x50, 0x00, 0x00, 0x00, 0x00, 0x05, 0x35, 0x14, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x06, 0x40, 0xC3, 0x50, 0x00, 0x00, 0x00, 0x00, 0x07, 0x16, 0x48, 0x40, 0x00, 0x00, -0x00, 0x00, 0x08, 0x20, 0xA5, 0x50, 0x00, 0x00, 0x00, 0x00, 0x08, 0xF7, 0x7B, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x0A, 0x00, 0x87, 0x50, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0x6A, 0x40, 0x00, 0x00, -0x00, 0x00, 0x0B, 0xE0, 0x69, 0x50, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0x86, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x0D, 0xC0, 0x4B, 0x50, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0x68, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x0F, 0xB2, 0xA2, 0x50, 0x00, 0x00, 0x00, 0x00, 0x10, 0x7D, 0x9B, 0x40, 0x00, 0x00, -0x00, 0x00, 0x11, 0x51, 0xEA, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x12, 0x66, 0xB7, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x13, 0x31, 0xCC, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x14, 0x46, 0x99, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x15, 0x5B, 0x82, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x26, 0x7B, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x17, 0x3B, 0x64, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x18, 0x06, 0x5D, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x19, 0x1B, 0x46, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x19, 0xE6, 0x3F, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x1A, 0xFB, 0x28, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xCF, 0x5C, 0x40, 0x00, 0x00, -0x00, 0x00, 0x1C, 0xDB, 0x0A, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xAF, 0x3E, 0x40, 0x00, 0x00, -0x00, 0x00, 0x1E, 0x7A, 0x53, 0x50, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x8F, 0x20, 0x40, 0x00, 0x00, -0x00, 0x00, 0x20, 0x5A, 0x35, 0x50, 0x00, 0x00, 0x00, 0x00, 0x21, 0x6F, 0x02, 0x40, 0x00, 0x00, -0x00, 0x00, 0x22, 0x43, 0x51, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x23, 0x4E, 0xE4, 0x40, 0x00, 0x00, -0x00, 0x00, 0x24, 0x23, 0x33, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x25, 0x2E, 0xC6, 0x40, 0x00, 0x00, -0x00, 0x00, 0x26, 0x15, 0x8A, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x27, 0x17, 0xE2, 0xC0, 0x00, 0x00, -0x00, 0x00, 0x27, 0xFE, 0xA7, 0x50, 0x00, 0x00, 0x00, 0x00, 0x28, 0xF7, 0xD2, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x29, 0xDE, 0x89, 0x50, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xD7, 0xB4, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x2B, 0xBE, 0x6B, 0x50, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xB7, 0x96, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x2D, 0x9E, 0x4D, 0x50, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x97, 0x78, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x2F, 0x7E, 0x2F, 0x50, 0x00, 0x00, 0x00, 0x00, 0x30, 0x77, 0x5A, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x31, 0x67, 0x4B, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x32, 0x57, 0x3C, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x33, 0x47, 0x2D, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x34, 0x40, 0x59, 0x50, 0x00, 0x00, -0x00, 0x00, 0x35, 0x1D, 0xD5, 0x50, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xB0, 0x50, 0x00, 0x00, -0x00, 0x00, 0x36, 0xFD, 0xB7, 0x50, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xCC, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x38, 0xE6, 0xD3, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xAE, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x3A, 0xC6, 0xB5, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x90, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x3C, 0xAF, 0xD2, 0x50, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x72, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x3E, 0x8F, 0xB4, 0x50, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x54, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x40, 0x66, 0x5B, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x35, 0x50, 0x00, 0x00, -0x00, 0x00, 0x45, 0xF3, 0x8C, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x17, 0x50, 0x00, 0x00, -0x00, 0x00, 0x47, 0xDC, 0xA9, 0x50, 0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xF9, 0x50, 0x00, 0x00, -0x00, 0x00, 0x49, 0xB3, 0x50, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xDB, 0x50, 0x00, 0x00, -0x00, 0x00, 0x4B, 0x9C, 0x6D, 0x50, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xF7, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x4D, 0x85, 0x89, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xBF, 0x4E, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x4F, 0x77, 0xE0, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x95, 0xF6, 0x50, 0x00, 0x00, -0x00, 0x00, 0x51, 0x3C, 0x13, 0x50, 0x00, 0x00, 0x00, 0x00, 0x52, 0x75, 0xD8, 0x50, 0x00, 0x00, -0x00, 0x00, 0x53, 0x1B, 0xF5, 0x50, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xBA, 0x50, 0x00, 0x00, -0x00, 0x00, 0x54, 0xFB, 0xD7, 0x50, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0x9C, 0x50, 0x00, 0x00, -0x00, 0x00, 0x56, 0xE4, 0xF3, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xB8, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x58, 0xC4, 0xD5, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0x9A, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x5A, 0xA4, 0xB7, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0x7C, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x5C, 0x84, 0x99, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x5E, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x5E, 0x64, 0x7B, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x40, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x60, 0x4D, 0x98, 0x50, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x5D, 0x50, 0x00, 0x00, -0x00, 0x00, 0x62, 0x2D, 0x7A, 0x50, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x3F, 0x50, 0x00, 0x00, -0x00, 0x00, 0x64, 0x0D, 0x5C, 0x50, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x21, 0x50, 0x00, 0x00, -0x00, 0x00, 0x65, 0xED, 0x3E, 0x50, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x03, 0x50, 0x00, 0x00, -0x00, 0x00, 0x67, 0xCD, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, 0x69, 0x06, 0xE5, 0x50, 0x00, 0x00, -0x00, 0x00, 0x69, 0xAD, 0x02, 0x50, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xC7, 0x50, 0x00, 0x00, -0x00, 0x00, 0x6B, 0x96, 0x1E, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xCF, 0xE3, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x6D, 0x76, 0x00, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xC5, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x6F, 0x55, 0xE2, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xA7, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x71, 0x35, 0xC4, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0x89, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x73, 0x15, 0xA6, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0x6B, 0xD0, 0x00, 0x00, -0x00, 0x00, 0x74, 0xFE, 0xC3, 0x50, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0x88, 0x50, 0x00, 0x00, -0x00, 0x00, 0x76, 0xDE, 0xA5, 0x50, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0x6A, 0x50, 0x00, 0x00, -0x00, 0x00, 0x78, 0xBE, 0x87, 0x50, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x4C, 0x50, 0x00, 0x00, -0x00, 0x00, 0x7A, 0x9E, 0x69, 0x50, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x2E, 0x50, 0x00, 0x00, -0x00, 0x00, 0x7C, 0x7E, 0x4B, 0x50, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x10, 0x50, 0x00, 0x00, -0x00, 0x00, 0x7E, 0x5E, 0x2D, 0x50, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x97, 0xF2, 0x50, 0x01, 0x03, +0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0xFF, 0xFF, +0xB2, 0xC8, 0x00, 0x00, 0xFF, 0xFF, 0xB2, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, +0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, +0x01, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, +0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A, 0x00, 0x00, 0x00, 0x06, +0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x69, 0x87, 0x28, 0xB8, 0xFF, 0xFF, 0xFF, 0xFF, +0xAC, 0x62, 0xC2, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0xD3, 0x94, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, +0xB2, 0x74, 0x5D, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x5B, 0x66, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, +0xC8, 0xD3, 0x51, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0x3B, 0x48, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, +0xCA, 0xBC, 0x6D, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x24, 0x65, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, +0xCC, 0x9C, 0x4F, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0xC4, 0x0B, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, +0xD2, 0x3B, 0xF5, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0xA3, 0xED, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, +0xD4, 0x1B, 0xD7, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x60, 0x05, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, +0xF7, 0xFF, 0x7D, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0x3D, 0x44, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, +0xF9, 0xE3, 0x53, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xDB, 0x3B, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, +0xFB, 0xA7, 0x86, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xC5, 0xA9, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, +0xFD, 0x87, 0x68, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x00, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, +0xFF, 0xA7, 0xE3, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x97, 0xE2, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x01, 0x87, 0xC5, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x02, 0x77, 0xC4, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x03, 0x70, 0xE2, 0x40, 0x00, 0x00, 0x00, 0x00, 0x04, 0x60, 0xE1, 0x50, 0x00, 0x00, 0x00, 0x00, +0x05, 0x35, 0x14, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xC3, 0x50, 0x00, 0x00, 0x00, 0x00, +0x07, 0x16, 0x48, 0x40, 0x00, 0x00, 0x00, 0x00, 0x08, 0x20, 0xA5, 0x50, 0x00, 0x00, 0x00, 0x00, +0x08, 0xF7, 0x7B, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x87, 0x50, 0x00, 0x00, 0x00, 0x00, +0x0A, 0xF0, 0x6A, 0x40, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x69, 0x50, 0x00, 0x00, 0x00, 0x00, +0x0C, 0xD9, 0x86, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x4B, 0x50, 0x00, 0x00, 0x00, 0x00, +0x0E, 0xB9, 0x68, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xB2, 0xA2, 0x50, 0x00, 0x00, 0x00, 0x00, +0x10, 0x7D, 0x9B, 0x40, 0x00, 0x00, 0x00, 0x00, 0x11, 0x51, 0xEA, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x12, 0x66, 0xB7, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x31, 0xCC, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x14, 0x46, 0x99, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x5B, 0x82, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x16, 0x26, 0x7B, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x3B, 0x64, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x18, 0x06, 0x5D, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x19, 0x1B, 0x46, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x19, 0xE6, 0x3F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xFB, 0x28, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x1B, 0xCF, 0x5C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xDB, 0x0A, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x1D, 0xAF, 0x3E, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x7A, 0x53, 0x50, 0x00, 0x00, 0x00, 0x00, +0x1F, 0x8F, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00, 0x20, 0x5A, 0x35, 0x50, 0x00, 0x00, 0x00, 0x00, +0x21, 0x6F, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00, 0x22, 0x43, 0x51, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x23, 0x4E, 0xE4, 0x40, 0x00, 0x00, 0x00, 0x00, 0x24, 0x23, 0x33, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x25, 0x2E, 0xC6, 0x40, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0x8A, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x27, 0x17, 0xE2, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xA7, 0x50, 0x00, 0x00, 0x00, 0x00, +0x28, 0xF7, 0xD2, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0x89, 0x50, 0x00, 0x00, 0x00, 0x00, +0x2A, 0xD7, 0xB4, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x6B, 0x50, 0x00, 0x00, 0x00, 0x00, +0x2C, 0xB7, 0x96, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x4D, 0x50, 0x00, 0x00, 0x00, 0x00, +0x2E, 0x97, 0x78, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x2F, 0x50, 0x00, 0x00, 0x00, 0x00, +0x30, 0x77, 0x5A, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x4B, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x32, 0x57, 0x3C, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x2D, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x34, 0x40, 0x59, 0x50, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0xD5, 0x50, 0x00, 0x00, 0x00, 0x00, +0x36, 0x32, 0xB0, 0x50, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0xB7, 0x50, 0x00, 0x00, 0x00, 0x00, +0x38, 0x1B, 0xCC, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xD3, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x39, 0xFB, 0xAE, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xB5, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x3B, 0xDB, 0x90, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xD2, 0x50, 0x00, 0x00, 0x00, 0x00, +0x3D, 0xBB, 0x72, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xB4, 0x50, 0x00, 0x00, 0x00, 0x00, +0x3F, 0x9B, 0x54, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x5B, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x45, 0x44, 0x35, 0x50, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0x8C, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x47, 0x24, 0x17, 0x50, 0x00, 0x00, 0x00, 0x00, 0x47, 0xDC, 0xA9, 0x50, 0x00, 0x00, 0x00, 0x00, +0x49, 0x03, 0xF9, 0x50, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x50, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x4A, 0xE3, 0xDB, 0x50, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0x6D, 0x50, 0x00, 0x00, 0x00, 0x00, +0x4C, 0xCC, 0xF7, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x85, 0x89, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x4E, 0xBF, 0x4E, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x77, 0xE0, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x50, 0x95, 0xF6, 0x50, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x13, 0x50, 0x00, 0x00, 0x00, 0x00, +0x52, 0x75, 0xD8, 0x50, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1B, 0xF5, 0x50, 0x00, 0x00, 0x00, 0x00, +0x54, 0x55, 0xBA, 0x50, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFB, 0xD7, 0x50, 0x00, 0x00, 0x00, 0x00, +0x56, 0x35, 0x9C, 0x50, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE4, 0xF3, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x58, 0x1E, 0xB8, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC4, 0xD5, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x59, 0xFE, 0x9A, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xB7, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x5B, 0xDE, 0x7C, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0x99, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x5D, 0xBE, 0x5E, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0x7B, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x5F, 0x9E, 0x40, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0x98, 0x50, 0x00, 0x00, 0x00, 0x00, +0x61, 0x87, 0x5D, 0x50, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0x7A, 0x50, 0x00, 0x00, 0x00, 0x00, +0x63, 0x67, 0x3F, 0x50, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x5C, 0x50, 0x00, 0x00, 0x00, 0x00, +0x65, 0x47, 0x21, 0x50, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x3E, 0x50, 0x00, 0x00, 0x00, 0x00, +0x67, 0x27, 0x03, 0x50, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, +0x69, 0x06, 0xE5, 0x50, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x02, 0x50, 0x00, 0x00, 0x00, 0x00, +0x6C, 0xCF, 0xE3, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x00, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x6E, 0xAF, 0xC5, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x55, 0xE2, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x70, 0x8F, 0xA7, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xC4, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x72, 0x6F, 0x89, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xA6, 0xD0, 0x00, 0x00, 0x00, 0x00, +0x74, 0x4F, 0x6B, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xC3, 0x50, 0x00, 0x00, 0x00, 0x00, +0x76, 0x38, 0x88, 0x50, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xA5, 0x50, 0x00, 0x00, 0x00, 0x00, +0x78, 0x18, 0x6A, 0x50, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0x87, 0x50, 0x00, 0x00, 0x00, 0x00, +0x79, 0xF8, 0x4C, 0x50, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0x69, 0x50, 0x00, 0x00, 0x00, 0x00, +0x7B, 0xD8, 0x2E, 0x50, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x4B, 0x50, 0x00, 0x00, 0x00, 0x00, +0x7D, 0xB8, 0x10, 0x50, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x2D, 0x50, 0x00, 0x00, 0x00, 0x00, +0x7F, 0x97, 0xF2, 0x50, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, -0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, -0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x05, 0x04, -0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, +0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, +0x02, 0x04, 0x02, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, -0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0xFF, 0xFF, 0xB2, 0xC8, 0x00, 0x00, -0xFF, 0xFF, 0xB2, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, -0x00, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0x4C, 0x4D, -0x54, 0x00, 0x48, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, -0x00, 0x00, 0x01, 0x01, 0x0A, 0x43, 0x53, 0x54, 0x35, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, -0x32, 0x2E, 0x30, 0x2F, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x2F, 0x31, 0x0A, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0xFF, 0xFF, +0xB2, 0xC8, 0x00, 0x00, 0xFF, 0xFF, 0xB2, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, +0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, +0x01, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, +0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0A, 0x43, 0x53, 0x54, 0x35, 0x43, 0x44, 0x54, +0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2F, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, +0x30, 0x2F, 0x31, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + /* EET */ 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -70690,4 +70720,4 @@ }; #endif -const timelib_tzdb timezonedb_builtin = { "2026.5", 598, timezonedb_idx_builtin, timelib_timezone_db_data_builtin }; +const timelib_tzdb timezonedb_builtin = { "2026.6", 598, timezonedb_idx_builtin, timelib_timezone_db_data_builtin }; diff -Nru php8.4-8.4.27/ext/date/php_date.c php8.4-8.4.28/ext/date/php_date.c --- php8.4-8.4.27/ext/date/php_date.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/date/php_date.c 2026-11-17 20:29:32.000000000 +0000 @@ -388,6 +388,7 @@ date_globals->default_timezone = NULL; date_globals->timezone = NULL; date_globals->tzcache = NULL; + date_globals->last_errors = NULL; } /* }}} */ @@ -446,12 +447,13 @@ /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(date) { + php_date_global_timezone_db = NULL; + php_date_global_timezone_db_enabled = 0; + REGISTER_INI_ENTRIES(); date_register_classes(); register_php_date_symbols(module_number); - php_date_global_timezone_db = NULL; - php_date_global_timezone_db_enabled = 0; DATEG(last_errors) = NULL; return SUCCESS; } @@ -2265,6 +2267,12 @@ return props; } + /* The table may still be held elsewhere (e.g. json_encode() walking a cycle), so separate it before writing */ + if (UNEXPECTED(GC_REFCOUNT(props) > 1)) { + GC_TRY_DELREF(props); + props = object->properties = zend_array_dup(props); + } + date_interval_object_to_hash(intervalobj, props); return props; diff -Nru php8.4-8.4.27/ext/date/tests/GHSA-gr4f-wgx5-jpfv.phpt php8.4-8.4.28/ext/date/tests/GHSA-gr4f-wgx5-jpfv.phpt --- php8.4-8.4.27/ext/date/tests/GHSA-gr4f-wgx5-jpfv.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/date/tests/GHSA-gr4f-wgx5-jpfv.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,22 @@ +--TEST-- +GHSA-gr4f-wgx5-jpfv: DATEG(tzcache) use-after-free +--CREDITS-- +Sebastian Bergmann +--CGI-- +--ENV-- +QUERY_STRING=a=1&b=2 +--EXTENSIONS-- +session +zend_test +--INI-- +error_log="{TMP}/GHSA-gr4f-wgx5-jpfv.log" +log_errors=1 +max_input_vars=1 +zend_test.warn_on_startup=1 +--FILE-- + +--EXPECTF-- +Warning: PHP Request Startup: Input variables exceeded 1. To increase the limit change max_input_vars in php.ini. in Unknown on line 0 +Hello world%r(?:\n\nWarning: Test startup warning from zend_test in Unknown on line 0)?%r diff -Nru php8.4-8.4.27/ext/date/tests/bug-gh20503.phpt php8.4-8.4.28/ext/date/tests/bug-gh20503.phpt --- php8.4-8.4.27/ext/date/tests/bug-gh20503.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/date/tests/bug-gh20503.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,33 @@ +--TEST-- +GH-20503 (Assertion failure with ext/date DateInterval property hash construction) +--SKIPIF-- + +--INI-- +zend.max_allowed_stack_size=512K +--FILE-- +prop3 = $obj; +var_dump(json_encode($obj)); +var_dump(json_last_error_msg()); + +$obj2 = new DateInterval('P1D'); +$obj2->prop = [$obj2]; +var_dump(json_encode($obj2)); +var_dump(json_last_error_msg()); +?> +--EXPECTF-- +Deprecated: Creation of dynamic property DateInterval::$prop3 is deprecated in %s on line %d +bool(false) +string(28) "Maximum stack depth exceeded" + +Deprecated: Creation of dynamic property DateInterval::$prop is deprecated in %s on line %d +bool(false) +string(18) "Recursion detected" diff -Nru php8.4-8.4.27/ext/date/tests/unserialize-test.phpt php8.4-8.4.28/ext/date/tests/unserialize-test.phpt --- php8.4-8.4.27/ext/date/tests/unserialize-test.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/date/tests/unserialize-test.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -31,7 +31,6 @@ ossfuzz-55599.txt: %s: unserialize(): Error at offset 26 of 26 bytes in %sunserialize-test.php on line %d -Error: Invalid serialization data for DateTime object bool(false) @@ -42,6 +41,4 @@ ossfuzz-56931.txt: %s: unserialize(): Error at offset 39 of 39 bytes in %sunserialize-test.php on line %d - -Deprecated: Creation of dynamic property DateInterval::$ is deprecated in %s on line %d bool(false) diff -Nru php8.4-8.4.27/ext/dba/dba_ndbm.c php8.4-8.4.28/ext/dba/dba_ndbm.c --- php8.4-8.4.27/ext/dba/dba_ndbm.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/dba/dba_ndbm.c 2026-11-17 20:29:32.000000000 +0000 @@ -53,6 +53,9 @@ } dbf = dbm_open(ZSTR_VAL(info->path), gmode, filemode); + if (dbf == NULL) { + return FAILURE; + } pinfo->dbf = dbf; return SUCCESS; diff -Nru php8.4-8.4.27/ext/dba/tests/gh24641.phpt php8.4-8.4.28/ext/dba/tests/gh24641.phpt --- php8.4-8.4.27/ext/dba/tests/gh24641.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/dba/tests/gh24641.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,30 @@ +--TEST-- +GH-24641 (ndbm backend never checks dbm_open() return value, NULL deref on first use after a failed open) +--EXTENSIONS-- +dba +--FILE-- + +DONE +--CLEAN-- + +--EXPECT-- +DONE diff -Nru php8.4-8.4.27/ext/dl_test/dl_test.stub.php php8.4-8.4.28/ext/dl_test/dl_test.stub.php --- php8.4-8.4.27/ext/dl_test/dl_test.stub.php 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/dl_test/dl_test.stub.php 2026-11-17 20:29:32.000000000 +0000 @@ -20,6 +20,7 @@ class DlTestSuperClass { public int $a; + public int $temporary = 0; public function test(string $str = ""): string {} } diff -Nru php8.4-8.4.27/ext/dl_test/dl_test_arginfo.h php8.4-8.4.28/ext/dl_test/dl_test_arginfo.h --- php8.4-8.4.27/ext/dl_test/dl_test_arginfo.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/dl_test/dl_test_arginfo.h 2026-11-17 20:29:32.000000000 +0000 @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 0ab7bc0f3289a77ecb1850a1cc7056b7c5297fda */ + * Stub hash: 41b8200735b71e691dc431d7ce34e9e0b9a4a7fd */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_dl_test_test1, 0, 0, IS_VOID, 0) ZEND_END_ARG_INFO() @@ -69,6 +69,12 @@ zend_declare_typed_property(class_entry, property_a_name, &property_a_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_LONG)); zend_string_release(property_a_name); + zval property_temporary_default_value; + ZVAL_LONG(&property_temporary_default_value, 0); + zend_string *property_temporary_name = zend_string_init("temporary", sizeof("temporary") - 1, 1); + zend_declare_typed_property(class_entry, property_temporary_name, &property_temporary_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_LONG)); + zend_string_release(property_temporary_name); + return class_entry; } diff -Nru php8.4-8.4.27/ext/dl_test/tests/opcache_temporary_strings.inc php8.4-8.4.28/ext/dl_test/tests/opcache_temporary_strings.inc --- php8.4-8.4.27/ext/dl_test/tests/opcache_temporary_strings.inc 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/dl_test/tests/opcache_temporary_strings.inc 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,16 @@ +getMessage(), PHP_EOL; +} + +try { + (new DlTest)->test([]); +} catch (TypeError $e) { + echo $e::class, ": ", $e->getMessage(), PHP_EOL; +} + +var_dump((new ReflectionFunction('dl_test_test2'))->getName()); + +var_dump(get_object_vars(new DlTestSubClass)); diff -Nru php8.4-8.4.27/ext/dl_test/tests/opcache_temporary_strings.phpt php8.4-8.4.28/ext/dl_test/tests/opcache_temporary_strings.phpt --- php8.4-8.4.27/ext/dl_test/tests/opcache_temporary_strings.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/dl_test/tests/opcache_temporary_strings.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,22 @@ +--TEST-- +dl() under opcache: refcounting names declared by a temporary module +--SKIPIF-- + +--EXTENSIONS-- +opcache +--INI-- +enable_dl=1 +opcache.enable_cli=1 +--FILE-- + +--EXPECT-- +TypeError: dl_test_test2(): Argument #1 ($str) must be of type string, array given +TypeError: DlTest::test(): Argument #1 ($str) must be of type string, array given +string(13) "dl_test_test2" +array(1) { + ["temporary"]=> + int(0) +} diff -Nru php8.4-8.4.27/ext/dom/document.c php8.4-8.4.28/ext/dom/document.c --- php8.4-8.4.27/ext/dom/document.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/dom/document.c 2026-11-17 20:29:32.000000000 +0000 @@ -1086,21 +1086,26 @@ } } -static void php_dom_transfer_document_ref(xmlNodePtr node, php_libxml_ref_obj *new_document) +static zend_always_inline void php_dom_transfer_document_ref_single_aux(xmlNodePtr node, php_libxml_ref_obj *new_document) { - if (node->children) { - php_dom_transfer_document_ref(node->children, new_document); - } - - while (node) { - if (node->type == XML_ELEMENT_NODE) { - for (xmlAttrPtr attr = node->properties; attr != NULL; attr = attr->next) { - php_dom_transfer_document_ref_single_node((xmlNodePtr) attr, new_document); + php_dom_transfer_document_ref_single_node(node, new_document); + if (node->type == XML_ELEMENT_NODE) { + for (xmlAttrPtr attr = node->properties; attr; attr = attr->next) { + php_dom_transfer_document_ref_single_node((xmlNodePtr) attr, new_document); + for (xmlNodePtr child = attr->children; child; child = child->next) { + php_dom_transfer_document_ref_single_node((xmlNodePtr) child, new_document); } } + } +} - php_dom_transfer_document_ref_single_node(node, new_document); - node = node->next; +static void php_dom_transfer_document_ref(xmlNodePtr node, php_libxml_ref_obj *new_document) +{ + php_dom_transfer_document_ref_single_aux(node, new_document); + xmlNodePtr tmp = node->children; + while (tmp) { + php_dom_transfer_document_ref_single_aux(tmp, new_document); + tmp = php_dom_next_in_tree_order(tmp, node); } } diff -Nru php8.4-8.4.27/ext/dom/element.c php8.4-8.4.28/ext/dom/element.c --- php8.4-8.4.27/ext/dom/element.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/dom/element.c 2026-11-17 20:29:32.000000000 +0000 @@ -156,7 +156,7 @@ /* Typed property, so it is a string already */ ZEND_ASSERT(Z_TYPE_P(newval) == IS_STRING); - return xmlSetNsProp(nodep, NULL, (const xmlChar *) name, (const xmlChar *) Z_STRVAL_P(newval)); + return dom_set_attribute_value(nodep, NULL, (const xmlChar *) name, (const xmlChar *) Z_STRVAL_P(newval)); } /* {{{ className string @@ -1030,11 +1030,7 @@ if (errorcode == 0) { php_dom_libxml_ns_mapper *ns_mapper = php_dom_get_ns_mapper(intern); xmlNsPtr ns = php_dom_libxml_ns_mapper_get_ns_raw_prefix_string(ns_mapper, prefix, xmlStrlen(prefix), uri); - xmlNodePtr existing = (xmlNodePtr) xmlHasNsProp(elemp, localname, ns == NULL ? NULL : ns->href); - if (existing != NULL && existing->type != XML_ATTRIBUTE_DECL) { - node_list_unlink(existing->children); - } - xmlAttrPtr attr = xmlSetNsProp(elemp, ns, localname, BAD_CAST value); + xmlAttrPtr attr = dom_set_attribute_value(elemp, ns, localname, BAD_CAST value); if (UNEXPECTED(attr == NULL)) { php_dom_throw_error(INVALID_STATE_ERR, /* strict */ true); } else { diff -Nru php8.4-8.4.27/ext/dom/html5_parser.c php8.4-8.4.28/ext/dom/html5_parser.c --- php8.4-8.4.27/ext/dom/html5_parser.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/dom/html5_parser.c 2026-11-17 20:29:32.000000000 +0000 @@ -39,6 +39,7 @@ uintptr_t current_active_namespace; xmlNodePtr lxml_parent; xmlNsPtr lxml_ns; + bool in_template; } work_list_item; static void lexbor_libxml2_bridge_work_list_item_push( @@ -46,7 +47,8 @@ lxb_dom_node_t *node, uintptr_t current_active_namespace, xmlNodePtr lxml_parent, - xmlNsPtr lxml_ns + xmlNsPtr lxml_ns, + bool in_template ) { work_list_item *item = (work_list_item *) lexbor_array_obj_push_wo_cls(array); @@ -54,6 +56,7 @@ item->current_active_namespace = current_active_namespace; item->lxml_parent = lxml_parent; item->lxml_ns = lxml_ns; + item->in_template = in_template; } static unsigned short sanitize_line_nr(size_t line) @@ -109,6 +112,7 @@ xmlNodePtr root, bool compact_text_nodes, bool create_default_ns, + bool in_template_contents, php_dom_private_data *private_data ) { @@ -124,13 +128,14 @@ lexbor_array_obj_init(&work_list, WORK_LIST_INIT_SIZE, sizeof(work_list_item)); for (lxb_dom_node_t *node = start_node; node != NULL; node = node->prev) { - lexbor_libxml2_bridge_work_list_item_push(&work_list, node, LXB_NS__UNDEF, root, NULL); + lexbor_libxml2_bridge_work_list_item_push(&work_list, node, LXB_NS__UNDEF, root, NULL, in_template_contents); } work_list_item *current_stack_item; while ((current_stack_item = lexbor_array_obj_pop(&work_list)) != NULL) { lxb_dom_node_t *node = current_stack_item->node; xmlNodePtr lxml_parent = current_stack_item->lxml_parent; + bool in_template = current_stack_item->in_template; /* CDATA section and processing instructions don't occur in parsed HTML documents. * The historical types are not emitted by the parser either. */ @@ -173,7 +178,9 @@ * Other types of nodes contain their children directly. */ xmlNodePtr lxml_child_parent = lxml_element; lxb_dom_node_t *child_node = element->node.last_child; + bool child_in_template = in_template; if (lxb_html_tree_node_is(&element->node, LXB_TAG_TEMPLATE)) { + child_in_template = true; if (create_default_ns) { lxml_child_parent = xmlNewDocFragment(lxml_doc); if (UNEXPECTED(lxml_child_parent == NULL)) { @@ -198,7 +205,8 @@ child_node, entering_namespace, lxml_child_parent, - current_lxml_ns + current_lxml_ns, + child_in_template ); } @@ -275,7 +283,7 @@ /* xmlIsID does some other stuff too that is irrelevant here. */ if (local_name_length == 2 && local_name[0] == 'i' && local_name[1] == 'd' && lxml_attr->ns == NULL) { - if (xmlAddID(NULL, lxml_doc, value, lxml_attr) == 0) { + if (in_template || xmlAddID(NULL, lxml_doc, value, lxml_attr) == 0) { /* If the ID already exists, the ID attribute still needs to be marked as an ID. */ lxml_attr->atype = XML_ATTRIBUTE_ID; } @@ -369,6 +377,7 @@ (xmlNodePtr) lxml_doc, compact_text_nodes, create_default_ns, + false, private_data ); if (status != LEXBOR_LIBXML2_BRIDGE_STATUS_OK) { @@ -385,6 +394,7 @@ xmlNodePtr *fragment_out, bool compact_text_nodes, bool create_default_ns, + bool in_template_contents, php_dom_private_data *private_data ) { @@ -398,6 +408,7 @@ fragment, compact_text_nodes, create_default_ns, + in_template_contents, private_data ); if (status != LEXBOR_LIBXML2_BRIDGE_STATUS_OK) { diff -Nru php8.4-8.4.27/ext/dom/html5_parser.h php8.4-8.4.28/ext/dom/html5_parser.h --- php8.4-8.4.27/ext/dom/html5_parser.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/dom/html5_parser.h 2026-11-17 20:29:32.000000000 +0000 @@ -79,6 +79,7 @@ xmlNodePtr *fragment_out, bool compact_text_nodes, bool create_default_ns, + bool in_template_contents, php_dom_private_data *private_data ); void lexbor_libxml2_bridge_report_errors( diff -Nru php8.4-8.4.27/ext/dom/inner_html_mixin.c php8.4-8.4.28/ext/dom/inner_html_mixin.c --- php8.4-8.4.27/ext/dom/inner_html_mixin.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/dom/inner_html_mixin.c 2026-11-17 20:29:32.000000000 +0000 @@ -181,7 +181,7 @@ } /* https://html.spec.whatwg.org/#html-fragment-parsing-algorithm */ -static xmlNodePtr dom_html_fragment_parsing_algorithm(dom_object *obj, xmlNodePtr context_node, const zend_string *input, php_libxml_quirks_mode quirks_mode) +static xmlNodePtr dom_html_fragment_parsing_algorithm(dom_object *obj, xmlNodePtr context_node, const zend_string *input, php_libxml_quirks_mode quirks_mode, bool is_template) { /* The whole algorithm is implemented in Lexbor, we just have to be the adapter between the * data structures used in PHP and what Lexbor expects. */ @@ -209,7 +209,7 @@ xmlNodePtr fragment = NULL; if (node != NULL) { /* node->last_child could be NULL, but that is allowed. */ - lexbor_libxml2_bridge_status status = lexbor_libxml2_bridge_convert_fragment(node->last_child, context_node->doc, &fragment, true, true, php_dom_get_private_data(obj)); + lexbor_libxml2_bridge_status status = lexbor_libxml2_bridge_convert_fragment(node->last_child, context_node->doc, &fragment, true, true, is_template, php_dom_get_private_data(obj)); if (UNEXPECTED(status != LEXBOR_LIBXML2_BRIDGE_STATUS_OK)) { php_dom_throw_error(INVALID_STATE_ERR, true); } @@ -342,18 +342,19 @@ { DOM_PROP_NODE(xmlNodePtr, context_node, obj); + bool is_template = php_dom_ns_is_fast(context_node, php_dom_ns_is_html_magic_token) && xmlStrEqual(context_node->name, BAD_CAST "template"); xmlNodePtr fragment; if (context_node->doc->type == XML_DOCUMENT_NODE) { fragment = dom_xml_fragment_parsing_algorithm(obj, context_node, Z_STR_P(newval)); } else { - fragment = dom_html_fragment_parsing_algorithm(obj, context_node, Z_STR_P(newval), obj->document->quirks_mode); + fragment = dom_html_fragment_parsing_algorithm(obj, context_node, Z_STR_P(newval), obj->document->quirks_mode, is_template); } if (fragment == NULL) { return FAILURE; } - if (php_dom_ns_is_fast(context_node, php_dom_ns_is_html_magic_token) && xmlStrEqual(context_node->name, BAD_CAST "template")) { + if (is_template) { context_node = php_dom_ensure_templated_content(php_dom_get_private_data(obj), context_node); if (context_node == NULL) { xmlFreeNode(fragment); diff -Nru php8.4-8.4.27/ext/dom/parentnode/css_selectors.c php8.4-8.4.28/ext/dom/parentnode/css_selectors.c --- php8.4-8.4.27/ext/dom/parentnode/css_selectors.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/dom/parentnode/css_selectors.c 2026-11-17 20:29:32.000000000 +0000 @@ -240,7 +240,7 @@ selectors_str, dom_query_selector_find_array_callback, &ctx, - LXB_SELECTORS_OPT_DEFAULT + LXB_SELECTORS_OPT_MATCH_FIRST ) != LXB_STATUS_OK) { zend_array_destroy(list); RETURN_THROWS(); diff -Nru php8.4-8.4.27/ext/dom/php_dom.c php8.4-8.4.28/ext/dom/php_dom.c --- php8.4-8.4.27/ext/dom/php_dom.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/dom/php_dom.c 2026-11-17 20:29:32.000000000 +0000 @@ -2408,6 +2408,15 @@ } } +xmlAttrPtr dom_set_attribute_value(xmlNodePtr element, xmlNsPtr ns, const xmlChar *name, const xmlChar *value) +{ + xmlAttrPtr existing = xmlHasNsProp(element, name, ns == NULL ? NULL : ns->href); + if (existing != NULL && existing->type != XML_ATTRIBUTE_DECL) { + node_list_unlink(existing->children); + } + return xmlSetNsProp(element, ns, name, value); +} + void php_dom_get_content_into_zval(const xmlNode *nodep, zval *return_value, bool null_on_failure) { ZEND_ASSERT(nodep != NULL); diff -Nru php8.4-8.4.27/ext/dom/php_dom.h php8.4-8.4.28/ext/dom/php_dom.h --- php8.4-8.4.27/ext/dom/php_dom.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/dom/php_dom.h 2026-11-17 20:29:32.000000000 +0000 @@ -140,6 +140,7 @@ #endif bool dom_get_strict_error(php_libxml_ref_obj *document); void node_list_unlink(xmlNodePtr node); +xmlAttrPtr dom_set_attribute_value(xmlNodePtr element, xmlNsPtr ns, const xmlChar *name, const xmlChar *value); int dom_check_qname(char *qname, char **localname, char **prefix, int uri_len, int name_len); xmlNsPtr dom_get_ns(xmlNodePtr node, char *uri, int *errorcode, char *prefix); xmlNsPtr dom_get_ns_unchecked(xmlNodePtr nodep, char *uri, char *prefix); diff -Nru php8.4-8.4.27/ext/dom/tests/DOMDocument_adoptNode_sibling_subtree.phpt php8.4-8.4.28/ext/dom/tests/DOMDocument_adoptNode_sibling_subtree.phpt --- php8.4-8.4.27/ext/dom/tests/DOMDocument_adoptNode_sibling_subtree.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/dom/tests/DOMDocument_adoptNode_sibling_subtree.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,22 @@ +--TEST-- +DOMDocument::adoptNode() with a node retained under a later sibling +--EXTENSIONS-- +dom +--FILE-- +appendChild($source->createElement('root')); +$root->appendChild($source->createElement('first')); +$second = $root->appendChild($source->createElement('second')); +$victim = $second->appendChild($source->createElement('grandchild')); + +$destination = new DOMDocument(); +$destination->appendChild($destination->adoptNode($root)); +unset($destination, $source, $root, $second); + +echo $victim->nodeName, PHP_EOL; + +?> +--EXPECT-- +grandchild diff -Nru php8.4-8.4.27/ext/dom/tests/gh22077.phpt php8.4-8.4.28/ext/dom/tests/gh22077.phpt --- php8.4-8.4.27/ext/dom/tests/gh22077.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/dom/tests/gh22077.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,20 @@ +--TEST-- +GH-22077 (UAF in custom XPath function) +--FILE-- +registerNamespace("my", "my.ns"); +$xpath->registerPHPFunctionNS('my.ns', 'include', function(): DOMElement { + $includedDocument = new DOMDocument; + $includedDocument->loadXML(''); + return $includedDocument->documentElement; +}); +$nodeset = $xpath->query('my:include()/uaf'); +$node = $nodeset->item(0); +var_dump($nodeset->length); +var_dump($node->ownerDocument->saveXML($node)); +?> +--EXPECT-- +int(2) +string(6) "" diff -Nru php8.4-8.4.27/ext/dom/tests/gh22554.phpt php8.4-8.4.28/ext/dom/tests/gh22554.phpt --- php8.4-8.4.27/ext/dom/tests/gh22554.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/dom/tests/gh22554.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,38 @@ +--TEST-- +GH-22554 (Use-after-free when an XPath callback returns a node from a document created inside the callback) +--CREDITS-- +waseem-cve +--EXTENSIONS-- +dom +--FILE-- +loadXML(''); + +$xp = new DOMXPath($doc); +$xp->registerNamespace('my', 'my.ns'); + +$xp->registerPHPFunctionNS('my.ns', 'include', function () { + $d = new DOMDocument; + $d->loadXML(''); + + return $d->documentElement; +}); + +$xp->registerPHPFunctionNS('my.ns', 'process', function ($arg) { + echo "process arg: ", get_class($arg[0]), " ", $arg[0]->nodeName, "\n"; + return 'x'; +}); + +$result = $xp->query('my:process(my:include()/uaf)'); +var_dump($result->length); +unset($xp); + +echo "Done\n"; + +?> +--EXPECT-- +process arg: DOMElement uaf +int(0) +Done diff -Nru php8.4-8.4.27/ext/dom/tests/gh23352.phpt php8.4-8.4.28/ext/dom/tests/gh23352.phpt --- php8.4-8.4.27/ext/dom/tests/gh23352.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/dom/tests/gh23352.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,21 @@ +--TEST-- +GH-23352 (UAF reading an attribute value node retained across DOMDocument::adoptNode()) +--EXTENSIONS-- +dom +--FILE-- +appendChild($source->createElement('element')); +$element->setAttribute('attribute', 'victim'); +$victim = $element->getAttributeNode('attribute')->firstChild; + +$destination = new DOMDocument(); +$destination->appendChild($destination->adoptNode($element)); +unset($destination, $source, $element); + +echo $victim->data, PHP_EOL; + +?> +--EXPECT-- +victim diff -Nru php8.4-8.4.27/ext/dom/tests/modern/css_selectors/gh24260.phpt php8.4-8.4.28/ext/dom/tests/modern/css_selectors/gh24260.phpt --- php8.4-8.4.27/ext/dom/tests/modern/css_selectors/gh24260.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/dom/tests/modern/css_selectors/gh24260.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,29 @@ +--TEST-- +GH-24260 (querySelectorAll() returns duplicate elements for selector lists) +--EXTENSIONS-- +dom +--FILE-- +

one

two

' +); + +foreach ([$dom, $dom->querySelector('div')] as $context) { + foreach (['.a, .b', '.a, .b, .a.b', 'p, :is(.a, .b)'] as $selector) { + $texts = []; + foreach ($context->querySelectorAll($selector) as $node) { + $texts[] = $node->textContent; + } + echo $selector, ': ', implode(' ', $texts), "\n"; + } +} + +?> +--EXPECT-- +.a, .b: one two +.a, .b, .a.b: one two +p, :is(.a, .b): one two +.a, .b: one two +.a, .b, .a.b: one two +p, :is(.a, .b): one two diff -Nru php8.4-8.4.27/ext/dom/tests/modern/html/interactions/gh23334.phpt php8.4-8.4.28/ext/dom/tests/modern/html/interactions/gh23334.phpt --- php8.4-8.4.27/ext/dom/tests/modern/html/interactions/gh23334.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/dom/tests/modern/html/interactions/gh23334.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,26 @@ +--TEST-- +GH-23334 (Template contents must not be reachable through the ID cache) +--EXTENSIONS-- +dom +--FILE-- +
'; + +$doc = Dom\HTMLDocument::createFromString($html, LIBXML_NOERROR); +var_dump($doc->getElementById('inner')); +var_dump((new Dom\XPath($doc))->query("id('inner')")->length); +var_dump($doc->getElementById('tpl')->innerHTML); + +$doc = Dom\HTMLDocument::createFromString($html, LIBXML_NOERROR); +$tpl = $doc->getElementById('tpl'); +$tpl->innerHTML = '

WORLD

'; +var_dump((new Dom\XPath($doc))->query("id('set')")->length); +var_dump($tpl->innerHTML); +$doc->getElementById('host')->innerHTML = ''; +?> +--EXPECT-- +NULL +int(0) +string(27) "
HELLO
" +int(0) +string(21) "

WORLD

" diff -Nru php8.4-8.4.27/ext/dom/tests/modern/spec/gh23352.phpt php8.4-8.4.28/ext/dom/tests/modern/spec/gh23352.phpt --- php8.4-8.4.27/ext/dom/tests/modern/spec/gh23352.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/dom/tests/modern/spec/gh23352.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,21 @@ +--TEST-- +GH-23352 (UAF reading an attribute value node retained across Dom\Document::adoptNode()) +--EXTENSIONS-- +dom +--FILE-- +'); +$element = $source->documentElement; +$element->setAttribute('attribute', 'victim'); +$victim = $element->getAttributeNode('attribute')->firstChild; + +$destination = Dom\XMLDocument::createEmpty(); +$destination->appendChild($destination->adoptNode($element)); +unset($destination, $source, $element); + +echo $victim->data, PHP_EOL; + +?> +--EXPECT-- +victim diff -Nru php8.4-8.4.27/ext/dom/tests/modern/xml/GHSA-x8r7-mg3g-74hg.phpt php8.4-8.4.28/ext/dom/tests/modern/xml/GHSA-x8r7-mg3g-74hg.phpt --- php8.4-8.4.27/ext/dom/tests/modern/xml/GHSA-x8r7-mg3g-74hg.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/dom/tests/modern/xml/GHSA-x8r7-mg3g-74hg.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,23 @@ +--TEST-- +GHSA-x8r7-mg3g-74hg (Lifetime issue in Dom\XMLDocument serialiser) +--EXTENSIONS-- +dom +--CREDITS-- +EliseZeroTwo +--FILE-- +', LIBXML_NOERROR); +echo $doc->saveXml(), "\n"; + +$doc = Dom\XMLDocument::createFromString(''); +$doc->documentElement->setAttributeNS('meow', 'miau', 'miaou'); +echo $doc->saveXml(), "\n"; + +?> +--EXPECT-- + + + + + diff -Nru php8.4-8.4.27/ext/dom/tests/modern/xml/serialize_document_write_failure.phpt php8.4-8.4.28/ext/dom/tests/modern/xml/serialize_document_write_failure.phpt --- php8.4-8.4.27/ext/dom/tests/modern/xml/serialize_document_write_failure.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/dom/tests/modern/xml/serialize_document_write_failure.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,39 @@ +--TEST-- +Dom\XMLDocument: failed write while serializing the document node must not detach its children +--EXTENSIONS-- +dom +--FILE-- +
'); +var_dump($doc->saveXmlFile('failing://out')); + +var_dump($doc->documentElement?->nodeName); +var_dump($doc->childNodes->length); +echo $doc->saveXml(); + +?> +--EXPECT-- +bool(false) +string(4) "root" +int(1) + + diff -Nru php8.4-8.4.27/ext/dom/tests/modern/xml/serialize_document_write_mutation.phpt php8.4-8.4.28/ext/dom/tests/modern/xml/serialize_document_write_mutation.phpt --- php8.4-8.4.27/ext/dom/tests/modern/xml/serialize_document_write_mutation.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/dom/tests/modern/xml/serialize_document_write_mutation.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,40 @@ +--TEST-- +Dom\XMLDocument: mutating the document from a stream write during document serialization +--EXTENSIONS-- +dom +--FILE-- +append($doc->createComment('injected')); + } + return strlen($data); + } +} + +stream_wrapper_register('mutating', MutatingStream::class); + +$doc = Dom\XMLDocument::createFromString(''); +MutatingStream::$doc = $doc; +$doc->saveXmlFile('mutating://out'); + +$doc->append($doc->createComment('after')); +var_dump($doc->childNodes->length); +echo $doc->saveXml(), "\n"; + +?> +--EXPECT-- +int(3) + + diff -Nru php8.4-8.4.27/ext/dom/tests/reflected_attribute_write_live_child.phpt php8.4-8.4.28/ext/dom/tests/reflected_attribute_write_live_child.phpt --- php8.4-8.4.27/ext/dom/tests/reflected_attribute_write_live_child.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/dom/tests/reflected_attribute_write_live_child.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,63 @@ +--TEST-- +Reflected attribute writes keep attribute children with live wrappers +--EXTENSIONS-- +dom +--FILE-- +documentElement; + $text = $element->getAttributeNode('class')->firstChild; + + $write($element); + + echo $label, ": detached: "; + var_dump($text->parentNode === null); + echo $label, ": text: "; + var_dump($text->textContent); + echo $label, ": new value: "; + var_dump($element->getAttribute('class')); +} + +$doc = new DOMDocument(); +$doc->loadXML(''); +check('legacy className', $doc, static fn ($element) => $element->className = 'new'); + +$doc = Dom\XMLDocument::createFromString(''); +check('modern className', $doc, static fn ($element) => $element->className = 'new'); + +$doc = Dom\XMLDocument::createFromString(''); +check('classList value', $doc, static fn ($element) => $element->classList->value = 'new'); + +$doc = Dom\XMLDocument::createFromString(''); +check('classList update', $doc, static fn ($element) => $element->classList->add('new')); + +$doc = Dom\XMLDocument::createFromString(''); +$element = $doc->documentElement; +$element->id = 'old'; +$text = $element->getAttributeNode('id')->firstChild; +$element->id = 'new'; +echo "id: detached: "; +var_dump($text->parentNode === null); +echo "id: text: "; +var_dump($text->textContent); +echo "id: new value: "; +var_dump($element->id); + +?> +--EXPECT-- +legacy className: detached: bool(true) +legacy className: text: string(3) "old" +legacy className: new value: string(3) "new" +modern className: detached: bool(true) +modern className: text: string(3) "old" +modern className: new value: string(3) "new" +classList value: detached: bool(true) +classList value: text: string(3) "old" +classList value: new value: string(3) "new" +classList update: detached: bool(true) +classList update: text: string(3) "old" +classList update: new value: string(7) "old new" +id: detached: bool(true) +id: text: string(3) "old" +id: new value: string(3) "new" diff -Nru php8.4-8.4.27/ext/dom/tests/xpath_php_function_foreign_doc.phpt php8.4-8.4.28/ext/dom/tests/xpath_php_function_foreign_doc.phpt --- php8.4-8.4.27/ext/dom/tests/xpath_php_function_foreign_doc.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/dom/tests/xpath_php_function_foreign_doc.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,40 @@ +--TEST-- +DOMXPath: php:function nodeset args plus a foreign-document return must not treat arrays as DOM objects +--EXTENSIONS-- +dom +--FILE-- +loadXML('1'); +$doc2 = new DOMDocument(); +$doc2->loadXML('2'); + +$xp = new DOMXPath($doc1); +$xp->registerNamespace('php', 'http://php.net/xpath'); +$xp->registerPhpFunctions(); + +function uses_nodeset($nodes) { + return true; +} + +function foreign() { + global $doc2; + return $doc2->documentElement; +} + +$xp->query('//a[php:function("uses_nodeset", //a)]'); +$res = $xp->query('php:function("foreign")'); +echo "count: "; +var_dump($res->length); +$n = $res->item(0); +echo "name: "; +var_dump($n->nodeName); +echo "owner is doc2: "; +var_dump($n->ownerDocument === $doc2); +echo "done\n"; +?> +--EXPECT-- +count: int(1) +name: string(4) "root" +owner is doc2: bool(true) +done diff -Nru php8.4-8.4.27/ext/dom/tests/xpath_php_function_foreign_doc_namespace_axis.phpt php8.4-8.4.28/ext/dom/tests/xpath_php_function_foreign_doc_namespace_axis.phpt --- php8.4-8.4.27/ext/dom/tests/xpath_php_function_foreign_doc_namespace_axis.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/dom/tests/xpath_php_function_foreign_doc_namespace_axis.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,36 @@ +--TEST-- +DOMXPath: namespace axis result on a node from a document created inside an XPath callback +--EXTENSIONS-- +dom +--FILE-- +loadXML(''); + +$xp = new DOMXPath($doc); +$xp->registerNamespace('my', 'my.ns'); +$xp->registerPHPFunctionNS('my.ns', 'include', function () { + $d = new DOMDocument; + $d->loadXML(''); + return $d->documentElement; +}); + +$result = $xp->query('my:include()/uaf/namespace::*'); +var_dump($result->length); +unset($xp); + +foreach ($result as $ns) { + var_dump($ns->nodeName, $ns->parentNode->nodeName); +} + +echo "Done\n"; + +?> +--EXPECT-- +int(2) +string(9) "xmlns:xml" +string(3) "uaf" +string(7) "xmlns:a" +string(3) "uaf" +Done diff -Nru php8.4-8.4.27/ext/dom/token_list.c php8.4-8.4.28/ext/dom/token_list.c --- php8.4-8.4.27/ext/dom/token_list.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/dom/token_list.c 2026-11-17 20:29:32.000000000 +0000 @@ -143,7 +143,7 @@ /* 2. Set an attribute value for the associated element using associated attribute’s local name and the result of * running the ordered set serializer for token set. */ char *value = dom_ordered_set_serializer(token_set); - xmlSetNsProp(dom_token_list_get_element(intern), NULL, BAD_CAST "class", BAD_CAST value); + dom_set_attribute_value(dom_token_list_get_element(intern), NULL, BAD_CAST "class", BAD_CAST value); efree(intern->cached_string); intern->cached_string = value; } @@ -382,7 +382,7 @@ zend_value_error("Value must not contain any null bytes"); return FAILURE; } - xmlSetNsProp(dom_token_list_get_element(intern), NULL, BAD_CAST "class", BAD_CAST Z_STRVAL_P(newval)); + dom_set_attribute_value(dom_token_list_get_element(intern), NULL, BAD_CAST "class", BAD_CAST Z_STRVAL_P(newval)); /* Note: we don't update the set here, the set is always lazily updated for performance reasons. */ return SUCCESS; } diff -Nru php8.4-8.4.27/ext/dom/xml_serializer.c php8.4-8.4.28/ext/dom/xml_serializer.c --- php8.4-8.4.27/ext/dom/xml_serializer.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/dom/xml_serializer.c 2026-11-17 20:29:32.000000000 +0000 @@ -244,6 +244,10 @@ } else if (GC_REFCOUNT(list) > 1) { GC_DELREF(list); list = zend_array_dup(list); + ZEND_HASH_PACKED_FOREACH_VAL(list, zval *val) { + /* Descendant does not own the data. */ + DOM_Z_UNOWNED(val, Z_PTR_P(val)); + } ZEND_HASH_FOREACH_END(); zend_hash_str_update_ptr(map->ht, (const char *) ns, ns_length, list); } @@ -1228,18 +1232,18 @@ /* 1. Let serialized document be an empty string. * => We use the output buffer instead. */ - xmlNodePtr child = node->children; - node->children = NULL; - /* https://github.com/w3c/DOM-Parsing/issues/50 */ TRY(xmlOutputBufferFlush(ctx->out)); - TRY(xmlSaveDoc(ctx->ctxt, (xmlDocPtr) node)); + /* To gain the xml declaration, use a shallow copy of the document with the children NULLed out. + * Stream wrappers can access the real document, so we cannot modify that. */ + xmlDoc declaration_doc = *(xmlDocPtr) node; + declaration_doc.children = declaration_doc.last = NULL; + TRY(xmlSaveDoc(ctx->ctxt, &declaration_doc)); TRY(xmlSaveFlush(ctx->ctxt)); - node->children = child; - /* 2. For each child child of node, in tree order, run the XML serialization algorithm on the child passing along the provided arguments, * and append the result to serialized document. */ + xmlNodePtr child = node->children; while (child != NULL) { TRY(dom_xml_serialization_algorithm(ctx, namespace_prefix_map, child, namespace, prefix_index, indent, require_well_formed)); child = child->next; diff -Nru php8.4-8.4.27/ext/dom/xpath.c php8.4-8.4.28/ext/dom/xpath.c --- php8.4-8.4.27/ext/dom/xpath.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/dom/xpath.c 2026-11-17 20:29:32.000000000 +0000 @@ -34,6 +34,43 @@ #ifdef LIBXML_XPATH_ENABLED +static dom_object *dom_xpath_intern_from_entry(zval *entry, xmlDocPtr doc) +{ + if (Z_TYPE_P(entry) == IS_OBJECT) { + dom_object *obj = Z_DOMOBJ_P(entry); + if (obj->document && obj->document->ptr == doc) { + return obj; + } + } else if (Z_TYPE_P(entry) == IS_ARRAY) { + zval *inner; + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(entry), inner) { + dom_object *obj = dom_xpath_intern_from_entry(inner, doc); + if (obj) { + return obj; + } + } ZEND_HASH_FOREACH_END(); + } + return NULL; +} + +static dom_object *dom_xpath_intern_for_doc(dom_xpath_object *xpath_obj, xmlDocPtr doc) +{ + if (xpath_obj->dom.document && xpath_obj->dom.document->ptr == doc) { + return &xpath_obj->dom; + } + HashTable *node_list = xpath_obj->xpath_callbacks.node_list; + if (node_list) { + zval *entry; + ZEND_HASH_PACKED_FOREACH_VAL(node_list, entry) { + dom_object *obj = dom_xpath_intern_from_entry(entry, doc); + if (obj) { + return obj; + } + } ZEND_HASH_FOREACH_END(); + } + return &xpath_obj->dom; +} + void dom_xpath_objects_free_storage(zend_object *object) { dom_xpath_object *intern = php_xpath_obj_from_obj(object); @@ -60,7 +97,8 @@ ZEND_ASSERT(node->type != XML_NAMESPACE_DECL); - php_dom_create_object(node, child, intern); + dom_xpath_object *xobj = php_xpath_obj_from_obj(&intern->std); + php_dom_create_object(node, child, dom_xpath_intern_for_doc(xobj, node->doc)); } static dom_xpath_object *dom_xpath_ext_fetch_intern(xmlXPathParserContextPtr ctxt) @@ -373,12 +411,13 @@ /* Make sure parent dom object exists, so we can take an extra reference. */ zval parent_zval; /* don't destroy me, my lifetime is transfered to the fake namespace decl */ - php_dom_create_object(nsparent, &parent_zval, &intern->dom); + php_dom_create_object(nsparent, &parent_zval, dom_xpath_intern_for_doc(intern, nsparent->doc)); dom_object *parent_intern = Z_DOMOBJ_P(&parent_zval); node = php_dom_create_fake_namespace_decl(nsparent, original, &child, parent_intern); } else { - php_dom_create_object(node, &child, &intern->dom); + dom_object *parent = dom_xpath_intern_for_doc(intern, node->doc); + php_dom_create_object(node, &child, parent); } add_next_index_zval(&retval, &child); if (ZEND_HAS_OOM()) { diff -Nru php8.4-8.4.27/ext/ffi/ffi.c php8.4-8.4.28/ext/ffi/ffi.c --- php8.4-8.4.27/ext/ffi/ffi.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/ffi/ffi.c 2026-11-17 20:29:32.000000000 +0000 @@ -3644,6 +3644,11 @@ va_list va; char *message = NULL; + if (FFI_G(parse_failed)) { + /* An error was already reported, parsing only continues to unwind cleanly */ + return; + } + va_start(va, format); zend_vspprintf(&message, 0, format, va); @@ -5752,20 +5757,22 @@ /* parser callbacks */ void zend_ffi_parser_error(const char *format, ...) /* {{{ */ { - va_list va; - char *message = NULL; + if (!FFI_G(parse_failed)) { + va_list va; + char *message = NULL; - va_start(va, format); - zend_vspprintf(&message, 0, format, va); + va_start(va, format); + zend_vspprintf(&message, 0, format, va); - if (EG(current_execute_data)) { - zend_throw_exception(zend_ffi_parser_exception_ce, message, 0); - } else { - zend_error(E_WARNING, "FFI Parser: %s", message); - } + if (EG(current_execute_data)) { + zend_throw_exception(zend_ffi_parser_exception_ce, message, 0); + } else { + zend_error(E_WARNING, "FFI Parser: %s", message); + } - efree(message); - va_end(va); + efree(message); + va_end(va); + } LONGJMP(FFI_G(bailout), FAILURE); } @@ -5851,10 +5858,16 @@ case ZEND_FFI_DCL_FLOAT|ZEND_FFI_DCL_COMPLEX: case ZEND_FFI_DCL_DOUBLE|ZEND_FFI_DCL_COMPLEX: case ZEND_FFI_DCL_DOUBLE|ZEND_FFI_DCL_LONG|ZEND_FFI_DCL_COMPLEX: - zend_ffi_parser_error("Unsupported type _Complex at line %d", FFI_G(line)); + zend_ffi_throw_parser_error("Unsupported type _Complex at line %d", FFI_G(line)); + /* Do not bail out here: callers may hold memory that is not owned by dcl yet. + * Continue with a placeholder type, zend_ffi_parse_*() report the failure. */ + FFI_G(parse_failed) = 1; + dcl->type = (zend_ffi_type*)&zend_ffi_type_sint32; break; default: - zend_ffi_parser_error("Unsupported type specifier combination at line %d", FFI_G(line)); + zend_ffi_throw_parser_error("Unsupported type specifier combination at line %d", FFI_G(line)); + FFI_G(parse_failed) = 1; + dcl->type = (zend_ffi_type*)&zend_ffi_type_sint32; break; } dcl->flags &= ~ZEND_FFI_DCL_TYPE_SPECIFIERS; diff -Nru php8.4-8.4.27/ext/ffi/ffi.g php8.4-8.4.28/ext/ffi/ffi.g --- php8.4-8.4.27/ext/ffi/ffi.g 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/ffi/ffi.g 2026-11-17 20:29:32.000000000 +0000 @@ -890,9 +890,15 @@ FFI_G(attribute_parsing) = 0; yy_buf = (unsigned char*)str; yy_end = yy_buf + len; + FFI_G(parse_failed) = 0; parse(); + if (FFI_G(parse_failed)) { + FFI_G(parse_failed) = 0; + return FAILURE; + } return SUCCESS; } else { + FFI_G(parse_failed) = 0; return FAILURE; } } @@ -906,13 +912,19 @@ yy_pos = yy_text = yy_buf = (unsigned char*)str; yy_end = yy_buf + len; yy_line = 1; + FFI_G(parse_failed) = 0; sym = parse_type_name(get_sym(), dcl); if (sym != YY_EOF) { yy_error_sym(" expected, got", sym); } zend_ffi_validate_type_name(dcl); + if (FFI_G(parse_failed)) { + FFI_G(parse_failed) = 0; + return FAILURE; + } return SUCCESS; } else { + FFI_G(parse_failed) = 0; return FAILURE; }; } diff -Nru php8.4-8.4.27/ext/ffi/ffi_parser.c php8.4-8.4.28/ext/ffi/ffi_parser.c --- php8.4-8.4.27/ext/ffi/ffi_parser.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/ffi/ffi_parser.c 2026-11-17 20:29:32.000000000 +0000 @@ -3623,9 +3623,15 @@ FFI_G(attribute_parsing) = 0; yy_buf = (unsigned char*)str; yy_end = yy_buf + len; + FFI_G(parse_failed) = 0; parse(); + if (FFI_G(parse_failed)) { + FFI_G(parse_failed) = 0; + return FAILURE; + } return SUCCESS; } else { + FFI_G(parse_failed) = 0; return FAILURE; } } @@ -3639,13 +3645,19 @@ yy_pos = yy_text = yy_buf = (unsigned char*)str; yy_end = yy_buf + len; yy_line = 1; + FFI_G(parse_failed) = 0; sym = parse_type_name(get_sym(), dcl); if (sym != YY_EOF) { yy_error_sym(" expected, got", sym); } zend_ffi_validate_type_name(dcl); + if (FFI_G(parse_failed)) { + FFI_G(parse_failed) = 0; + return FAILURE; + } return SUCCESS; } else { + FFI_G(parse_failed) = 0; return FAILURE; }; } diff -Nru php8.4-8.4.27/ext/ffi/php_ffi.h php8.4-8.4.28/ext/ffi/php_ffi.h --- php8.4-8.4.27/ext/ffi/php_ffi.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/ffi/php_ffi.h 2026-11-17 20:29:32.000000000 +0000 @@ -57,6 +57,7 @@ bool allow_vla; bool attribute_parsing; bool persistent; + bool parse_failed; uint32_t default_type_attr; ZEND_END_MODULE_GLOBALS(ffi) diff -Nru php8.4-8.4.27/ext/ffi/tests/finalize_type_bailout_leak.phpt php8.4-8.4.28/ext/ffi/tests/finalize_type_bailout_leak.phpt --- php8.4-8.4.27/ext/ffi/tests/finalize_type_bailout_leak.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/ffi/tests/finalize_type_bailout_leak.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,64 @@ +--TEST-- +FFI: no memory leak when zend_ffi_finalize_type() bails out inside a declarator +--EXTENSIONS-- +ffi +--INI-- +ffi.enable=1 +--FILE-- += $n; +} + +$cases = [ + // zend_ffi_make_pointer_type() + 'double _Complex *x;', + 'double _Complex **x;', + // zend_ffi_make_func_type() + 'double _Complex f(int a, int b);', + // zend_ffi_add_arg(): first and later argument + 'void f(double _Complex x);', + 'void f(int a, double _Complex x);', + // zend_ffi_nested_declaration() + 'double _Complex (x[3]);', + 'double _Complex (f(int a));', + // parsing continues after the error: only the first one is reported + 'double _Complex x; int y;', + 'struct S { double _Complex a; int b; };', + 'int x; double _Complex y; double _Complex z;', +]; + +foreach ($cases as $code) { + try { + FFI::cdef($code); + echo "no error: $code\n"; + } catch (FFI\ParserException $e) { + echo $e->getMessage(), "\n"; + } + if (leaks($code)) { + echo "leak: $code\n"; + } +} + +?> +--EXPECT-- +Unsupported type _Complex at line 1 +Unsupported type _Complex at line 1 +Unsupported type _Complex at line 1 +Unsupported type _Complex at line 1 +Unsupported type _Complex at line 1 +Unsupported type _Complex at line 1 +Unsupported type _Complex at line 1 +Unsupported type _Complex at line 1 +Unsupported type _Complex at line 1 +Unsupported type _Complex at line 1 diff -Nru php8.4-8.4.27/ext/fileinfo/create_data_file.php php8.4-8.4.28/ext/fileinfo/create_data_file.php --- php8.4-8.4.27/ext/fileinfo/create_data_file.php 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/fileinfo/create_data_file.php 2026-11-17 20:29:32.000000000 +0000 @@ -39,7 +39,7 @@ $chunks = str_split($dta, CHUNK_SIZE); $chunks[count($chunks) - 1] = str_pad($chunks[count($chunks) - 1], CHUNK_SIZE, chr(0)); - echo 'const unsigned char php_magic_database[' . count($chunks) . '][' . CHUNK_SIZE . "] ZEND_NONSTRING = {\n"; + echo 'ZEND_SET_ALIGNED(8, const unsigned char php_magic_database[' . count($chunks) . '][' . CHUNK_SIZE . "]) ZEND_NONSTRING = {\n"; foreach ($chunks as $chunk) { echo '"' . strtr($chunk, $map) . '",' . "\n"; } diff -Nru php8.4-8.4.27/ext/fileinfo/data_file.c php8.4-8.4.28/ext/fileinfo/data_file.c --- php8.4-8.4.27/ext/fileinfo/data_file.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/fileinfo/data_file.c 2026-11-17 20:29:32.000000000 +0000 @@ -1,6 +1,6 @@ /* This is a generated file, do not modify */ /* Usage: php create_data_file.php /path/to/magic.mgc > data_file.c */ -const unsigned char php_magic_database[8313][1024] ZEND_NONSTRING = { +ZEND_SET_ALIGNED(8, const unsigned char php_magic_database[8313][1024]) ZEND_NONSTRING = { "\034\004\036\361\022\0\0\0m?\0\0\001\031\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0 \0=/\005\0\0\0\0\0\0\0\0\0\0\0\0\0/\0\0\0\0\0\0\0\0\0\0\0Brain Vision Data Exchange Marker File, Version\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0Biosig/Brainvision Marker file\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0biosig/brainvision\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0 \0=.\005\0\0\0\0\0\0\0\0\0\0\0\0\0z\0\0\0\0\0\0\0\0\0\0\0FileId=TMSi PortiLab sample log file\n\015Version=\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0Biosig/TMSiLOG\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0biosig/tmsilog\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0 \0=+\005\0\0\0\0\0\004\0\0\0\0\0\0\0}\0\0\0\0\0\0\0\0\0\0\0Synergy\0\0048\0049(&\0048\0048)&\0048\0048\0048&\0048\0048\0048\0\0028\0\0\0\002\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\001\0\0\0=\017\005\0\0\0\0\0?\0\0\0\0\0\0\0~\0\0\0\0\0\0\0\0\0\0\0CRawDataElement\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\002\0\0\0=\016\005\0\0\0\0\0U\0\0\0\0\0\0\0\177\0\0\0\0\0\0\0\0\0\0\0CRawDataBuffer\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0Biosig/S", "YNERGY\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0biosig/synergy\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0 \0=+\005\0\0\0\0\0\0\0\0\0\0\0\0\0.\0\0\0\0\0\0\0\0\0\0\0Brain Vision V-Amp Data Header File Version\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0Biosig/Brainvision V-Amp file\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0 \0=&\005\0\0\0\0\0\0\0\0\0\0\0\0\0-\0\0\0\0\0\0\0\0\0\0\0Brain Vision Data Exchange Header File\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0Biosig/Brainvision data file\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0 \0=&\005\0\0\0\0\0\0\0\0\0\0\0\0\0\026\007\0\0\0\0\0\0\0\0\0\0MetaView Service Assurance Expor", diff -Nru php8.4-8.4.27/ext/fileinfo/fileinfo.c php8.4-8.4.28/ext/fileinfo/fileinfo.c --- php8.4-8.4.27/ext/fileinfo/fileinfo.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/fileinfo/fileinfo.c 2026-11-17 20:29:32.000000000 +0000 @@ -373,8 +373,8 @@ php_stream_wrapper *wrap; php_stream_statbuf ssb; - // Implementation is used for both finfo_file() and mimetype_emu() - int buffer_param_num = (mimetype_emu ? 1 : 2); + // Implementation is used for finfo_file(), finfo::file() and mimetype_emu() + int buffer_param_num = (mimetype_emu || hasThis() ? 1 : 2); if (buffer == NULL || buffer_len == 0) { zend_argument_must_not_be_empty_error(buffer_param_num); goto clean; diff -Nru php8.4-8.4.27/ext/fileinfo/tests/gh24289.phpt php8.4-8.4.28/ext/fileinfo/tests/gh24289.phpt --- php8.4-8.4.27/ext/fileinfo/tests/gh24289.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/fileinfo/tests/gh24289.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,23 @@ +--TEST-- +GH-24289 (finfo::file() reports the wrong argument number for an invalid $filename) +--EXTENSIONS-- +fileinfo +--FILE-- +file('')); +} catch (\ValueError $e) { + echo $e->getMessage() . \PHP_EOL; +} +try { + var_dump($finfo->file("\0")); +} catch (\TypeError $e) { + echo $e->getMessage() . \PHP_EOL; +} + +?> +--EXPECT-- +finfo::file(): Argument #1 ($filename) must not be empty +finfo::file(): Argument #1 ($filename) must not contain any null bytes diff -Nru php8.4-8.4.27/ext/filter/tests/oom_filter_default_encoded.phpt php8.4-8.4.28/ext/filter/tests/oom_filter_default_encoded.phpt --- php8.4-8.4.27/ext/filter/tests/oom_filter_default_encoded.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/filter/tests/oom_filter_default_encoded.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -38,6 +38,8 @@ 'CONTENT_LENGTH' => (string) strlen($body), 'SCRIPT_FILENAME' => $script, 'REDIRECT_STATUS' => '1', + /* PATH is needed to find ASan DLLs (and maybe others) on Windows */ + 'PATH' => getenv('PATH'), ] ); fwrite($pipes[0], $body); diff -Nru php8.4-8.4.27/ext/filter/tests/oom_filter_input.phpt php8.4-8.4.28/ext/filter/tests/oom_filter_input.phpt --- php8.4-8.4.27/ext/filter/tests/oom_filter_input.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/filter/tests/oom_filter_input.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -33,6 +33,8 @@ 'CONTENT_LENGTH' => (string) strlen($body), 'SCRIPT_FILENAME' => $script, 'REDIRECT_STATUS' => '1', + /* PATH is needed to find ASan DLLs (and maybe others) on Windows */ + 'PATH' => getenv('PATH'), ] ); fwrite($pipes[0], $body); diff -Nru php8.4-8.4.27/ext/filter/tests/oom_filter_input_array.phpt php8.4-8.4.28/ext/filter/tests/oom_filter_input_array.phpt --- php8.4-8.4.27/ext/filter/tests/oom_filter_input_array.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/filter/tests/oom_filter_input_array.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -33,6 +33,8 @@ 'CONTENT_LENGTH' => (string) strlen($body), 'SCRIPT_FILENAME' => $script, 'REDIRECT_STATUS' => '1', + /* PATH is needed to find ASan DLLs (and maybe others) on Windows */ + 'PATH' => getenv('PATH'), ] ); fwrite($pipes[0], $body); diff -Nru php8.4-8.4.27/ext/ftp/ftp.c php8.4-8.4.28/ext/ftp/ftp.c --- php8.4-8.4.27/ext/ftp/ftp.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/ftp/ftp.c 2026-11-17 20:29:32.000000000 +0000 @@ -1874,7 +1874,7 @@ data->listener = -1; if (data->fd == -1) { - efree(data); + /* data is still owned by ftp->data, the caller's data_close() frees it */ return NULL; } diff -Nru php8.4-8.4.27/ext/ftp/tests/ftp_get_data_accept_timeout.phpt php8.4-8.4.28/ext/ftp/tests/ftp_get_data_accept_timeout.phpt --- php8.4-8.4.27/ext/ftp/tests/ftp_get_data_accept_timeout.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/ftp/tests/ftp_get_data_accept_timeout.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,39 @@ +--TEST-- +ftp_get()/ftp_nb_get() fail cleanly when the active data connection is never opened +--EXTENSIONS-- +ftp +pcntl +--FILE-- + +--CLEAN-- + +--EXPECTF-- +bool(true) +bool(true) + +Warning: ftp_get(): %s timed out in %s on line %d + +Warning: ftp_get(): File status okay; about to open data connection. in %s on line %d +bool(false) + +Warning: ftp_nb_get(): %s timed out in %s on line %d + +Warning: ftp_nb_get(): File status okay; about to open data connection. in %s on line %d +bool(true) diff -Nru php8.4-8.4.27/ext/ftp/tests/server.inc php8.4-8.4.28/ext/ftp/tests/server.inc --- php8.4-8.4.27/ext/ftp/tests/server.inc 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/ftp/tests/server.inc 2026-11-17 20:29:32.000000000 +0000 @@ -328,6 +328,11 @@ break; } }elseif (preg_match('/^RETR ([\/]*[\w\h]+)/', $buf, $matches)) { + if ($matches[1] === "no_data_connection") { + // Never open the active data connection. + fputs($s, "150 File status okay; about to open data connection.\r\n"); + continue; + } if(!empty($pasv)){ ; } @@ -407,6 +412,10 @@ fclose($fs); + }elseif (preg_match('/^PASV/', $buf, $matches) && isset($pasv_reply_at_buffer_end)) { + // The address ends at the 510th byte and the port is cut off. + fputs($s, "227 " . str_repeat("x", 496) . "127,0,0,1,4,210)\r\n"); + }elseif (preg_match('/^PASV/', $buf, $matches)) { $pasv=true; $host = "127.0.0.1"; @@ -537,6 +546,13 @@ fclose($fs); }elseif (preg_match('/^SIZE \/bug73457/', $buf)) { fputs($s, "213 10\r\n"); + }elseif (preg_match('/^SIZE \/pasvbufferend/', $buf)) { + fputs($s, "213 10\r\n"); + }elseif (preg_match('/^SIZE \/mdtmnodigits/', $buf)) { + // A longer line with digits, read into the same buffer before MDTM. + fputs($s, "213 10 bytes (19991005213102)\r\n"); + }elseif (preg_match('/^MDTM \/mdtmnodigits/', $buf)) { + fputs($s, "213 unknown\r\n"); }elseif (preg_match("/^SITE/", $buf)) { fputs($s, "500 Syntax error, command unrecognized.\r\n"); }else { diff -Nru php8.4-8.4.27/ext/gd/config.w32 php8.4-8.4.28/ext/gd/config.w32 --- php8.4-8.4.27/ext/gd/config.w32 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/gd/config.w32 2026-11-17 20:29:32.000000000 +0000 @@ -16,8 +16,8 @@ CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng12")) && (CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) && CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && - (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", PHP_GD) )) || - (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "gd", PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) + (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib;zs.lib;z.lib", "gd", PHP_GD) )) || + (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib;zs.lib;z.lib", "gd", PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) ) { if (CHECK_LIB("libXpm_a.lib", "gd", PHP_GD) && diff -Nru php8.4-8.4.27/ext/gd/gd.c php8.4-8.4.28/ext/gd/gd.c --- php8.4-8.4.27/ext/gd/gd.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/gd/gd.c 2026-11-17 20:29:32.000000000 +0000 @@ -729,7 +729,7 @@ im = php_gd_libgdimageptr_from_zval_p(IM); if (ncolors <= 0 || ZEND_LONG_INT_OVFL(ncolors)) { - zend_argument_value_error(3, "must be greater than 0 and less than %d", INT_MAX); + zend_argument_value_error(3, "must be between 1 and %d", INT_MAX); RETURN_THROWS(); } diff -Nru php8.4-8.4.27/ext/gd/tests/bug72697.phpt php8.4-8.4.28/ext/gd/tests/bug72697.phpt --- php8.4-8.4.27/ext/gd/tests/bug72697.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/gd/tests/bug72697.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -20,5 +20,5 @@ ?> DONE --EXPECT-- -!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be greater than 0 and less than 2147483647 +!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be between 1 and 2147483647 DONE diff -Nru php8.4-8.4.27/ext/gd/tests/imagetruecolortopalette_error3.phpt php8.4-8.4.28/ext/gd/tests/imagetruecolortopalette_error3.phpt --- php8.4-8.4.27/ext/gd/tests/imagetruecolortopalette_error3.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/gd/tests/imagetruecolortopalette_error3.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -20,4 +20,4 @@ ?> --EXPECT-- -!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be greater than 0 and less than 2147483647 +!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be between 1 and 2147483647 diff -Nru php8.4-8.4.27/ext/gd/tests/imagetruecolortopalette_error4.phpt php8.4-8.4.28/ext/gd/tests/imagetruecolortopalette_error4.phpt --- php8.4-8.4.27/ext/gd/tests/imagetruecolortopalette_error4.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/gd/tests/imagetruecolortopalette_error4.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -21,5 +21,5 @@ ?> --EXPECT-- -!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be greater than 0 and less than 2147483647 -!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be greater than 0 and less than 2147483647 +!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be between 1 and 2147483647 +!! [ValueError] imagetruecolortopalette(): Argument #3 ($num_colors) must be between 1 and 2147483647 diff -Nru php8.4-8.4.27/ext/hash/hash_gost.c php8.4-8.4.28/ext/hash/hash_gost.c --- php8.4-8.4.27/ext/hash/hash_gost.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/hash/hash_gost.c 2026-11-17 20:29:32.000000000 +0000 @@ -247,17 +247,12 @@ context->tables = &tables_crypto; } -static const uint32_t MAX32 = 0xffffffffLU; - PHP_HASH_API void PHP_GOSTUpdate(PHP_GOST_CTX *context, const unsigned char *input, size_t len) { - if ((MAX32 - context->count[0]) < (len * 8)) { - context->count[1]++; - context->count[0] = MAX32 - context->count[0]; - context->count[0] = (len * 8) - context->count[0]; - } else { - context->count[0] += len * 8; - } + uint64_t count = (((uint64_t) context->count[1] << 32) | context->count[0]) + (uint64_t) len * 8; + + context->count[0] = (uint32_t) count; + context->count[1] = (uint32_t) (count >> 32); if (context->length + len < 32) { memcpy(&context->buffer[context->length], input, len); diff -Nru php8.4-8.4.27/ext/hash/hash_snefru.c php8.4-8.4.28/ext/hash/hash_snefru.c --- php8.4-8.4.27/ext/hash/hash_snefru.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/hash/hash_snefru.c 2026-11-17 20:29:32.000000000 +0000 @@ -133,17 +133,12 @@ memset(context, 0, sizeof(*context)); } -static const uint32_t MAX32 = 0xffffffffLU; - PHP_HASH_API void PHP_SNEFRUUpdate(PHP_SNEFRU_CTX *context, const unsigned char *input, size_t len) { - if ((MAX32 - context->count[1]) < (len * 8)) { - context->count[0]++; - context->count[1] = MAX32 - context->count[1]; - context->count[1] = ((uint32_t) len * 8) - context->count[1]; - } else { - context->count[1] += (uint32_t) len * 8; - } + uint64_t count = (((uint64_t) context->count[0] << 32) | context->count[1]) + (uint64_t) len * 8; + + context->count[0] = (uint32_t) (count >> 32); + context->count[1] = (uint32_t) count; if (context->length + len < 32) { memcpy(&context->buffer[context->length], input, len); diff -Nru php8.4-8.4.27/ext/hash/hash_xxhash.c php8.4-8.4.28/ext/hash/hash_xxhash.c --- php8.4-8.4.27/ext/hash/hash_xxhash.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/hash/hash_xxhash.c 2026-11-17 20:29:32.000000000 +0000 @@ -115,11 +115,13 @@ zval *seed = zend_hash_str_find_deref(args, "seed", sizeof("seed") - 1); /* This might be a bit too restrictive, but thinking that a seed might be set once and for all, it should be done a clean way. */ - if (seed && IS_LONG == Z_TYPE_P(seed)) { - XXH64_reset(&ctx->s, (XXH64_hash_t)Z_LVAL_P(seed)); - return; - } else { - php_error_docref(NULL, E_DEPRECATED, "Passing a seed of a type other than int is deprecated because it is the same as setting the seed to 0"); + if (seed) { + if (IS_LONG == Z_TYPE_P(seed)) { + XXH64_reset(&ctx->s, (XXH64_hash_t)Z_LVAL_P(seed)); + return; + } else { + php_error_docref(NULL, E_DEPRECATED, "Passing a seed of a type other than int is deprecated because it is the same as setting the seed to 0"); + } } } diff -Nru php8.4-8.4.27/ext/hash/murmur/PMurHash.c php8.4-8.4.28/ext/hash/murmur/PMurHash.c --- php8.4-8.4.27/ext/hash/murmur/PMurHash.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/hash/murmur/PMurHash.c 2026-11-17 20:29:32.000000000 +0000 @@ -67,6 +67,11 @@ #define UNALIGNED_SAFE #endif +/* Avoid miscompiled aligned reads with the v142 ARM64 optimizer. */ +#if defined(_MSC_VER) && _MSC_VER < 1930 && defined(_M_ARM64) && !defined(__clang__) + #define UNALIGNED_SAFE +#endif + /* Find best way to ROTL */ #if defined(_MSC_VER) #define FORCE_INLINE static __forceinline diff -Nru php8.4-8.4.27/ext/hash/tests/gost_snefru_512mib.phpt php8.4-8.4.28/ext/hash/tests/gost_snefru_512mib.phpt --- php8.4-8.4.27/ext/hash/tests/gost_snefru_512mib.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/hash/tests/gost_snefru_512mib.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,30 @@ +--TEST-- +Hash: gost and snefru with 512 MiB of input (bit counter carry) +--SKIPIF-- + +--INI-- +memory_limit=-1 +--FILE-- + +--EXPECT-- +gost: 6c30acc180f544a79c22fa763593a812aec721dd61658b1a5e9a6f3a7955146d +snefru: 0842a8e735ab08a30149e7e6e34833f365291978ee68c37a5135253b70afa486 +snefru: 0842a8e735ab08a30149e7e6e34833f365291978ee68c37a5135253b70afa486 diff -Nru php8.4-8.4.27/ext/hash/tests/xxhash_options_without_seed.phpt php8.4-8.4.28/ext/hash/tests/xxhash_options_without_seed.phpt --- php8.4-8.4.27/ext/hash/tests/xxhash_options_without_seed.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/hash/tests/xxhash_options_without_seed.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,15 @@ +--TEST-- +Hash: xxHash options without a seed do not emit a deprecation +--FILE-- + +--EXPECT-- +bool(true) +bool(true) +bool(true) +bool(true) diff -Nru php8.4-8.4.27/ext/iconv/tests/gh7980.phpt php8.4-8.4.28/ext/iconv/tests/gh7980.phpt --- php8.4-8.4.27/ext/iconv/tests/gh7980.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/iconv/tests/gh7980.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -2,6 +2,12 @@ Bug GH-7980 (Unexpected result for iconv_mime_decode) --EXTENSIONS-- iconv +--SKIPIF-- + --FILE-- '; diff -Nru php8.4-8.4.27/ext/intl/dateformat/dateformat_parse.c php8.4-8.4.28/ext/intl/dateformat/dateformat_parse.c --- php8.4-8.4.27/ext/intl/dateformat/dateformat_parse.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/intl/dateformat/dateformat_parse.c 2026-11-17 20:29:32.000000000 +0000 @@ -169,7 +169,7 @@ zval *z_parse_pos_tmp = z_parse_pos; ZVAL_DEREF(z_parse_pos_tmp); zend_long long_parse_pos = zval_get_long(z_parse_pos_tmp); - if (ZEND_LONG_INT_OVFL(long_parse_pos)) { + if (ZEND_LONG_EXCEEDS_INT(long_parse_pos)) { intl_error_set_code(NULL, U_ILLEGAL_ARGUMENT_ERROR); intl_error_set_custom_msg(NULL, "String index is out of valid range.", 0); RETURN_FALSE; @@ -212,7 +212,7 @@ zend_argument_type_error(2, "must be of type int, %s given", zend_zval_value_name(z_parse_pos)); RETURN_THROWS(); } - if (ZEND_LONG_INT_OVFL(long_parse_pos)) { + if (ZEND_LONG_EXCEEDS_INT(long_parse_pos)) { intl_error_set_code(NULL, U_ILLEGAL_ARGUMENT_ERROR); intl_error_set_custom_msg(NULL, "String index is out of valid range.", 0); RETURN_FALSE; @@ -251,7 +251,7 @@ zval *z_parse_pos_tmp = z_parse_pos; ZVAL_DEREF(z_parse_pos_tmp); zend_long long_parse_pos = zval_get_long(z_parse_pos_tmp); - if (ZEND_LONG_INT_OVFL(long_parse_pos)) { + if (ZEND_LONG_EXCEEDS_INT(long_parse_pos)) { intl_error_set_code(NULL, U_ILLEGAL_ARGUMENT_ERROR); intl_error_set_custom_msg(NULL, "String index is out of valid range.", 0); RETURN_FALSE; diff -Nru php8.4-8.4.27/ext/intl/grapheme/grapheme_string.c php8.4-8.4.28/ext/intl/grapheme/grapheme_string.c --- php8.4-8.4.27/ext/intl/grapheme/grapheme_string.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/intl/grapheme/grapheme_string.c 2026-11-17 20:29:32.000000000 +0000 @@ -786,7 +786,8 @@ } } - str_len -= (pstr - str); + lstart = pstr - str; + str_len -= lstart; /* if the string is all ASCII up to size+1 - or str_len whichever is first - then we are done. (size + 1 because the size-th character might be the beginning of a grapheme cluster) @@ -795,7 +796,7 @@ if ( -1 != grapheme_ascii_check((unsigned char *)pstr, MIN(size + 1, str_len)) ) { size_t nsize = MIN(size, str_len); if ( NULL != next ) { - ZEND_TRY_ASSIGN_REF_LONG(next, start + nsize); + ZEND_TRY_ASSIGN_REF_LONG(next, lstart + nsize); } RETURN_STRINGL(pstr, nsize); } @@ -829,7 +830,7 @@ ubrk_close(bi); if ( NULL != next ) { - ZEND_TRY_ASSIGN_REF_LONG(next, start + ret_pos); + ZEND_TRY_ASSIGN_REF_LONG(next, lstart + ret_pos); } RETURN_STRINGL(((char *)pstr), ret_pos); diff -Nru php8.4-8.4.27/ext/intl/tests/dateformat_formatObject_calendar_variant_icu72-1.phpt php8.4-8.4.28/ext/intl/tests/dateformat_formatObject_calendar_variant_icu72-1.phpt --- php8.4-8.4.27/ext/intl/tests/dateformat_formatObject_calendar_variant_icu72-1.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/intl/tests/dateformat_formatObject_calendar_variant_icu72-1.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -4,6 +4,7 @@ intl --SKIPIF-- = 72.1'); ?> += 0) die('skip for ICU < 79.1'); ?> --FILE-- = 79.1'); ?> +--FILE-- +setTime(strtotime('2012-01-01 00:00:00')*1000.); +echo IntlDateFormatter::formatObject($cal), "\n"; +echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\n"; + +?> +--EXPECTF-- +01/01/2012, 00:00:00 +domingo, 1 de janeiro de 2012 às 00:00:00 Hora padrão %Sda Europa Ocidental +Jan 1, 2012, 12:00:00 AM +1/1/12, 12:00:00 AM Western European Standard Time +Sun 2012-01-1 00,00,00.000 Portugal Time +domingo, 1 de janeiro de 2012 às 05:00:00 +03:00 GMT +06/02/1433, 00:00:00 +Sunday, Safar 6, 1433 at 12:00:00 AM Western European Standard Time diff -Nru php8.4-8.4.27/ext/intl/tests/dateformat_formatObject_datetime_variant_icu72-1.phpt php8.4-8.4.28/ext/intl/tests/dateformat_formatObject_datetime_variant_icu72-1.phpt --- php8.4-8.4.27/ext/intl/tests/dateformat_formatObject_datetime_variant_icu72-1.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/intl/tests/dateformat_formatObject_datetime_variant_icu72-1.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -4,6 +4,7 @@ intl --SKIPIF-- += 0) die('skip for ICU < 79.1'); ?> --FILE-- = 79.1'); ?> +--FILE-- + +--EXPECTF-- +01/01/2012, 00:00:00 +domingo, 1 de janeiro de 2012 às 00:00:00 Hora padrão %Sda Europa Ocidental +Jan 1, 2012, 12:00:00 AM +1/1/12, 12:00:00 AM Western European Standard Time +Sun 2012-01-1 00,00,00.000 Portugal Time +domingo, 1 de janeiro de 2012 às 05:00:00 +03:00 GMT diff -Nru php8.4-8.4.27/ext/intl/tests/dateformat_parse_offset_out_of_range.phpt php8.4-8.4.28/ext/intl/tests/dateformat_parse_offset_out_of_range.phpt --- php8.4-8.4.27/ext/intl/tests/dateformat_parse_offset_out_of_range.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/intl/tests/dateformat_parse_offset_out_of_range.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,33 @@ +--TEST-- +IntlDateFormatter parse functions reject an offset below INT_MIN +--EXTENSIONS-- +intl +--SKIPIF-- + +--FILE-- +parseToCalendar('12026', $offset), $offset, intl_get_error_message()); + +$offset = -4294967295; +var_dump(datefmt_localtime($fmt, '12026', $offset), $offset, intl_get_error_message()); +?> +--EXPECTF-- +bool(false) +int(-4294967295) +string(%d) "%SString index is out of valid range.: U_ILLEGAL_ARGUMENT_ERROR" +bool(false) +int(-4294967295) +string(%d) "%SString index is out of valid range.: U_ILLEGAL_ARGUMENT_ERROR" +bool(false) +int(-4294967295) +string(%d) "%SString index is out of valid range.: U_ILLEGAL_ARGUMENT_ERROR" diff -Nru php8.4-8.4.27/ext/intl/tests/grapheme_extract_next_offset.phpt php8.4-8.4.28/ext/intl/tests/grapheme_extract_next_offset.phpt --- php8.4-8.4.27/ext/intl/tests/grapheme_extract_next_offset.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/intl/tests/grapheme_extract_next_offset.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,39 @@ +--TEST-- +grapheme_extract() includes skipped UTF-8 continuation bytes in the next offset +--EXTENSIONS-- +intl +--FILE-- + +--EXPECT-- +78 3 +78 5 +78 5 +78 5 +f09f9880 6 +f09f9880 6 +f09f9880 6 +c3a9 6 +78 3 +f09f9880 4 + 1 diff -Nru php8.4-8.4.27/ext/intl/tests/timezone_IDforWindowsID_basic_icu76_1.phpt php8.4-8.4.28/ext/intl/tests/timezone_IDforWindowsID_basic_icu76_1.phpt --- php8.4-8.4.27/ext/intl/tests/timezone_IDforWindowsID_basic_icu76_1.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/intl/tests/timezone_IDforWindowsID_basic_icu76_1.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -4,6 +4,7 @@ intl --SKIPIF-- = 76.1'); ?> += 0) die('skip for ICU < 79.1'); ?> --FILE-- = 79.1'); ?> +--FILE-- + array(NULL), + 'Pacific Standard Time' => array('001', 'CA', 'MX', 'US', 'ZZ'), + 'Romance Standard Time' => array('001', 'BE', 'DK', 'ES', 'FR'), +); + +foreach ($tzs as $tz => $regions) { + echo "** $tz\n"; + foreach ($regions as $region) { + var_dump(IntlTimeZone::getIDForWindowsID($tz, $region)); + if (intl_get_error_code() != U_ZERO_ERROR) { + echo "Error: ", intl_get_error_message(), "\n"; + } + } +} +?> +--EXPECT-- +** India Standard Time +string(13) "Asia/Calcutta" +** Pacific Standard Time +string(19) "America/Los_Angeles" +string(19) "America/Los_Angeles" +string(19) "America/Los_Angeles" +string(19) "America/Los_Angeles" +string(19) "America/Los_Angeles" +** Romance Standard Time +string(12) "Europe/Paris" +string(15) "Europe/Brussels" +string(17) "Europe/Copenhagen" +string(13) "Europe/Madrid" +string(12) "Europe/Paris" diff -Nru php8.4-8.4.27/ext/json/json.c php8.4-8.4.28/ext/json/json.c --- php8.4-8.4.27/ext/json/json.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/json/json.c 2026-11-17 20:29:32.000000000 +0000 @@ -232,6 +232,11 @@ Z_PARAM_LONG(depth) ZEND_PARSE_PARAMETERS_END(); + if (ZEND_LONG_EXCEEDS_INT(depth)) { + zend_argument_value_error(3, "must be between %d and %d", INT_MIN, INT_MAX); + RETURN_THROWS(); + } + php_json_encode_init(&encoder); encoder.max_depth = (int)depth; php_json_encode_zval(&buf, parameter, (int)options, &encoder); diff -Nru php8.4-8.4.27/ext/json/json_encoder.c php8.4-8.4.28/ext/json/json_encoder.c --- php8.4-8.4.27/ext/json/json_encoder.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/json/json_encoder.c 2026-11-17 20:29:32.000000000 +0000 @@ -187,11 +187,11 @@ if (php_json_escape_string(buf, ZSTR_VAL(prop_info->name), ZSTR_LEN(prop_info->name), options & ~PHP_JSON_NUMERIC_CHECK, encoder) == FAILURE) { - if (ZEND_HAS_OOM()) { + if (ZEND_HAS_OOM() || !(options & PHP_JSON_PARTIAL_OUTPUT_ON_ERROR)) { PHP_JSON_HASH_UNPROTECT_RECURSION(obj); return FAILURE; } - if ((options & PHP_JSON_PARTIAL_OUTPUT_ON_ERROR) && buf->s) { + if (buf->s) { ZEND_ASSERT(ZSTR_LEN(buf->s) >= 4); ZSTR_LEN(buf->s) -= 4; smart_str_appendl(buf, "\"\"", 2); @@ -308,12 +308,13 @@ if (php_json_escape_string(buf, ZSTR_VAL(key), ZSTR_LEN(key), options & ~PHP_JSON_NUMERIC_CHECK, encoder) == FAILURE) { - if (ZEND_HAS_OOM()) { - PHP_JSON_HASH_UNPROTECT_RECURSION(myht); + if (ZEND_HAS_OOM() || !(options & PHP_JSON_PARTIAL_OUTPUT_ON_ERROR)) { + PHP_JSON_HASH_UNPROTECT_RECURSION(recursion_rc); zend_release_properties(prop_ht); + zval_ptr_dtor(&tmp); return FAILURE; } - if ((options & PHP_JSON_PARTIAL_OUTPUT_ON_ERROR) && buf->s) { + if (buf->s) { ZEND_ASSERT(ZSTR_LEN(buf->s) >= 4); ZSTR_LEN(buf->s) -= 4; smart_str_appendl(buf, "\"\"", 2); diff -Nru php8.4-8.4.27/ext/json/tests/json_encode_depth.phpt php8.4-8.4.28/ext/json/tests/json_encode_depth.phpt --- php8.4-8.4.27/ext/json/tests/json_encode_depth.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/json/tests/json_encode_depth.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,19 @@ +--TEST-- +json_encode() rejects depth values outside the encoder range +--SKIPIF-- + +--FILE-- +getMessage(), "\n"; + } +} + +?> +--EXPECT-- +ValueError: json_encode(): Argument #3 ($depth) must be between -2147483648 and 2147483647 +ValueError: json_encode(): Argument #3 ($depth) must be between -2147483648 and 2147483647 diff -Nru php8.4-8.4.27/ext/json/tests/json_encode_invalid_key_aborts.phpt php8.4-8.4.28/ext/json/tests/json_encode_invalid_key_aborts.phpt --- php8.4-8.4.27/ext/json/tests/json_encode_invalid_key_aborts.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/json/tests/json_encode_invalid_key_aborts.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,55 @@ +--TEST-- +json_encode() stops encoding after an object or array key fails to encode +--FILE-- +{"\xff"} = 1; +$dynamic->next = new Value; + +$declared = new Declared; +$declared->next = new Value; + +$cases = [ + 'array' => ["\xff" => 1, 'next' => new Value], + 'array, later NAN' => ["\xff" => 1, 'next' => NAN], + 'dynamic property' => $dynamic, + 'declared property' => $declared, +]; + +foreach ($cases as $name => $value) { + echo "$name:\n"; + var_dump(json_encode($value), json_last_error_msg()); +} + +echo "partial output:\n"; +var_dump(json_encode(["\xff" => 1, 'next' => 2], JSON_PARTIAL_OUTPUT_ON_ERROR), json_last_error_msg()); + +?> +--EXPECT-- +array: +bool(false) +string(56) "Malformed UTF-8 characters, possibly incorrectly encoded" +array, later NAN: +bool(false) +string(56) "Malformed UTF-8 characters, possibly incorrectly encoded" +dynamic property: +bool(false) +string(56) "Malformed UTF-8 characters, possibly incorrectly encoded" +declared property: +bool(false) +string(56) "Malformed UTF-8 characters, possibly incorrectly encoded" +partial output: +string(15) "{"":1,"next":2}" +string(56) "Malformed UTF-8 characters, possibly incorrectly encoded" diff -Nru php8.4-8.4.27/ext/json/tests/json_encode_oom_hooked_property_recursion_guard.phpt php8.4-8.4.28/ext/json/tests/json_encode_oom_hooked_property_recursion_guard.phpt --- php8.4-8.4.27/ext/json/tests/json_encode_oom_hooked_property_recursion_guard.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/json/tests/json_encode_oom_hooked_property_recursion_guard.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,28 @@ +--TEST-- +json_encode() OOM while escaping a property name releases the recursion guard of an object with hooked properties +--FILE-- + str_repeat('v', 100); } +} + +$o = new C; +$o->{str_repeat('k', 3 * 1024 * 1024)} = 1; + +register_shutdown_function(function () use ($o) { + ini_set('memory_limit', '-1'); + $json = json_encode($o); + var_dump($json !== false, json_last_error_msg()); +}); + +// Leave less than the 3 MiB property name needs, so that pre-allocating it +// fails while escaping the key, after the object was marked as being encoded. +ini_set('memory_limit', memory_get_usage(true) + 1024 * 1024); +json_encode($o); +?> +--EXPECTF-- +Fatal error: Allowed memory size of %d bytes exhausted %S(tried to allocate %d bytes) in %s on line %d +%Abool(true) +string(8) "No error" diff -Nru php8.4-8.4.27/ext/ldap/ldap.c php8.4-8.4.28/ext/ldap/ldap.c --- php8.4-8.4.27/ext/ldap/ldap.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/ldap/ldap.c 2026-11-17 20:29:32.000000000 +0000 @@ -4129,10 +4129,12 @@ } if (lretdata) { - ZEND_TRY_ASSIGN_REF_STRINGL(retdata, lretdata->bv_val, lretdata->bv_len); + if (retdata) { + ZEND_TRY_ASSIGN_REF_STRINGL(retdata, lretdata->bv_val, lretdata->bv_len); + } ldap_memfree(lretdata->bv_val); ldap_memfree(lretdata); - } else { + } else if (retdata) { ZEND_TRY_ASSIGN_REF_EMPTY_STRING(retdata); } diff -Nru php8.4-8.4.27/ext/ldap/tests/ldap_exop_sync_without_response_data.phpt php8.4-8.4.28/ext/ldap/tests/ldap_exop_sync_without_response_data.phpt --- php8.4-8.4.27/ext/ldap/tests/ldap_exop_sync_without_response_data.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/ldap/tests/ldap_exop_sync_without_response_data.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,22 @@ +--TEST-- +ldap_exop_sync() - without the response_data argument +--EXTENSIONS-- +ldap +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +bool(true) +bool(true) +string(%d) "dn:%s" diff -Nru php8.4-8.4.27/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c php8.4-8.4.28/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c --- php8.4-8.4.27/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c 2026-11-17 20:29:32.000000000 +0000 @@ -339,7 +339,7 @@ int8_t offset = mbfl_encoding_ptr_list_after_hashing[key]; if (offset >= 0) { encoding = mbfl_encoding_ptr_list + offset; - if (strncasecmp((*encoding)->name, name, name_len) == 0) { + if (strlen((*encoding)->name) == name_len && strncasecmp((*encoding)->name, name, name_len) == 0) { return *encoding; } } diff -Nru php8.4-8.4.27/ext/mbstring/mbstring.c php8.4-8.4.28/ext/mbstring/mbstring.c --- php8.4-8.4.27/ext/mbstring/mbstring.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/mbstring/mbstring.c 2026-11-17 20:29:32.000000000 +0000 @@ -275,7 +275,7 @@ } static const mbfl_encoding *php_mb_get_encoding_or_pass(const char *encoding_name, size_t encoding_name_len) { - if (strncmp(encoding_name, "pass", encoding_name_len) == 0) { + if (encoding_name_len == strlen("pass") && strncmp(encoding_name, "pass", encoding_name_len) == 0) { return &mbfl_encoding_pass; } @@ -335,7 +335,7 @@ } size_t p1_length = p - p1 + 1; /* convert to the encoding number and check encoding */ - if (strncasecmp(p1, "auto", p1_length) == 0) { + if (p1_length == strlen("auto") && strncasecmp(p1, "auto", p1_length) == 0) { if (!included_auto) { const enum mbfl_no_encoding *src = MBSTRG(default_detect_order_list); const size_t identify_list_size = MBSTRG(default_detect_order_list_size); @@ -607,8 +607,10 @@ ++pos; } } else { - pos += php_mb_mbchar_bytes(pos, (const mbfl_encoding *)encoding); - + size_t len = php_mb_mbchar_bytes(pos, (const mbfl_encoding *)encoding); + while (len-- > 0 && *pos) { + ++pos; + } } } if (*pos == '\0') { @@ -620,7 +622,10 @@ res = estrndup(*line, pos - *line); while (*pos == stop) { - pos += php_mb_mbchar_bytes(pos, (const mbfl_encoding *)encoding); + size_t len = php_mb_mbchar_bytes(pos, (const mbfl_encoding *)encoding); + while (len-- > 0 && *pos) { + ++pos; + } } *line = pos; diff -Nru php8.4-8.4.27/ext/mbstring/tests/gh15824.phpt php8.4-8.4.28/ext/mbstring/tests/gh15824.phpt --- php8.4-8.4.27/ext/mbstring/tests/gh15824.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/mbstring/tests/gh15824.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -17,8 +17,8 @@ echo "== mime name ==\n"; var_dump(mb_detect_encoding('abc', 'ANSI_X3.4-1968, ISO-8859-1')); var_dump(mb_detect_encoding('abc', 'CP50220, ANSI_X3.4-1968')); -/* last comma is not mistake, intentionally */ -var_dump(mb_detect_encoding(bin2hex('1b24422422242424262428242a1b2842'), 'CP50220, ANSI_X3.4-1968,', false)); + +var_dump(mb_detect_encoding(bin2hex('1b24422422242424262428242a1b2842'), 'CP50220, ANSI_X3.4-1968', false)); var_dump(mb_detect_encoding('😄', 'US-ASCII, UTF-8-Mobile#KDDI-B, UTF-8')); ?> --EXPECT-- diff -Nru php8.4-8.4.27/ext/mbstring/tests/gh23958.phpt php8.4-8.4.28/ext/mbstring/tests/gh23958.phpt --- php8.4-8.4.27/ext/mbstring/tests/gh23958.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/mbstring/tests/gh23958.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,35 @@ +--TEST-- +GH-23958: Truncated encoding names must not be accepted +--EXTENSIONS-- +mbstring +--FILE-- +getMessage(), "\n"; + } +} +try { + mb_detect_order('aut'); +} catch (ValueError $e) { + echo $e->getMessage(), "\n"; +} +var_dump(ini_set('mbstring.detect_order', ',')); + +try { + mb_detect_encoding(bin2hex('1b24422422242424262428242a1b2842'), 'CP50220, ANSI_X3.4-1968,', false); +} catch (ValueError $e) { + echo $e->getMessage(), "\n"; +} +?> +--EXPECTF-- +mb_http_output(): Argument #1 ($encoding) must be a valid encoding, "pa" given +mb_http_output(): Argument #1 ($encoding) must be a valid encoding, "UCS-" given +mb_http_output(): Argument #1 ($encoding) must be a valid encoding, "" given +mb_detect_order(): Argument #1 ($encoding) contains invalid encoding "aut" + +Warning: ini_set(): INI setting contains invalid encoding "" in %s on line %d +bool(false) +mb_detect_encoding(): Argument #2 ($encodings) contains invalid encoding "" diff -Nru php8.4-8.4.27/ext/mbstring/tests/mb_rfc1867_getword_overread.phpt php8.4-8.4.28/ext/mbstring/tests/mb_rfc1867_getword_overread.phpt --- php8.4-8.4.27/ext/mbstring/tests/mb_rfc1867_getword_overread.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/mbstring/tests/mb_rfc1867_getword_overread.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,22 @@ +--TEST-- +Over-read in php_mb_rfc1867_getword() on a multibyte field name (mbstring.encoding_translation=On) +--EXTENSIONS-- +mbstring +--POST_RAW-- +Content-Type: multipart/form-data; boundary=blah + +--blah +Content-Disposition: form-data; name=a× + +x +--blah-- +--INI-- +mbstring.encoding_translation=On +--FILE-- + +--EXPECT-- +int(1) +Done diff -Nru php8.4-8.4.27/ext/mbstring/tests/oom_mb_strcut_filter.phpt php8.4-8.4.28/ext/mbstring/tests/oom_mb_strcut_filter.phpt --- php8.4-8.4.27/ext/mbstring/tests/oom_mb_strcut_filter.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/mbstring/tests/oom_mb_strcut_filter.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -2,6 +2,12 @@ mb_strcut() doesn't reach hard limit - encodings without a length table --EXTENSIONS-- mbstring +--SKIPIF-- + --INI-- memory_limit=8M memory_hard_limit_percent=125 diff -Nru php8.4-8.4.27/ext/mbstring/tests/retry_limit_negative.phpt php8.4-8.4.28/ext/mbstring/tests/retry_limit_negative.phpt --- php8.4-8.4.27/ext/mbstring/tests/retry_limit_negative.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/mbstring/tests/retry_limit_negative.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,25 @@ +--TEST-- +Oniguruma retry limit is not set from a negative mbstring.regex_retry_limit +--EXTENSIONS-- +mbstring +--SKIPIF-- += 6.9.3'); +} +?> +--INI-- +error_reporting=E_ALL & ~E_DEPRECATED +mbstring.regex_retry_limit=-1 +--FILE-- + +--EXPECT-- +bool(false) diff -Nru php8.4-8.4.27/ext/mysqli/tests/fake_server.inc php8.4-8.4.28/ext/mysqli/tests/fake_server.inc --- php8.4-8.4.27/ext/mysqli/tests/fake_server.inc 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/mysqli/tests/fake_server.inc 2026-11-17 20:29:32.000000000 +0000 @@ -1185,6 +1185,23 @@ $conn->read(65536); } +function my_mysqli_test_auth_switch_clear_password(my_mysqli_fake_server_conn $conn): void +{ + $p = new my_mysqli_fake_packet(); + $p->packet_length = "2b0000"; + $p->packet_number = "02"; + $p->response_code = "fe"; + $p->auth_plugin_name = bin2hex('mysql_clear_password' . chr(0)); + // servers always send a fresh scramble with the switch request + $p->auth_plugin_data = "473e3f6047257c676c6b55463f49335f686c643100"; + + $conn->send_server_greetings(); + $conn->read(); + $conn->send($p->to_bytes(), "Auth Switch Request [mysql_clear_password]"); + $conn->read(); + $conn->send($conn->packet_generator->server_ok("04")->to_bytes(), "Server OK"); +} + function my_mysqli_test_chg_user_response_empty(my_mysqli_fake_server_conn $conn): void { $p = $conn->packet_generator->server_ok("01"); diff -Nru php8.4-8.4.27/ext/mysqli/tests/gh24293.phpt php8.4-8.4.28/ext/mysqli/tests/gh24293.phpt --- php8.4-8.4.27/ext/mysqli/tests/gh24293.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/mysqli/tests/gh24293.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,32 @@ +--TEST-- +GH-24293 (Segfault on connect with an empty password to a MariaDB PAM account) +--EXTENSIONS-- +mysqli +--FILE-- +wait(); + +$conn = new mysqli($servername, $username, $password, "", $process->getPort()); +$conn->close(); + +$process->terminate(true); + +print "done!"; +?> +--EXPECTF-- +[*] Server started on 127.0.0.1:%d +[*] Connection established +[*] Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264 +[*] Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31 +[*] Sending - Auth Switch Request [mysql_clear_password]: 2b000002fe6d7973716c5f636c6561725f70617373776f726400473e3f6047257c676c6b55463f49335f686c643100 +[*] Received: 0100000300 +[*] Sending - Server OK: 0700000400000002000000 +[*] Server finished +done! diff -Nru php8.4-8.4.27/ext/mysqlnd/config.w32 php8.4-8.4.28/ext/mysqlnd/config.w32 --- php8.4-8.4.27/ext/mysqlnd/config.w32 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/mysqlnd/config.w32 2026-11-17 20:29:32.000000000 +0000 @@ -28,8 +28,8 @@ "mysqlnd_wireprotocol.c " + "php_mysqlnd.c "; EXTENSION("mysqlnd", mysqlnd_source, false, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); - if ((((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "mysqlnd", PHP_MYSQLND))) || - (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "mysqlnd", PHP_MYSQLND)) || + if ((((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib;zs.lib;z.lib", "mysqlnd", PHP_MYSQLND))) || + (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib;zs.lib;z.lib", "mysqlnd", PHP_MYSQLND)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) && CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" + php_usual_include_suspects) ) diff -Nru php8.4-8.4.27/ext/mysqlnd/mysqlnd_auth.c php8.4-8.4.28/ext/mysqlnd/mysqlnd_auth.c --- php8.4-8.4.27/ext/mysqlnd/mysqlnd_auth.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/mysqlnd/mysqlnd_auth.c 2026-11-17 20:29:32.000000000 +0000 @@ -629,9 +629,7 @@ zend_uchar * ret = NULL; /* copy pass*/ - if (passwd && passwd_len) { - ret = (zend_uchar*) zend_strndup(passwd, passwd_len); - } + ret = (zend_uchar*) zend_strndup(passwd, passwd_len); /* Trailing null required. bug#78680 https://dev.mysql.com/doc/dev/mysql-server/latest/page_protocol_connection_phase_authentication_methods_clear_text_password.html diff -Nru php8.4-8.4.27/ext/mysqlnd/mysqlnd_wireprotocol.c php8.4-8.4.28/ext/mysqlnd/mysqlnd_wireprotocol.c --- php8.4-8.4.27/ext/mysqlnd/mysqlnd_wireprotocol.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/mysqlnd/mysqlnd_wireprotocol.c 2026-11-17 20:29:32.000000000 +0000 @@ -1129,7 +1129,7 @@ zend_uchar * const buf = (zend_uchar *) pfc->cmd_buffer.buffer; const zend_uchar * p = buf; const zend_uchar * const begin = buf; - size_t len; + zend_ulong len; MYSQLND_OPTIONAL_UINT64_T len_ll; DBG_ENTER("php_mysqlnd_rset_header_read"); diff -Nru php8.4-8.4.27/ext/odbc/php_odbc.c php8.4-8.4.28/ext/odbc/php_odbc.c --- php8.4-8.4.27/ext/odbc/php_odbc.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/odbc/php_odbc.c 2026-11-17 20:29:32.000000000 +0000 @@ -997,6 +997,7 @@ } result->conn_ptr = conn; result->fetched = 0; + odbc_insert_new_result(conn, return_value); result->param_info = (odbc_param_info *) safe_emalloc(sizeof(odbc_param_info), result->numparams, 0); for (i=0;inumparams;i++) { @@ -1004,14 +1005,11 @@ &result->param_info[i].scale, &result->param_info[i].nullable); if (rc == SQL_ERROR) { odbc_sql_error(result->conn_ptr, result->stmt, "SQLDescribeParameter"); - SQLFreeStmt(result->stmt, SQL_RESET_PARAMS); - efree(result->param_info); + odbc_result_free(result); zval_ptr_dtor(return_value); RETURN_FALSE; } } - - odbc_insert_new_result(conn, return_value); } /* }}} */ diff -Nru php8.4-8.4.27/ext/odbc/tests/gh24736.phpt php8.4-8.4.28/ext/odbc/tests/gh24736.phpt --- php8.4-8.4.27/ext/odbc/tests/gh24736.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/odbc/tests/gh24736.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,20 @@ +--TEST-- +GH-24736 (Connection string value without closing brace treated as quoted) +--EXTENSIONS-- +odbc +--FILE-- + +--EXPECT-- +bool(false) +bool(false) +bool(false) +bool(true) +bool(true) +bool(true) diff -Nru php8.4-8.4.27/ext/odbc/tests/gh25036.phpt php8.4-8.4.28/ext/odbc/tests/gh25036.phpt --- php8.4-8.4.27/ext/odbc/tests/gh25036.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/odbc/tests/gh25036.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,39 @@ +--TEST-- +GH-25036 (odbc_prepare() double free when SQLDescribeParam() fails) +--EXTENSIONS-- +odbc +--SKIPIF-- + +--FILE-- +getMessage(), PHP_EOL; +} +?> +--EXPECTF-- +Warning: odbc_prepare(): SQL error: %s, SQL state %s in SQLDescribeParameter in %s on line %d +bool(false) + +Warning: odbc_prepare(): SQL error: %s, SQL state %s in SQLDescribeParameter in %s on line %d +bool(false) +array(1) { + ["a"]=> + string(1) "1" +} +Error: ODBC result has already been closed diff -Nru php8.4-8.4.27/ext/opcache/ZendAccelerator.c php8.4-8.4.28/ext/opcache/ZendAccelerator.c --- php8.4-8.4.27/ext/opcache/ZendAccelerator.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/ZendAccelerator.c 2026-11-17 20:29:32.000000000 +0000 @@ -450,8 +450,9 @@ /* Discard non-global CE_CACHE slots on reset. */ uintptr_t idx = (GC_REFCOUNT(s) - 1) / sizeof(void *); if (idx >= ZCSG(map_ptr_last)) { - GC_SET_REFCOUNT(s, 2); GC_DEL_FLAGS(s, IS_STR_CLASS_NAME_MAP_PTR); + ZEND_ATOMIC_FENCE_RELEASE(); + GC_SET_REFCOUNT(s, 2); } } @@ -560,6 +561,7 @@ if (ZSTR_HAS_CE_CACHE(str) && !ZSTR_HAS_CE_CACHE(s)) { ZEND_ASSERT(GC_FLAGS(str) & IS_STR_PERMANENT); GC_SET_REFCOUNT(s, GC_REFCOUNT(str)); + ZEND_ATOMIC_FENCE_RELEASE(); GC_ADD_FLAGS(s, IS_STR_CLASS_NAME_MAP_PTR); } @@ -578,6 +580,13 @@ return ret; } } +#if ZEND_RC_DEBUG + /* PHP shouldn't create persistent strings during request, but at least + * dl() may do this. They belong to the temporary module and are not shared. */ + if (!zend_rc_debug && !ZSTR_IS_INTERNED(str) && (GC_FLAGS(str) & GC_PERSISTENT)) { + GC_MAKE_PERSISTENT_LOCAL(str); + } +#endif return str; } @@ -602,22 +611,34 @@ static zend_string* ZEND_FASTCALL accel_init_interned_string_for_php(const char *str, size_t size, bool permanent) { + zend_string *ret; + if (ZCG(counted)) { zend_ulong h = zend_inline_hash_func(str, size); - zend_string *ret = accel_find_interned_string_ex(h, str, size); + ret = accel_find_interned_string_ex(h, str, size); - if (!ret) { - ret = zend_string_finit(str, size, permanent, CG(interned_strings_fallible)); - if (UNEXPECTED(!ret)) { - return NULL; - } - ZSTR_H(ret) = h; + if (ret) { + return ret; } - return ret; + ret = zend_string_finit(str, size, permanent, CG(interned_strings_fallible)); + if (UNEXPECTED(!ret)) { + return NULL; + } + ZSTR_H(ret) = h; + } else { + ret = zend_string_finit(str, size, permanent, CG(interned_strings_fallible)); } - return zend_string_finit(str, size, permanent, CG(interned_strings_fallible)); +#if ZEND_RC_DEBUG + /* PHP shouldn't create persistent strings during request, but at least + * dl() may do this. They belong to the temporary module and are not shared. */ + if (!zend_rc_debug && permanent) { + GC_MAKE_PERSISTENT_LOCAL(ret); + } +#endif + + return ret; } static inline void accel_copy_permanent_list_types( @@ -1496,10 +1517,10 @@ } } +/* Must perform the same check as phar_compile_file(). */ static zend_always_inline bool is_phar_file(zend_string *filename) { - return filename && ZSTR_LEN(filename) >= sizeof(".phar") && - !memcmp(ZSTR_VAL(filename) + ZSTR_LEN(filename) - (sizeof(".phar")-1), ".phar", sizeof(".phar")-1) && + return filename && strstr(ZSTR_VAL(filename), ".phar") && !strstr(ZSTR_VAL(filename), "://"); } @@ -3408,6 +3429,11 @@ static void accel_post_shutdown(void) { + /* Call original shutdown prior to detaching SHM, so it can access its memory safely. */ + if (orig_post_shutdown_cb) { + orig_post_shutdown_cb(); + } + zend_shared_alloc_shutdown(); } @@ -4764,6 +4790,9 @@ zend_shared_alloc_save_state(); accel_interned_strings_save_state(); +#ifdef HAVE_JIT + zend_jit_save_restart_point(); +#endif SHM_PROTECT(); HANDLE_UNBLOCK_INTERRUPTIONS(); diff -Nru php8.4-8.4.27/ext/opcache/jit/ir/dynasm/dasm_arm64.h php8.4-8.4.28/ext/opcache/jit/ir/dynasm/dasm_arm64.h --- php8.4-8.4.27/ext/opcache/jit/ir/dynasm/dasm_arm64.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/jit/ir/dynasm/dasm_arm64.h 2026-11-17 20:29:32.000000000 +0000 @@ -175,44 +175,46 @@ return -1; } -static int dasm_ffs(unsigned long long x) +#if defined(__GNUC__) || defined(__clang__) +#define dasm_ctz(x) __builtin_ctzll(x) +#define dasm_clz(x) __builtin_clzll(x) +#else +static int dasm_ctz(unsigned long long x) { - int n = -1; - while (x) { x >>= 1; n++; } + int n = 0; + x = ~x; + while (x & 1) { x >>= 1; n++; } return n; } +static int dasm_clz(unsigned long long x) +{ + int n = 0; + x = ~x; + while ((long long)x < 0) { x <<= 1; n++; } + return n; +} +#endif + +static unsigned long long dasm_ror(unsigned long long x, int n) +{ + return (x << (-n & 63)) | (x >> n); +} + static int dasm_imm13(int lo, int hi) { - int inv = 0, w = 64, s = 0xfff, xa, xb; + /* Thanks to: https://dougallj.wordpress.com/2021/10/30/ */ + int rot, ones, size, immr, imms; unsigned long long n = (((unsigned long long)hi) << 32) | (unsigned int)lo; - unsigned long long m = 1ULL, a, b, c; - if (n & 1) { n = ~n; inv = 1; } - a = n & (unsigned long long)-(long long)n; - b = (n+a)&(unsigned long long)-(long long)(n+a); - c = (n+a-b)&(unsigned long long)-(long long)(n+a-b); - xa = dasm_ffs(a); xb = dasm_ffs(b); - if (c) { - w = dasm_ffs(c) - xa; - if (w == 32) m = 0x0000000100000001UL; - else if (w == 16) m = 0x0001000100010001UL; - else if (w == 8) m = 0x0101010101010101UL; - else if (w == 4) m = 0x1111111111111111UL; - else if (w == 2) m = 0x5555555555555555UL; - else return -1; - s = (-2*w & 0x3f) - 1; - } else if (!a) { - return -1; - } else if (xb == -1) { - xb = 64; - } - if ((b-a) * m != n) return -1; - if (inv) { - return ((w - xb) << 6) | (s+w+xa-xb); - } else { - return ((w - xa) << 6) | (s+xb-xa); - } - return -1; + if ((n+1u) <= 1u) return -1; /* Neither all-zero nor all-ones are allowed. */ + rot = (n & (n+1u)) ? dasm_ctz(n & (n+1u)) : 64; + n = dasm_ror(n, rot & 63); + ones = dasm_ctz(~n); + size = dasm_clz(n) + ones; + if (dasm_ror(n, size & 63) != n) return -1; /* Non-repeating? */ + immr = -rot & (size - 1); + imms = (-(size << 1) | (ones - 1)) & 63; + return ((immr | (size & 64)) << 6) | imms; } /* Pass 1: Store actions and args, link branches/labels, estimate offsets. */ diff -Nru php8.4-8.4.27/ext/opcache/jit/ir/ir_aarch64.dasc php8.4-8.4.28/ext/opcache/jit/ir/ir_aarch64.dasc --- php8.4-8.4.27/ext/opcache/jit/ir/ir_aarch64.dasc 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/jit/ir/ir_aarch64.dasc 2026-11-17 20:29:32.000000000 +0000 @@ -6945,7 +6945,7 @@ if (ctx->code_buffer) { if (ctx->code_buffer->pos == (char*)entry + size) { /* rollback */ - ctx->code_buffer->pos = (char*)entry - size; + ctx->code_buffer->pos = (char*)entry; } } else { ir_mem_unmap(entry, size); @@ -7068,7 +7068,7 @@ dasm_free(&dasm_state); if (code_buffer->pos == (char*)entry + size) { /* rollback */ - code_buffer->pos = (char*)entry - size; + code_buffer->pos = (char*)entry; } return NULL; } diff -Nru php8.4-8.4.27/ext/opcache/jit/ir/ir_x86.dasc php8.4-8.4.28/ext/opcache/jit/ir/ir_x86.dasc --- php8.4-8.4.27/ext/opcache/jit/ir/ir_x86.dasc 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/jit/ir/ir_x86.dasc 2026-11-17 20:29:32.000000000 +0000 @@ -12267,7 +12267,7 @@ if (ctx->code_buffer) { if (ctx->code_buffer->pos == (char*)entry + size) { /* rollback */ - ctx->code_buffer->pos = (char*)entry - size; + ctx->code_buffer->pos = (char*)entry; } } else { ir_mem_unmap(entry, size); @@ -12393,7 +12393,7 @@ dasm_free(&dasm_state); if (code_buffer->pos == (char*)entry + size) { /* rollback */ - code_buffer->pos = (char*)entry - size; + code_buffer->pos = (char*)entry; } return NULL; } diff -Nru php8.4-8.4.27/ext/opcache/jit/zend_jit.c php8.4-8.4.28/ext/opcache/jit/zend_jit.c --- php8.4-8.4.27/ext/opcache/jit/zend_jit.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/jit/zend_jit.c 2026-11-17 20:29:32.000000000 +0000 @@ -1164,7 +1164,7 @@ if (range->start > op_num) { /* further blocks will not be relevant... */ break; - } else if (op_num < range->end && var_num == (range->var & ~ZEND_LIVE_MASK)) { + } else if (op_num < range->end && EX_NUM_TO_VAR(var_num) == (range->var & ~ZEND_LIVE_MASK)) { /* check if opcodes in range may throw */ do { if (zend_may_throw(op_array->opcodes + op_num, ssa->ops + op_num, op_array, ssa)) { @@ -2739,6 +2739,8 @@ call_level--; } break; + /* FETCH_OBJ_FUNC_ARG may dispatch into the FETCH_OBJ_R handler (if sent by value). */ + case ZEND_FETCH_OBJ_FUNC_ARG: case ZEND_FETCH_OBJ_R: if (!zend_jit_handler(&ctx, opline, zend_may_throw(opline, ssa_op, op_array, ssa))) { @@ -3122,6 +3124,8 @@ uint32_t i; jit_extension = (zend_jit_op_array_hot_extension*)ZEND_FUNC_INFO(op_array); + /* The JIT-ed code is gone, so allow compiling it again */ + jit_extension->func_info.flags &= ~ZEND_FUNC_JITED; for (i = 0; i < op_array->last; i++) { op_array->opcodes[i].handler = jit_extension->orig_handlers[i]; } @@ -3731,10 +3735,7 @@ zend_jit_trace_startup(reattached); - zend_jit_unprotect(); - /* save JIT buffer pos */ - dasm_ptr[1] = dasm_ptr[0]; - zend_jit_protect(); + zend_jit_save_restart_point(); } void zend_jit_shutdown(void) @@ -3915,5 +3916,16 @@ zend_jit_protect(); } } + +/* Saves the current JIT buffer position as the one zend_jit_restart() rewinds to, + * so that the code generated so far is kept across restarts */ +void zend_jit_save_restart_point(void) +{ + if (dasm_ptr) { + zend_jit_unprotect(); + dasm_ptr[1] = dasm_ptr[0]; + zend_jit_protect(); + } +} #endif /* HAVE_JIT */ diff -Nru php8.4-8.4.27/ext/opcache/jit/zend_jit.h php8.4-8.4.28/ext/opcache/jit/zend_jit.h --- php8.4-8.4.27/ext/opcache/jit/zend_jit.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/jit/zend_jit.h 2026-11-17 20:29:32.000000000 +0000 @@ -167,6 +167,7 @@ ZEND_EXT_API void zend_jit_status(zval *ret); ZEND_EXT_API void zend_jit_blacklist_function(zend_op_array *op_array); void zend_jit_restart(void); +void zend_jit_save_restart_point(void); #define ZREG_LOAD (1<<0) #define ZREG_STORE (1<<1) diff -Nru php8.4-8.4.27/ext/opcache/jit/zend_jit_ir.c php8.4-8.4.28/ext/opcache/jit/zend_jit_ir.c --- php8.4-8.4.27/ext/opcache/jit/zend_jit_ir.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/jit/zend_jit_ir.c 2026-11-17 20:29:32.000000000 +0000 @@ -449,6 +449,15 @@ } } } + +static void zend_jit_discard_veneers(void) +{ + int i, count = sizeof(zend_jit_stubs) / sizeof(zend_jit_stubs[0]); + + for (i = 0; i < count; i++) { + zend_jit_stub_handlers[count + i] = NULL; + } +} #endif static bool zend_jit_prefer_const_addr_load(zend_jit_ctx *jit, uintptr_t addr) @@ -1398,7 +1407,9 @@ if (dst_phi->pi >= 0) { jit->ra[src_var].ref = val; src_var = dst_phi->ssa_var; - if (!(jit->ra[src_var].flags & ZREG_FORWARD)) { + if (!(jit->ra[src_var].flags & ZREG_FORWARD) + /* Pi in a block that is not generated yet. It forwards later on its own. */ + || (jit->bb_start_ref && !jit->bb_start_ref[dst_phi->block])) { phi = zend_ssa_next_use_phi(jit->ssa, var, phi); continue; } @@ -2922,7 +2933,11 @@ #if defined(IR_TARGET_AARCH64) if (ctx->flags2 & IR_HAS_VENEERS) { - zend_jit_commit_veneers(); + if (entry) { + zend_jit_commit_veneers(); + } else { + zend_jit_discard_veneers(); + } } #endif @@ -3766,6 +3781,11 @@ if (k != n) { ir_ref n2, k2; + /* BEGIN reads op2 as a label, so clear the vacated inputs */ + while (r != q) { + *r = IR_UNUSED; + r++; + } if (k <= 1) { insn->op = IR_BEGIN; insn->inputs_count = 0; @@ -4933,6 +4953,9 @@ exit_point = zend_jit_trace_get_exit_point(opline + 1, 0); exit_addr = zend_jit_trace_get_exit_addr(exit_point); + if (!exit_addr) { + return 0; + } ir_GUARD_NOT(ir_OVERFLOW(ref), ir_CONST_ADDR(exit_addr)); if ((opline->opcode == ZEND_PRE_INC || opline->opcode == ZEND_PRE_DEC) && @@ -4974,6 +4997,9 @@ exit_point = zend_jit_trace_get_exit_point(opline + 1, 0); exit_addr = zend_jit_trace_get_exit_addr(exit_point); + if (!exit_addr) { + return 0; + } ir_GUARD(ir_OVERFLOW(ref), ir_CONST_ADDR(exit_addr)); if (opline->result_type != IS_UNUSED) { @@ -5938,6 +5964,9 @@ if (Z_MODE(res_addr) == IS_REG) { ref = ir_CONST_LONG(0); // dead code } + } else if (op2_lval == -1) { + /* Prevent overflow error/crash if op1 == LONG_MIN */ + ref = ir_CONST_LONG(0); } else if (zend_long_is_power_of_two(op2_lval) && op1_range && op1_range->min >= 0) { ref = ir_AND_L(jit_Z_LVAL(jit, op1_addr), ir_CONST_LONG(op2_lval - 1)); } else { @@ -6288,6 +6317,13 @@ ir_ref if_op1_typed = IR_UNUSED; binary_op_type binary_op = get_binary_op(opline->extended_value); + if (Z_MODE(op2_addr) == IS_REG + && Z_LOAD(op2_addr) + && jit->ra[Z_SSA_VAR(op2_addr)].ref == IR_NULL) { + /* Force load, so that the register is defined on all paths */ + zend_jit_use_reg(jit, op2_addr); + } + ref = jit_ZVAL_ADDR(jit, op1_addr); if_op1_ref = jit_if_Z_TYPE_ref(jit, ref, ir_CONST_U8(IS_REFERENCE)); ir_IF_FALSE(if_op1_ref); @@ -13573,9 +13609,10 @@ if (!zend_jit_spill_store_inv(jit, op3_addr, real_addr, op1_data_info)) { return 0; } - op3_addr = real_addr; + arg2 = jit_ZVAL_ADDR(jit, real_addr); + } else { + arg2 = jit_ZVAL_ADDR(jit, op3_addr); } - arg2 = jit_ZVAL_ADDR(jit, op3_addr); ir_CALL_3(IR_VOID, ir_CONST_FC_FUNC(zend_jit_assign_op_to_typed_ref), reference, arg2, ir_CONST_FC_FUNC(binary_op)); @@ -13666,6 +13703,9 @@ ir_MERGE_list(end_inputs); } + if (op1_data_info & (MAY_BE_REF|MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) { + op1_data_info |= MAY_BE_RC1|MAY_BE_RCN; + } jit_FREE_OP(jit, (opline+1)->op1_type, (opline+1)->op1, op1_data_info, NULL); jit_FREE_OP(jit, opline->op2_type, opline->op2, op2_info, NULL); if (may_throw) { @@ -15835,12 +15875,13 @@ } if (var_info & (MAY_BE_ANY - MAY_BE_LONG)) { - if (var_info & (MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) { - may_throw = 1; - } if (if_long) { ir_IF_FALSE_cold(if_long); } + if (var_info & (MAY_BE_ANY - (MAY_BE_LONG|MAY_BE_DOUBLE))) { + may_throw = 1; + jit_SET_EX_OPLINE(jit, opline); + } if (opline->opcode == ZEND_POST_INC_OBJ || opline->opcode == ZEND_POST_DEC_OBJ) { jit_ZVAL_COPY(jit, res_addr, -1, var_addr, var_info, 1); } @@ -15999,15 +16040,22 @@ if (opline->op1_type == IS_CONST) { zval *zv = RT_CONSTANT(opline, opline->op1); zval *jump_zv = NULL; + const zend_op *target; int b; + /* Wrong type for SWITCH_LONG/SWITCH_STRING falls back to the ZEND_CASE chain */ + target = ZEND_OFFSET_TO_OPLINE(opline, opline->extended_value); if (opline->opcode == ZEND_SWITCH_LONG) { if (Z_TYPE_P(zv) == IS_LONG) { jump_zv = zend_hash_index_find(jumptable, Z_LVAL_P(zv)); + } else { + target = opline + 1; } } else if (opline->opcode == ZEND_SWITCH_STRING) { if (Z_TYPE_P(zv) == IS_STRING) { jump_zv = zend_hash_find_known_hash(jumptable, Z_STR_P(zv)); + } else { + target = opline + 1; } } else if (opline->opcode == ZEND_MATCH) { if (Z_TYPE_P(zv) == IS_LONG) { @@ -16018,21 +16066,13 @@ } else { ZEND_UNREACHABLE(); } + if (jump_zv != NULL) { + target = ZEND_OFFSET_TO_OPLINE(opline, Z_LVAL_P(jump_zv)); + } if (next_opline) { - const zend_op *target; - - if (jump_zv != NULL) { - target = ZEND_OFFSET_TO_OPLINE(opline, Z_LVAL_P(jump_zv)); - } else { - target = ZEND_OFFSET_TO_OPLINE(opline, opline->extended_value); - } ZEND_ASSERT(target == next_opline); } else { - if (jump_zv != NULL) { - b = ssa->cfg.map[ZEND_OFFSET_TO_OPLINE(opline, Z_LVAL_P(jump_zv)) - op_array->opcodes]; - } else { - b = ssa->cfg.map[ZEND_OFFSET_TO_OPLINE(opline, opline->extended_value) - op_array->opcodes]; - } + b = ssa->cfg.map[target - op_array->opcodes]; _zend_jit_add_predecessor_ref(jit, b, jit->b, ir_END()); jit->b = -1; } @@ -16212,7 +16252,7 @@ if (fallback_label) { jit_guard_Z_TYPE(jit, op1_addr, IS_REFERENCE, fallback_label); } else { - ir_ref if_ref = jit_if_Z_TYPE(jit, op1_addr, IS_STRING); + ir_ref if_ref = jit_if_Z_TYPE(jit, op1_addr, IS_REFERENCE); ir_IF_FALSE_cold(if_ref); ir_refs_add(slow_inputs, ir_END()); ir_IF_TRUE(if_ref); @@ -16222,7 +16262,7 @@ op1_addr = ZEND_ADDR_REF_ZVAL(ref2); if (fallback_label) { - jit_guard_Z_TYPE(jit, op1_addr, IS_LONG, fallback_label); + jit_guard_Z_TYPE(jit, op1_addr, IS_STRING, fallback_label); } else { if_string = jit_if_Z_TYPE(jit, op1_addr, IS_STRING); ir_IF_FALSE_cold(if_string); diff -Nru php8.4-8.4.27/ext/opcache/jit/zend_jit_trace.c php8.4-8.4.28/ext/opcache/jit/zend_jit_trace.c --- php8.4-8.4.27/ext/opcache/jit/zend_jit_trace.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/jit/zend_jit_trace.c 2026-11-17 20:29:32.000000000 +0000 @@ -333,6 +333,16 @@ // TODO: recompilation may change target ??? return 0; #endif + /* FETCH_OBJ_FUNC_ARG may dispatch into the FETCH_OBJ_R handler (if sent by value). */ + case ZEND_FETCH_OBJ_FUNC_ARG: + case ZEND_FETCH_OBJ_R: + if (opline->op2_type == IS_CONST) { + const zend_class_entry *ce = opline->op1_type == IS_UNUSED ? op_array->scope : NULL; + if (!ce || !(ce->ce_flags & ZEND_ACC_FINAL) || ce->num_hooked_props > 0) { + return 1; + } + } + break; case ZEND_RETURN_BY_REF: case ZEND_RETURN: /* return */ @@ -1704,7 +1714,7 @@ if (i < op_array->last_var) { ssa_var_info[i].type = MAY_BE_UNDEF | MAY_BE_RC1 | MAY_BE_RCN | MAY_BE_REF | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; } else { - ssa_var_info[i].type = MAY_BE_RC1 | MAY_BE_RCN | MAY_BE_REF | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; + ssa_var_info[i].type = MAY_BE_RC1 | MAY_BE_RCN | MAY_BE_REF | MAY_BE_INDIRECT | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; } } if (i < parent_vars_count) { @@ -3282,6 +3292,7 @@ RA_REG_FLAGS(def) |= ZREG_LOAD; RA_REG_FLAGS(use) |= ZREG_STORE; } else { + /* trace-entry value */ use = phi->sources[0]; if (zend_jit_var_supports_reg(ssa, use)) { ZEND_ASSERT(!RA_HAS_REG(use)); @@ -3290,6 +3301,8 @@ count++; } else { RA_REG_FLAGS(def) |= ZREG_LOAD; + /* back-edge value */ + RA_REG_FLAGS(phi->sources[1]) |= ZREG_STORE; } } } else if (RA_HAS_REG(use)) { @@ -3473,6 +3486,20 @@ return 0; } +/* While a trace is being compiled, a register-allocated variable is tracked by + * its IR reference only (STACK_REG() is still ZREG_NONE). */ +static bool zend_jit_trace_stack_has_unstored_refs(zend_jit_trace_stack *stack, uint32_t stack_size) +{ + uint32_t i; + + for (i = 0; i < stack_size; i++) { + if (STACK_REF(stack, i) && !(STACK_FLAGS(stack, i) & (ZREG_LOAD|ZREG_STORE))) { + return 1; + } + } + return 0; +} + static int zend_jit_trace_exit_needs_deoptimization(uint32_t trace_num, uint32_t exit_num) { const zend_op *opline = zend_jit_traces[trace_num].exit_info[exit_num].opline; @@ -3675,7 +3702,7 @@ zend_long op1_min, op1_max, op2_min, op2_max; if ((OP1_INFO() & MAY_BE_ANY) != MAY_BE_LONG - || (OP1_INFO() & MAY_BE_ANY) != MAY_BE_LONG) { + || (OP2_INFO() & MAY_BE_ANY) != MAY_BE_LONG) { return; } @@ -3750,7 +3777,7 @@ zend_jit_trace_set_var_range( &ssa->var_info[ssa_op->op2_use], op2_min, - op2_max != ZEND_LONG_MIN ?MIN(op2_max, op1_max - 1) : op1_max); + op1_max != ZEND_LONG_MIN ? MIN(op2_max, op1_max - 1) : op2_max); } } break; @@ -5118,19 +5145,6 @@ && ssa->vars[ssa_op->op1_def].alias == NO_ALIAS) { ssa->var_info[ssa_op->op1_def].guarded_reference = 1; } - if (opline->result_type == IS_UNUSED) { - res_addr = 0; - } else { - res_addr = RES_REG_ADDR(); - if (Z_MODE(res_addr) != IS_REG - && zend_jit_trace_next_is_send_result(opline, p, frame)) { - send_result = 1; - res_addr = ZEND_ADDR_MEM_ZVAL(ZREG_RX, (opline+1)->result.var); - if (!zend_jit_reuse_ip(&ctx)) { - goto jit_failure; - } - } - } op1_def_addr = op1_addr; op1_def_info &= ~MAY_BE_REF; } else if (op1_info & MAY_BE_REF) { @@ -5148,6 +5162,9 @@ res_addr = RES_REG_ADDR(); res_info = RES_INFO(); if (Z_MODE(res_addr) != IS_REG + /* assignment to typed reference may cause conversion, + * so SEND_VAL has to check the type of the result */ + && !ref_addr && zend_jit_trace_next_is_send_result(opline, p, frame)) { send_result = 1; res_addr = ZEND_ADDR_MEM_ZVAL(ZREG_RX, (opline+1)->result.var); @@ -6874,7 +6891,7 @@ ssa->var_info[j].type &= ~MAY_BE_GUARD; op_type = concrete_type(ssa->var_info[j].type); - if (!zend_jit_type_guard(&ctx, NULL, EX_NUM_TO_VAR(i), op_type)) { + if (!zend_jit_type_guard(&ctx, (p+1)->opline, EX_NUM_TO_VAR(i), op_type)) { goto jit_failure; } SET_STACK_TYPE(stack, i, op_type, 1); @@ -7157,7 +7174,8 @@ if (trace_buffer->stop != ZEND_JIT_TRACE_STOP_RECURSIVE_RET) { if (!(t->flags & ZEND_JIT_TRACE_USES_INITIAL_IP) || (ra - && zend_jit_trace_stack_needs_deoptimization(stack, op_array->last_var + op_array->T))) { + && (zend_jit_trace_stack_needs_deoptimization(stack, op_array->last_var + op_array->T) + || zend_jit_trace_stack_has_unstored_refs(stack, op_array->last_var + op_array->T)))) { /* Deoptimize to the first instruction of the loop */ uint32_t exit_point = zend_jit_trace_get_exit_point(trace_buffer[1].opline, ZEND_JIT_EXIT_TO_VM); @@ -8788,7 +8806,7 @@ SHM_UNPROTECT(); zend_jit_unprotect(); - ((zend_op*)opline)->handler = + ((zend_op*)(t->opline))->handler = ZEND_OP_TRACE_INFO(t->opline, jit_extension->offset)->orig_handler; ZEND_OP_TRACE_INFO(t->opline, jit_extension->offset)->trace_flags &= ~ZEND_JIT_TRACE_JITED; diff -Nru php8.4-8.4.27/ext/opcache/tests/bug66338.phpt php8.4-8.4.28/ext/opcache/tests/bug66338.phpt --- php8.4-8.4.27/ext/opcache/tests/bug66338.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/bug66338.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -8,7 +8,7 @@ server --FILE-- +--CLEAN-- + --EXPECT-- The President of the USA is Barack Hussein Obama II diff -Nru php8.4-8.4.27/ext/opcache/tests/gh17733.phpt php8.4-8.4.28/ext/opcache/tests/gh17733.phpt --- php8.4-8.4.27/ext/opcache/tests/gh17733.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/gh17733.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,110 @@ +--TEST-- +GH-17733 (System entropy does not take into account function order, resulting in wrong functions possibly called in different configurations) +--EXTENSIONS-- +opcache +--FILE-- +getMessage(), "\n"; + } + PHP); +} + +function run(string $cache, string $script, string $disable_functions): void { + $ext = ini_get('extension_dir'); + $opcache = PHP_OS_FAMILY === 'Windows' ? 'php_opcache.dll' : 'opcache.so'; + $cmd = [PHP_BINARY, '-n', '-d', 'extension_dir="' . $ext . '"']; + if (file_exists($ext . '/' . $opcache)) { + array_push($cmd, '-d', 'zend_extension=opcache'); + } + array_push($cmd, + '-d', 'opcache.enable_cli=1', + '-d', 'opcache.file_cache="' . $cache . '"', + '-d', 'opcache.file_cache_only=1', + '-d', 'opcache.file_update_protection=0', + '-d', 'opcache.validate_timestamps=0', // Important to tell apart versions + '-d', 'disable_functions=' . $disable_functions, + $script, + ); + $proc = proc_open($cmd, [1 => ['pipe', 'w'], 2 => ['redirect', 1]], $pipes); + echo stream_get_contents($pipes[1]); + proc_close($proc); +} + +function system_ids(string $cache): int { + $pattern = PHP_OS_FAMILY === 'Windows' ? '/*/*' : '/*'; + return count(glob($cache . $pattern, GLOB_ONLYDIR)); +} + +write_script($script, 1); +run($cache, $script, ''); +var_dump(system_ids($cache)); + +write_script($script, 2); +echo "--- Same environment reuses the cache ---\n"; +run($cache, $script, ''); +var_dump(system_ids($cache)); + +echo "--- Shifted function table ---\n"; +run($cache, $script, 'zend_version'); +var_dump(system_ids($cache)); + +echo "--- Disabled function ---\n"; +run($cache, $script, 'str_repeat'); +var_dump(system_ids($cache)); + +write_script($script, 3); +echo "--- Each environment reuses its own cache ---\n"; +run($cache, $script, 'zend_version'); +run($cache, $script, 'str_repeat'); +run($cache, $script, ''); +var_dump(system_ids($cache)); +?> +--CLEAN-- +isDir() ? rmdir($file->getPathname()) : unlink($file->getPathname()); + } + rmdir($cache); +} +?> +--EXPECT-- +v1 +string(6) "ababab" +int(1) +--- Same environment reuses the cache --- +v1 +string(6) "ababab" +int(1) +--- Shifted function table --- +v2 +string(6) "ababab" +int(2) +--- Disabled function --- +v2 +Error: Call to undefined function str_repeat() +int(3) +--- Each environment reuses its own cache --- +v2 +string(6) "ababab" +v2 +Error: Call to undefined function str_repeat() +v1 +string(6) "ababab" +int(3) diff -Nru php8.4-8.4.27/ext/opcache/tests/gh23626.phpt php8.4-8.4.28/ext/opcache/tests/gh23626.phpt --- php8.4-8.4.27/ext/opcache/tests/gh23626.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/gh23626.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,59 @@ +--TEST-- +GH-23626: OPcache: orphaned temporaries cause leaks and assertions +--CREDITS-- +Mrmaxmeier +--EXTENSIONS-- +opcache +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.optimization_level=-1 +--FILE-- +name .= '-clone'; } + public function __destruct() { echo "destruct {$this->name}\n"; } +} + +function test_assert($u) { + (function () use ($u) {}) ** match (1) { 2 => 3 }; +} + +function one($o) { + (clone $o) ** match (1) { 2 => 3 }; +} + +function two($a, $b) { + (clone $a) ** ((clone $b) ** match (1) { 2 => 3 }); +} + +function rope($o) { + return "x{$o->name}y" . match (1) { 2 => 3 }; +} + +$a = new D('a'); +$b = new D('b'); + +foreach (['test_assert' => [1], 'one' => [$a], 'two' => [$a, $b], 'rope' => [$a]] as $fn => $args) { + try { + $fn(...$args); + } catch (\UnhandledMatchError $e) { + echo "$fn: ", $e->getMessage(), "\n"; + } +} + +unset($a, $b, $args, $e); +echo "done\n"; +?> +--EXPECT-- +test_assert: Unhandled match case 1 +destruct a-clone +one: Unhandled match case 1 +destruct a-clone +destruct b-clone +two: Unhandled match case 1 +rope: Unhandled match case 1 +destruct b +destruct a +done diff -Nru php8.4-8.4.27/ext/opcache/tests/gh24218.phpt php8.4-8.4.28/ext/opcache/tests/gh24218.phpt --- php8.4-8.4.27/ext/opcache/tests/gh24218.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/gh24218.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,17 @@ +--TEST-- +GH-24218 (Invalid opcode for count() of a literal array when SCCP is disabled) +--EXTENSIONS-- +opcache +--INI-- +opcache.enable_cli=1 +opcache.optimization_level=0x60 +--FILE-- + +--EXPECT-- +int(1) +int(3) diff -Nru php8.4-8.4.27/ext/opcache/tests/gh24534.phpt php8.4-8.4.28/ext/opcache/tests/gh24534.phpt --- php8.4-8.4.27/ext/opcache/tests/gh24534.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/gh24534.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,95 @@ +--TEST-- +GH-24534: Inheritance cache must not record an unlinked child as a dependency +--CREDITS-- +Wim Winterberg +--EXTENSIONS-- +opcache +--CONFLICTS-- +server +--FILE-- + +--CLEAN-- + +--EXPECT-- +base-first: user +child-first: user +base-first: user diff -Nru php8.4-8.4.27/ext/opcache/tests/gh24577.phpt php8.4-8.4.28/ext/opcache/tests/gh24577.phpt --- php8.4-8.4.27/ext/opcache/tests/gh24577.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/gh24577.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,150 @@ +--TEST-- +Bug GH-24577: CE-cache flag on shared interned class name must not crash with concurrent access +--EXTENSIONS-- +opcache +pcntl +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.interned_strings_buffer=8 +opcache.file_update_protection=0 +--FILE-- + $readyPrefix . $r, range(0, $numReaders - 1)); +$expectedReady[] = $readyPrefix . 'writer'; +foreach ($expectedReady as $readyFile) { + while (!file_exists($readyFile)) { + usleep(200); + } +} + +// Release barrier so writer persists $classesFile while readers probe $names +file_put_contents($gateFile, '1'); + +$failed = false; +foreach ($children as $pid) { + pcntl_waitpid($pid, $status); + if (!pcntl_wifexited($status) || pcntl_wexitstatus($status) !== 0) { + $failed = true; + } +} + +foreach ($expectedReady as $readyFile) { + @unlink($readyFile); +} +@unlink($gateFile); +@unlink($consumerFile); +@unlink($classesFile); + +echo $failed ? "Failed\n" : "Done\n"; +?> +--CLEAN-- + +--EXPECT-- +Done diff -Nru php8.4-8.4.27/ext/opcache/tests/is_identical_nothrow_recursive_array.phpt php8.4-8.4.28/ext/opcache/tests/is_identical_nothrow_recursive_array.phpt --- php8.4-8.4.27/ext/opcache/tests/is_identical_nothrow_recursive_array.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/is_identical_nothrow_recursive_array.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,39 @@ +--TEST-- +IS_IDENTICAL/IS_NOT_IDENTICAL must not use the NOTHROW handler for arrays that may contain arrays +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.optimization_level=-1 +--EXTENSIONS-- +opcache +--FILE-- +getMessage(), " on line ", $e->getLine(), "\n"; +} + +try { + not_identical($x, [[]]); +} catch (Throwable $e) { + echo $e::class, ": ", $e->getMessage(), " on line ", $e->getLine(), "\n"; +} +?> +--EXPECT-- +Error: Nesting level too deep - recursive dependency? on line 3 +Error: Nesting level too deep - recursive dependency? on line 9 diff -Nru php8.4-8.4.27/ext/opcache/tests/issue0149.phpt php8.4-8.4.28/ext/opcache/tests/issue0149.phpt --- php8.4-8.4.27/ext/opcache/tests/issue0149.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/issue0149.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -22,7 +22,7 @@ include "php_cli_server.inc"; -$ini = '-d opcache.enable=1 -d opcache.enable_cli=1'; +$ini = '-d opcache.enable=1 -d opcache.enable_cli=1 -d opcache.file_update_protection=0'; if (file_exists(ini_get('extension_dir').'/phar.'.PHP_SHLIB_SUFFIX)) { $ini .= ' -d extension=phar.'.PHP_SHLIB_SUFFIX; } diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/add_array_unpack_packed.phpt php8.4-8.4.28/ext/opcache/tests/jit/add_array_unpack_packed.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/add_array_unpack_packed.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/add_array_unpack_packed.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,24 @@ +--TEST-- +JIT: unpacking a hash array with integer keys produces a packed array +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.jit_buffer_size=64M +opcache.jit=1205 +--EXTENSIONS-- +opcache +--FILE-- + 1, -6 => 2, -7 => 3] : [-7 => 2]; + $a = [...$b]; + foreach ($a as $k => $v) { + echo "$k => $v\n"; + } +} +f(true); +?> +--EXPECT-- +0 => 1 +1 => 2 +2 => 3 diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/and_003.phpt php8.4-8.4.28/ext/opcache/tests/jit/and_003.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/and_003.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/and_003.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,19 @@ +--TEST-- +JIT BW_AND: 003 (non-encodable AArch64 logical immediate, wrong result) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit=function +opcache.jit_buffer_size=64M +--EXTENSIONS-- +opcache +--SKIPIF-- + +--FILE-- + +--EXPECT-- +int(6148914691236517204) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/and_004.phpt php8.4-8.4.28/ext/opcache/tests/jit/and_004.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/and_004.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/and_004.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,19 @@ +--TEST-- +JIT BW_AND: 004 (non-encodable AArch64 logical immediate, illegal instruction) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit=function +opcache.jit_buffer_size=64M +--EXTENSIONS-- +opcache +--SKIPIF-- + +--FILE-- + +--EXPECT-- +int(8589934595) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/assign_dim_op_008.phpt php8.4-8.4.28/ext/opcache/tests/jit/assign_dim_op_008.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/assign_dim_op_008.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/assign_dim_op_008.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,21 @@ +--TEST-- +JIT ASSIGN_DIM_OP: CONCAT of a temporary string into a null element +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit=function +--FILE-- + null]; + $arr[5] .= dechex($n); + return $arr; +} +var_dump(f(255)); +?> +--EXPECT-- +array(1) { + [5]=> + string(2) "ff" +} diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/assign_dim_op_009.phpt php8.4-8.4.28/ext/opcache/tests/jit/assign_dim_op_009.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/assign_dim_op_009.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/assign_dim_op_009.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,19 @@ +--TEST-- +JIT ASSIGN_DIM_OP: CONCAT of a temporary string into a referenced null element +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit=function +--FILE-- + null]; + $r = &$arr[5]; + $arr[5] .= dechex($n); + return $r; +} +var_dump(f(255)); +?> +--EXPECT-- +string(2) "ff" diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/assign_dim_op_010.phpt php8.4-8.4.28/ext/opcache/tests/jit/assign_dim_op_010.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/assign_dim_op_010.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/assign_dim_op_010.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,26 @@ +--TEST-- +JIT ASSIGN_DIM_OP: CONCAT of a temporary string into a typed reference +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit=function +--FILE-- + null]; + $arr[5] = &$c->p; + $arr[5] .= dechex($n); + return $c; +} +var_dump(f(255)); +?> +--EXPECT-- +object(C)#1 (1) { + ["p"]=> + string(2) "ff" +} diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/assign_dim_op_011.phpt php8.4-8.4.28/ext/opcache/tests/jit/assign_dim_op_011.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/assign_dim_op_011.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/assign_dim_op_011.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,28 @@ +--TEST-- +JIT ASSIGN_DIM_OP: CONCAT of a temporary string into an ArrayAccess offset +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit=function +--FILE-- +d[$o] ?? null; } + function offsetSet($o, $v): void { $this->d[$o] = $v; } + function offsetExists($o): bool { return isset($this->d[$o]); } + function offsetUnset($o): void {} +} +function f($n) { + $a = new A; + $a[5] .= dechex($n); + return $a->d; +} +var_dump(f(255)); +?> +--EXPECT-- +array(1) { + [5]=> + string(2) "ff" +} diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/assign_dim_op_012.phpt php8.4-8.4.28/ext/opcache/tests/jit/assign_dim_op_012.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/assign_dim_op_012.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/assign_dim_op_012.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,26 @@ +--TEST-- +JIT ASSIGN_DIM_OP: ADD of a temporary array +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit=function +--FILE-- + []]; + $arr[5] += $n ? [1, str_repeat("a", $n)] : 1; + return $arr; +} +var_dump(f(3)); +?> +--EXPECT-- +array(1) { + [5]=> + array(2) { + [0]=> + int(1) + [1]=> + string(3) "aaa" + } +} diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/assign_dim_packed_string_key_001.phpt php8.4-8.4.28/ext/opcache/tests/jit/assign_dim_packed_string_key_001.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/assign_dim_packed_string_key_001.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/assign_dim_packed_string_key_001.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,31 @@ +--TEST-- +JIT: string key write turns a packed array into a hash with integer keys (function JIT) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit_buffer_size=64M +opcache.jit=function +--EXTENSIONS-- +opcache +--FILE-- += 0; $i--) { + $arr['b'] = true; + echo $i, ":\n"; + var_dump($arr[$i]); + } +} +f(); +?> +--EXPECTF-- +2: + +Warning: Undefined array key 2 in %s on line %d +NULL +1: +int(11) +0: +int(10) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/assign_dim_packed_string_key_002.phpt php8.4-8.4.28/ext/opcache/tests/jit/assign_dim_packed_string_key_002.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/assign_dim_packed_string_key_002.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/assign_dim_packed_string_key_002.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,22 @@ +--TEST-- +JIT: compound string key assignment turns a packed array into a hash with integer keys +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit_buffer_size=64M +opcache.jit=function +--EXTENSIONS-- +opcache +--FILE-- + +--EXPECTF-- +Warning: Undefined array key "a" in %s on line %d +int(2) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/assign_dim_packed_string_key_003.phpt php8.4-8.4.28/ext/opcache/tests/jit/assign_dim_packed_string_key_003.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/assign_dim_packed_string_key_003.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/assign_dim_packed_string_key_003.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,29 @@ +--TEST-- +JIT: nested string key write turns a packed array into a hash with integer keys (tracing JIT) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit_buffer_size=64M +opcache.jit=tracing +--EXTENSIONS-- +opcache +--FILE-- + 'x', 5 => 'y']; + $arr['a'][32] = 1; + $r = 0; + for ($i = 0; $i < 100; $i++) { + $r += isset($arr[0][$c]); + } + var_dump($r); +} +for ($k = 0; $k < 3; $k++) { + f(0); +} +?> +--EXPECT-- +int(100) +int(100) +int(100) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/cmp_010.phpt php8.4-8.4.28/ext/opcache/tests/jit/cmp_010.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/cmp_010.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/cmp_010.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,57 @@ +--TEST-- +JIT CMP: 010 Integer range must not be narrowed by a comparison with a non-integer operand +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit=tracing +opcache.jit_hot_func=1 +opcache.jit_hot_loop=1 +opcache.jit_hot_return=1 +opcache.jit_hot_side_exit=1 +--EXTENSIONS-- +opcache +--SKIPIF-- + +--FILE-- + +--EXPECT-- +int < float: float(9.223372036854776E+18) +int < numeric string: float(9.223372036854776E+18) +int <= float (false): float(-9.223372036854776E+18) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/gh16821.phpt php8.4-8.4.28/ext/opcache/tests/jit/gh16821.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/gh16821.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/gh16821.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,63 @@ +--TEST-- +GH-16821 (Spill conflict between ASSIGN.op1_def and ASSIGN.op2_use) +--EXTENSIONS-- +opcache +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.jit=tracing +opcache.jit_buffer_size=64M +opcache.jit_hot_loop=1 +opcache.jit_hot_func=1 +opcache.jit_hot_return=1 +opcache.jit_hot_side_exit=1 +--FILE-- += 571;) { + $g = $h >> 3; + for ($mask = 0x80; $mask > 0; $mask >>= 1, $i--, $h++) { + if (ord($c[$g]) & $mask) { + $temp = $i - 571; + $j = $temp >> 3; + $t1 = $j ? substr($c, 0, -$j) : $c; + $length = strlen($t1); + $temp = $t1 ^ str_pad($u, $length, "\0", STR_PAD_LEFT); + $c = substr_replace($c, $temp, 0, $length); + } + } + } + return $c; +} + +var_dump(md5(reduce(str_repeat("\xff", 72), "\x04\x25"))); +?> +--EXPECT-- +string(32) "dd12a5bb6e3d7b4abcdd92e135850169" + diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/gh17626.inc php8.4-8.4.28/ext/opcache/tests/jit/gh17626.inc --- php8.4-8.4.27/ext/opcache/tests/jit/gh17626.inc 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/gh17626.inc 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,2 @@ + +--EXPECT-- +Aa +Bb diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/gh17626_002.inc php8.4-8.4.28/ext/opcache/tests/jit/gh17626_002.inc --- php8.4-8.4.27/ext/opcache/tests/jit/gh17626_002.inc 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/gh17626_002.inc 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,2 @@ +run('x'); +$a->run('x'); +$a->run('x'); +echo $a->run('x'), "\n"; +echo $b->run('y'), "\n"; +echo $b->run('y'), "\n"; +echo $a->run('x'), "\n"; +?> +--EXPECT-- +Ax +By +By +Ax diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/gh20890.phpt php8.4-8.4.28/ext/opcache/tests/jit/gh20890.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/gh20890.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/gh20890.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,37 @@ +--TEST-- +GH-20890 (Segfault in zval_undefined_cv with non-simple property hook with minimal tracing JIT) +--CREDITS-- +Moonster8282 +--EXTENSIONS-- +opcache +--INI-- +opcache.jit=1251 +--FILE-- +readCount++; + return $this->readCount * 2; + } + } +} + +function hook_hot_path($obj, $iterations) { + $sum = 0; + for ($i = 0; $i < $iterations; $i++) { + $sum += $obj->computed; + } + return $sum; +} + +echo "Testing property hook in hot path...\n"; +$obj = new HookJIT(); +$result = hook_hot_path($obj, 100); +echo "Result: $result\n"; +?> +--EXPECT-- +Testing property hook in hot path... +Result: 10100 diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/gh24206.phpt php8.4-8.4.28/ext/opcache/tests/jit/gh24206.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/gh24206.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/gh24206.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,65 @@ +--TEST-- +GH-24206: Tracing JIT loses loop-carried CV when its loop PHI is reloaded from memory +--EXTENSIONS-- +opcache +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit_buffer_size=64M +opcache.jit=tracing +--CREDITS-- +Fabien Potencier and Symfony contributors +mercierj +--FILE-- + 1, "\xc3" => 2, "\xa9" => 0]; + + public static function scan(string $s): int { + $n = strlen($s); + $count = 0; + for ($i = 0; $i < $n; ++$i) { + $char = $s[$i]; + $size = self::MAP[$char]; + if ($size == 0) { + return -1; + } + for ($j = 1; $j < $size; ++$j) { + } + $i += $j - 1; + ++$count; + } + return $count; + } +} + +var_dump(Scanner::scan(str_repeat("a", 200) . "\xc3\xa9" . "aaa")); + +?> +--EXPECT-- +int(204) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/gh24337.phpt php8.4-8.4.28/ext/opcache/tests/jit/gh24337.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/gh24337.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/gh24337.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,105 @@ +--TEST-- +GH-24337 (JIT: segfault in zend_get_executed_lineno when decrementing a non-numeric string property) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit_buffer_size=64M +opcache.jit=tracing +opcache.jit_hot_loop=2 +opcache.jit_hot_func=2 +opcache.jit_hot_return=2 +opcache.jit_hot_side_exit=1 +--EXTENSIONS-- +opcache +--FILE-- +pu--; + } + } + function inc() { + for ($i = 0; $i < 2; $i++) { + $this->pu++; + } + } +} +class S extends Q { + public $pu = 'u'; + function run() { + parent::run(); + } +} +class B extends Q { + public $pu = true; + function run() { + parent::run(); + } +} +class A extends Q { + public $pu = []; + function run() { + parent::run(); + } +} +$objs = [new Q, new S, new B, new A]; +for ($k = 0; $k < 4; $k++) { + foreach ($objs as $o) { + try { + $o->run(); + } catch (TypeError $e) { + echo $e->getMessage(), " on line ", $e->getLine(), "\n"; + } + try { + $o->inc(); + } catch (TypeError $e) { + echo $e->getMessage(), " on line ", $e->getLine(), "\n"; + } + } +} +var_dump($objs[0]->pu, $objs[1]->pu, $objs[2]->pu, $objs[3]->pu); +?> +--EXPECT-- +Decrement on non-numeric string has no effect and is deprecated on line 9 +Decrement on non-numeric string has no effect and is deprecated on line 9 +Decrement on type bool has no effect, this will change in the next major version of PHP on line 9 +Decrement on type bool has no effect, this will change in the next major version of PHP on line 9 +Increment on type bool has no effect, this will change in the next major version of PHP on line 14 +Increment on type bool has no effect, this will change in the next major version of PHP on line 14 +Cannot decrement array on line 9 +Cannot increment array on line 14 +Decrement on non-numeric string has no effect and is deprecated on line 9 +Decrement on non-numeric string has no effect and is deprecated on line 9 +Decrement on type bool has no effect, this will change in the next major version of PHP on line 9 +Decrement on type bool has no effect, this will change in the next major version of PHP on line 9 +Increment on type bool has no effect, this will change in the next major version of PHP on line 14 +Increment on type bool has no effect, this will change in the next major version of PHP on line 14 +Cannot decrement array on line 9 +Cannot increment array on line 14 +Decrement on non-numeric string has no effect and is deprecated on line 9 +Decrement on non-numeric string has no effect and is deprecated on line 9 +Decrement on type bool has no effect, this will change in the next major version of PHP on line 9 +Decrement on type bool has no effect, this will change in the next major version of PHP on line 9 +Increment on type bool has no effect, this will change in the next major version of PHP on line 14 +Increment on type bool has no effect, this will change in the next major version of PHP on line 14 +Cannot decrement array on line 9 +Cannot increment array on line 14 +Decrement on non-numeric string has no effect and is deprecated on line 9 +Decrement on non-numeric string has no effect and is deprecated on line 9 +Decrement on type bool has no effect, this will change in the next major version of PHP on line 9 +Decrement on type bool has no effect, this will change in the next major version of PHP on line 9 +Increment on type bool has no effect, this will change in the next major version of PHP on line 14 +Increment on type bool has no effect, this will change in the next major version of PHP on line 14 +Cannot decrement array on line 9 +Cannot increment array on line 14 +int(0) +string(2) "ac" +bool(true) +array(0) { +} diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/gh24386.phpt php8.4-8.4.28/ext/opcache/tests/jit/gh24386.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/gh24386.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/gh24386.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,34 @@ +--TEST-- +GH-24386 (register operand must be loaded before the typed reference check) +--EXTENSIONS-- +opcache +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.jit=tracing +opcache.jit_hot_func=2 +--FILE-- +prop; +f(3); +var_dump($c->prop, $h); +?> +--EXPECT-- +int(2) +int(2) +int(3) +int(5) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/gh24388.phpt php8.4-8.4.28/ext/opcache/tests/jit/gh24388.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/gh24388.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/gh24388.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,31 @@ +--TEST-- +GH-24388 (Tracing JIT: segfault when a trace runs out of side exits) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit_buffer_size=64M +opcache.jit=tracing +--EXTENSIONS-- +opcache +--FILE-- + +DONE +--CLEAN-- + +--EXPECT-- +DONE diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/gh24389.phpt php8.4-8.4.28/ext/opcache/tests/jit/gh24389.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/gh24389.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/gh24389.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,30 @@ +--TEST-- +GH-24389 (Tracing JIT: type guard on entry of an inlined call exits with an uninitialized opline) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit_buffer_size=64M +opcache.jit=tracing +--EXTENSIONS-- +opcache +--FILE-- + +--EXPECT-- +int(1) +float(1) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/gh24391.phpt php8.4-8.4.28/ext/opcache/tests/jit/gh24391.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/gh24391.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/gh24391.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,37 @@ +--TEST-- +GH-24391 (JIT: switch on constant of wrong type takes default instead of falling back to the case chain) +--EXTENSIONS-- +opcache +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.jit=function +opcache.optimization_level=0 +--FILE-- + +--EXPECT-- +int(1) +int(6) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/gh24396.phpt php8.4-8.4.28/ext/opcache/tests/jit/gh24396.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/gh24396.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/gh24396.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,22 @@ +--TEST-- +GH-24396: Assertion failure in zend_jit_def_reg() "reg forwarding" with chained Pi nodes +--EXTENSIONS-- +opcache +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit=function +--FILE-- + 200); + return $i; +} +var_dump(f()); +?> +--EXPECT-- +int(2) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/gh24397.phpt php8.4-8.4.28/ext/opcache/tests/jit/gh24397.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/gh24397.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/gh24397.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,23 @@ +--TEST-- +GH-24397 (JIT: stale label operand on a MERGE reduced to BEGIN) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit_buffer_size=64M +opcache.jit=function +opcache.jit_debug=0x1000000 +--EXTENSIONS-- +opcache +--FILE-- + +--EXPECTF-- +%ADone diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/gh24398.phpt php8.4-8.4.28/ext/opcache/tests/jit/gh24398.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/gh24398.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/gh24398.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,36 @@ +--TEST-- +GH-24398: Function JIT level 1 crash on FETCH_OBJ_FUNC_ARG of a hooked property +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.jit_buffer_size=64M +opcache.jit=1201 +--EXTENSIONS-- +opcache +--FILE-- + 5; + } +} + +if (true) { + function g($x) { + return $x; + } +} + +function f($o) { + return g($o->prop); +} + +$c = new C(); +var_dump(f($c)); +var_dump(f($c)); + +?> +--EXPECT-- +int(5) +int(5) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/gh24398_002.phpt php8.4-8.4.28/ext/opcache/tests/jit/gh24398_002.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/gh24398_002.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/gh24398_002.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,44 @@ +--TEST-- +GH-24398 (tracing): FETCH_OBJ_FUNC_ARG of a hooked property with unknown send mode +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.jit_buffer_size=64M +opcache.jit=tracing +opcache.jit_hot_loop=1 +--EXTENSIONS-- +opcache +--FILE-- + 5; + } +} + +if (true) { + function g($x) { + return $x; + } +} + +function f($o) { + // The named argument leaves the send mode unknown to the tracing JIT, + // so FETCH_OBJ_FUNC_ARG is executed by the VM handler. + return g(x: $o->prop); +} + +$sum = 0; +foreach ([new A, new A, new A, new B, new B, new B] as $o) { + $sum += f($o); +} +var_dump($sum); + +?> +--EXPECT-- +int(30) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/gh24436.phpt php8.4-8.4.28/ext/opcache/tests/jit/gh24436.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/gh24436.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/gh24436.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,38 @@ +--TEST-- +GH-24436 (Tracing JIT: wrong value of assignment to typed reference passed as argument) +--EXTENSIONS-- +opcache +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.jit=tracing +--FILE-- +$p, 3)); +} +var_dump($o->f, $o->s); +?> +--EXPECT-- +int(5) +int(5) +int(5) +float(5) +string(1) "5" +float(5) +string(1) "5" diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/gh24437.phpt php8.4-8.4.28/ext/opcache/tests/jit/gh24437.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/gh24437.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/gh24437.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,50 @@ +--TEST-- +GH-24437 (JIT: tracing JIT gives wrong sum for `$a[0] += $i + 1` on an array parameter in a loop) +--EXTENSIONS-- +opcache +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.jit=tracing +--FILE-- + 2])); +$x = 10; +var_dump(g([&$x]), $x); +$c = new C; +var_dump(g([&$c->prop]), $c->prop); +@h([]); +?> +DONE +--EXPECT-- +int(6) +int(16) +int(16) +int(16) +int(16) +DONE diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/gh24438.phpt php8.4-8.4.28/ext/opcache/tests/jit/gh24438.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/gh24438.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/gh24438.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,40 @@ +--TEST-- +GH-24438 (Tracing JIT preserves indirect arguments on side-trace entry) +--EXTENSIONS-- +opcache +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit_buffer_size=64M +opcache.jit=tracing +opcache.jit_hot_loop=1 +opcache.jit_hot_func=1 +opcache.jit_hot_return=1 +opcache.jit_hot_side_exit=1 +opcache.jit_max_polymorphic_calls=0 +--FILE-- + +--EXPECT-- +int(70) +int(80) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/gh24988.phpt php8.4-8.4.28/ext/opcache/tests/jit/gh24988.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/gh24988.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/gh24988.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,47 @@ +--TEST-- +GH-24988 (JIT: crash in cleanup_live_vars when % by zero throws mid-expression) +--CREDITS-- +waroad +jorgsowa +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.jit_buffer_size=64M +opcache.jit=function +opcache.optimization_level=0 +--EXTENSIONS-- +opcache +--FILE-- +self()->self(); +} + +function deep(int $a, int $b, int $c) { + $a &= 255; + return ($a + 1) - ($b + $b + (($a + 1) % ($b % $c))); +} + +$o = new D; +var_dump(deep(15, 3, 7)); +pollute($o, 1, 2); +try { + deep(15, 3, 0); +} catch (DivisionByZeroError $e) { + echo $e->getMessage(), "\n"; +} +echo "end\n"; + +?> +--EXPECT-- +int(9) +Modulo by zero +end +dtor diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/loop_vm_interrupt_001.phpt php8.4-8.4.28/ext/opcache/tests/jit/loop_vm_interrupt_001.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/loop_vm_interrupt_001.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/loop_vm_interrupt_001.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,38 @@ +--TEST-- +Tracing JIT: register-allocated loop variable must survive a VM interrupt raised in the loop body +--DESCRIPTION-- +Comparing two VmInterruptComparable objects sets EG(vm_interrupt) without a +PHP function call, so the JIT only notices the interrupt at the end of the +loop. Before handing control to the VM there, it has to write $s back to +memory, or the loop continues with a stale value. + +This only shows up if $s is kept in a callee-saved register across the +comparison, which is why it's an int: x86_64 has no callee-saved floating +point registers, so a float would always be spilled to memory first. +--EXTENSIONS-- +opcache +zend_test +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.jit=tracing +opcache.jit_buffer_size=64M +opcache.jit_hot_loop=1 +--FILE-- + +--EXPECT-- +int(600) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/mod_002.phpt php8.4-8.4.28/ext/opcache/tests/jit/mod_002.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/mod_002.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/mod_002.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -32,6 +32,7 @@ var_dump(modNeg33(-125)); try { var_dump(modNeg1(125)); + var_dump(modNeg1(PHP_INT_MIN)); } catch (Throwable $e) { echo "Exception " . $e->getMessage() . "\n"; } @@ -49,4 +50,5 @@ int(26) int(-26) int(0) +int(0) Exception (DivisionByZeroError): Modulo by zero diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/or_001.phpt php8.4-8.4.28/ext/opcache/tests/jit/or_001.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/or_001.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/or_001.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,19 @@ +--TEST-- +JIT BW_OR: 001 (non-encodable AArch64 logical immediate, wrong result) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit=function +opcache.jit_buffer_size=64M +--EXTENSIONS-- +opcache +--SKIPIF-- + +--FILE-- + +--EXPECT-- +int(6148914691236517204) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/or_002.phpt php8.4-8.4.28/ext/opcache/tests/jit/or_002.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/or_002.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/or_002.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,19 @@ +--TEST-- +JIT BW_OR: 002 (non-encodable AArch64 logical immediate, illegal instruction) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit=function +opcache.jit_buffer_size=64M +--EXTENSIONS-- +opcache +--SKIPIF-- + +--FILE-- + +--EXPECT-- +int(8589934595) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/preload_restart_function_jit.phpt php8.4-8.4.28/ext/opcache/tests/jit/preload_restart_function_jit.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/preload_restart_function_jit.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/preload_restart_function_jit.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,83 @@ +--TEST-- +Preloaded functions JIT-compiled on script load must survive an OPcache restart +--EXTENSIONS-- +opcache +--SKIPIF-- + +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.jit=disable +opcache.jit_buffer_size=16M +--CONFLICTS-- +server +--FILE-- +> 2); + } + return $s; +} +function preloaded_str(string $x): string { + return strrev($x) . strlen($x); +} +PHP); + +file_put_contents($dir . '/call.php', <<<'PHP' + +--CLEAN-- + +--EXPECT-- +1502868 olleh5 +bool(true) +1289143 +1502868 olleh5 +1502868 olleh5 diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/preload_restart_hot_counters.phpt php8.4-8.4.28/ext/opcache/tests/jit/preload_restart_hot_counters.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/preload_restart_hot_counters.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/preload_restart_hot_counters.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,77 @@ +--TEST-- +Preloaded functions JIT-compiled by hot counters must be JIT-compiled again after an OPcache restart +--EXTENSIONS-- +opcache +--SKIPIF-- + +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.jit=1235 +opcache.jit_buffer_size=16M +--CONFLICTS-- +server +--FILE-- +> 2); + } + return $s; +} +PHP); + +/* A dynamic call keeps the function out of the call graph of the calling script */ +file_put_contents($dir . '/call.php', <<<'PHP' + ['timeout' => 5]]); +foreach (['call', 'reset', 'call', 'call'] as $script) { + echo @file_get_contents($base . $script . '.php', false, $context) ?: "no response\n"; +} +?> +--CLEAN-- + +--EXPECT-- +1502868 +bool(true) +bool(true) +1502868 +1502868 diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/switch_002.phpt php8.4-8.4.28/ext/opcache/tests/jit/switch_002.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/switch_002.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/switch_002.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,27 @@ +--TEST-- +JIT SWITCH_STRING on a reference holding a non-string value +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit=tracing +opcache.jit_hot_loop=1 +--EXTENSIONS-- +opcache +--FILE-- + +--EXPECT-- +int(1) +int(0) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/switch_003.phpt php8.4-8.4.28/ext/opcache/tests/jit/switch_003.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/switch_003.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/switch_003.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,26 @@ +--TEST-- +JIT SWITCH_STRING on a reference (function JIT) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit=function +--EXTENSIONS-- +opcache +--FILE-- + +--EXPECT-- +int(2) +int(0) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/xor_004.phpt php8.4-8.4.28/ext/opcache/tests/jit/xor_004.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/xor_004.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/xor_004.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,19 @@ +--TEST-- +JIT XOR: 004 (non-encodable AArch64 logical immediate, wrong result) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit=function +opcache.jit_buffer_size=64M +--EXTENSIONS-- +opcache +--SKIPIF-- + +--FILE-- + +--EXPECT-- +int(6148914691236517204) diff -Nru php8.4-8.4.27/ext/opcache/tests/jit/xor_005.phpt php8.4-8.4.28/ext/opcache/tests/jit/xor_005.phpt --- php8.4-8.4.27/ext/opcache/tests/jit/xor_005.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/jit/xor_005.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,19 @@ +--TEST-- +JIT XOR: 005 (non-encodable AArch64 logical immediate, illegal instruction) +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.file_update_protection=0 +opcache.jit=function +opcache.jit_buffer_size=64M +--EXTENSIONS-- +opcache +--SKIPIF-- + +--FILE-- + +--EXPECT-- +int(8589934595) diff -Nru php8.4-8.4.27/ext/opcache/tests/opt/assign_dim_op_result_type.phpt php8.4-8.4.28/ext/opcache/tests/opt/assign_dim_op_result_type.phpt --- php8.4-8.4.27/ext/opcache/tests/opt/assign_dim_op_result_type.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/opt/assign_dim_op_result_type.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,82 @@ +--TEST-- +Type inference of ASSIGN_DIM_OP result uses the container and key types +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.optimization_level=-1 +opcache.opt_debug_level=0x400000 +opcache.preload= +--EXTENSIONS-- +opcache +--FILE-- + +--EXPECTF-- +$_main: + ; (lines=1, args=0, vars=0, tmps=%d, ssa_vars=0, no_loops) + ; (after dfa pass) + ; %s + ; return [long] RANGE[1..1] +BB0: + ; start exit lines=[0-0] + ; level=0 +0000 RETURN int(1) + +f: + ; (lines=9, args=3, vars=5, tmps=%d, ssa_vars=14, no_loops) + ; (after dfa pass) + ; %s + ; return [long, double] + ; #0.CV0($p) NOVAL [undef] + ; #1.CV1($q) NOVAL [undef] + ; #2.CV2($k) NOVAL [undef] + ; #3.CV3($a) NOVAL [undef] + ; #4.CV4($r) NOVAL [undef] +BB0: + ; start exit lines=[0-8] + ; level=0 +0000 #5.CV0($p) [long] RANGE[MIN..MAX] = RECV 1 +0001 #6.CV1($q) [long] RANGE[MIN..MAX] = RECV 2 +0002 #7.CV2($k) [long] RANGE[MIN..MAX] = RECV 3 +0003 #8.T5 NOESC [[packed, hash] array [long] of [long]] = INIT_ARRAY 2 (packed) #5.CV0($p) [long] RANGE[MIN..MAX] NEXT +0004 ADD_ARRAY_ELEMENT #6.CV1($q) [long] RANGE[MIN..MAX] NEXT #8.T5 NOESC [[packed, hash] array [long] of [long]] -> #9.T5 NOESC [[packed, hash] array [long] of [long]] +0005 #10.CV3($a) NOESC [[packed, hash] array [long] of [long]] = QM_ASSIGN #9.T5 NOESC [[packed, hash] array [long] of [long]] +0006 #13.CV4($r) [long, double] = ASSIGN_DIM_OP (ADD) #10.CV3($a) NOESC [[packed, hash] array [long] of [long]] -> #11.CV3($a) NOVAL NOESC [[packed, hash] array [long] of [long, double]] #7.CV2($k) [long] RANGE[MIN..MAX] +0007 OP_DATA int(1) +0008 RETURN #13.CV4($r) [long, double] + +g: + ; (lines=11, args=3, vars=5, tmps=%d, ssa_vars=16, no_loops) + ; (after dfa pass) + ; %s + ; return [long, double, array of [any, ref]] + ; #0.CV0($p) NOVAL [undef] + ; #1.CV1($q) NOVAL [undef] + ; #2.CV2($k) NOVAL [undef] + ; #3.CV3($a) NOVAL [undef] + ; #4.CV4($r) NOVAL [undef] +BB0: + ; start exit lines=[0-10] + ; level=0 +0000 #5.CV0($p) [long] RANGE[MIN..MAX] = RECV 1 +0001 #6.CV1($q) [long] RANGE[MIN..MAX] = RECV 2 +0002 #7.CV2($k) [long] RANGE[MIN..MAX] = RECV 3 +0003 #8.T5 NOESC [[packed, hash] array [long] of [long]] = INIT_ARRAY 1 (packed) #5.CV0($p) [long] RANGE[MIN..MAX] NEXT +0004 #9.T6 NOESC [[packed, hash] array [long] of [array]] = INIT_ARRAY 2 (packed) #8.T5 NOESC [[packed, hash] array [long] of [long]] NEXT +0005 #10.T7 NOESC [[packed, hash] array [long] of [long]] = INIT_ARRAY 1 (packed) #6.CV1($q) [long] RANGE[MIN..MAX] NEXT +0006 ADD_ARRAY_ELEMENT #10.T7 NOESC [[packed, hash] array [long] of [long]] NEXT #9.T6 NOESC [[packed, hash] array [long] of [array]] -> #11.T6 NOESC [[packed, hash] array [long] of [array]] +0007 #12.CV3($a) NOESC [[packed, hash] array [long] of [array]] = QM_ASSIGN #11.T6 NOESC [[packed, hash] array [long] of [array]] +0008 #15.CV4($r) [long, double, array of [any, ref]] = ASSIGN_DIM_OP (ADD) #12.CV3($a) NOESC [[packed, hash] array [long] of [array]] -> #13.CV3($a) NOVAL NOESC [[packed, hash] array [long] of [long, double, array]] #7.CV2($k) [long] RANGE[MIN..MAX] +0009 OP_DATA array(...) +0010 RETURN #15.CV4($r) [long, double, array of [any, ref]] diff -Nru php8.4-8.4.27/ext/opcache/tests/opt/block_pass_fast_call_op2.phpt php8.4-8.4.28/ext/opcache/tests/opt/block_pass_fast_call_op2.phpt --- php8.4-8.4.27/ext/opcache/tests/opt/block_pass_fast_call_op2.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/opt/block_pass_fast_call_op2.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,45 @@ +--TEST-- +Block pass must not remove the source of the ZEND_FAST_CALL OP2 return value +--EXTENSIONS-- +opcache +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +--FILE-- +getMessage(), "\n"; + } + return "fallback"; +} + +function test_refcounted() { + $x = 1; + try { + try { + return true ? "returned" : "other"; + } finally { + undef_fn(); + } + } catch (Throwable $e) { + echo $e::class, ': ', $e->getMessage(), "\n"; + } + return "fallback"; +} + +var_dump(test_scalar()); +var_dump(test_refcounted()); +?> +--EXPECT-- +Error: Call to undefined function undef_fn() +string(8) "fallback" +Error: Call to undefined function undef_fn() +string(8) "fallback" diff -Nru php8.4-8.4.27/ext/opcache/tests/opt/escape_analysis_array_access.phpt php8.4-8.4.28/ext/opcache/tests/opt/escape_analysis_array_access.phpt --- php8.4-8.4.27/ext/opcache/tests/opt/escape_analysis_array_access.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/opt/escape_analysis_array_access.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,76 @@ +--TEST-- +Escape analysis: objects implementing ArrayAccess escape through dimension accesses +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.optimization_level=-1 +--EXTENSIONS-- +opcache +--FILE-- +x = 3; return true; } + function offsetGet($o): mixed { $this->x = 2; return 42; } + function offsetSet($o, $v): void { $this->x = 4; } + function offsetUnset($o): void {} + + static function fetch() { + $o = new self; + $o->x = 1; + $o[0]; + return $o->x; + } + + static function isset() { + $o = new self; + $o->x = 1; + return [isset($o[0]), $o->x]; + } + + static function assign() { + $o = new self; + $o->x = 1; + $o[0] = 1; + return $o->x; + } +} + +#[AllowDynamicProperties] class B {} +#[AllowDynamicProperties] +class BB implements ArrayAccess { + function offsetExists($o): bool { + return true; + } + + function offsetGet($o): mixed { + $this->x = 2; + return 1; + } + + function offsetSet($o, $v): void {} + + function offsetUnset($o): void {} + + static function f($c) { + if ($c) { $o = new B; $o->x = 1; } else { $o = new self; $o->x = 1; } + $o[0]; + return $o->x; + } +} + +var_dump(AA::fetch()); +var_dump(AA::isset()); +var_dump(AA::assign()); +var_dump(BB::f(false)); +?> +--EXPECT-- +int(2) +array(2) { + [0]=> + bool(true) + [1]=> + int(3) +} +int(4) +int(2) diff -Nru php8.4-8.4.27/ext/opcache/tests/opt/fetch_dim_func_arg_unused_chain.phpt php8.4-8.4.28/ext/opcache/tests/opt/fetch_dim_func_arg_unused_chain.phpt --- php8.4-8.4.27/ext/opcache/tests/opt/fetch_dim_func_arg_unused_chain.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/opt/fetch_dim_func_arg_unused_chain.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,29 @@ +--TEST-- +FETCH_DIM_FUNC_ARG with UNUSED op2 followed by other FUNC_ARG fetches must not be partially converted +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.optimization_level=-1 +--EXTENSIONS-- +opcache +--FILE-- +b); + } catch (Error $e) { + echo $e->getMessage(), "\n"; + } + try { + byVal($a[][0]); + } catch (Error $e) { + echo $e->getMessage(), "\n"; + } +} +class Node { function __construct() {} } +function byVal($x) {} +test(); +?> +--EXPECT-- +Cannot use [] for reading +Cannot use [] for reading diff -Nru php8.4-8.4.27/ext/opcache/tests/opt/gh25061.phpt php8.4-8.4.28/ext/opcache/tests/opt/gh25061.phpt --- php8.4-8.4.27/ext/opcache/tests/opt/gh25061.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/tests/opt/gh25061.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,43 @@ +--TEST-- +GH-25061 ($x = $x - 1 on null is optimized to PRE_DEC) +--EXTENSIONS-- +opcache +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.optimization_level=-1 +--FILE-- + +--EXPECTF-- +int(-1) +int(4) + +Warning: Undefined variable $x in %s on line %d +int(-1) +int(-2) diff -Nru php8.4-8.4.27/ext/opcache/zend_accelerator_module.c php8.4-8.4.28/ext/opcache/zend_accelerator_module.c --- php8.4-8.4.27/ext/opcache/zend_accelerator_module.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/zend_accelerator_module.c 2026-11-17 20:29:32.000000000 +0000 @@ -93,7 +93,12 @@ static ZEND_INI_MH(OnUpdateInternedStringsBuffer) { - if (accel_startup_ok) { + /* Under ZTS, every thread started later re-applies the INI entries at + * ZEND_INI_STAGE_STARTUP to fill its own globals. Accepting that is safe: the + * value comes from the global INI directives, so it is the one OPcache was + * set up with. NTS does not have this problem: STARTUP handlers run before + * accel_startup_ok is set, and accel_shutdown() clears it again. */ + if (accel_startup_ok && stage != ZEND_INI_STAGE_STARTUP) { if (strcmp(sapi_module.name, "fpm-fcgi") == 0) { zend_accel_error(ACCEL_LOG_WARNING, "opcache.interned_strings_buffer cannot be changed when OPcache is already set up. Are you using php_admin_value[opcache.interned_strings_buffer] in an individual pool's configuration?\n"); } else { diff -Nru php8.4-8.4.27/ext/opcache/zend_file_cache.c php8.4-8.4.28/ext/opcache/zend_file_cache.c --- php8.4-8.4.27/ext/opcache/zend_file_cache.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/zend_file_cache.c 2026-11-17 20:29:32.000000000 +0000 @@ -532,32 +532,13 @@ } if (opline->op2_type == IS_CONST) { SERIALIZE_PTR(opline->op2.zv); - - /* See GH-17733. Reset Z_EXTRA_P(op2) of ZEND_INIT_FCALL, which - * is an offset into the global function table, to avoid calling - * incorrect functions when environment changes. This, and the - * equivalent code below, can be removed once proper system ID - * validation is implemented. */ - if (opline->opcode == ZEND_INIT_FCALL) { - zval *op2 = opline->op2.zv; - UNSERIALIZE_PTR(op2); - Z_EXTRA_P(op2) = 0; - ZEND_VM_SET_OPCODE_HANDLER(opline); - } } #else if (opline->op1_type == IS_CONST) { opline->op1.constant = RT_CONSTANT(opline, opline->op1) - literals; } if (opline->op2_type == IS_CONST) { - zval *op2 = RT_CONSTANT(opline, opline->op2); - opline->op2.constant = op2 - literals; - - /* See GH-17733 and comment above. */ - if (opline->opcode == ZEND_INIT_FCALL) { - Z_EXTRA_P(op2) = 0; - ZEND_VM_SET_OPCODE_HANDLER(opline); - } + opline->op2.constant = RT_CONSTANT(opline, opline->op2) - literals; } #endif #if ZEND_USE_ABS_JMP_ADDR diff -Nru php8.4-8.4.27/ext/opcache/zend_persist.c php8.4-8.4.28/ext/opcache/zend_persist.c --- php8.4-8.4.27/ext/opcache/zend_persist.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/opcache/zend_persist.c 2026-11-17 20:29:32.000000000 +0000 @@ -343,6 +343,7 @@ ZEND_ASSERT(!ZSTR_HAS_CE_CACHE(type_name)); GC_SET_REFCOUNT(type_name, (uint32_t)Z_LVAL_P(zv)); + ZEND_ATOMIC_FENCE_RELEASE(); GC_ADD_FLAGS(type_name, IS_STR_CLASS_NAME_MAP_PTR); } ZEND_HASH_FOREACH_END(); diff -Nru php8.4-8.4.27/ext/openssl/openssl.c php8.4-8.4.28/ext/openssl/openssl.c --- php8.4-8.4.27/ext/openssl/openssl.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/openssl/openssl.c 2026-11-17 20:29:32.000000000 +0000 @@ -663,16 +663,16 @@ char *cert_file, size_t cert_file_len, uint32_t arg_num); static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request * req); -static void php_openssl_add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int shortname) /* {{{ */ +static void php_openssl_add_assoc_name_entry(zval * val, char * key, const X509_NAME * name, int shortname) /* {{{ */ { zval *data; zval subitem, tmp; int i; char *sname; int nid; - X509_NAME_ENTRY * ne; - ASN1_STRING * str = NULL; - ASN1_OBJECT * obj; + const X509_NAME_ENTRY * ne; + const ASN1_STRING * str = NULL; + const ASN1_OBJECT * obj; if (key != NULL) { array_init(&subitem); @@ -703,7 +703,7 @@ } else { /* ASN1_STRING_get0_data(3): Since this is an internal pointer it should not be freed or modified in any way */ to_add = ASN1_STRING_get0_data(str); - to_add_len = ASN1_STRING_length(str); + to_add_len = ASN1_STRING_get_length(str); } if (to_add_len != -1) { @@ -737,9 +737,9 @@ } /* }}} */ -static void php_openssl_add_assoc_asn1_string(zval * val, char * key, ASN1_STRING * str) /* {{{ */ +static void php_openssl_add_assoc_asn1_string(zval * val, char * key, const ASN1_STRING * str) /* {{{ */ { - add_assoc_stringl(val, key, (const char *)ASN1_STRING_get0_data(str), ASN1_STRING_length(str)); + add_assoc_stringl(val, key, (const char *)ASN1_STRING_get0_data(str), ASN1_STRING_get_length(str)); } /* }}} */ @@ -756,6 +756,7 @@ struct tm thetime; char * strbuf; char * thestr; + const char *timestr_data; long gmadjust = 0; size_t timestr_len; @@ -764,24 +765,25 @@ return (time_t)-1; } - timestr_len = (size_t)ASN1_STRING_length(timestr); + timestr_len = ASN1_STRING_get_length(timestr); + timestr_data = timestr_len ? (const char *)ASN1_STRING_get0_data(timestr) : ""; - if (timestr_len != strlen((const char *)ASN1_STRING_get0_data(timestr))) { + if (memchr(timestr_data, '\0', timestr_len) != NULL) { php_error_docref(NULL, E_WARNING, "Illegal length in timestamp"); return (time_t)-1; } if (timestr_len < 13) { - php_error_docref(NULL, E_WARNING, "Unable to parse time string %s correctly", ASN1_STRING_get0_data(timestr)); + php_error_docref(NULL, E_WARNING, "Unable to parse time string %.*s correctly", (int)timestr_len, timestr_data); return (time_t)-1; } if (ASN1_STRING_type(timestr) == V_ASN1_GENERALIZEDTIME && timestr_len < 15) { - php_error_docref(NULL, E_WARNING, "Unable to parse time string %s correctly", ASN1_STRING_get0_data(timestr)); + php_error_docref(NULL, E_WARNING, "Unable to parse time string %.*s correctly", (int)timestr_len, timestr_data); return (time_t)-1; } - strbuf = estrdup((const char *)ASN1_STRING_get0_data(timestr)); + strbuf = estrndup(timestr_data, timestr_len); memset(&thetime, 0, sizeof(thetime)); @@ -1324,7 +1326,7 @@ } php_stream_xport_register("ssl", php_openssl_ssl_socket_factory); -#ifndef OPENSSL_NO_SSL3 +#if OPENSSL_VERSION_NUMBER < 0x40000000L && !defined(OPENSSL_NO_SSL3) php_stream_xport_register("sslv3", php_openssl_ssl_socket_factory); #endif php_stream_xport_register("tls", php_openssl_ssl_socket_factory); @@ -1410,7 +1412,7 @@ php_unregister_url_stream_wrapper("ftps"); php_stream_xport_unregister("ssl"); -#ifndef OPENSSL_NO_SSL3 +#if OPENSSL_VERSION_NUMBER < 0x40000000L && !defined(OPENSSL_NO_SSL3) php_stream_xport_unregister("sslv3"); #endif php_stream_xport_unregister("tls"); @@ -1632,7 +1634,7 @@ } if (challenge) { - if (!ASN1_STRING_set(spki->spkac->challenge, challenge, (int)challenge_len)) { + if (!ASN1_STRING_set1_data(spki->spkac->challenge, (const unsigned char *) challenge, challenge_len)) { php_openssl_store_errors(); php_error_docref(NULL, E_WARNING, "Unable to set challenge data"); goto cleanup; @@ -1824,7 +1826,8 @@ goto cleanup; } - RETVAL_STRING((const char *)ASN1_STRING_get0_data(spki->spkac->challenge)); + RETVAL_STRINGL_FAST((const char *)ASN1_STRING_get0_data(spki->spkac->challenge), + ASN1_STRING_get_length(spki->spkac->challenge)); goto cleanup; cleanup: @@ -2026,11 +2029,11 @@ * Christian Heimes */ -static int openssl_x509v3_subjectAltName(BIO *bio, X509_EXTENSION *extension) +static int openssl_x509v3_subjectAltName(BIO *bio, PHP_OPENSSL_X509_EXTENSION *extension) { GENERAL_NAMES *names; const X509V3_EXT_METHOD *method = NULL; - ASN1_OCTET_STRING *extension_data; + const ASN1_OCTET_STRING *extension_data; long i, length, num; const unsigned char *p; @@ -2041,7 +2044,7 @@ extension_data = X509_EXTENSION_get_data(extension); p = ASN1_STRING_get0_data(extension_data); - length = ASN1_STRING_length(extension_data); + length = ASN1_STRING_get_length(extension_data); if (method->it) { names = (GENERAL_NAMES*) (ASN1_item_d2i(NULL, &p, length, ASN1_ITEM_ptr(method->it))); @@ -2063,19 +2066,19 @@ BIO_puts(bio, "email:"); as = name->d.rfc822Name; BIO_write(bio, ASN1_STRING_get0_data(as), - ASN1_STRING_length(as)); + ASN1_STRING_get_length(as)); break; case GEN_DNS: BIO_puts(bio, "DNS:"); as = name->d.dNSName; BIO_write(bio, ASN1_STRING_get0_data(as), - ASN1_STRING_length(as)); + ASN1_STRING_get_length(as)); break; case GEN_URI: BIO_puts(bio, "URI:"); as = name->d.uniformResourceIdentifier; BIO_write(bio, ASN1_STRING_get0_data(as), - ASN1_STRING_length(as)); + ASN1_STRING_get_length(as)); break; default: /* use builtin print for GEN_OTHERNAME, GEN_X400, @@ -2103,8 +2106,8 @@ bool useshortnames = 1; char * tmpstr; zval subitem; - X509_EXTENSION *extension; - X509_NAME *subject_name; + PHP_OPENSSL_X509_EXTENSION *extension; + const X509_NAME *subject_name; char *cert_name; char *extname; BIO *bio_out; @@ -2989,7 +2992,12 @@ zval *item, *subitem; zend_string *strindex = NULL; - subj = X509_REQ_get_subject_name(csr); + subj = X509_NAME_new(); + if (subj == NULL) { + php_openssl_store_errors(); + return FAILURE; + } + /* apply values from the dn hash */ ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(dn), strindex, item) { if (strindex) { @@ -2998,10 +3006,12 @@ if (Z_TYPE_P(item) == IS_ARRAY) { ZEND_HASH_FOREACH_NUM_KEY_VAL(Z_ARRVAL_P(item), i, subitem) { if (php_openssl_csr_add_subj_entry(subitem, subj, nid) == FAILURE) { + X509_NAME_free(subj); return FAILURE; } } ZEND_HASH_FOREACH_END(); } else if (php_openssl_csr_add_subj_entry(item, subj, nid) == FAILURE) { + X509_NAME_free(subj); return FAILURE; } } else { @@ -3052,13 +3062,23 @@ if (!X509_NAME_add_entry_by_txt(subj, type, MBSTRING_UTF8, (unsigned char*)v->value, -1, -1, 0)) { php_openssl_store_errors(); php_error_docref(NULL, E_WARNING, "add_entry_by_txt %s -> %s (failed)", type, v->value); + X509_NAME_free(subj); return FAILURE; } if (!X509_NAME_entry_count(subj)) { php_error_docref(NULL, E_WARNING, "No objects specified in config file"); + X509_NAME_free(subj); return FAILURE; } } + + if (!X509_REQ_set_subject_name(csr, subj)) { + php_openssl_store_errors(); + X509_NAME_free(subj); + return FAILURE; + } + X509_NAME_free(subj); + if (attribs) { ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(attribs), strindex, item) { int nid; @@ -3547,7 +3567,7 @@ zend_object *csr_obj; zend_string *csr_str; bool use_shortnames = 1; - X509_NAME *subject; + const X509_NAME *subject; ZEND_PARSE_PARAMETERS_START(1, 2) Z_PARAM_OBJ_OF_CLASS_OR_STR(csr_obj, php_openssl_request_ce, csr_str) @@ -4697,7 +4717,7 @@ } OPENSSL_PKEY_SET_BN(data, cofactor); - if (!OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_COFACTOR, cofactor) || + if ((cofactor && !OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_COFACTOR, cofactor)) || !EC_GROUP_set_generator(group, point_g, order, cofactor)) { goto cleanup; } @@ -6053,7 +6073,7 @@ BUF_MEM *bio_buf; BIO_get_mem_ptr(bio_out, &bio_buf); ZVAL_STRINGL(&zcert, bio_buf->data, bio_buf->length); - add_index_zval(zout, i, &zcert); + add_next_index_zval(zout, &zcert); } BIO_free(bio_out); } @@ -6068,7 +6088,7 @@ BUF_MEM *bio_buf; BIO_get_mem_ptr(bio_out, &bio_buf); ZVAL_STRINGL(&zcert, bio_buf->data, bio_buf->length); - add_index_zval(zout, i, &zcert); + add_next_index_zval(zout, &zcert); } BIO_free(bio_out); } @@ -6709,7 +6729,7 @@ BUF_MEM *bio_buf; BIO_get_mem_ptr(bio_out, &bio_buf); ZVAL_STRINGL(&zcert, bio_buf->data, bio_buf->length); - add_index_zval(zout, i, &zcert); + add_next_index_zval(zout, &zcert); } BIO_free(bio_out); } @@ -6724,7 +6744,7 @@ BUF_MEM *bio_buf; BIO_get_mem_ptr(bio_out, &bio_buf); ZVAL_STRINGL(&zcert, bio_buf->data, bio_buf->length); - add_index_zval(zout, i, &zcert); + add_next_index_zval(zout, &zcert); } BIO_free(bio_out); } diff -Nru php8.4-8.4.27/ext/openssl/php_openssl.h php8.4-8.4.28/ext/openssl/php_openssl.h --- php8.4-8.4.27/ext/openssl/php_openssl.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/openssl/php_openssl.h 2026-11-17 20:29:32.000000000 +0000 @@ -25,7 +25,9 @@ #include "php_version.h" #define PHP_OPENSSL_VERSION PHP_VERSION +#include #include +#include #ifdef LIBRESSL_VERSION_NUMBER /* LibreSSL version check */ #if LIBRESSL_VERSION_NUMBER < 0x20700000L @@ -44,6 +46,17 @@ #endif #endif +#if OPENSSL_VERSION_NUMBER < 0x40100000L +#define ASN1_STRING_set1_data(str, data, len) ASN1_STRING_set((str), (data), (int) (len)) +#define ASN1_STRING_get_length(str) ((size_t) ASN1_STRING_length(str)) +#endif + +#if defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_MAJOR >= 4 +typedef const X509_EXTENSION PHP_OPENSSL_X509_EXTENSION; +#else +typedef X509_EXTENSION PHP_OPENSSL_X509_EXTENSION; +#endif + #define PHP_OPENSSL_ERR_BUFFER_SIZE 16 #define OPENSSL_RAW_DATA 1 diff -Nru php8.4-8.4.27/ext/openssl/tests/bug28382.phpt php8.4-8.4.28/ext/openssl/tests/bug28382.phpt --- php8.4-8.4.27/ext/openssl/tests/bug28382.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/openssl/tests/bug28382.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -6,6 +6,12 @@ = 0x40000000) { + $extensions = &$ext['extensions']; + $extensions['crlDistributionPoints'] = preg_replace('/^Full Name:\R\s*/', '', trim($extensions['crlDistributionPoints'])); +} + var_dump($ext['extensions']); /* * The reason for %A at the end of crlDistributionPoints and authorityKeyIdentifier is that @@ -30,7 +36,7 @@ string(59) "B0:A7:FF:F9:41:15:DE:23:39:BD:DD:31:0F:97:A0:B2:A2:74:E0:FC" ["authorityKeyIdentifier"]=> string(%d) "DirName:/C=RO/ST=Romania/L=Craiova/O=Sergiu/OU=Sergiu SRL/CN=Sergiu CA/emailAddress=n_sergiu@hotmail.com -serial:00%A" +serial:%A" ["keyUsage"]=> string(71) "Digital Signature, Non Repudiation, Key Encipherment, Data Encipherment" ["nsBaseUrl"]=> diff -Nru php8.4-8.4.27/ext/openssl/tests/ecc_custom_params.phpt php8.4-8.4.28/ext/openssl/tests/ecc_custom_params.phpt --- php8.4-8.4.27/ext/openssl/tests/ecc_custom_params.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/openssl/tests/ecc_custom_params.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -5,6 +5,30 @@ --SKIPIF-- = 0x40000000) { + $d = hex2bin('8D0AC65AAEA0D6B96254C65817D4A143A9E7A03876F1A37D'); + $p = hex2bin('BDB6F4FE3E8B1D9E0DA8C0D46F4C318CEFE4AFE3B6B8551F'); + $a = hex2bin('BB8E5E8FBC115E139FE6A814FE48AAA6F0ADA1AA5DF91985'); + $b = hex2bin('1854BEBDC31B21B7AEFC80AB0ECD10D5B1B3308E6DBF11C1'); + $g_x = hex2bin('4AD5F7048DE709AD51236DE65E4D4B482C836DC6E4106640'); + $g_y = hex2bin('02BB3A02D4AAADACAE24817A4CA3A1B014B5270432DB27D2'); + $order = hex2bin('BDB6F4FE3E8B1D9E0DA8C0D40FC962195DFAE76F56564677'); + + if (@openssl_pkey_new(array( + 'ec' => array( + 'p' => $p, + 'a' => $a, + 'b' => $b, + 'order' => $order, + 'g_x' => $g_x, + 'g_y' => $g_y, + 'd' => $d, + ), + )) === false) { + die("skip EC custom params unsupported with OpenSSL 4"); + } +} ?> --FILE-- $pkcs7, 'openssl_cms_read' => $cms] as $func => $data) { + echo $func, "\n"; + var_dump($func($data, $result)); + var_dump(count($result)); + foreach ($result as $i => $pem) { + echo $i, ': ', strtok($pem, "\n"), "\n"; + } +} +?> +--EXPECT-- +openssl_pkcs7_read +bool(true) +int(2) +0: -----BEGIN CERTIFICATE----- +1: -----BEGIN X509 CRL----- +openssl_cms_read +bool(true) +int(2) +0: -----BEGIN CERTIFICATE----- +1: -----BEGIN X509 CRL----- diff -Nru php8.4-8.4.27/ext/openssl/tests/openssl_spki_export_challenge_binary.phpt php8.4-8.4.28/ext/openssl/tests/openssl_spki_export_challenge_binary.phpt --- php8.4-8.4.27/ext/openssl/tests/openssl_spki_export_challenge_binary.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/openssl/tests/openssl_spki_export_challenge_binary.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,19 @@ +--TEST-- +openssl_spki_export_challenge() preserves empty challenges and embedded NUL bytes +--EXTENSIONS-- +openssl +--FILE-- + +--EXPECT-- +bool(true) +bool(true) +bool(true) +bool(true) +bool(true) diff -Nru php8.4-8.4.27/ext/openssl/tests/openssl_x509_parse_basic_openssl32.phpt php8.4-8.4.28/ext/openssl/tests/openssl_x509_parse_basic_openssl32.phpt --- php8.4-8.4.27/ext/openssl/tests/openssl_x509_parse_basic_openssl32.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/openssl/tests/openssl_x509_parse_basic_openssl32.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -8,12 +8,28 @@ ?> --FILE-- --EXPECTF-- bool(true) diff -Nru php8.4-8.4.27/ext/openssl/xp_ssl.c php8.4-8.4.28/ext/openssl/xp_ssl.c --- php8.4-8.4.27/ext/openssl/xp_ssl.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/openssl/xp_ssl.c 2026-11-17 20:29:32.000000000 +0000 @@ -93,7 +93,7 @@ #define HAVE_SEC_LEVEL 1 #endif -#ifndef OPENSSL_NO_SSL3 +#if OPENSSL_VERSION_NUMBER < 0x40000000L && !defined(OPENSSL_NO_SSL3) #define HAVE_SSL3 1 #define PHP_OPENSSL_MIN_PROTO_VERSION STREAM_CRYPTO_METHOD_SSLv3 #else @@ -480,7 +480,7 @@ /* TODO: warn ? */ continue; } - if ((size_t)ASN1_STRING_length(san->d.dNSName) != strlen((const char*)cert_name)) { + if (ASN1_STRING_get_length(san->d.dNSName) != strlen((const char*)cert_name)) { OPENSSL_free(cert_name); /* prevent null-byte poisoning*/ continue; @@ -500,7 +500,7 @@ } OPENSSL_free(cert_name); } else if (san->type == GEN_IPADD) { - if (ASN1_STRING_length(san->d.iPAddress) == 4) { + if (ASN1_STRING_get_length(san->d.iPAddress) == 4) { snprintf(ipbuffer, sizeof(ipbuffer), "%d.%d.%d.%d", ASN1_STRING_get0_data(san->d.iPAddress)[0], ASN1_STRING_get0_data(san->d.iPAddress)[1], @@ -514,7 +514,7 @@ } } #ifdef HAVE_IPV6_SAN - else if (ASN1_STRING_length(san->d.ip) == 16 && subject_name_is_ipv6) { + else if (ASN1_STRING_get_length(san->d.ip) == 16 && subject_name_is_ipv6) { ipbuffer[0] = 0; EXPAND_IPV6_ADDRESS(ipbuffer, ASN1_STRING_get0_data(san->d.iPAddress)); if (strcasecmp((const char*)subject_name_ipv6_expanded, (const char*)ipbuffer) == 0) { @@ -544,26 +544,55 @@ static bool php_openssl_matches_common_name(X509 *peer, const char *subject_name) /* {{{ */ { - char buf[1024]; - X509_NAME *cert_name; + unsigned char *cert_name = NULL; +#if PHP_OPENSSL_API_VERSION < 0x30000 + X509_NAME *name; +#else + const X509_NAME *name; +#endif + const X509_NAME_ENTRY *name_entry; + const ASN1_STRING *name_asn1; bool is_match = 0; + int name_index; int cert_name_len; - cert_name = X509_get_subject_name(peer); - cert_name_len = X509_NAME_get_text_by_NID(cert_name, NID_commonName, buf, sizeof(buf)); + name = X509_get_subject_name(peer); + name_index = X509_NAME_get_index_by_NID(name, NID_commonName, -1); + if (name_index == -1) { + php_error_docref(NULL, E_WARNING, "Unable to locate peer certificate CN"); + return false; + } - if (cert_name_len == -1) { + name_entry = X509_NAME_get_entry(name, name_index); + if (name_entry == NULL) { php_error_docref(NULL, E_WARNING, "Unable to locate peer certificate CN"); - } else if ((size_t)cert_name_len != strlen(buf)) { - php_error_docref(NULL, E_WARNING, "Peer certificate CN=`%.*s' is malformed", cert_name_len, buf); - } else if (php_openssl_matches_wildcard_name(subject_name, buf)) { + return false; + } + + name_asn1 = X509_NAME_ENTRY_get_data(name_entry); + cert_name_len = ASN1_STRING_get_length(name_asn1); + cert_name = (unsigned char *) OPENSSL_strndup((const char *) ASN1_STRING_get0_data(name_asn1), cert_name_len); + if (cert_name == NULL) { + php_error_docref(NULL, E_WARNING, "Unable to locate peer certificate CN"); + return false; + } + + if ((size_t)cert_name_len != strlen((const char *)cert_name)) { + php_error_docref(NULL, E_WARNING, "Peer certificate CN=`%.*s' is malformed", cert_name_len, (const char *)cert_name); + OPENSSL_free(cert_name); + return false; + } else if (php_openssl_matches_wildcard_name(subject_name, (const char *)cert_name)) { is_match = 1; } else { php_error_docref(NULL, E_WARNING, "Peer certificate CN=`%.*s' did not match expected CN=`%s'", - cert_name_len, buf, subject_name); + cert_name_len, (const char *)cert_name, subject_name); + OPENSSL_free(cert_name); + return false; } + OPENSSL_free(cert_name); + return is_match; } /* }}} */ diff -Nru php8.4-8.4.27/ext/pdo/pdo_dbh.c php8.4-8.4.28/ext/pdo/pdo_dbh.c --- php8.4-8.4.27/ext/pdo/pdo_dbh.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/pdo/pdo_dbh.c 2026-11-17 20:29:32.000000000 +0000 @@ -854,9 +854,16 @@ if (!pdo_get_long_param(&lval, value)) { return false; } - /* TODO Check for valid value (NULL_NATURAL, NULL_EMPTY_STRING, NULL_TO_STRING)? */ - dbh->oracle_nulls = lval; - return true; + switch (lval) { + case PDO_NULL_NATURAL: + case PDO_NULL_EMPTY_STRING: + case PDO_NULL_TO_STRING: + dbh->oracle_nulls = lval; + return true; + default: + zend_value_error("PDO::ATTR_ORACLE_NULLS must be one of the PDO::NULL_* constants"); + return false; + } case PDO_ATTR_DEFAULT_FETCH_MODE: if (Z_TYPE_P(value) == IS_ARRAY) { @@ -900,7 +907,6 @@ pdo_raise_impl_error(dbh, NULL, "HY000", "PDO::ATTR_STATEMENT_CLASS cannot be used with persistent PDO instances" ); - PDO_HANDLE_DBH_ERR(); return false; } if (Z_TYPE_P(value) != IS_ARRAY) { diff -Nru php8.4-8.4.27/ext/pdo/pdo_stmt.c php8.4-8.4.28/ext/pdo/pdo_stmt.c --- php8.4-8.4.27/ext/pdo/pdo_stmt.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/pdo/pdo_stmt.c 2026-11-17 20:29:32.000000000 +0000 @@ -391,29 +391,6 @@ } /* }}} */ -static bool pdo_stmt_do_next_rowset(pdo_stmt_t *stmt); - -static void pdo_stmt_invalidate_result(pdo_stmt_t *stmt) -{ - if (stmt->methods->cursor_closer) { - stmt->methods->cursor_closer(stmt); - } else { - do { - while (stmt->methods->fetcher(stmt, PDO_FETCH_ORI_NEXT, 0)) - ; - if (!stmt->methods->next_rowset) { - break; - } - - if (!pdo_stmt_do_next_rowset(stmt)) { - break; - } - } while (1); - } - - stmt->executed = 0; -} - /* {{{ Execute a prepared statement, optionally binding parameters */ PHP_METHOD(PDOStatement, execute) { @@ -430,9 +407,10 @@ RETURN_THROWS(); } - if (stmt->executed) { - pdo_stmt_invalidate_result(stmt); + if (stmt->executed && stmt->methods->cursor_closer) { + stmt->methods->cursor_closer(stmt); } + stmt->execute_incomplete = 1; PDO_STMT_CLEAR_ERR(); if (input_params) { @@ -499,6 +477,7 @@ RETURN_FALSE; } if (stmt->methods->executer(stmt)) { + stmt->execute_incomplete = 0; if (!stmt->executed) { /* this is the first execute */ @@ -605,7 +584,7 @@ static bool do_fetch_common(pdo_stmt_t *stmt, enum pdo_fetch_orientation ori, zend_long offset) /* {{{ */ { - if (!stmt->executed) { + if (!stmt->executed || stmt->execute_incomplete) { return 0; } diff -Nru php8.4-8.4.27/ext/pdo/php_pdo_driver.h php8.4-8.4.28/ext/pdo/php_pdo_driver.h --- php8.4-8.4.27/ext/pdo/php_pdo_driver.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/pdo/php_pdo_driver.h 2026-11-17 20:29:32.000000000 +0000 @@ -568,8 +568,9 @@ * emulate prepare and bind on its behalf */ unsigned supports_placeholders:2; unsigned in_param_event:1; + unsigned execute_incomplete:1; - unsigned _reserved:28; + unsigned _reserved:27; /* the number of columns in the result set; not valid until after * the statement has been executed at least once. In some cases, might diff -Nru php8.4-8.4.27/ext/pdo/tests/pdo_oracle_nulls_invalid.phpt php8.4-8.4.28/ext/pdo/tests/pdo_oracle_nulls_invalid.phpt --- php8.4-8.4.27/ext/pdo/tests/pdo_oracle_nulls_invalid.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/pdo/tests/pdo_oracle_nulls_invalid.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,49 @@ +--TEST-- +PDO Common: Invalid Oracle null handling modes do not change the attribute +--EXTENSIONS-- +pdo +--SKIPIF-- + +--FILE-- +setAttribute(PDO::ATTR_ORACLE_NULLS, $value)); + var_dump($pdo->getAttribute(PDO::ATTR_ORACLE_NULLS)); +} + +foreach ([-1, 3, 4, PHP_INT_MAX] as $value) { + try { + $pdo->setAttribute(PDO::ATTR_ORACLE_NULLS, $value); + } catch (ValueError $e) { + echo $e::class, ': ', $e->getMessage(), PHP_EOL; + } + echo "Unchanged mode: "; + var_dump($pdo->getAttribute(PDO::ATTR_ORACLE_NULLS)); +} +?> +--EXPECT-- +Valid mode: bool(true) +int(0) +Valid mode: bool(true) +int(1) +Valid mode: bool(true) +int(2) +ValueError: PDO::ATTR_ORACLE_NULLS must be one of the PDO::NULL_* constants +Unchanged mode: int(2) +ValueError: PDO::ATTR_ORACLE_NULLS must be one of the PDO::NULL_* constants +Unchanged mode: int(2) +ValueError: PDO::ATTR_ORACLE_NULLS must be one of the PDO::NULL_* constants +Unchanged mode: int(2) +ValueError: PDO::ATTR_ORACLE_NULLS must be one of the PDO::NULL_* constants +Unchanged mode: int(2) diff -Nru php8.4-8.4.27/ext/pdo/tests/pdo_persistent_statement_class.phpt php8.4-8.4.28/ext/pdo/tests/pdo_persistent_statement_class.phpt --- php8.4-8.4.27/ext/pdo/tests/pdo_persistent_statement_class.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/pdo/tests/pdo_persistent_statement_class.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,32 @@ +--TEST-- +PDO Common: Rejecting ATTR_STATEMENT_CLASS on a persistent connection reports one error +--EXTENSIONS-- +pdo +--SKIPIF-- + +--FILE-- + true])); +$db = PDOTest::factory(); + +var_dump($db->setAttribute(PDO::ATTR_STATEMENT_CLASS, [PDOStatement::class])); + +$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); +try { + $db->setAttribute(PDO::ATTR_STATEMENT_CLASS, [PDOStatement::class]); +} catch (PDOException $e) { + echo $e::class, ": ", $e->getMessage(), "\n"; +} +?> +--EXPECTF-- +Warning: PDO::setAttribute(): SQLSTATE[HY000]: General error: PDO::ATTR_STATEMENT_CLASS cannot be used with persistent PDO instances in %s on line %d +bool(false) +PDOException: SQLSTATE[HY000]: General error: PDO::ATTR_STATEMENT_CLASS cannot be used with persistent PDO instances diff -Nru php8.4-8.4.27/ext/pdo_firebird/firebird_statement.c php8.4-8.4.28/ext/pdo_firebird/firebird_statement.c --- php8.4-8.4.27/ext/pdo_firebird/firebird_statement.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/pdo_firebird/firebird_statement.c 2026-11-17 20:29:32.000000000 +0000 @@ -342,9 +342,15 @@ static int pdo_firebird_stmt_get_column_meta(pdo_stmt_t *stmt, zend_long colno, zval *return_value) { pdo_firebird_stmt *S = (pdo_firebird_stmt *) stmt->driver_data; - XSQLVAR *var = &S->out_sqlda.sqlvar[colno]; - + XSQLVAR *var; enum pdo_param_type param_type; + + if (colno >= stmt->column_count) { + ZVAL_EMPTY_ARRAY(return_value); + return 1; + } + + var = &S->out_sqlda.sqlvar[colno]; if (var->sqlscale < 0) { param_type = PDO_PARAM_STR; } else { diff -Nru php8.4-8.4.27/ext/pdo_firebird/tests/gh25006.phpt php8.4-8.4.28/ext/pdo_firebird/tests/gh25006.phpt --- php8.4-8.4.27/ext/pdo_firebird/tests/gh25006.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/pdo_firebird/tests/gh25006.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,73 @@ +--TEST-- +GH-25006 (PDO_Firebird::getColumnMeta() reads out of bounds for an out-of-range column index) +--EXTENSIONS-- +pdo_firebird +--SKIPIF-- + +--XLEAK-- +A bug in firebird causes a memory leak when calling `isc_attach_database()`. +See https://github.com/FirebirdSQL/firebird/issues/7849 +--FILE-- +setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + +$stmt = $dbh->prepare('SELECT 1 AS one, 2 AS two FROM RDB$DATABASE'); + +echo "before execute: "; +try { + var_dump($stmt->getColumnMeta(2)); +} catch (Throwable $e) { + echo $e::class, ': ', $e->getMessage(), "\n"; +} + +$stmt->execute(); + +echo "column 0: "; +$meta = $stmt->getColumnMeta(0); +echo $meta['name'], ' ', $meta['pdo_type'], "\n"; + +echo "column 1: "; +$meta = $stmt->getColumnMeta(1); +echo $meta['name'], ' ', $meta['pdo_type'], "\n"; + +foreach ([2, 1000000] as $col) { + echo "column $col: "; + try { + var_dump($stmt->getColumnMeta($col)); + } catch (Throwable $e) { + echo $e::class, ': ', $e->getMessage(), "\n"; + } +} + +echo "no output columns: "; +$empty = $dbh->prepare('EXECUTE BLOCK AS BEGIN END'); +echo $empty->columnCount(), ' '; +try { + var_dump($empty->getColumnMeta(0)); +} catch (Throwable $e) { + echo $e::class, ': ', $e->getMessage(), "\n"; +} + +echo "negative: "; +try { + var_dump($stmt->getColumnMeta(-1)); +} catch (Throwable $e) { + echo $e::class, ': ', $e->getMessage(), "\n"; +} + +echo "done\n"; +?> +--EXPECT-- +before execute: PDOException: SQLSTATE[07009]: Invalid descriptor index: invalid column index +column 0: ONE 1 +column 1: TWO 1 +column 2: PDOException: SQLSTATE[07009]: Invalid descriptor index: invalid column index +column 1000000: PDOException: SQLSTATE[07009]: Invalid descriptor index: invalid column index +no output columns: 0 PDOException: SQLSTATE[07009]: Invalid descriptor index: invalid column index +negative: ValueError: PDOStatement::getColumnMeta(): Argument #1 ($column) must be greater than or equal to 0 +done diff -Nru php8.4-8.4.27/ext/pdo_pgsql/pgsql_driver.c php8.4-8.4.28/ext/pdo_pgsql/pgsql_driver.c --- php8.4-8.4.27/ext/pdo_pgsql/pgsql_driver.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/pdo_pgsql/pgsql_driver.c 2026-11-17 20:29:32.000000000 +0000 @@ -1297,6 +1297,15 @@ } } +static void pdo_pgsql_request_shutdown(pdo_dbh_t *dbh) +{ + pdo_pgsql_db_handle *H = (pdo_pgsql_db_handle *)dbh->driver_data; + + if (H && dbh->refcount <= 2) { + pdo_pgsql_cleanup_notice_callback(H); + } +} + static bool pdo_pgsql_set_attr(pdo_dbh_t *dbh, zend_long attr, zval *val) { bool bval; @@ -1334,7 +1343,7 @@ pdo_pgsql_get_attribute, pdo_pgsql_check_liveness, /* check_liveness */ pdo_pgsql_get_driver_methods, /* get_driver_methods */ - NULL, + pdo_pgsql_request_shutdown, pgsql_handle_in_transaction, NULL, /* get_gc */ pdo_pgsql_scanner diff -Nru php8.4-8.4.27/ext/pdo_pgsql/tests/pdopgsql_setNoticeCallback_persistent.phpt php8.4-8.4.28/ext/pdo_pgsql/tests/pdopgsql_setNoticeCallback_persistent.phpt --- php8.4-8.4.27/ext/pdo_pgsql/tests/pdopgsql_setNoticeCallback_persistent.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/pdo_pgsql/tests/pdopgsql_setNoticeCallback_persistent.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,49 @@ +--TEST-- +Pdo\Pgsql::setNoticeCallback() does not outlive the request on a persistent connection +--EXTENSIONS-- +pdo +pdo_pgsql +--SKIPIF-- + +--CONFLICTS-- +server +--FILE-- + true]);' . <<<'PHP' +if (isset($_GET['set'])) { + $db->setNoticeCallback(function ($message) { + echo trim($message), "\n"; + }); +} +$db->exec("DO $$ BEGIN RAISE NOTICE 'request {$_GET['n']}'; END $$"); +echo "request {$_GET['n']} done\n"; +PHP; + +$args = ['-d', 'extension_dir=' . ini_get('extension_dir')]; +foreach (['pdo', 'pdo_pgsql'] as $ext) { + $args[] = '-d'; + $args[] = 'extension=' . (PHP_OS_FAMILY === 'Windows' ? 'php_' : '') . $ext . '.' . PHP_SHLIB_SUFFIX; +} +if (php_ini_loaded_file()) { + $args[] = '-c'; + $args[] = php_ini_loaded_file(); +} +php_cli_server_start($code, 'index.php', $args); + +echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/?n=1&set=1'); +echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/?n=2'); +echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/?n=3&set=1'); +?> +--EXPECT-- +NOTICE: request 1 +request 1 done +request 2 done +NOTICE: request 3 +request 3 done diff -Nru php8.4-8.4.27/ext/pdo_sqlite/sqlite_driver.c php8.4-8.4.28/ext/pdo_sqlite/sqlite_driver.c --- php8.4-8.4.27/ext/pdo_sqlite/sqlite_driver.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/pdo_sqlite/sqlite_driver.c 2026-11-17 20:29:32.000000000 +0000 @@ -355,7 +355,11 @@ /* get the value */ switch (sqlite3_value_type(argv[i])) { case SQLITE_INTEGER: +#ifdef ZEND_ENABLE_ZVAL_LONG64 + ZVAL_LONG(&zargs[i + is_agg], sqlite3_value_int64(argv[i])); +#else ZVAL_LONG(&zargs[i + is_agg], sqlite3_value_int(argv[i])); +#endif break; case SQLITE_FLOAT: @@ -393,7 +397,11 @@ if (!Z_ISUNDEF(retval)) { switch (Z_TYPE(retval)) { case IS_LONG: +#ifdef ZEND_ENABLE_ZVAL_LONG64 + sqlite3_result_int64(context, Z_LVAL(retval)); +#else sqlite3_result_int(context, Z_LVAL(retval)); +#endif break; case IS_NULL: diff -Nru php8.4-8.4.27/ext/pdo_sqlite/sqlite_statement.c php8.4-8.4.28/ext/pdo_sqlite/sqlite_statement.c --- php8.4-8.4.27/ext/pdo_sqlite/sqlite_statement.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/pdo_sqlite/sqlite_statement.c 2026-11-17 20:29:32.000000000 +0000 @@ -62,11 +62,10 @@ return 1; case SQLITE_ERROR: - sqlite3_reset(S->stmt); - ZEND_FALLTHROUGH; case SQLITE_MISUSE: case SQLITE_BUSY: default: + sqlite3_reset(S->stmt); pdo_sqlite_error_stmt(stmt); return 0; } @@ -115,7 +114,7 @@ } } else { convert_to_long(parameter); -#if ZEND_LONG_MAX > 2147483647 +#ifdef ZEND_ENABLE_ZVAL_LONG64 if (SQLITE_OK == sqlite3_bind_int64(S->stmt, param->paramno + 1, Z_LVAL_P(parameter))) { return 1; } diff -Nru php8.4-8.4.27/ext/pdo_sqlite/tests/gh24990.phpt php8.4-8.4.28/ext/pdo_sqlite/tests/gh24990.phpt --- php8.4-8.4.27/ext/pdo_sqlite/tests/gh24990.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/pdo_sqlite/tests/gh24990.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,33 @@ +--TEST-- +GH-24990 (Statement unusable after a failed execute()) +--EXTENSIONS-- +pdo_sqlite +--FILE-- + PDO::ERRMODE_EXCEPTION]); +$db->exec('CREATE TABLE test (k TEXT PRIMARY KEY NOT NULL)'); +$db->exec("INSERT INTO test VALUES ('a')"); + +$stmt = $db->prepare('INSERT INTO test (k) VALUES (?)'); +foreach (['a', 'b', 'b', 'c'] as $k) { + try { + var_dump($stmt->execute([$k])); + } catch (PDOException $e) { + echo $e->getMessage(), "\n"; + } +} +var_dump($db->query('SELECT k FROM test ORDER BY k')->fetchAll(PDO::FETCH_COLUMN)); +?> +--EXPECT-- +SQLSTATE[23000]: Integrity constraint violation: 19 UNIQUE constraint failed: test.k +bool(true) +SQLSTATE[23000]: Integrity constraint violation: 19 UNIQUE constraint failed: test.k +bool(true) +array(3) { + [0]=> + string(1) "a" + [1]=> + string(1) "b" + [2]=> + string(1) "c" +} diff -Nru php8.4-8.4.27/ext/pdo_sqlite/tests/gh25021-udf.phpt php8.4-8.4.28/ext/pdo_sqlite/tests/gh25021-udf.phpt --- php8.4-8.4.27/ext/pdo_sqlite/tests/gh25021-udf.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/pdo_sqlite/tests/gh25021-udf.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,28 @@ +--TEST-- +GH-25021 (UDF isn't using sqlite3_*_int64 API) +--EXTENSIONS-- +pdo_sqlite +--FILE-- +sqliteCreateFunction('my_udf_pass_int', static fn(int $v): int => $v); + +foreach ([ + 10, + PHP_INT_MIN, + PHP_INT_MAX, +] as $v) { + $stmt = $conn->prepare('select my_udf_pass_int(:v)'); + $stmt->bindValue(':v', $v, PDO::PARAM_INT); + $stmt->execute(); + $result = $stmt->fetch(); + + var_dump($result[0] === $v); +} +?> +--EXPECT-- +bool(true) +bool(true) +bool(true) diff -Nru php8.4-8.4.27/ext/phar/phar_object.c php8.4-8.4.28/ext/phar/phar_object.c --- php8.4-8.4.27/ext/phar/phar_object.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/phar/phar_object.c 2026-11-17 20:29:32.000000000 +0000 @@ -784,7 +784,7 @@ sapi_header_op(SAPI_HEADER_REPLACE, &ctr); if (not_cgi) { - tmp = strstr(path_info, basename) + fname_len; + tmp = strstr(path_info, basename) + (fname_len - (basename - fname)); sa = *tmp; *tmp = '\0'; } @@ -3161,7 +3161,7 @@ phar_entry_info *entry = (phar_entry_info *)Z_PTR_P(zv); uint32_t compress = *(uint32_t *)argument; - if (entry->is_deleted) { + if (entry->is_deleted || (entry->flags & PHAR_ENT_COMPRESSION_MASK) == compress) { return ZEND_HASH_APPLY_KEEP; } @@ -3173,6 +3173,30 @@ } /* }}} */ +typedef struct { + uint32_t compress; + char *error; +} phar_compression_args; + +static int phar_decompress_for_compression_change(zval *zv, void *argument) /* {{{ */ +{ + phar_entry_info *entry = (phar_entry_info *)Z_PTR_P(zv); + phar_compression_args *args = (phar_compression_args *)argument; + uint32_t current = entry->flags & PHAR_ENT_COMPRESSION_MASK; + + if (entry->is_deleted || entry->is_dir || !current || current == args->compress) { + return ZEND_HASH_APPLY_KEEP; + } + + /* phar_flush() would otherwise copy the old compressed bytes as the new contents */ + if (FAILURE == phar_open_entry_fp(entry, &args->error, 0)) { + return ZEND_HASH_APPLY_STOP; + } + + return ZEND_HASH_APPLY_KEEP; +} +/* }}} */ + static int phar_test_compression(zval *zv, void *argument) /* {{{ */ { phar_entry_info *entry = (phar_entry_info *)Z_PTR_P(zv); @@ -3197,9 +3221,18 @@ } /* }}} */ -static void pharobj_set_compression(HashTable *manifest, uint32_t compress) /* {{{ */ +static zend_result pharobj_set_compression(HashTable *manifest, uint32_t compress, char **error) /* {{{ */ { + phar_compression_args args = { .compress = compress, .error = NULL }; + + zend_hash_apply_with_argument(manifest, phar_decompress_for_compression_change, &args); + if (args.error) { + *error = args.error; + return FAILURE; + } + zend_hash_apply_with_argument(manifest, phar_set_compression, &compress); + return SUCCESS; } /* }}} */ @@ -3390,7 +3423,11 @@ zend_throw_exception_ex(phar_ce_PharException, 0, "phar \"%s\" is persistent, unable to copy on write", phar_obj->archive->fname); RETURN_THROWS(); } - pharobj_set_compression(&phar_obj->archive->manifest, flags); + if (FAILURE == pharobj_set_compression(&phar_obj->archive->manifest, flags, &error)) { + zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "%s", error); + efree(error); + RETURN_THROWS(); + } phar_obj->archive->is_modified = 1; phar_flush(phar_obj->archive, &error); @@ -3432,7 +3469,11 @@ zend_throw_exception_ex(phar_ce_PharException, 0, "phar \"%s\" is persistent, unable to copy on write", phar_obj->archive->fname); RETURN_THROWS(); } - pharobj_set_compression(&phar_obj->archive->manifest, PHAR_ENT_COMPRESSED_NONE); + if (FAILURE == pharobj_set_compression(&phar_obj->archive->manifest, PHAR_ENT_COMPRESSED_NONE, &error)) { + zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "%s", error); + efree(error); + RETURN_THROWS(); + } } phar_obj->archive->is_modified = 1; @@ -3519,9 +3560,23 @@ newentry.filename_len = tmp_len; newentry.fp_refcount = 0; + if (newentry.link) { + newentry.link = estrdup(newentry.link); + } + + if (newentry.tmp) { + newentry.tmp = estrdup(newentry.tmp); + } + if (oldentry->fp_type != PHAR_FP) { if (FAILURE == phar_copy_entry_fp(oldentry, &newentry, &error)) { efree(newentry.filename); + if (newentry.link) { + efree(newentry.link); + } + if (newentry.tmp) { + efree(newentry.tmp); + } php_stream_close(newentry.fp); zend_throw_exception_ex(phar_ce_PharException, 0, "%s", error); efree(error); diff -Nru php8.4-8.4.27/ext/phar/stream.c php8.4-8.4.28/ext/phar/stream.c --- php8.4-8.4.27/ext/phar/stream.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/phar/stream.c 2026-11-17 20:29:32.000000000 +0000 @@ -846,12 +846,18 @@ php_error_docref(NULL, E_WARNING, "phar error: cannot rename \"%s\" to \"%s\" from extracted phar archive, source has been deleted", url_from, url_to); return 0; } + if (zend_string_equals(resource_from->path, resource_to->path)) { + php_url_free(resource_from); + php_url_free(resource_to); + return 1; + } /* transfer all data over to the new entry */ memcpy((void *) &new, (void *) entry, sizeof(phar_entry_info)); /* mark the old one for deletion */ entry->is_deleted = 1; entry->fp = NULL; ZVAL_UNDEF(&entry->metadata_tracker.val); + entry->metadata_tracker.str = NULL; entry->link = entry->tmp = NULL; source = entry; diff -Nru php8.4-8.4.27/ext/phar/tar.c php8.4-8.4.28/ext/phar/tar.c --- php8.4-8.4.27/ext/phar/tar.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/phar/tar.c 2026-11-17 20:29:32.000000000 +0000 @@ -588,7 +588,7 @@ } if (entry.filename_len >= sizeof(".phar/.metadata")-1 && !memcmp(entry.filename, ".phar/.metadata", sizeof(".phar/.metadata")-1)) { - if (FAILURE == phar_tar_process_metadata(newentry, fp)) { + if (size > totalsize || FAILURE == phar_tar_process_metadata(newentry, fp)) { if (error) { spprintf(error, 4096, "phar error: tar-based phar \"%s\" has invalid metadata in magic file \"%s\"", fname, entry.filename); } diff -Nru php8.4-8.4.27/ext/phar/tests/gh25090.phpt php8.4-8.4.28/ext/phar/tests/gh25090.phpt --- php8.4-8.4.27/ext/phar/tests/gh25090.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/phar/tests/gh25090.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,25 @@ +--TEST-- +GH-25090 (Use-after-free in phar_wrapper_rename() with entry metadata) +--EXTENSIONS-- +phar +--INI-- +phar.readonly=0 +--FILE-- +setMetadata(['k' => 'v']); +rename('phar://' . $fname . '/a', 'phar://' . $fname . '/b'); +$phar['c'] = 'y'; +var_dump($phar['b']->getMetadata()); +?> +--CLEAN-- + +--EXPECT-- +array(1) { + ["k"]=> + string(1) "v" +} diff -Nru php8.4-8.4.27/ext/phar/tests/gh25091.phpt php8.4-8.4.28/ext/phar/tests/gh25091.phpt --- php8.4-8.4.27/ext/phar/tests/gh25091.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/phar/tests/gh25091.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,24 @@ +--TEST-- +GH-25091: Use-after-free in rename() when source and destination are the same entry +--EXTENSIONS-- +phar +--INI-- +phar.readonly=0 +--FILE-- + +--CLEAN-- + +--EXPECT-- +bool(true) +string(8) "contents" diff -Nru php8.4-8.4.27/ext/phar/tests/gh25092.phpt php8.4-8.4.28/ext/phar/tests/gh25092.phpt --- php8.4-8.4.27/ext/phar/tests/gh25092.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/phar/tests/gh25092.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,62 @@ +--TEST-- +GH-25092 (Double free in Phar::copy() on link and mounted entries) +--EXTENSIONS-- +phar +--INI-- +phar.readonly=0 +--FILE-- +copy('l', 'l2'); +unset($t); + +$t = new PharData($tar); +var_dump(isset($t['l']), isset($t['l2'])); +unset($t); + +$phar = __DIR__ . '/gh25092.phar'; +file_put_contents(__DIR__ . '/gh25092.txt', 'hello'); + +$p = new Phar($phar); +$p->addFromString('x.txt', 'x'); +$p->setStub(''); +unset($p); + +$p = new Phar($phar); +Phar::mount('phar://' . $phar . '/m.txt', __DIR__ . '/gh25092.txt'); +$p->copy('m.txt', 'c.txt'); +var_dump(isset($p['c.txt'])); +?> +--CLEAN-- + +--EXPECT-- +bool(true) +bool(true) +bool(true) diff -Nru php8.4-8.4.27/ext/phar/tests/gh25093.phpt php8.4-8.4.28/ext/phar/tests/gh25093.phpt --- php8.4-8.4.27/ext/phar/tests/gh25093.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/phar/tests/gh25093.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,47 @@ +--TEST-- +GH-25093: Phar::webPhar() redirect reads past the request URI +--EXTENSIONS-- +phar +--SKIPIF-- + +--CONFLICTS-- +server +--INI-- +phar.readonly=0 +phar.require_hash=0 +--FILE-- +docRoot . '/gh25093.phar'); +$phar->addFromString('index.php', 'setStub(''); +unset($phar); + +$context = stream_context_create(['http' => ['follow_location' => 0]]); +$uri = '/gh25093.phar/' . str_repeat('a', strlen($info->docRoot) + 32); +file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . $uri, false, $context); + +foreach (http_get_last_response_headers() as $header) { + if (str_starts_with($header, 'Location: ')) { + echo $header, "\n"; + } +} +?> +--EXPECT-- +Location: /gh25093.phar/index.php diff -Nru php8.4-8.4.27/ext/phar/tests/gh8469.phpt php8.4-8.4.28/ext/phar/tests/gh8469.phpt --- php8.4-8.4.27/ext/phar/tests/gh8469.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/phar/tests/gh8469.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,59 @@ +--TEST-- +GH-8469 (Phar::decompressFiles() and Phar::compressFiles() keep the old compressed contents) +--EXTENSIONS-- +phar +zlib +bz2 +--INI-- +phar.require_hash=0 +phar.readonly=0 +--FILE-- +addEmptyDir('dir'); + + $phar->compressFiles(Phar::GZ); + $phar->compressFiles(Phar::BZ2); + var_dump($phar['a.txt']->isCompressed(Phar::BZ2)); + var_dump($phar['a.txt']->getContent() === $contents); + + var_dump($phar->decompressFiles()); + var_dump($phar['a.txt']->isCompressed()); + var_dump($phar['a.txt']->getContent() === $contents); + var_dump($phar['b.txt']->getContent()); + unset($phar); + + $phar = new Phar($fname); + var_dump($phar['a.txt']->getContent() === $contents); + var_dump(file_get_contents("phar://$fname/b.txt")); + unset($phar); +} +?> +--CLEAN-- + +--EXPECT-- +bool(true) +bool(true) +bool(true) +bool(false) +bool(true) +string(11) "our fathers" +bool(true) +string(11) "our fathers" +bool(true) +bool(true) +bool(true) +bool(false) +bool(true) +string(11) "our fathers" +bool(true) +string(11) "our fathers" diff -Nru php8.4-8.4.27/ext/phar/tests/ghsa-68fq-fh7h-f8gr.phpt php8.4-8.4.28/ext/phar/tests/ghsa-68fq-fh7h-f8gr.phpt --- php8.4-8.4.27/ext/phar/tests/ghsa-68fq-fh7h-f8gr.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/phar/tests/ghsa-68fq-fh7h-f8gr.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,122 @@ +--TEST-- +GHSA-68fq-fh7h-f8gr (OpenSSL signature bypass by downgrading the algorithm to a keyless one) +--EXTENSIONS-- +phar +openssl +--SKIPIF-- + +--INI-- +phar.readonly=0 +phar.require_hash=1 +--FILE-- + __DIR__ . '/files/openssl.cnf']); +$pubkey = openssl_pkey_get_details($private)['key']; + +function build(string $file, string $pkey): string +{ + $phar = new Phar($file); + $phar['main.php'] = 'setStub('setSignatureAlgorithm(Phar::OPENSSL, $pkey); + + return file_get_contents($file); +} + +// a phar built in this process comes back from the cache, so each case is read under its own name +function open(string $file, string $archive, ?string $pubkey): void +{ + file_put_contents($file, $archive); + if ($pubkey !== null) { + file_put_contents($file . '.pubkey', $pubkey); + } + + try { + echo (new Phar($file))->getSignature()['hash_type'], "\n"; + } catch (UnexpectedValueException $e) { + echo $e->getMessage(), "\n"; + } +} + +function downgrade_phar(string $archive): string +{ + // the last 12 bytes are [length][algorithm]["GBMB"], the signature sits just before them + $siglen = unpack('V', substr($archive, -12, 4))[1]; + $message = substr($archive, 0, strlen($archive) - 12 - $siglen); + + return $message . hash('sha256', $message, true) . pack('V', 0x0003) . 'GBMB'; // 0x0003 is PHAR_SIG_SHA256 +} + +function downgrade_tar(string $archive): string +{ + for ($offset = 0; $offset + 512 <= strlen($archive); ) { + $size = (int) octdec(trim(substr($archive, $offset + 124, 12), " \0")); // octal size field of a 512 byte header + + if (rtrim(substr($archive, $offset, 100), "\0") === '.phar/signature.bin') { + // the signed message stops at this header, so rewriting the entry content leaves it alone + $blob = pack('VV', 0x0003, 32) . hash('sha256', substr($archive, 0, $offset), true); // [algorithm][digest length][digest] + + return substr_replace($archive, str_pad($blob, $size, "\0"), $offset + 512, $size); + } + + $offset += 512 + (($size + 511) & ~511); + } + + throw new RuntimeException('no signature entry'); +} + +function downgrade_zip(string $archive): string +{ + $eocd = strrpos($archive, "PK\x05\x06"); + $cdir = unpack('V', substr($archive, $eocd + 16, 4))[1]; // the eocd holds the directory offset at +16 and the archive comment length at +20 + $comment = substr($archive, $eocd + 22, unpack('v', substr($archive, $eocd + 20, 2))[1]); + + for ($record = $cdir; substr($archive, $record, 4) === "PK\x01\x02"; ) { + $namelen = unpack('v', substr($archive, $record + 28, 2))[1]; + + if (substr($archive, $record + 46, $namelen) === '.phar/signature.bin') { + $size = unpack('V', substr($archive, $record + 24, 4))[1]; + $local = unpack('V', substr($archive, $record + 42, 4))[1]; + $content = $local + 30 + unpack('v', substr($archive, $local + 26, 2))[1] + unpack('v', substr($archive, $local + 28, 2))[1]; + // the signed message is everything before the local entry plus the directory up to this record + $message = substr($archive, 0, $local) . substr($archive, $cdir, $record - $cdir) . $comment; + $blob = pack('VV', 0x0003, 32) . hash('sha256', $message, true); + + return substr_replace($archive, str_pad($blob, $size, "\0"), $content, $size); + } + + $record += 46 + $namelen + unpack('v', substr($archive, $record + 30, 2))[1] + unpack('v', substr($archive, $record + 32, 2))[1]; + } + + throw new RuntimeException('no signature entry'); +} + +foreach (['phar' => 'downgrade_phar', 'phar.tar' => 'downgrade_tar', 'phar.zip' => 'downgrade_zip'] as $suffix => $downgrade) { + $archive = build($base . '.source.' . $suffix, $pkey); + open($base . '.signed.' . $suffix, $archive, $pubkey); + open($base . '.tampered.' . $suffix, $downgrade($archive), $pubkey); + open($base . '.nokey.' . $suffix, $downgrade($archive), null); +} +?> +--CLEAN-- + +--EXPECTF-- +OpenSSL +phar "%stampered.phar" SHA256 signature could not be verified: openssl public key found, but the signature does not use openssl +SHA-256 +OpenSSL +phar error: tar-based phar "%stampered.phar.tar" signature cannot be verified: openssl public key found, but the signature does not use openssl +SHA-256 +OpenSSL +phar error: signature cannot be verified: openssl public key found, but the signature does not use openssl in zip-based phar "%stampered.phar.zip" +SHA-256 diff -Nru php8.4-8.4.27/ext/phar/tests/tar/gh24740.phpt php8.4-8.4.28/ext/phar/tests/tar/gh24740.phpt --- php8.4-8.4.27/ext/phar/tests/tar/gh24740.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/phar/tests/tar/gh24740.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,44 @@ +--TEST-- +GH-24740 (Unbounded size of .phar/.metadata* entry in TAR phar) +--EXTENSIONS-- +phar +--INI-- +memory_limit=16M +--FILE-- += 148 && $i < 156) ? 0x20 : ord($header[$i]); + } + + return substr_replace($header, sprintf("%06o\0 ", $checksum), 148, 8); +} + +$fname = __DIR__ . '/gh24740.tar'; +file_put_contents($fname, tar_header('.phar/.metadata.bin', 0x7FFFFE00) . str_repeat("\0", 1024)); + +try { + new PharData($fname); +} catch (UnexpectedValueException $e) { + echo $e->getMessage(), "\n"; +} +?> +--CLEAN-- + +--EXPECTF-- +phar error: tar-based phar "%sgh24740.tar" has invalid metadata in magic file ".phar/.metadata.bin" diff -Nru php8.4-8.4.27/ext/phar/tests/zip/gh24531.phpt php8.4-8.4.28/ext/phar/tests/zip/gh24531.phpt --- php8.4-8.4.27/ext/phar/tests/zip/gh24531.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/phar/tests/zip/gh24531.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,32 @@ +--TEST-- +GH-24531 (NULL pointer dereference when flushing a zip-based phar whose file was renamed) +--EXTENSIONS-- +phar +--INI-- +phar.readonly=0 +phar.require_hash=0 +--FILE-- +addFromString('first', 'first'); +unset($phar); + +rename($source, $target); + +try { + $phar = new Phar($source); + $phar->addFromString('second', 'second'); +} catch (PharException $e) { + echo $e::class, ": ", $e->getMessage(), PHP_EOL; +} +?> +--CLEAN-- + +--EXPECTF-- +PharException: phar zip flush of "%sgh24531.phar.zip" failed: unable to copy contents of file "first" while creating zip-based phar "%sgh24531.phar.zip" diff -Nru php8.4-8.4.27/ext/phar/tests/zip/gh25089.phpt php8.4-8.4.28/ext/phar/tests/zip/gh25089.phpt --- php8.4-8.4.27/ext/phar/tests/zip/gh25089.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/phar/tests/zip/gh25089.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,35 @@ +--TEST-- +GH-25089 (Heap buffer over-read via crafted alias size in zip-based phar) +--EXTENSIONS-- +phar +zlib +--FILE-- +getAlias()); +?> +--CLEAN-- + +--EXPECT-- +string(4) "ABCD" diff -Nru php8.4-8.4.27/ext/phar/util.c php8.4-8.4.28/ext/phar/util.c --- php8.4-8.4.27/ext/phar/util.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/phar/util.c 2026-11-17 20:29:32.000000000 +0000 @@ -1582,6 +1582,23 @@ php_stream_rewind(fp); + if (sig_type != PHAR_SIG_OPENSSL && sig_type != PHAR_SIG_OPENSSL_SHA256 && sig_type != PHAR_SIG_OPENSSL_SHA512) { + php_stream_statbuf ssb; + char *pfile; + bool has_pubkey; + + spprintf(&pfile, 0, "%s.pubkey", fname); + has_pubkey = php_stream_stat_path_ex(pfile, PHP_STREAM_URL_STAT_QUIET, &ssb, NULL) == 0; + efree(pfile); + + if (has_pubkey) { + if (error) { + spprintf(error, 0, "openssl public key found, but the signature does not use openssl"); + } + return FAILURE; + } + } + switch (sig_type) { case PHAR_SIG_OPENSSL_SHA512: case PHAR_SIG_OPENSSL_SHA256: diff -Nru php8.4-8.4.27/ext/phar/zip.c php8.4-8.4.28/ext/phar/zip.c --- php8.4-8.4.27/ext/phar/zip.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/phar/zip.c 2026-11-17 20:29:32.000000000 +0000 @@ -648,7 +648,6 @@ fp->readpos = 0; /* the above lines should be for php < 5.2.6 after 5.3 filters are fixed */ - mydata->alias_len = entry.uncompressed_filesize; if (entry.flags & PHAR_ENT_COMPRESSED_GZ) { filter = php_stream_filter_create("zlib.inflate", NULL, php_stream_is_persistent(fp)); @@ -735,6 +734,8 @@ } } + mydata->alias_len = entry.uncompressed_filesize; + /* return to central directory parsing */ php_stream_seek(fp, restore_pos, SEEK_SET); } @@ -1153,7 +1154,7 @@ } } - if (!entry->is_dir && entry->compressed_filesize && SUCCESS != php_stream_copy_to_stream_ex(p->old, p->filefp, entry->compressed_filesize, NULL)) { + if (!entry->is_dir && entry->compressed_filesize && (!p->old || SUCCESS != php_stream_copy_to_stream_ex(p->old, p->filefp, entry->compressed_filesize, NULL))) { spprintf(p->error, 0, "unable to copy contents of file \"%s\" while creating zip-based phar \"%s\"", entry->filename, entry->phar->fname); return ZEND_HASH_APPLY_STOP; } diff -Nru php8.4-8.4.27/ext/random/tests/03_randomizer/methods/shuffleArray_engine_throws_with_holes.phpt php8.4-8.4.28/ext/random/tests/03_randomizer/methods/shuffleArray_engine_throws_with_holes.phpt --- php8.4-8.4.27/ext/random/tests/03_randomizer/methods/shuffleArray_engine_throws_with_holes.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/random/tests/03_randomizer/methods/shuffleArray_engine_throws_with_holes.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,61 @@ +--TEST-- +Random: Randomizer: shuffleArray(): Engine throwing on an array with holes +--FILE-- +calls-- <= 0) { + throw new Exception('Error'); + } + + return "\x01\x00\x00\x00\x00\x00\x00\x00"; + } +} + +foreach ([0, 1] as $calls) { + $array = [new stdClass, new stdClass, new stdClass, new stdClass]; + unset($array[1]); + + try { + (new Randomizer(new ThrowingEngine($calls)))->shuffleArray($array); + } catch (Exception $e) { + echo $e->getMessage(), PHP_EOL; + } + + var_dump($array); +} + +?> +--EXPECTF-- +Error +array(3) { + [0]=> + object(stdClass)#%d (0) { + } + [2]=> + object(stdClass)#%d (0) { + } + [3]=> + object(stdClass)#%d (0) { + } +} +Error +array(3) { + [0]=> + object(stdClass)#%d (0) { + } + [2]=> + object(stdClass)#%d (0) { + } + [3]=> + object(stdClass)#%d (0) { + } +} diff -Nru php8.4-8.4.27/ext/readline/readline.c php8.4-8.4.28/ext/readline/readline.c --- php8.4-8.4.27/ext/readline/readline.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/readline/readline.c 2026-11-17 20:29:32.000000000 +0000 @@ -248,7 +248,7 @@ if (!try_convert_to_string(value)) { RETURN_THROWS(); } - rl_completion_append_character = (int)Z_STRVAL_P(value)[0]; + rl_completion_append_character = (unsigned char)Z_STRVAL_P(value)[0]; } RETVAL_INTERNED_STR( oldval == 0 ? ZSTR_EMPTY_ALLOC() : ZSTR_CHAR(oldval)); diff -Nru php8.4-8.4.27/ext/readline/tests/readline_info_completion_append_character.phpt php8.4-8.4.28/ext/readline/tests/readline_info_completion_append_character.phpt --- php8.4-8.4.27/ext/readline/tests/readline_info_completion_append_character.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/readline/tests/readline_info_completion_append_character.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,27 @@ +--TEST-- +readline_info(): completion_append_character supports non-ASCII bytes +--EXTENSIONS-- +readline +--SKIPIF-- + +--FILE-- + +--EXPECT-- +old= current=7f info=7f +old=7f current=80 info=80 +old=80 current=ff info=ff +old=ff current= info= diff -Nru php8.4-8.4.27/ext/session/mod_files.c php8.4-8.4.28/ext/session/mod_files.c --- php8.4-8.4.27/ext/session/mod_files.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/session/mod_files.c 2026-11-17 20:29:32.000000000 +0000 @@ -165,7 +165,7 @@ ps_files_close(data); - if (php_session_valid_key(ZSTR_VAL(key)) == FAILURE) { + if (php_session_valid_key_ex(key) == FAILURE) { php_error_docref(NULL, E_WARNING, "Session ID is too long or contains illegal characters. Only the A-Z, a-z, 0-9, \"-\", and \",\" characters are allowed"); return; } @@ -236,9 +236,9 @@ return FAILURE; } - /* Truncate file if the amount of new data is smaller than the existing data set. */ - if (ZSTR_LEN(val) < data->st_size) { - php_ignore_value(ftruncate(data->fd, 0)); + if (ftruncate(data->fd, 0) != 0) { + php_error_docref(NULL, E_WARNING, "ftruncate() failed: %s (%d)", strerror(errno), errno); + return FAILURE; } #ifdef HAVE_PWRITE diff -Nru php8.4-8.4.27/ext/session/php_session.h php8.4-8.4.28/ext/session/php_session.h --- php8.4-8.4.27/ext/session/php_session.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/session/php_session.h 2026-11-17 20:29:32.000000000 +0000 @@ -274,6 +274,7 @@ PHPAPI const ps_serializer *_php_find_ps_serializer(const char *name); PHPAPI zend_result php_session_valid_key(const char *key); +zend_result php_session_valid_key_ex(const zend_string *key); PHPAPI zend_result php_session_reset_id(void); #define PS_ADD_VARL(name) do { \ diff -Nru php8.4-8.4.27/ext/session/session.c php8.4-8.4.28/ext/session/session.c --- php8.4-8.4.27/ext/session/session.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/session/session.c 2026-11-17 20:29:32.000000000 +0000 @@ -93,6 +93,12 @@ return FAILURE; \ } +#define SESSION_CHECK_UPLOAD_PROGRESS_STATE \ + if (PS(rfc1867_enabled) && stage == ZEND_INI_STAGE_RUNTIME) { \ + zend_throw_error(NULL, "Session ini settings cannot be changed at runtime when session.upload_progress.enabled is On"); \ + return FAILURE; \ + } + #define SESSION_FORBIDDEN_CHARS "=,;.[ \t\r\n\013\014" #define SESSION_FORBIDDEN_CHARS_FOR_ERROR_MSG "=,;.[ \\t\\r\\n\\013\\014" @@ -119,6 +125,8 @@ PS(module_number) = my_module_number; PS(in_rfc1867_update) = false; ZVAL_UNDEF(&PS(http_session_vars)); + PS(session_started_filename) = NULL; + PS(session_started_lineno) = 0; } /* }}} */ @@ -355,14 +363,18 @@ /* Default session id char validation function allowed by ps_modules. * If you change the logic here, please also update the error message in - * ps_modules appropriately */ -PHPAPI zend_result php_session_valid_key(const char *key) /* {{{ */ + * ps_modules appropriately. */ +static zend_result php_session_valid_key_len(const char *key, size_t key_len) { - size_t len; - const char *p; - char c; + /* Somewhat arbitrary length limit here, but should be way more than + anyone needs and avoids file-level warnings later on if we exceed MAX_PATH */ + if (key_len == 0 || key_len > PS_MAX_SID_LENGTH) { + return FAILURE; + } + + for (size_t i = 0; i < key_len; i++) { + unsigned char c = (unsigned char) key[i]; - for (p = key; (c = *p); p++) { /* valid characters are [a-z], [A-Z], [0-9], - (hyphen) and , (comma) */ if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') @@ -373,18 +385,21 @@ } } - len = p - key; - - /* Somewhat arbitrary length limit here, but should be way more than - anyone needs and avoids file-level warnings later on if we exceed MAX_PATH */ - if (len == 0 || len > PS_MAX_SID_LENGTH) { - return FAILURE; - } - return SUCCESS; } -/* }}} */ +/* Validate the full zend_string, including embedded NUL bytes. */ +zend_result php_session_valid_key_ex(const zend_string *key) +{ + return php_session_valid_key_len(ZSTR_VAL(key), ZSTR_LEN(key)); +} + +/* C-string compatibility wrapper. Callers that have a zend_string should use + * php_session_valid_key_ex() instead. */ +PHPAPI zend_result php_session_valid_key(const char *key) +{ + return php_session_valid_key_len(key, strlen(key)); +} static zend_long php_session_gc(bool immediate) /* {{{ */ { @@ -600,6 +615,7 @@ const ps_module *tmp; int err_type = E_ERROR; + SESSION_CHECK_UPLOAD_PROGRESS_STATE; SESSION_CHECK_ACTIVE_STATE; SESSION_CHECK_OUTPUT_STATE; @@ -635,6 +651,7 @@ { const ps_serializer *tmp; + SESSION_CHECK_UPLOAD_PROGRESS_STATE; SESSION_CHECK_ACTIVE_STATE; SESSION_CHECK_OUTPUT_STATE; @@ -663,6 +680,7 @@ static PHP_INI_MH(OnUpdateSaveDir) /* {{{ */ { + SESSION_CHECK_UPLOAD_PROGRESS_STATE; SESSION_CHECK_ACTIVE_STATE; SESSION_CHECK_OUTPUT_STATE; @@ -697,6 +715,7 @@ static PHP_INI_MH(OnUpdateName) /* {{{ */ { + SESSION_CHECK_UPLOAD_PROGRESS_STATE; SESSION_CHECK_ACTIVE_STATE; SESSION_CHECK_OUTPUT_STATE; @@ -729,6 +748,7 @@ static PHP_INI_MH(OnUpdateCookieLifetime) /* {{{ */ { + SESSION_CHECK_UPLOAD_PROGRESS_STATE; SESSION_CHECK_ACTIVE_STATE; SESSION_CHECK_OUTPUT_STATE; @@ -751,6 +771,7 @@ static PHP_INI_MH(OnUpdateSessionLong) /* {{{ */ { + SESSION_CHECK_UPLOAD_PROGRESS_STATE; SESSION_CHECK_ACTIVE_STATE; SESSION_CHECK_OUTPUT_STATE; return OnUpdateLong(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage); @@ -760,6 +781,7 @@ static PHP_INI_MH(OnUpdateSessionString) /* {{{ */ { + SESSION_CHECK_UPLOAD_PROGRESS_STATE; SESSION_CHECK_ACTIVE_STATE; SESSION_CHECK_OUTPUT_STATE; return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage); @@ -769,6 +791,7 @@ static PHP_INI_MH(OnUpdateSessionBool) /* {{{ */ { + SESSION_CHECK_UPLOAD_PROGRESS_STATE; SESSION_CHECK_ACTIVE_STATE; SESSION_CHECK_OUTPUT_STATE; return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage); @@ -781,6 +804,7 @@ zend_long val; char *endptr = NULL; + SESSION_CHECK_UPLOAD_PROGRESS_STATE; SESSION_CHECK_ACTIVE_STATE; SESSION_CHECK_OUTPUT_STATE; val = ZEND_STRTOL(ZSTR_VAL(new_value), &endptr, 10); @@ -804,6 +828,7 @@ zend_long val; char *endptr = NULL; + SESSION_CHECK_UPLOAD_PROGRESS_STATE; SESSION_CHECK_ACTIVE_STATE; SESSION_CHECK_OUTPUT_STATE; val = ZEND_STRTOL(ZSTR_VAL(new_value), &endptr, 10); @@ -824,6 +849,7 @@ static PHP_INI_MH(OnUpdateSessionGcProbability) /* {{{ */ { + SESSION_CHECK_UPLOAD_PROGRESS_STATE; SESSION_CHECK_ACTIVE_STATE; SESSION_CHECK_OUTPUT_STATE; @@ -843,6 +869,7 @@ static PHP_INI_MH(OnUpdateSessionDivisor) /* {{{ */ { + SESSION_CHECK_UPLOAD_PROGRESS_STATE; SESSION_CHECK_ACTIVE_STATE; SESSION_CHECK_OUTPUT_STATE; @@ -881,6 +908,7 @@ static PHP_INI_MH(OnUpdateUseOnlyCookies) { + SESSION_CHECK_UPLOAD_PROGRESS_STATE; SESSION_CHECK_ACTIVE_STATE; SESSION_CHECK_OUTPUT_STATE; bool *p = (bool *) ZEND_INI_GET_ADDR(); @@ -893,6 +921,7 @@ static PHP_INI_MH(OnUpdateUseTransSid) { + SESSION_CHECK_UPLOAD_PROGRESS_STATE; SESSION_CHECK_ACTIVE_STATE; SESSION_CHECK_OUTPUT_STATE; bool *p = (bool *) ZEND_INI_GET_ADDR(); @@ -905,6 +934,7 @@ static PHP_INI_MH(OnUpdateRefererCheck) { + SESSION_CHECK_UPLOAD_PROGRESS_STATE; SESSION_CHECK_ACTIVE_STATE; SESSION_CHECK_OUTPUT_STATE; if (ZSTR_LEN(new_value) != 0) { @@ -942,7 +972,7 @@ /* Upload progress */ STD_PHP_INI_BOOLEAN("session.upload_progress.enabled", - "1", ZEND_INI_PERDIR, OnUpdateBool, rfc1867_enabled, php_ps_globals, ps_globals) + "0", ZEND_INI_PERDIR, OnUpdateBool, rfc1867_enabled, php_ps_globals, ps_globals) STD_PHP_INI_BOOLEAN("session.upload_progress.cleanup", "1", ZEND_INI_PERDIR, OnUpdateBool, rfc1867_cleanup, php_ps_globals, ps_globals) STD_PHP_INI_ENTRY("session.upload_progress.prefix", @@ -2436,8 +2466,14 @@ RETURN_FALSE; } } + PS(mod)->s_close(&PS(mod_data)); + if (PS(session_status) != php_session_active) { + php_error_docref(NULL, E_WARNING, "Session ID cannot be regenerated because the save handler closed the session"); + RETURN_FALSE; + } + /* New session data */ if (PS(session_vars)) { zend_string_release_ex(PS(session_vars), 0); @@ -2521,7 +2557,7 @@ zend_argument_value_error(1, "cannot be longer than %d characters", PS_MAX_SID_LENGTH); RETURN_THROWS(); } - if (php_session_valid_key(ZSTR_VAL(prefix)) == FAILURE) { + if (php_session_valid_key_ex(prefix) == FAILURE) { /* E_ERROR raised for security reason. */ php_error_docref(NULL, E_WARNING, "Prefix cannot contain special characters. Only the A-Z, a-z, 0-9, \"-\", and \",\" characters are allowed"); RETURN_FALSE; @@ -3007,6 +3043,7 @@ ps_globals->serializer = NULL; ps_globals->mod_data = NULL; ps_globals->in_rfc1867_update = false; + ps_globals->rfc1867_enabled = false; ps_globals->session_status = php_session_none; ps_globals->default_mod = NULL; ps_globals->mod_user_implemented = 0; diff -Nru php8.4-8.4.27/ext/session/tests/session_id_nul_byte.phpt php8.4-8.4.28/ext/session/tests/session_id_nul_byte.phpt --- php8.4-8.4.27/ext/session/tests/session_id_nul_byte.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/session/tests/session_id_nul_byte.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,27 @@ +--TEST-- +Session IDs with NUL bytes are rejected as a whole, not truncated +--INI-- +session.save_handler=files +session.save_path= +session.use_cookies=0 +session.use_strict_mode=0 +--EXTENSIONS-- +session +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +Warning: session_start(): Session ID is too long or contains illegal characters. Only the A-Z, a-z, 0-9, "-", and "," characters are allowed in %s on line %d + +Warning: session_start(): Failed to read session data: files (path: ) in %s on line %d +bool(false) +string(0) "" diff -Nru php8.4-8.4.27/ext/session/tests/session_ini_set_upload_progress_enabled.phpt php8.4-8.4.28/ext/session/tests/session_ini_set_upload_progress_enabled.phpt --- php8.4-8.4.27/ext/session/tests/session_ini_set_upload_progress_enabled.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/session/tests/session_ini_set_upload_progress_enabled.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,128 @@ +--TEST-- +ini_set() for session.* is not allowed when session.upload_progress.enabled is On +--EXTENSIONS-- +session +--SKIPIF-- + +--INI-- +error_reporting=E_ALL & ~E_DEPRECATED +session.upload_progress.enabled=1 +session.save_path= +session.name=NOTPHPSESSID +session.save_handler=files +session.serialize_handler=php_serialize +session.cookie_lifetime=42 +session.gc_probability=2 +session.cookie_path=/startup +session.cookie_secure=1 +session.sid_length=40 +session.sid_bits_per_character=5 +--FILE-- +getMessage(), "\n"; + } +} + +/* One entry per ini modify handler guarded by the check. */ +try_ini_set("session.save_path", "/tmp"); +try_ini_set("session.name", "PHPSESSID"); +try_ini_set("session.save_handler", "user"); +try_ini_set("session.serialize_handler", "php"); +try_ini_set("session.cookie_lifetime", "1"); +try_ini_set("session.gc_probability", "1"); +try_ini_set("session.cookie_path", "/runtime"); +try_ini_set("session.cookie_secure", "0"); +try_ini_set("session.sid_length", "32"); +try_ini_set("session.sid_bits_per_character", "4"); + +echo "\n*** ini_restore() is rejected at runtime ***\n"; +try { + var_dump(ini_restore("session.name")); +} catch (\Throwable $e) { + echo $e::class, ": ", $e->getMessage(), "\n"; +} +var_dump(ini_get("session.name")); + +echo "\n*** Values are unchanged ***\n"; +foreach ([ + "session.name", + "session.serialize_handler", + "session.cookie_lifetime", + "session.gc_probability", + "session.cookie_path", + "session.cookie_secure", + "session.sid_length", + "session.sid_bits_per_character", +] as $name) { + printf("%s=%s\n", $name, var_export(ini_get($name), true)); +} + +echo "\n*** Non-session ini settings are unaffected ***\n"; +var_dump(ini_set("precision", "10")); +var_dump(ini_get("precision")); + +echo "Done\n"; +?> +--EXPECT-- +*** Settings applied at startup *** +session.name='NOTPHPSESSID' +session.serialize_handler='php_serialize' +session.cookie_lifetime='42' +session.gc_probability='2' +session.cookie_path='/startup' +session.cookie_secure='1' +session.sid_length='40' +session.sid_bits_per_character='5' + +*** ini_set() is rejected at runtime *** +Error: Session ini settings cannot be changed at runtime when session.upload_progress.enabled is On +Error: Session ini settings cannot be changed at runtime when session.upload_progress.enabled is On +Error: Session ini settings cannot be changed at runtime when session.upload_progress.enabled is On +Error: Session ini settings cannot be changed at runtime when session.upload_progress.enabled is On +Error: Session ini settings cannot be changed at runtime when session.upload_progress.enabled is On +Error: Session ini settings cannot be changed at runtime when session.upload_progress.enabled is On +Error: Session ini settings cannot be changed at runtime when session.upload_progress.enabled is On +Error: Session ini settings cannot be changed at runtime when session.upload_progress.enabled is On +Error: Session ini settings cannot be changed at runtime when session.upload_progress.enabled is On +Error: Session ini settings cannot be changed at runtime when session.upload_progress.enabled is On + +*** ini_restore() is rejected at runtime *** +Error: Session ini settings cannot be changed at runtime when session.upload_progress.enabled is On +string(12) "NOTPHPSESSID" + +*** Values are unchanged *** +session.name='NOTPHPSESSID' +session.serialize_handler='php_serialize' +session.cookie_lifetime='42' +session.gc_probability='2' +session.cookie_path='/startup' +session.cookie_secure='1' +session.sid_length='40' +session.sid_bits_per_character='5' + +*** Non-session ini settings are unaffected *** +string(2) "14" +string(2) "10" +Done diff -Nru php8.4-8.4.27/ext/session/tests/user_session_module/session_regenerate_id_handler_closes_session.phpt php8.4-8.4.28/ext/session/tests/user_session_module/session_regenerate_id_handler_closes_session.phpt --- php8.4-8.4.27/ext/session/tests/user_session_module/session_regenerate_id_handler_closes_session.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/session/tests/user_session_module/session_regenerate_id_handler_closes_session.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,65 @@ +--TEST-- +session_regenerate_id() when the close handler destroys the session +--INI-- +session.gc_probability=0 +--EXTENSIONS-- +session +--FILE-- +destroyed) { + $this->destroyed = true; + session_destroy(); + } + return true; + } + + public function read(string $id): string|false + { + return ''; + } + + public function write(string $id, string $data): bool + { + return true; + } + + public function destroy(string $id): bool + { + return true; + } + + public function gc(int $max_lifetime): int|false + { + return 0; + } +} + +session_set_save_handler(new MySessionHandler(), true); +session_start(); + +var_dump(session_regenerate_id(false)); +var_dump(session_status() === PHP_SESSION_NONE); + +?> +--EXPECTF-- +Warning: session_destroy(): Cannot call session save handler in a recursive manner in %s on line %d + +Warning: session_destroy(): Session object destruction failed in %s on line %d + +Warning: session_regenerate_id(): Session ID cannot be regenerated because the save handler closed the session in %s on line %d +bool(false) +bool(true) diff -Nru php8.4-8.4.27/ext/session/tests/user_session_module/session_regenerate_id_handler_destroys_session.phpt php8.4-8.4.28/ext/session/tests/user_session_module/session_regenerate_id_handler_destroys_session.phpt --- php8.4-8.4.27/ext/session/tests/user_session_module/session_regenerate_id_handler_destroys_session.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/session/tests/user_session_module/session_regenerate_id_handler_destroys_session.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,35 @@ +--TEST-- +session_regenerate_id() when the save handler destroys the session +--INI-- +session.gc_probability=0 +--EXTENSIONS-- +session +--FILE-- + +--EXPECTF-- +Warning: session_destroy(): Cannot call session save handler in a recursive manner in %s on line %d + +Warning: session_destroy(): Session object destruction failed in %s on line %d + +Warning: session_regenerate_id(): Session ID cannot be regenerated because the save handler closed the session in %s on line %d +bool(false) +bool(true) diff -Nru php8.4-8.4.27/ext/simplexml/simplexml.c php8.4-8.4.28/ext/simplexml/simplexml.c --- php8.4-8.4.27/ext/simplexml/simplexml.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/simplexml/simplexml.c 2026-11-17 20:29:32.000000000 +0000 @@ -2202,7 +2202,7 @@ if (sxe->properties) { ZEND_ASSERT(!(GC_FLAGS(sxe->properties) & IS_ARRAY_IMMUTABLE)); - zend_hash_release(sxe->properties); + zend_array_release(sxe->properties); } } /* }}} */ diff -Nru php8.4-8.4.27/ext/simplexml/tests/gh24488.phpt php8.4-8.4.28/ext/simplexml/tests/gh24488.phpt --- php8.4-8.4.27/ext/simplexml/tests/gh24488.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/simplexml/tests/gh24488.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,24 @@ +--TEST-- +GH-24488 (GC double-frees the SimpleXMLElement properties table) +--EXTENSIONS-- +simplexml +--FILE-- +'); + get_object_vars($xml); + + $holder = new stdClass; + $holder->xml = $xml; + $holder->self = $holder; + unset($xml, $holder); + + gc_collect_cycles(); + $junk[] = str_repeat('x', 100); +} + +echo "Done\n"; +?> +--EXPECT-- +Done diff -Nru php8.4-8.4.27/ext/soap/php_encoding.c php8.4-8.4.28/ext/soap/php_encoding.c --- php8.4-8.4.27/ext/soap/php_encoding.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/soap/php_encoding.c 2026-11-17 20:29:32.000000000 +0000 @@ -2078,7 +2078,7 @@ } str++; } - return i; + return i != 0 ? i : 1; } static void soap_array_position_add_digit(int *position, int digit) diff -Nru php8.4-8.4.27/ext/soap/php_xml.c php8.4-8.4.28/ext/soap/php_xml.c --- php8.4-8.4.27/ext/soap/php_xml.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/soap/php_xml.c 2026-11-17 20:29:32.000000000 +0000 @@ -50,6 +50,9 @@ xmlUnlinkNode(trav); xmlFreeNode(trav); } + } else if (trav->type == XML_DTD_NODE) { + /* Attribute-value entity references can share content with the DTD. + * Keep it alive until the document itself is freed. */ } else if ((trav->type != XML_ELEMENT_NODE) && (trav->type != XML_CDATA_SECTION_NODE)) { xmlUnlinkNode(trav); diff -Nru php8.4-8.4.27/ext/soap/soap.c php8.4-8.4.28/ext/soap/soap.c --- php8.4-8.4.27/ext/soap/soap.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/soap/soap.c 2026-11-17 20:29:32.000000000 +0000 @@ -2245,6 +2245,7 @@ return false; } + ZVAL_UNDEF(&func); ZVAL_UNDEF(¶ms[0]); ZVAL_UNDEF(¶ms[1]); ZVAL_UNDEF(¶ms[2]); diff -Nru php8.4-8.4.27/ext/soap/tests/GHSA-4646-p932-gw34.phpt php8.4-8.4.28/ext/soap/tests/GHSA-4646-p932-gw34.phpt --- php8.4-8.4.27/ext/soap/tests/GHSA-4646-p932-gw34.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/soap/tests/GHSA-4646-p932-gw34.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,35 @@ +--TEST-- +GHSA-4646-p932-gw34: DTD entity references must not outlive their declarations +--POST-- + +]> + + + + + + x + + +--EXTENSIONS-- +soap +--FILE-- + 'urn:t', + 'style' => SOAP_RPC, + 'use' => SOAP_ENCODED, +]); +$server->addFunction('echo_'); +$server->handle(); +?> +--EXPECT-- + +SOAP-ENV:ServerDTD are not supported by SOAP diff -Nru php8.4-8.4.27/ext/soap/tests/GHSA-q23r-hr55-xmpg-wsdl.phpt php8.4-8.4.28/ext/soap/tests/GHSA-q23r-hr55-xmpg-wsdl.phpt --- php8.4-8.4.27/ext/soap/tests/GHSA-q23r-hr55-xmpg-wsdl.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/soap/tests/GHSA-q23r-hr55-xmpg-wsdl.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,80 @@ +--TEST-- +GHSA-q23r-hr55-xmpg: Unbounded array walk on empty wsdl:arraySize +--EXTENSIONS-- +soap +--INI-- +soap.wsdl_cache_enabled=0 +--FILE-- + + + + + + + + XML; +} + +class ReplayClient extends SoapClient +{ + public function __construct(public string $arrayType) { + parent::__construct(WSDL); + } + + public function __doRequest($request, $location, $action, $version, $oneWay = 0): ?string { + return << + + + + arrayType}Response> + + A + B + C + + arrayType}Response> + + + XML; + } +} + +$server = new SoapServer(WSDL); +$server->addFunction(['itemType', 'sizeOnly']); + +foreach (['itemType', 'sizeOnly'] as $operation) { + ob_start(); + $server->handle(request($operation)); + $response = ob_get_clean(); + + preg_match('/arraySize="[^"]*"/', $response, $matches); + echo 'encode ', $operation, ' => ', $matches[0] ?? 'none', "\n"; +} + +foreach (['ItemType', 'SizeOnly'] as $arrayType) { + $client = new ReplayClient($arrayType); + echo 'decode ', $arrayType, ' => ', json_encode($client->{lcfirst($arrayType)}()), "\n"; +} + +?> +--EXPECT-- +encode itemType => arraySize="3" +encode sizeOnly => arraySize="3" +decode ItemType => ["A","B","C"] +decode SizeOnly => ["A","B","C"] diff -Nru php8.4-8.4.27/ext/soap/tests/GHSA-q23r-hr55-xmpg-wsdl.wsdl php8.4-8.4.28/ext/soap/tests/GHSA-q23r-hr55-xmpg-wsdl.wsdl --- php8.4-8.4.27/ext/soap/tests/GHSA-q23r-hr55-xmpg-wsdl.wsdl 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/soap/tests/GHSA-q23r-hr55-xmpg-wsdl.wsdl 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru php8.4-8.4.27/ext/soap/tests/GHSA-q23r-hr55-xmpg.phpt php8.4-8.4.28/ext/soap/tests/GHSA-q23r-hr55-xmpg.phpt --- php8.4-8.4.27/ext/soap/tests/GHSA-q23r-hr55-xmpg.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/soap/tests/GHSA-q23r-hr55-xmpg.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,65 @@ +--TEST-- +GHSA-q23r-hr55-xmpg: Out-of-bounds read on empty SOAP-ENC:arraySize +--EXTENSIONS-- +soap +--FILE-- + + + + + + + A + B + C + + + + + XML; +} + +function decode(SoapServer $server, string $request): string { + ob_start(); + $server->handle($request); + $response = ob_get_clean(); + + if (str_contains($response, '')) { + return 'fault: ' . strip_tags($response); + } + + return json_encode(array_pop($GLOBALS['decoded'])); +} + +$server = new SoapServer(null, ['uri' => 'http://test']); +$server->addFunction('echo_back'); + +$GLOBALS['decoded'] = []; + +foreach (['', ' ', 'abc', '*', '3', '2 2'] as $arraySize) { + echo var_export($arraySize, true), ' => ', decode($server, request($arraySize)), "\n"; +} + +echo "itemType => ", decode($server, request('', 'xsd:string')), "\n"; + +?> +--EXPECT-- +'' => ["A","B","C"] +' ' => ["A","B","C"] +'abc' => ["A","B","C"] +'*' => ["A","B","C"] +'3' => ["A","B","C"] +'2 2' => [["A","B"],["C"]] +itemType => ["A","B","C"] diff -Nru php8.4-8.4.27/ext/soap/tests/gh22585.phpt php8.4-8.4.28/ext/soap/tests/gh22585.phpt --- php8.4-8.4.27/ext/soap/tests/gh22585.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/soap/tests/gh22585.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,39 @@ +--TEST-- +GH-22585 (Use of uninitialized params in do_request() on out-of-memory bailout) +--EXTENSIONS-- +soap +--INI-- +soap.wsdl_cache_enabled=0 +memory_limit=64M +--FILE-- + "http://localhost/soap.php", 'uri' => "http://localhost/"] + ); + $soap->call(1.1); + main(); + } + } + + main(); +} catch (\Throwable $e) { +} +echo "Done" . PHP_EOL; +?> +--EXPECTREGEX-- +(?s)(Done|.*Allowed memory size of \d+ bytes exhausted.*) diff -Nru php8.4-8.4.27/ext/sockets/sockets.c php8.4-8.4.28/ext/sockets/sockets.c --- php8.4-8.4.27/ext/sockets/sockets.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/sockets/sockets.c 2026-11-17 20:29:32.000000000 +0000 @@ -1881,7 +1881,7 @@ #endif zend_long level, optname; void *opt_ptr; - HashTable *opt_ht; + HashTable *opt_ht, *opt_props = NULL; zval *l_onoff, *l_linger; zval *sec, *usec; @@ -1955,23 +1955,27 @@ zend_argument_type_error(4, "must be of type array when argument #3 ($option) is SO_LINGER, %s given", zend_zval_value_name(arg4)); RETURN_THROWS(); } else { - opt_ht = Z_OBJPROP_P(arg4); + opt_props = zend_get_properties_for(arg4, ZEND_PROP_PURPOSE_ARRAY_CAST); + opt_ht = opt_props ? opt_props : (HashTable *) &zend_empty_array; } } else { opt_ht = Z_ARRVAL_P(arg4); } - if ((l_onoff = zend_hash_str_find(opt_ht, l_onoff_key, sizeof(l_onoff_key) - 1)) == NULL) { + if ((l_onoff = zend_hash_str_find_ind(opt_ht, l_onoff_key, sizeof(l_onoff_key) - 1)) == NULL) { + zend_release_properties(opt_props); zend_argument_value_error(4, "must have key \"%s\"", l_onoff_key); RETURN_THROWS(); } - if ((l_linger = zend_hash_str_find(opt_ht, l_linger_key, sizeof(l_linger_key) - 1)) == NULL) { + if ((l_linger = zend_hash_str_find_ind(opt_ht, l_linger_key, sizeof(l_linger_key) - 1)) == NULL) { + zend_release_properties(opt_props); zend_argument_value_error(4, "must have key \"%s\"", l_linger_key); RETURN_THROWS(); } zend_long val_lonoff = zval_get_long(l_onoff); zend_long val_linger = zval_get_long(l_linger); + zend_release_properties(opt_props); if (val_lonoff < 0 || val_lonoff > USHRT_MAX) { zend_argument_value_error(4, "\"%s\" must be between 0 and %u", l_onoff_key, USHRT_MAX); @@ -1979,7 +1983,7 @@ } if (val_linger < 0 || val_linger > USHRT_MAX) { - zend_argument_value_error(4, "\"%s\" must be between 0 and %d", l_linger, USHRT_MAX); + zend_argument_value_error(4, "\"%s\" must be between 0 and %d", l_linger_key, USHRT_MAX); RETURN_THROWS(); } @@ -2003,23 +2007,27 @@ zend_zval_value_name(arg4)); RETURN_THROWS(); } else { - opt_ht = Z_OBJPROP_P(arg4); + opt_props = zend_get_properties_for(arg4, ZEND_PROP_PURPOSE_ARRAY_CAST); + opt_ht = opt_props ? opt_props : (HashTable *) &zend_empty_array; } } else { opt_ht = Z_ARRVAL_P(arg4); } - if ((sec = zend_hash_str_find(opt_ht, sec_key, sizeof(sec_key) - 1)) == NULL) { + if ((sec = zend_hash_str_find_ind(opt_ht, sec_key, sizeof(sec_key) - 1)) == NULL) { + zend_release_properties(opt_props); zend_argument_value_error(4, "must have key \"%s\"", sec_key); RETURN_THROWS(); } - if ((usec = zend_hash_str_find(opt_ht, usec_key, sizeof(usec_key) - 1)) == NULL) { + if ((usec = zend_hash_str_find_ind(opt_ht, usec_key, sizeof(usec_key) - 1)) == NULL) { + zend_release_properties(opt_props); zend_argument_value_error(4, "must have key \"%s\"", usec_key); RETURN_THROWS(); } zend_long valsec = zval_get_long(sec); zend_long valusec = zval_get_long(usec); + zend_release_properties(opt_props); #ifndef PHP_WIN32 tv.tv_sec = valsec; tv.tv_usec = valusec; diff -Nru php8.4-8.4.27/ext/sockets/tests/gh24748.phpt php8.4-8.4.28/ext/sockets/tests/gh24748.phpt --- php8.4-8.4.27/ext/sockets/tests/gh24748.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/sockets/tests/gh24748.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,64 @@ +--TEST-- +GH-24748 (socket_set_option() crashes when the value is an object with declared properties) +--EXTENSIONS-- +sockets +--FILE-- +getMessage(), "\n"; +} + +$timeout = new Timeout(); +$timeout->usec = 0; +var_dump(socket_set_option($socket, SOL_SOCKET, SO_RCVTIMEO, $timeout)); +var_dump(socket_set_option($socket, SOL_SOCKET, SO_SNDTIMEO, $timeout)); +var_dump(socket_get_option($socket, SOL_SOCKET, SO_SNDTIMEO)); + +$linger = new stdClass(); +$linger->l_onoff = new stdClass(); +$linger->l_linger = 5; +set_error_handler(function () use ($linger) { + $tmp = (array) $linger; + $linger->extra = 1; + unset($tmp); + return true; +}); +var_dump(socket_set_option($socket, SOL_SOCKET, SO_LINGER, $linger)); +restore_error_handler(); + +try { + socket_set_option($socket, SOL_SOCKET, SO_LINGER, new ArrayObject(['l_onoff' => 1, 'l_linger' => 70000])); +} catch (ValueError $e) { + echo $e->getMessage(), "\n"; +} +?> +--EXPECT-- +bool(true) +int(5) +socket_set_option(): Argument #4 ($value) must have key "usec" +bool(true) +bool(true) +array(2) { + ["sec"]=> + int(1) + ["usec"]=> + int(0) +} +bool(true) +socket_set_option(): Argument #4 ($value) "l_linger" must be between 0 and 65535 diff -Nru php8.4-8.4.27/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt php8.4-8.4.28/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt --- php8.4-8.4.27/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -10,7 +10,9 @@ ?> --FILE-- --EXPECTF-- -Warning: socket_create(): Unable to create socket [%d]: Protocol not supported in %s on line %d bool(false) bool(false) Received Ping! diff -Nru php8.4-8.4.27/ext/sockets/tests/socket_tcp_congestion.phpt php8.4-8.4.28/ext/sockets/tests/socket_tcp_congestion.phpt --- php8.4-8.4.27/ext/sockets/tests/socket_tcp_congestion.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/sockets/tests/socket_tcp_congestion.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -11,15 +11,14 @@ --FILE-- funcs->move_forward(iterator); if (EG(exception)) { - if (!(object->flags & RIT_CATCH_GET_CHILD)) { + if (!spl_can_catch_exception(object->flags)) { return; } else { zend_clear_exception(); @@ -308,7 +315,7 @@ zend_call_method_with_0_params(obj, ce, cache, "haschildren", &retval); } if (EG(exception)) { - if (!(object->flags & RIT_CATCH_GET_CHILD)) { + if (!spl_can_catch_exception(object->flags)) { object->iterators[object->level].state = RS_NEXT; return; } else { @@ -344,7 +351,7 @@ } object->iterators[object->level].state = RS_NEXT; if (EG(exception)) { - if (!(object->flags & RIT_CATCH_GET_CHILD)) { + if (!spl_can_catch_exception(object->flags)) { return; } else { zend_clear_exception(); @@ -373,7 +380,7 @@ } if (EG(exception)) { - if (!(object->flags & RIT_CATCH_GET_CHILD)) { + if (!spl_can_catch_exception(object->flags)) { return; } else { zend_clear_exception(); @@ -417,7 +424,7 @@ if (object->beginChildren) { zend_call_method_with_0_params(Z_OBJ_P(zthis), object->ce, &object->beginChildren, "beginchildren", NULL); if (EG(exception)) { - if (!(object->flags & RIT_CATCH_GET_CHILD)) { + if (!spl_can_catch_exception(object->flags)) { return; } else { zend_clear_exception(); @@ -431,7 +438,7 @@ if (object->endChildren) { zend_call_method_with_0_params(Z_OBJ_P(zthis), object->ce, &object->endChildren, "endchildren", NULL); if (EG(exception)) { - if (!(object->flags & RIT_CATCH_GET_CHILD)) { + if (!spl_can_catch_exception(object->flags)) { return; } else { zend_clear_exception(); @@ -2300,7 +2307,7 @@ zend_call_method_with_0_params(Z_OBJ(intern->inner.zobject), intern->inner.ce, NULL, "haschildren", &retval); if (EG(exception)) { zval_ptr_dtor(&retval); - if (intern->u.caching.flags & CIT_CATCH_GET_CHILD) { + if (spl_can_catch_exception(intern->u.caching.flags)) { zend_clear_exception(); } else { return; @@ -2316,7 +2323,7 @@ zend_call_method_with_0_params(Z_OBJ(intern->inner.zobject), intern->inner.ce, NULL, "getchildren", &args[0]); if (EG(exception)) { zval_ptr_dtor(&args[0]); - if (intern->u.caching.flags & CIT_CATCH_GET_CHILD) { + if (spl_can_catch_exception(intern->u.caching.flags)) { zend_clear_exception(); } else { return; @@ -2333,7 +2340,7 @@ ); zval_ptr_dtor(&args[0]); if (is_initialized == FAILURE) { - if (intern->u.caching.flags & CIT_CATCH_GET_CHILD) { + if (spl_can_catch_exception(intern->u.caching.flags)) { zend_clear_exception(); } else { return; diff -Nru php8.4-8.4.27/ext/spl/tests/gh24264_1.phpt php8.4-8.4.28/ext/spl/tests/gh24264_1.phpt --- php8.4-8.4.27/ext/spl/tests/gh24264_1.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/spl/tests/gh24264_1.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,24 @@ +--TEST-- +GH-24264 (Unwind/GracefulExit discarded in spl_iterators.c): RecursiveIteratorIterator hasChildren() +--FILE-- + +--EXPECT-- +exit diff -Nru php8.4-8.4.27/ext/spl/tests/gh24264_2.phpt php8.4-8.4.28/ext/spl/tests/gh24264_2.phpt --- php8.4-8.4.27/ext/spl/tests/gh24264_2.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/spl/tests/gh24264_2.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,23 @@ +--TEST-- +GH-24264 (Unwind/GracefulExit discarded in spl_iterators.c): RecursiveCachingIterator hasChildren() +--FILE-- + +--EXPECT-- +exit diff -Nru php8.4-8.4.27/ext/spl/tests/gh24264_3.phpt php8.4-8.4.28/ext/spl/tests/gh24264_3.phpt --- php8.4-8.4.27/ext/spl/tests/gh24264_3.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/spl/tests/gh24264_3.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,24 @@ +--TEST-- +GH-24264 (Unwind/GracefulExit discarded in spl_iterators.c): RecursiveIteratorIterator getChildren() +--FILE-- + +--EXPECT-- +exit diff -Nru php8.4-8.4.27/ext/spl/tests/gh24264_4.phpt php8.4-8.4.28/ext/spl/tests/gh24264_4.phpt --- php8.4-8.4.27/ext/spl/tests/gh24264_4.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/spl/tests/gh24264_4.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,23 @@ +--TEST-- +GH-24264 (Unwind/GracefulExit discarded in spl_iterators.c): RecursiveCachingIterator getChildren() +--FILE-- + +--EXPECT-- +exit diff -Nru php8.4-8.4.27/ext/spl/tests/gh24264_5.phpt php8.4-8.4.28/ext/spl/tests/gh24264_5.phpt --- php8.4-8.4.27/ext/spl/tests/gh24264_5.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/spl/tests/gh24264_5.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,35 @@ +--TEST-- +GH-24264 (Unwind/GracefulExit discarded in spl_iterators.c): destroyed fiber suspended in getChildren() +--FILE-- +start(); +unset($fiber); + +echo "Done\n"; +?> +--EXPECT-- +finally +Done diff -Nru php8.4-8.4.27/ext/sqlite3/sqlite3.c php8.4-8.4.28/ext/sqlite3/sqlite3.c --- php8.4-8.4.27/ext/sqlite3/sqlite3.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/sqlite3/sqlite3.c 2026-11-17 20:29:32.000000000 +0000 @@ -638,7 +638,7 @@ switch (sqlite3_column_type(stmt, column)) { case SQLITE_INTEGER: val = sqlite3_column_int64(stmt, column); -#if LONG_MAX <= 2147483647 +#ifndef ZEND_ENABLE_ZVAL_LONG64 if (val > ZEND_LONG_MAX || val < ZEND_LONG_MIN) { const char *text = (const char *) sqlite3_column_text(stmt, column); if (UNEXPECTED(text == NULL)) { @@ -650,7 +650,7 @@ } else { #endif ZVAL_LONG(data, (zend_long) val); -#if LONG_MAX <= 2147483647 +#ifndef ZEND_ENABLE_ZVAL_LONG64 } #endif break; @@ -811,7 +811,7 @@ for (i = 0; i < argc; i++) { switch (sqlite3_value_type(argv[i])) { case SQLITE_INTEGER: -#if ZEND_LONG_MAX > 2147483647 +#ifdef ZEND_ENABLE_ZVAL_LONG64 ZVAL_LONG(&zargs[i + is_agg], sqlite3_value_int64(argv[i])); #else ZVAL_LONG(&zargs[i + is_agg], sqlite3_value_int(argv[i])); @@ -862,7 +862,7 @@ if (!Z_ISUNDEF(retval)) { switch (Z_TYPE(retval)) { case IS_LONG: -#if ZEND_LONG_MAX > 2147483647 +#ifdef ZEND_ENABLE_ZVAL_LONG64 sqlite3_result_int64(context, Z_LVAL(retval)); #else sqlite3_result_int(context, Z_LVAL(retval)); @@ -1590,7 +1590,7 @@ switch (param->type) { case SQLITE_INTEGER: convert_to_long(parameter); -#if ZEND_LONG_MAX > 2147483647 +#ifdef ZEND_ENABLE_ZVAL_LONG64 return_code = sqlite3_bind_int64(stmt_obj->stmt, param->param_number, Z_LVAL_P(parameter)); #else return_code = sqlite3_bind_int(stmt_obj->stmt, param->param_number, Z_LVAL_P(parameter)); diff -Nru php8.4-8.4.27/ext/sqlite3/tests/gh25021-udf.phpt php8.4-8.4.28/ext/sqlite3/tests/gh25021-udf.phpt --- php8.4-8.4.27/ext/sqlite3/tests/gh25021-udf.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/sqlite3/tests/gh25021-udf.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,27 @@ +--TEST-- +GH-25021 (UDF isn't using sqlite3_*_int64 API) +--EXTENSIONS-- +sqlite3 +--FILE-- +createFunction('my_udf_pass_int', static fn(int $v): int => $v); + +foreach ([ + 10, + PHP_INT_MIN, + PHP_INT_MAX, +] as $v) { + $stmt = $conn->prepare('select my_udf_pass_int(:v)'); + $stmt->bindValue(':v', $v, SQLITE3_INTEGER); + $result = $stmt->execute()->fetchArray(); + + var_dump($result[0] === $v); +} +?> +--EXPECT-- +bool(true) +bool(true) +bool(true) diff -Nru php8.4-8.4.27/ext/standard/array.c php8.4-8.4.28/ext/standard/array.c --- php8.4-8.4.27/ext/standard/array.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/array.c 2026-11-17 20:29:32.000000000 +0000 @@ -185,7 +185,7 @@ s2 = zend_print_long_to_buf(buf2 + sizeof(buf2) - 1, s->h); l2 = buf2 + sizeof(buf2) - 1 - s2; } - return zend_binary_strcasecmp_l(s1, l1, s2, l2); + return zend_binary_strcasecmp(s1, l1, s2, l2); } /* }}} */ @@ -3302,6 +3302,10 @@ j++; } } + /* Truncate the stale slots left by compaction before the engine can throw. */ + hash->nNumUsed = n_elems; + hash->nInternalPointer = 0; + hash->nNextFreeElement = n_elems; while (--n_left) { rnd_idx = algo->range(state, 0, n_left); if (EG(exception)) { @@ -3330,6 +3334,9 @@ j++; } } + hash->nNumUsed = n_elems; + hash->nInternalPointer = 0; + hash->nNextFreeElement = n_elems; while (--n_left) { rnd_idx = algo->range(state, 0, n_left); if (EG(exception)) { @@ -3343,9 +3350,6 @@ } } } - hash->nNumUsed = n_elems; - hash->nInternalPointer = 0; - hash->nNextFreeElement = n_elems; return true; } diff -Nru php8.4-8.4.27/ext/standard/basic_functions.c php8.4-8.4.28/ext/standard/basic_functions.c --- php8.4-8.4.27/ext/standard/basic_functions.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/basic_functions.c 2026-11-17 20:29:32.000000000 +0000 @@ -36,6 +36,7 @@ #include "zend_attributes.h" #include "zend_enum.h" #include "zend_ini.h" +#include "zend_hrtime.h" #include "zend_operators.h" #include "ext/standard/php_dns.h" #include "ext/standard/php_uuencode.h" @@ -1212,8 +1213,9 @@ { double target_secs; struct timeval tm; - struct timespec php_req, php_rem; + struct timespec php_req; uint64_t current_ns, target_ns, diff_ns; + zend_hrtime_t start; const uint64_t ns_per_sec = 1000000000; const double top_target_sec = (double)(UINT64_MAX / ns_per_sec); @@ -1224,6 +1226,7 @@ if (gettimeofday((struct timeval *) &tm, NULL) != 0) { RETURN_FALSE; } + start = zend_hrtime(); if (UNEXPECTED(!(target_secs >= 0 && target_secs <= top_target_sec))) { zend_argument_value_error(1, "must be between 0 and %" PRIu64, (uint64_t)top_target_sec); @@ -1241,13 +1244,17 @@ php_req.tv_sec = (time_t) (diff_ns / ns_per_sec); php_req.tv_nsec = (long) (diff_ns % ns_per_sec); - while (nanosleep(&php_req, &php_rem)) { - if (errno == EINTR) { - php_req.tv_sec = php_rem.tv_sec; - php_req.tv_nsec = php_rem.tv_nsec; - } else { + while (nanosleep(&php_req, NULL)) { + if (errno != EINTR) { RETURN_FALSE; } + zend_hrtime_t elapsed = zend_hrtime() - start; + if (elapsed >= diff_ns) { + break; + } + uint64_t remaining_ns = diff_ns - elapsed; + php_req.tv_sec = (time_t) (remaining_ns / ns_per_sec); + php_req.tv_nsec = (long) (remaining_ns % ns_per_sec); } RETURN_TRUE; diff -Nru php8.4-8.4.27/ext/standard/dns_win32.c php8.4-8.4.28/ext/standard/dns_win32.c --- php8.4-8.4.27/ext/standard/dns_win32.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/dns_win32.c 2026-11-17 20:29:32.000000000 +0000 @@ -137,6 +137,8 @@ RETURN_FALSE; } + DnsRecordListFree(pResult, DnsFreeRecordListDeep); + RETURN_TRUE; } /* }}} */ diff -Nru php8.4-8.4.27/ext/standard/filestat.c php8.4-8.4.28/ext/standard/filestat.c --- php8.4-8.4.27/ext/standard/filestat.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/filestat.c 2026-11-17 20:29:32.000000000 +0000 @@ -434,7 +434,7 @@ try_again: err = getpwnam_r(name, &pw, pwbuf, pwbuflen, &retpwptr); if (err != 0 || retpwptr == NULL) { - if (err == EAGAIN) { + if (err == ERANGE) { pwbuflen *= 2; pwbuf = erealloc(pwbuf, pwbuflen); goto try_again; diff -Nru php8.4-8.4.27/ext/standard/ftp_fopen_wrapper.c php8.4-8.4.28/ext/standard/ftp_fopen_wrapper.c --- php8.4-8.4.27/ext/standard/ftp_fopen_wrapper.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/ftp_fopen_wrapper.c 2026-11-17 20:29:32.000000000 +0000 @@ -74,13 +74,23 @@ } php_ftp_dirstream_data; /* {{{ get_ftp_result */ +/* Reads reply lines into buffer until a complete status line ("ddd ") and + * returns its code, or 0 if the stream ends before one. + * On return the buffer always holds a NUL-terminated string, which the + * callers rely on when they parse or print the reply text: it is emptied + * first in case nothing can be read, and php_stream_gets() terminates every + * line it reads. */ static inline int get_ftp_result(php_stream *stream, char *buffer, size_t buffer_size) { buffer[0] = '\0'; /* in case read fails to read anything */ - while (php_stream_gets(stream, buffer, buffer_size-1) && - !(isdigit((unsigned char)buffer[0]) && isdigit((unsigned char)buffer[1]) && - isdigit((unsigned char)buffer[2]) && buffer[3] == ' ')); - return strtol(buffer, NULL, 10); + while (php_stream_gets(stream, buffer, buffer_size-1)) { + if (isdigit((unsigned char)buffer[0]) && isdigit((unsigned char)buffer[1]) && + isdigit((unsigned char)buffer[2]) && buffer[3] == ' ') { + return strtol(buffer, NULL, 10); + } + } + /* no complete status line, callers parse the reply from buffer + 4 */ + return 0; } /* }}} */ @@ -141,7 +151,7 @@ return NULL; } - use_ssl = resource->scheme && (ZSTR_LEN(resource->scheme) > 3) && ZSTR_VAL(resource->scheme)[3] == 's'; + use_ssl = resource->scheme && zend_string_equals_literal_ci(resource->scheme, "ftps"); /* use port 21 if one wasn't specified */ if (resource->port == 0) @@ -352,8 +362,10 @@ tpath++; } tpath[-1] = '\0'; - memcpy(ip, hoststart, ip_size); - ip[ip_size-1] = '\0'; + if ((size_t)(tpath - hoststart) > ip_size) { + return 0; + } + memcpy(ip, hoststart, tpath - hoststart); hoststart = ip; /* pull out the MSB of the port */ @@ -825,11 +837,11 @@ struct tm tm, tmbuf, *gmt; time_t stamp; - while ((size_t)(p - tmp_line) < sizeof(tmp_line) && !isdigit((unsigned char)*p)) { + while (*p && !isdigit((unsigned char)*p)) { p++; } - if ((size_t)(p - tmp_line) > sizeof(tmp_line)) { + if (!*p) { goto mdtm_error; } diff -Nru php8.4-8.4.27/ext/standard/http_fopen_wrapper.c php8.4-8.4.28/ext/standard/http_fopen_wrapper.c --- php8.4-8.4.27/ext/standard/http_fopen_wrapper.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/http_fopen_wrapper.c 2026-11-17 20:29:32.000000000 +0000 @@ -234,25 +234,21 @@ } /* Process folding headers of the current line and if there are none, parse last full response - * header line. It returns NULL if the last header is finished, otherwise it returns updated - * last header line. */ -static zend_string *php_stream_http_response_headers_parse(php_stream_wrapper *wrapper, + * header line. It returns true if the current line was folded into the last header line, + * otherwise false. */ +static bool php_stream_http_response_headers_parse(php_stream_wrapper *wrapper, php_stream *stream, php_stream_context *context, int options, - zend_string *last_header_line_str, char *header_line, size_t *header_line_length, + smart_str *last_header, char *header_line, size_t *header_line_length, int response_code, zval *response_header, php_stream_http_response_header_info *header_info) { - char *last_header_line = ZSTR_VAL(last_header_line_str); - size_t last_header_line_length = ZSTR_LEN(last_header_line_str); - char *last_header_line_end = ZSTR_VAL(last_header_line_str) + ZSTR_LEN(last_header_line_str) - 1; - /* Process non empty header line. */ if (header_line && (*header_line != '\n' && *header_line != '\r')) { /* Removing trailing white spaces. */ if (php_stream_http_response_header_trim(header_line, header_line_length) && *header_line_length == 0) { /* Only spaces so treat as an empty folding header. */ - return last_header_line_str; + return true; } /* Process folding headers if starting with a space or a tab. */ @@ -267,18 +263,18 @@ /* It has to have some characters because it would get returned after the call * php_stream_http_response_header_trim above. */ ZEND_ASSERT(http_folded_header_line_length > 0); - /* Concatenate last header line, space and current header line. */ - zend_string *extended_header_str = zend_string_concat3( - last_header_line, last_header_line_length, - " ", 1, - http_folded_header_line, http_folded_header_line_length); - zend_string_efree(last_header_line_str); - last_header_line_str = extended_header_str; - /* Return new header line. */ - return last_header_line_str; + /* Append space and current header line to the last header line. */ + smart_str_appendc(last_header, ' '); + smart_str_appendl(last_header, http_folded_header_line, http_folded_header_line_length); + return true; } } + zend_string *last_header_line_str = smart_str_extract(last_header); + char *last_header_line = ZSTR_VAL(last_header_line_str); + size_t last_header_line_length = ZSTR_LEN(last_header_line_str); + char *last_header_line_end = ZSTR_VAL(last_header_line_str) + ZSTR_LEN(last_header_line_str) - 1; + /* Find header separator position. */ char *last_header_value = memchr(last_header_line, ':', last_header_line_length); if (last_header_value) { @@ -290,7 +286,7 @@ php_stream_wrapper_log_error(wrapper, options, "HTTP invalid response format (space in header name)!"); zend_string_efree(last_header_line_str); - return NULL; + return false; } ++last_header_name; } @@ -308,7 +304,7 @@ php_stream_wrapper_log_error(wrapper, options, "HTTP invalid response format (no colon in header line)!"); zend_string_efree(last_header_line_str); - return NULL; + return false; } bool store_header = true; @@ -333,9 +329,9 @@ "HTTP Location header size is over the limit of %d bytes", HTTP_HEADER_MAX_LOCATION_SIZE); zend_string_efree(last_header_line_str); - return NULL; + return false; } - if (header_info->location_len == 0) { + if (header_info->location == NULL) { header_info->location = emalloc(last_header_value_len + 1); } else if (header_info->location_len <= last_header_value_len) { header_info->location = erealloc(header_info->location, last_header_value_len + 1); @@ -392,7 +388,7 @@ zend_string_efree(last_header_line_str); } - return NULL; + return false; } static php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, @@ -409,7 +405,7 @@ zval *ua_zval = NULL, *tmpzval = NULL, ssl_proxy_peer_name; int reqok = 0; char *http_header_line = NULL; - zend_string *last_header_line_str = NULL; + smart_str last_header = {0}; php_stream_http_response_header_info header_info; char tmp_line[128]; size_t chunk_size = 0; @@ -468,7 +464,7 @@ request_fulluri = zend_is_true(tmpzval); } - use_ssl = (ZSTR_LEN(resource->scheme) > 4) && ZSTR_VAL(resource->scheme)[4] == 's'; + use_ssl = zend_string_equals_literal_ci(resource->scheme, "https"); /* choose default ports */ if (use_ssl && resource->port == 0) resource->port = 443; @@ -1045,12 +1041,12 @@ last_line = false; } - if (last_header_line_str != NULL) { + if (last_header.s != NULL) { /* Parse last header line. */ - last_header_line_str = php_stream_http_response_headers_parse(wrapper, stream, - context, options, last_header_line_str, http_header_line, + bool folded = php_stream_http_response_headers_parse(wrapper, stream, + context, options, &last_header, http_header_line, &http_header_line_length, response_code, response_header, &header_info); - if (EXPECTED(last_header_line_str == NULL)) { + if (EXPECTED(!folded)) { if (UNEXPECTED(header_info.error)) { php_stream_close(stream); stream = NULL; @@ -1074,20 +1070,20 @@ } if (last_line) { /* For the last line the last header line must be NULL. */ - ZEND_ASSERT(last_header_line_str == NULL); + ZEND_ASSERT(last_header.s == NULL); break; } /* Save current line as the last line so it gets parsed in the next round. */ - last_header_line_str = zend_string_init(http_header_line, http_header_line_length, 0); + smart_str_appendl(&last_header, http_header_line, http_header_line_length); } else { break; } } /* If the stream was closed early, we still want to process the last line to keep BC. */ - if (last_header_line_str != NULL) { + if (last_header.s != NULL) { php_stream_http_response_headers_parse(wrapper, stream, context, options, - last_header_line_str, NULL, NULL, response_code, response_header, &header_info); + &last_header, NULL, NULL, response_code, response_header, &header_info); } if (!reqok || (header_info.location != NULL && header_info.follow_location)) { @@ -1216,6 +1212,7 @@ out: smart_str_free(&req_buf); + smart_str_free(&last_header); if (http_header_line) { efree(http_header_line); @@ -1259,6 +1256,8 @@ if (stream->writepos > stream->readpos) { php_stream_notify_progress_increment(context, stream->writepos - stream->readpos, 0); } + } else if (header_info.transfer_encoding) { + php_stream_filter_free(header_info.transfer_encoding); } return stream; @@ -1272,16 +1271,15 @@ ZVAL_UNDEF(&headers); - zval_ptr_dtor(&BG(last_http_headers)); - ZVAL_UNDEF(&BG(last_http_headers)); - stream = php_stream_url_wrap_http_ex( wrapper, path, mode, options, opened_path, context, PHP_URL_REDIRECT_MAX, HTTP_WRAPPER_HEADER_INIT, &headers STREAMS_CC); - if (!Z_ISUNDEF(headers)) { - ZVAL_COPY(&BG(last_http_headers), &headers); + /* After the request: one made from its notification callback may have stored its own headers here. */ + zval_ptr_dtor(&BG(last_http_headers)); + ZVAL_COPY(&BG(last_http_headers), &headers); + if (!Z_ISUNDEF(headers)) { if (FAILURE == zend_set_local_var_str( "http_response_header", sizeof("http_response_header")-1, &headers, 0)) { zval_ptr_dtor(&headers); diff -Nru php8.4-8.4.27/ext/standard/password.c php8.4-8.4.28/ext/standard/password.c --- php8.4-8.4.27/ext/standard/password.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/password.c 2026-11-17 20:29:32.000000000 +0000 @@ -113,21 +113,33 @@ /* bcrypt implementation */ -static bool php_password_bcrypt_valid(const zend_string *hash) { +static bool php_password_bcrypt_get_cost(const zend_string *hash, zend_long *cost) { const char *h = ZSTR_VAL(hash); - return (ZSTR_LEN(hash) == 60) && - (h[0] == '$') && (h[1] == '2') && (h[2] == 'y'); + + if ((ZSTR_LEN(hash) != 60) || + (h[0] != '$') || (h[1] != '2') || (h[2] != 'y') || (h[3] != '$') || + !ZEND_IS_DIGIT(h[4]) || !ZEND_IS_DIGIT(h[5]) || (h[6] != '$')) { + return false; + } + + *cost = (h[4] - '0') * 10 + (h[5] - '0'); + + return *cost >= 4 && *cost <= 31; +} + +static bool php_password_bcrypt_valid(const zend_string *hash) { + zend_long cost; + + return php_password_bcrypt_get_cost(hash, &cost); } static int php_password_bcrypt_get_info(zval *return_value, const zend_string *hash) { - zend_long cost = PHP_PASSWORD_BCRYPT_COST; + zend_long cost; - if (!php_password_bcrypt_valid(hash)) { + if (!php_password_bcrypt_get_cost(hash, &cost)) { /* Should never get called this way. */ return FAILURE; } - - sscanf(ZSTR_VAL(hash), "$2y$" ZEND_LONG_FMT "$", &cost); add_assoc_long(return_value, "cost", cost); return SUCCESS; @@ -135,15 +147,13 @@ static bool php_password_bcrypt_needs_rehash(const zend_string *hash, zend_array *options) { zval *znew_cost; - zend_long old_cost = PHP_PASSWORD_BCRYPT_COST; + zend_long old_cost; zend_long new_cost = PHP_PASSWORD_BCRYPT_COST; - if (!php_password_bcrypt_valid(hash)) { + if (!php_password_bcrypt_get_cost(hash, &old_cost)) { /* Should never get called this way. */ return 1; } - - sscanf(ZSTR_VAL(hash), "$2y$" ZEND_LONG_FMT "$", &old_cost); if (options && (znew_cost = zend_hash_str_find(options, "cost", sizeof("cost")-1)) != NULL) { new_cost = zval_get_long(znew_cost); } diff -Nru php8.4-8.4.27/ext/standard/proc_open.c php8.4-8.4.28/ext/standard/proc_open.c --- php8.4-8.4.27/ext/standard/proc_open.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/proc_open.c 2026-11-17 20:29:32.000000000 +0000 @@ -845,7 +845,7 @@ { #ifdef PHP_WIN32 desc->childend = CreateFileA("nul", GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); + FILE_SHARE_READ | FILE_SHARE_WRITE, &php_proc_open_security, OPEN_EXISTING, 0, NULL); if (desc->childend == INVALID_HANDLE_VALUE) { php_error_docref(NULL, E_WARNING, "Failed to open nul"); return FAILURE; diff -Nru php8.4-8.4.27/ext/standard/string.c php8.4-8.4.28/ext/standard/string.c --- php8.4-8.4.27/ext/standard/string.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/string.c 2026-11-17 20:29:32.000000000 +0000 @@ -6352,7 +6352,7 @@ if (!cs) { RETURN_LONG(zend_binary_strncmp(ZSTR_VAL(s1) + offset, (ZSTR_LEN(s1) - offset), ZSTR_VAL(s2), ZSTR_LEN(s2), cmp_len)); } else { - RETURN_LONG(zend_binary_strncasecmp_l(ZSTR_VAL(s1) + offset, (ZSTR_LEN(s1) - offset), ZSTR_VAL(s2), ZSTR_LEN(s2), cmp_len)); + RETURN_LONG(zend_binary_strncasecmp(ZSTR_VAL(s1) + offset, (ZSTR_LEN(s1) - offset), ZSTR_VAL(s2), ZSTR_LEN(s2), cmp_len)); } } /* }}} */ diff -Nru php8.4-8.4.27/ext/standard/syslog.c php8.4-8.4.28/ext/standard/syslog.c --- php8.4-8.4.27/ext/standard/syslog.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/syslog.c 2026-11-17 20:29:32.000000000 +0000 @@ -41,7 +41,9 @@ PHP_RSHUTDOWN_FUNCTION(syslog) { - php_closelog(); + if (PG(have_called_openlog)) { + php_closelog(); + } if (BG(syslog_device)) { free(BG(syslog_device)); BG(syslog_device) = NULL; @@ -102,6 +104,9 @@ Z_PARAM_STR(message) ZEND_PARSE_PARAMETERS_END(); + if (!PG(have_called_openlog)) { + php_openlog(PG(syslog_ident), 0, PG(syslog_facility)); + } php_syslog_str(priority, message); RETURN_TRUE; } diff -Nru php8.4-8.4.27/ext/standard/tests/file/bug60120.phpt php8.4-8.4.28/ext/standard/tests/file/bug60120.phpt --- php8.4-8.4.27/ext/standard/tests/file/bug60120.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/file/bug60120.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -14,7 +14,9 @@ error_reporting(E_ALL); $php = getenv('TEST_PHP_EXECUTABLE_ESCAPED'); -$cmd = $php . ' -r "\$in = file_get_contents(\'php://stdin\'); fwrite(STDOUT, \$in); fwrite(STDERR, \$in);"'; +$args = getenv('TEST_PHP_EXTRA_ARGS'); +$cmd = ' -r "\$in = file_get_contents(\'php://stdin\'); fwrite(STDOUT, \$in); fwrite(STDERR, \$in);"'; +$cmd = join(' ', [$php, $args, $cmd]); $descriptors = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w')); $stdin = str_repeat('*', 2049 ); diff -Nru php8.4-8.4.27/ext/standard/tests/file/chown_user_name.phpt php8.4-8.4.28/ext/standard/tests/file/chown_user_name.phpt --- php8.4-8.4.27/ext/standard/tests/file/chown_user_name.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/file/chown_user_name.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,25 @@ +--TEST-- +chown() and lchown() with a user name +--SKIPIF-- + +--FILE-- + +--CLEAN-- + +--EXPECT-- +bool(true) +bool(true) +bool(true) diff -Nru php8.4-8.4.27/ext/standard/tests/file/lstat_stat_variation18.phpt php8.4-8.4.28/ext/standard/tests/file/lstat_stat_variation18.phpt --- php8.4-8.4.27/ext/standard/tests/file/lstat_stat_variation18.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/file/lstat_stat_variation18.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -62,7 +62,7 @@ [5]=> int(%d) [6]=> - int(%d) + int(%i) [7]=> int(%d) [8]=> @@ -118,7 +118,7 @@ [5]=> int(%d) [6]=> - int(%d) + int(%i) [7]=> int(%d) [8]=> diff -Nru php8.4-8.4.27/ext/standard/tests/file/lstat_stat_variation19.phpt php8.4-8.4.28/ext/standard/tests/file/lstat_stat_variation19.phpt --- php8.4-8.4.27/ext/standard/tests/file/lstat_stat_variation19.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/file/lstat_stat_variation19.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -63,7 +63,7 @@ [5]=> int(%d) [6]=> - int(%d) + int(%i) [7]=> int(%d) [8]=> @@ -117,7 +117,7 @@ [5]=> int(%d) [6]=> - int(%d) + int(%i) [7]=> int(%d) [8]=> @@ -173,7 +173,7 @@ [5]=> int(%d) [6]=> - int(%d) + int(%i) [7]=> int(%d) [8]=> @@ -227,7 +227,7 @@ [5]=> int(%d) [6]=> - int(%d) + int(%i) [7]=> int(%d) [8]=> diff -Nru php8.4-8.4.27/ext/standard/tests/file/lstat_stat_variation20.phpt php8.4-8.4.28/ext/standard/tests/file/lstat_stat_variation20.phpt --- php8.4-8.4.27/ext/standard/tests/file/lstat_stat_variation20.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/file/lstat_stat_variation20.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -72,7 +72,7 @@ [5]=> int(%d) [6]=> - int(%d) + int(%i) [7]=> int(%d) [8]=> @@ -128,7 +128,7 @@ [5]=> int(%d) [6]=> - int(%d) + int(%i) [7]=> int(%d) [8]=> @@ -182,7 +182,7 @@ [5]=> int(%d) [6]=> - int(%d) + int(%i) [7]=> int(%d) [8]=> @@ -236,7 +236,7 @@ [5]=> int(%d) [6]=> - int(%d) + int(%i) [7]=> int(%d) [8]=> diff -Nru php8.4-8.4.27/ext/standard/tests/general_functions/gh24605_var_export_stack_guard.phpt php8.4-8.4.28/ext/standard/tests/general_functions/gh24605_var_export_stack_guard.phpt --- php8.4-8.4.27/ext/standard/tests/general_functions/gh24605_var_export_stack_guard.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/general_functions/gh24605_var_export_stack_guard.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,57 @@ +--TEST-- +GH-24605: var_export() checks native stack limit for arrays and objects +--SKIPIF-- + +--INI-- +zend.max_allowed_stack_size=256K +--FILE-- +getMessage(), 'Maximum call stack size') + ? "guarded\n" + : "unexpected error\n"; + } +} + +$data = 0; +for ($i = 0; $i < 5000; $i++) { + $data = [$data]; +} +test_export('array', $data); + +// Detach the nested arrays without recursively destroying them. +while (is_array($data)) { + $data = $data[0]; +} + +class StackNode { public ?StackNode $next = null; } +$first = new StackNode(); +$node = $first; +for ($i = 0; $i < 5000; $i++) { + $node->next = new StackNode(); + $node = $node->next; +} +test_export('object', $first); + +// Break the chain iteratively to avoid teardown recursion. +$node = $first; +while ($node !== null) { + $next = $node->next; + $node->next = null; + $node = $next; +} +?> +--EXPECT-- +array: guarded +object: guarded diff -Nru php8.4-8.4.27/ext/standard/tests/general_functions/header_over_4gib.phpt php8.4-8.4.28/ext/standard/tests/general_functions/header_over_4gib.phpt --- php8.4-8.4.27/ext/standard/tests/general_functions/header_over_4gib.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/general_functions/header_over_4gib.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,29 @@ +--TEST-- +header() with a header line longer than 4 GiB +--SKIPIF-- + +--CONFLICTS-- +all +--INI-- +memory_limit=-1 +--FILE-- + +--EXPECTF-- +Warning: Header may not contain more than a single header, new line detected in %s on line %d +Done diff -Nru php8.4-8.4.27/ext/standard/tests/general_functions/proc_open_descriptor_0_setup_failure.phpt php8.4-8.4.28/ext/standard/tests/general_functions/proc_open_descriptor_0_setup_failure.phpt --- php8.4-8.4.27/ext/standard/tests/general_functions/proc_open_descriptor_0_setup_failure.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/general_functions/proc_open_descriptor_0_setup_failure.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -5,8 +5,8 @@ if (!function_exists("proc_open")) { die("skip proc_open() unavailable"); } -if (!@is_dir("/proc/self/fd")) { - die("skip requires /proc/self/fd"); +if (!@is_link("/proc/self/fd/1")) { + die("skip requires /proc/self/fd symlinks"); } ?> --FILE-- diff -Nru php8.4-8.4.27/ext/standard/tests/general_functions/proc_open_null.phpt php8.4-8.4.28/ext/standard/tests/general_functions/proc_open_null.phpt --- php8.4-8.4.27/ext/standard/tests/general_functions/proc_open_null.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/general_functions/proc_open_null.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -4,7 +4,8 @@ ['null'], 2 => ['pipe', 'w']], $pipes); var_dump($pipes); diff -Nru php8.4-8.4.27/ext/standard/tests/general_functions/proc_open_redirect.phpt php8.4-8.4.28/ext/standard/tests/general_functions/proc_open_redirect.phpt --- php8.4-8.4.27/ext/standard/tests/general_functions/proc_open_redirect.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/general_functions/proc_open_redirect.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -4,26 +4,29 @@ getMessage() . "\n"; } try { - proc_open([$php], [['redirect', 'foo']], $pipes); + proc_open($cmd, [['redirect', 'foo']], $pipes); } catch (ValueError $exception) { echo $exception->getMessage() . "\n"; } try { - proc_open([$php], [['redirect', 42]], $pipes); + proc_open($cmd, [['redirect', 42]], $pipes); } catch (ValueError $exception) { echo $exception->getMessage() . "\n"; } echo "\nWith pipe:\n"; -$cmd = [$php, '-r', 'echo "Test\n"; fprintf(STDERR, "Error");']; +$cmd = "$php $args -r \"echo 'Test', chr(10); fprintf(STDERR, 'Error');\""; $proc = proc_open($cmd, [1 => ['pipe', 'w'], 2 => ['redirect', 1]], $pipes); var_dump($pipes); var_dump(stream_get_contents($pipes[1])); diff -Nru php8.4-8.4.27/ext/standard/tests/general_functions/proc_open_socket_descriptor_0_setup_failure.phpt php8.4-8.4.28/ext/standard/tests/general_functions/proc_open_socket_descriptor_0_setup_failure.phpt --- php8.4-8.4.27/ext/standard/tests/general_functions/proc_open_socket_descriptor_0_setup_failure.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/general_functions/proc_open_socket_descriptor_0_setup_failure.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -5,8 +5,8 @@ if (!function_exists("proc_open")) { die("skip proc_open() unavailable"); } -if (!@is_dir("/proc/self/fd")) { - die("skip requires /proc/self/fd"); +if (!@is_link("/proc/self/fd/1")) { + die("skip requires /proc/self/fd symlinks"); } ?> --FILE-- diff -Nru php8.4-8.4.27/ext/standard/tests/general_functions/proc_open_sockets1.phpt php8.4-8.4.28/ext/standard/tests/general_functions/proc_open_sockets1.phpt --- php8.4-8.4.27/ext/standard/tests/general_functions/proc_open_sockets1.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/general_functions/proc_open_sockets1.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -7,10 +7,9 @@ --FILE-- +--INI-- +ffi.enable=1 +--FILE-- +cast('GetCurrentThread_t', $kernel32->GetCurrentThread); +$QueueUserAPC = $ffi->cast('QueueUserAPC_t', $kernel32->QueueUserAPC); +$SleepEx = $ffi->cast('SleepEx_t', $kernel32->SleepEx); + +$called = 0; +$callback = static function (int $data) use (&$called): void { + $called = $data; + // The time spent in APCs is not time slept + usleep(300000); +}; + +echo "usleep()\n"; +var_dump($QueueUserAPC($callback, $GetCurrentThread(), 1) !== 0); +var_dump(usleep(1000000)); +var_dump($called === 1); + +echo "time_nanosleep()\n"; +var_dump($QueueUserAPC($callback, $GetCurrentThread(), 2) !== 0); +var_dump(time_nanosleep(2, 0)); +var_dump($called === 2); + +echo "time_sleep_until()\n"; +var_dump($QueueUserAPC($callback, $GetCurrentThread(), 3) !== 0); +$deadline = microtime(true) + 0.5; +var_dump(time_sleep_until($deadline)); +var_dump($called === 3); +$now = microtime(true); +var_dump($now + 0.002 >= $deadline); +var_dump($now < $deadline + 0.25); + +$SleepEx(0, 1); +?> +--EXPECT-- +usleep() +bool(true) +NULL +bool(true) +time_nanosleep() +bool(true) +array(2) { + ["seconds"]=> + int(2) + ["nanoseconds"]=> + int(0) +} +bool(true) +time_sleep_until() +bool(true) +bool(true) +bool(true) +bool(true) +bool(true) diff -Nru php8.4-8.4.27/ext/standard/tests/http/gh24508.phpt php8.4-8.4.28/ext/standard/tests/http/gh24508.phpt --- php8.4-8.4.27/ext/standard/tests/http/gh24508.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/http/gh24508.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,20 @@ +--TEST-- +GH-24508 (HTTP wrapper leaks the dechunk filter when header parsing fails after Transfer-Encoding) +--INI-- +allow_url_fopen=1 +--SKIPIF-- + +--FILE-- + $pid, 'uri' => $uri] = http_server([ + "data://text/plain,HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nBrokenHeaderNoColon\r\n\r\n", +]); + +var_dump(@file_get_contents($uri)); + +http_server_kill($pid); +?> +--EXPECT-- +bool(false) diff -Nru php8.4-8.4.27/ext/standard/tests/http/gh24509.phpt php8.4-8.4.28/ext/standard/tests/http/gh24509.phpt --- php8.4-8.4.27/ext/standard/tests/http/gh24509.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/http/gh24509.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,21 @@ +--TEST-- +GH-24509 (HTTP wrapper leaks the Location buffer when an empty Location header is followed by another) +--INI-- +allow_url_fopen=1 +--SKIPIF-- + +--FILE-- + $pid, 'uri' => $uri] = http_server([ + "data://text/plain,HTTP/1.1 302 Found\r\nLocation:\r\nLocation: /abcdefghijklmno\r\nContent-Length: 0\r\n\r\n", + "data://text/plain,HTTP/1.1 200 OK\r\nContent-Length: 2\r\n\r\nOK", +]); + +var_dump(file_get_contents($uri)); + +http_server_kill($pid); +?> +--EXPECT-- +string(2) "OK" diff -Nru php8.4-8.4.27/ext/standard/tests/http/ghsa-f6gg-rchx-xw8j.phpt php8.4-8.4.28/ext/standard/tests/http/ghsa-f6gg-rchx-xw8j.phpt --- php8.4-8.4.27/ext/standard/tests/http/ghsa-f6gg-rchx-xw8j.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/http/ghsa-f6gg-rchx-xw8j.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,61 @@ +--TEST-- +GHSA-f6gg-rchx-xw8j: mixed-case HTTPS URLs must use TLS +--EXTENSIONS-- +openssl +--SKIPIF-- + +--FILE-- + [ + 'method' => 'POST', + 'content' => 'opensec-sensitive-body', + 'header' => "X-Opensec-Request: validation\r\n", + ], + 'ssl' => [ + 'verify_peer' => false, + 'verify_peer_name' => false, + ], + ]); + var_dump(@file_get_contents('HTTPS://alice:secret@{{ ADDR }}/secret', false, $context)); + echo phpt_wait(); +CODE; + +include sprintf('%s/../../../openssl/tests/ServerClientTestCase.inc', __DIR__); +ServerClientTestCase::getInstance()->run($clientCode, $serverCode); +?> +--EXPECT-- +bool(false) +TLS diff -Nru php8.4-8.4.27/ext/standard/tests/http/http_response_header_nested_request.phpt php8.4-8.4.28/ext/standard/tests/http/http_response_header_nested_request.phpt --- php8.4-8.4.27/ext/standard/tests/http/http_response_header_nested_request.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/http/http_response_header_nested_request.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,41 @@ +--TEST-- +http_get_last_response_headers() after a request made from a notification callback +--SKIPIF-- + +--INI-- +allow_url_fopen=1 +--FILE-- + $pid, 'uri' => $uri] = http_server($responses, $output); + +$nested = false; +$ctx = stream_context_create([], ['notification' => function ($code) use (&$nested, $uri) { + if ($code === STREAM_NOTIFY_MIME_TYPE_IS && !$nested) { + $nested = true; + var_dump(file_get_contents($uri)); + } +}]); + +var_dump(file_get_contents($uri, false, $ctx)); +var_dump(http_get_last_response_headers()); + +http_server_kill($pid); +?> +--EXPECT-- +string(5) "inner" +string(5) "outer" +array(3) { + [0]=> + string(15) "HTTP/1.0 200 Ok" + [1]=> + string(24) "Content-Type: text/plain" + [2]=> + string(8) "Outer: 1" +} diff -Nru php8.4-8.4.27/ext/standard/tests/ini_info/php_ini_loaded_file.phpt php8.4-8.4.28/ext/standard/tests/ini_info/php_ini_loaded_file.phpt --- php8.4-8.4.27/ext/standard/tests/ini_info/php_ini_loaded_file.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/ini_info/php_ini_loaded_file.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -2,15 +2,16 @@ php_ini_loaded_file() function --FILE-- --EXPECTREGEX-- bool\(false\) diff -Nru php8.4-8.4.27/ext/standard/tests/network/gh24308.phpt php8.4-8.4.28/ext/standard/tests/network/gh24308.phpt --- php8.4-8.4.27/ext/standard/tests/network/gh24308.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/network/gh24308.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,44 @@ +--TEST-- +GH-24308 (syslog() without openlog() is closed at request end) +--SKIPIF-- + +--FILE-- + +--EXPECT-- +int(1) +array(0) { +} diff -Nru php8.4-8.4.27/ext/standard/tests/network/gh24616.phpt php8.4-8.4.28/ext/standard/tests/network/gh24616.phpt --- php8.4-8.4.27/ext/standard/tests/network/gh24616.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/network/gh24616.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,37 @@ +--TEST-- +GH-24616 (fsockopen()/stream_socket_client() accept TCP ports above 65535) +--FILE-- + +--EXPECT-- +bool(false) +bool(true) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(true) diff -Nru php8.4-8.4.27/ext/standard/tests/password/password_get_info.phpt php8.4-8.4.28/ext/standard/tests/password/password_get_info.phpt --- php8.4-8.4.27/ext/standard/tests/password/password_get_info.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/password/password_get_info.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -12,6 +12,26 @@ // Test Non-Bcrypt var_dump(password_get_info('$1$rasmusle$rISCgZzpwk3UhDidwXvin0')); +// Valid cost boundaries +$suffix = 'MTIzNDU2Nzg5MDEyMzQ1Nej0NmcAWSLR.oP7XOR9HD/vjUuOj100y'; +foreach ([4, 31] as $cost) { + $info = password_get_info('$2y$' . sprintf('%02d', $cost) . '$' . $suffix); + printf("valid %d: %s, cost %d\n", $cost, $info['algoName'], $info['options']['cost']); +} + +// Invalid cost grammar and range +$invalidHashes = [ + 'non-digit' => '$2y$a0$' . $suffix, + 'malformed separator' => '$2y$10x' . $suffix, + 'below range' => '$2y$03$' . $suffix, + 'above range' => '$2y$32$' . $suffix, + 'missing separator' => '$2y$' . str_repeat('9', 56), +]; +foreach ($invalidHashes as $description => $hash) { + $info = password_get_info($hash); + printf("%s: %s, options %d\n", $description, $info['algoName'], count($info['options'])); +} + echo "OK!"; ?> --EXPECT-- @@ -55,4 +75,11 @@ array(0) { } } +valid 4: bcrypt, cost 4 +valid 31: bcrypt, cost 31 +non-digit: unknown, options 0 +malformed separator: unknown, options 0 +below range: unknown, options 0 +above range: unknown, options 0 +missing separator: unknown, options 0 OK! diff -Nru php8.4-8.4.27/ext/standard/tests/password/password_needs_rehash.phpt php8.4-8.4.28/ext/standard/tests/password/password_needs_rehash.phpt --- php8.4-8.4.27/ext/standard/tests/password/password_needs_rehash.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/password/password_needs_rehash.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -33,6 +33,21 @@ // Should Issue Needs Rehash, Since Foo is cast to 0... var_dump(password_needs_rehash('$2y$10$MTIzNDU2Nzg5MDEyMzQ1Nej0NmcAWSLR.oP7XOR9HD/vjUuOj100y', PASSWORD_BCRYPT, array('cost' => 'foo'))); +// Valid cost boundaries +$suffix = 'MTIzNDU2Nzg5MDEyMzQ1Nej0NmcAWSLR.oP7XOR9HD/vjUuOj100y'; +$costCases = [ + 'valid lower boundary' => ['$2y$04$' . $suffix, 4], + 'valid upper boundary' => ['$2y$31$' . $suffix, 31], + 'non-digit' => ['$2y$a0$' . $suffix, 12], + 'malformed separator' => ['$2y$10x' . $suffix, 10], + 'below range' => ['$2y$03$' . $suffix, 3], + 'above range' => ['$2y$32$' . $suffix, 32], +]; +foreach ($costCases as $description => $case) { + echo $description, ': '; + var_dump(password_needs_rehash($case[0], PASSWORD_BCRYPT, ['cost' => $case[1]])); +} + // CRYPT_MD5 var_dump(password_needs_rehash(crypt('Example', '$1$'), PASSWORD_DEFAULT)); @@ -54,6 +69,12 @@ bool(true) bool(false) bool(true) +valid lower boundary: bool(false) +valid upper boundary: bool(false) +non-digit: bool(true) +malformed separator: bool(true) +below range: bool(true) +above range: bool(true) bool(true) bool(true) OK! diff -Nru php8.4-8.4.27/ext/standard/tests/serialize/__unserialize_malformed.phpt php8.4-8.4.28/ext/standard/tests/serialize/__unserialize_malformed.phpt --- php8.4-8.4.27/ext/standard/tests/serialize/__unserialize_malformed.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/serialize/__unserialize_malformed.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,38 @@ +--TEST-- +__unserialize() and destructors are not called for incomplete objects +--FILE-- + 'O:4:"Test":0:{', + 'nonempty' => 'O:4:"Test":1:{i:0;i:42;', + 'nested' => 'a:1:{i:0;O:4:"Test":0:{', +] as $name => $data) { + echo "$name: "; + var_dump(@unserialize($data)); +} + +echo "valid: "; +var_dump(unserialize('O:4:"Test":1:{i:0;i:42;}')); +?> +--EXPECT-- +empty: bool(false) +nonempty: bool(false) +nested: bool(false) +valid: __unserialize: array(1) { + [0]=> + int(42) +} +object(Test)#1 (0) { +} +__destruct diff -Nru php8.4-8.4.27/ext/standard/tests/serialize/__unserialize_malformed_nested_destructor.phpt php8.4-8.4.28/ext/standard/tests/serialize/__unserialize_malformed_nested_destructor.phpt --- php8.4-8.4.27/ext/standard/tests/serialize/__unserialize_malformed_nested_destructor.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/serialize/__unserialize_malformed_nested_destructor.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,27 @@ +--TEST-- +Destructor of a nested object in a failed __unserialize() payload cannot reach freed slots +--FILE-- + 'O:1:"T":2:{i:0;s:5:"hello";i:1;O:1:"D":0:{}', + 'malformed element' => 'O:1:"T":3:{i:0;s:5:"hello";i:1;O:1:"D":0:{}i:2;X', +] as $name => $data) { + echo "$name: "; + var_dump(@unserialize($data)); +} +?> +--EXPECT-- +missing brace: bool(false) +bool(false) +malformed element: bool(false) +bool(false) diff -Nru php8.4-8.4.27/ext/standard/tests/serialize/__wakeup_malformed.phpt php8.4-8.4.28/ext/standard/tests/serialize/__wakeup_malformed.phpt --- php8.4-8.4.27/ext/standard/tests/serialize/__wakeup_malformed.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/serialize/__wakeup_malformed.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,38 @@ +--TEST-- +__wakeup() and destructors are not called for incomplete objects +--FILE-- +value\n"; + } + + public function __destruct() { + echo "__destruct\n"; + } +} + +foreach ([ + 'empty' => 'O:4:"Test":0:{', + 'nonempty' => 'O:4:"Test":1:{s:5:"value";i:42;', + 'nested' => 'a:1:{i:0;O:4:"Test":0:{', +] as $name => $data) { + echo "$name: "; + var_dump(@unserialize($data)); +} + +echo "valid: "; +var_dump(unserialize('O:4:"Test":1:{s:5:"value";i:42;}')); +?> +--EXPECT-- +empty: bool(false) +nonempty: bool(false) +nested: bool(false) +valid: __wakeup: 42 +object(Test)#1 (1) { + ["value"]=> + int(42) +} +__destruct diff -Nru php8.4-8.4.27/ext/standard/tests/serialize/gh24373.phpt php8.4-8.4.28/ext/standard/tests/serialize/gh24373.phpt --- php8.4-8.4.27/ext/standard/tests/serialize/gh24373.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/serialize/gh24373.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,40 @@ +--TEST-- +GH-24373 (serialize() called from a destructor during var_hash destruction reuses the outer var_hash) +--CREDITS-- +janhelke +--FILE-- + new D()]; } +} +serialize([new Outer(), new stdClass()]); +echo $GLOBALS['inner'], PHP_EOL; + +class D2 { + public function __serialize(): array { return []; } + public function __destruct() { + $a = []; + for ($i = 0; $i < 2000; $i++) { $o = new stdClass(); $a[] = $o; $a[] = $o; } + serialize($a); + } +} +class Outer2 { + public function __serialize(): array { return ["d" => new D2()]; } +} +$shared = []; +for ($i = 0; $i < 200; $i++) { $shared[] = new stdClass(); } +$list = [new Outer2()]; +foreach ($shared as $o) { $list[] = $o; $list[] = $o; } +serialize($list); +echo "survived", PHP_EOL; +?> +--EXPECT-- +a:2:{i:0;O:8:"stdClass":0:{}i:1;r:2;} +survived diff -Nru php8.4-8.4.27/ext/standard/tests/serialize/gh24373_unserialize.phpt php8.4-8.4.28/ext/standard/tests/serialize/gh24373_unserialize.phpt --- php8.4-8.4.27/ext/standard/tests/serialize/gh24373_unserialize.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/serialize/gh24373_unserialize.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,14 @@ +--TEST-- +GH-24373 (unserialize() called from a destructor during var_hash destruction reuses the outer var_hash) +--FILE-- + +--EXPECT-- +bool(true) diff -Nru php8.4-8.4.27/ext/standard/tests/streams/bug69521.phpt php8.4-8.4.28/ext/standard/tests/streams/bug69521.phpt --- php8.4-8.4.27/ext/standard/tests/streams/bug69521.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/streams/bug69521.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -2,8 +2,8 @@ Bug #69521 Segfault in gc_collect_cycles() --FILE-- +--FILE-- + +--EXPECTF-- +Warning: fopen(%s): Failed to open stream: FTP server reports %a in %s on line %d +bool(false) diff -Nru php8.4-8.4.27/ext/standard/tests/streams/ftp_url_stat_mdtm_no_digits.phpt php8.4-8.4.28/ext/standard/tests/streams/ftp_url_stat_mdtm_no_digits.phpt --- php8.4-8.4.27/ext/standard/tests/streams/ftp_url_stat_mdtm_no_digits.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/streams/ftp_url_stat_mdtm_no_digits.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,20 @@ +--TEST-- +stat() on ftp:// ignores an MDTM reply without digits +--SKIPIF-- + +--FILE-- + +--EXPECT-- +int(10) +int(-1) diff -Nru php8.4-8.4.27/ext/standard/tests/streams/ghsa-f6gg-rchx-xw8j.phpt php8.4-8.4.28/ext/standard/tests/streams/ghsa-f6gg-rchx-xw8j.phpt --- php8.4-8.4.27/ext/standard/tests/streams/ghsa-f6gg-rchx-xw8j.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/streams/ghsa-f6gg-rchx-xw8j.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,34 @@ +--TEST-- +GHSA-f6gg-rchx-xw8j: mixed-case FTPS URLs must enable TLS +--EXTENSIONS-- +openssl +--SKIPIF-- + +--FILE-- +run($clientCode, $serverCode); +?> +--EXPECT-- +bool(false) +AUTH TLS diff -Nru php8.4-8.4.27/ext/standard/tests/strings/gh24552.phpt php8.4-8.4.28/ext/standard/tests/strings/gh24552.phpt --- php8.4-8.4.27/ext/standard/tests/strings/gh24552.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/strings/gh24552.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,38 @@ +--TEST-- +GH-24552 (Case-insensitive substr_compare, ksort, krsort are still locale-dependent) +--SKIPIF-- + +--FILE-- + 0, "\xC4" => 0]; +ksort($keys, SORT_STRING | SORT_FLAG_CASE); +var_dump(array_map('bin2hex', array_keys($keys))); + +$keys = ["\xC4" => 0, "\xE4" => 0]; +krsort($keys, SORT_STRING | SORT_FLAG_CASE); +var_dump(array_map('bin2hex', array_keys($keys))); +?> +--EXPECT-- +int(-32) +int(-32) +array(2) { + [0]=> + string(2) "c4" + [1]=> + string(2) "e4" +} +array(2) { + [0]=> + string(2) "e4" + [1]=> + string(2) "c4" +} diff -Nru php8.4-8.4.27/ext/standard/tests/strings/sapi_windows_cp_negative_codepage.phpt php8.4-8.4.28/ext/standard/tests/strings/sapi_windows_cp_negative_codepage.phpt --- php8.4-8.4.27/ext/standard/tests/strings/sapi_windows_cp_negative_codepage.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/strings/sapi_windows_cp_negative_codepage.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,37 @@ +--TEST-- +sapi_windows_cp_set() and sapi_windows_cp_conv() must reject a negative codepage +--SKIPIF-- + +--FILE-- +getMessage(), "\n"; +} + +try { + sapi_windows_cp_set(PHP_INT_MIN); +} catch (Throwable $e) { + echo $e::class, ': ', $e->getMessage(), "\n"; +} + +try { + sapi_windows_cp_conv(-1, 65001, 'php'); +} catch (Throwable $e) { + echo $e::class, ': ', $e->getMessage(), "\n"; +} + +try { + sapi_windows_cp_conv(65001, -1, 'php'); +} catch (Throwable $e) { + echo $e::class, ': ', $e->getMessage(), "\n"; +} +?> +--EXPECT-- +ValueError: sapi_windows_cp_set(): Argument #1 ($codepage) must be between 0 and 4294967295 +ValueError: sapi_windows_cp_set(): Argument #1 ($codepage) must be between 0 and 4294967295 +ValueError: sapi_windows_cp_conv(): Argument #1 ($in_codepage) must be between 0 and 4294967295 +ValueError: sapi_windows_cp_conv(): Argument #2 ($out_codepage) must be between 0 and 4294967295 diff -Nru php8.4-8.4.27/ext/standard/tests/strings/setlocale_variation2.phpt php8.4-8.4.28/ext/standard/tests/strings/setlocale_variation2.phpt --- php8.4-8.4.27/ext/standard/tests/strings/setlocale_variation2.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/tests/strings/setlocale_variation2.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -5,6 +5,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip Not valid for windows'); } +if (PHP_OS === 'FreeBSD') { + die("skip Some locales listed by locale -a on FreeBSD (e.g. hr_HR.ISO8859-2) are incomplete, cannot test LC_ALL"); +} exec("locale -a", $output, $exit_code); if ($exit_code !== 0) { die("skip locale -a not available"); diff -Nru php8.4-8.4.27/ext/standard/var.c php8.4-8.4.28/ext/standard/var.c --- php8.4-8.4.27/ext/standard/var.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/var.c 2026-11-17 20:29:32.000000000 +0000 @@ -542,6 +542,13 @@ zend_string *key; zval *val; +#ifdef ZEND_CHECK_STACK_LIMIT + if (UNEXPECTED(zend_call_stack_overflowed(EG(stack_limit)))) { + zend_call_stack_size_error(); + return FAILURE; + } +#endif + again: switch (Z_TYPE_P(struc)) { case IS_FALSE: @@ -672,10 +679,15 @@ return FAILURE; } } - php_object_element_export(val, index, key, level, buf); + zend_result result = php_object_element_export(val, index, key, level, buf); if (val == &tmp) { zval_ptr_dtor(val); } + if (UNEXPECTED(result == FAILURE)) { + ZEND_GUARD_OR_GC_UNPROTECT_RECURSION(guard, EXPORT, zobj); + zend_release_properties(myht); + return FAILURE; + } } ZEND_HASH_FOREACH_END(); } zend_release_properties(myht); @@ -1425,12 +1437,13 @@ PHPAPI void php_var_serialize_destroy(php_serialize_data_t d) { /* fprintf(stderr, "SERIALIZE_DESTROY == lock: %u, level: %u\n", BG(serialize_lock), BG(serialize).level); */ - if (BG(serialize_lock) || BG(serialize).level == 1) { + if (BG(serialize_lock)) { zend_hash_destroy(&d->ht); efree(d); - } - if (!BG(serialize_lock) && !--BG(serialize).level) { + } else if (!--BG(serialize).level) { BG(serialize).data = NULL; + zend_hash_destroy(&d->ht); + efree(d); } } diff -Nru php8.4-8.4.27/ext/standard/var_unserializer.c php8.4-8.4.28/ext/standard/var_unserializer.c --- php8.4-8.4.27/ext/standard/var_unserializer.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/var_unserializer.c 2026-11-17 20:29:32.000000000 +0000 @@ -90,12 +90,13 @@ PHPAPI void php_var_unserialize_destroy(php_unserialize_data_t d) { /* fprintf(stderr, "UNSERIALIZE_DESTROY == lock: %u, level: %u\n", BG(serialize_lock), BG(unserialize).level); */ - if (BG(serialize_lock) || BG(unserialize).level == 1) { + if (BG(serialize_lock)) { var_destroy(&d); efree(d); - } - if (!BG(serialize_lock) && !--BG(unserialize).level) { + } else if (!--BG(unserialize).level) { BG(unserialize).data = NULL; + var_destroy(&d); + efree(d); } } @@ -848,10 +849,11 @@ if (UNEXPECTED(!array_finit_size_mixed(&ary, elements))) { return 0; } - if (!process_nested_array_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL(ary), elements)) { + if (!process_nested_array_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL(ary), elements) + || !finish_nested_data(UNSERIALIZE_PASSTHRU)) { ZVAL_DEREF(rval); GC_ADD_FLAGS(Z_OBJ_P(rval), IS_OBJ_DESTRUCTOR_CALLED); - zval_ptr_dtor(&ary); + ZVAL_COPY_VALUE(var_tmp_var(var_hash), &ary); return 0; } @@ -864,7 +866,7 @@ tmp++; ZVAL_COPY_VALUE(tmp, &ary); - return finish_nested_data(UNSERIALIZE_PASSTHRU); + return 1; } has_wakeup = Z_OBJCE_P(rval) != PHP_IC_ENTRY @@ -878,7 +880,8 @@ if (UNEXPECTED(zend_hash_fextend(ht, zend_hash_num_elements(ht) + elements, HT_IS_PACKED(ht)) == FAILURE)) { return 0; } - if (!process_nested_object_data(UNSERIALIZE_PASSTHRU, ht, elements, Z_OBJ_P(rval))) { + if (!process_nested_object_data(UNSERIALIZE_PASSTHRU, ht, elements, Z_OBJ_P(rval)) + || !finish_nested_data(UNSERIALIZE_PASSTHRU)) { if (has_wakeup) { ZVAL_DEREF(rval); GC_ADD_FLAGS(Z_OBJ_P(rval), IS_OBJ_DESTRUCTOR_CALLED); @@ -894,7 +897,7 @@ Z_EXTRA_P(wakeup_var) = VAR_WAKEUP_FLAG; } - return finish_nested_data(UNSERIALIZE_PASSTHRU); + return 1; } #ifdef PHP_WIN32 # pragma optimize("", on) @@ -1729,7 +1732,9 @@ return 1; } + BG(serialize_lock)++; zend_class_entry *ce = zend_lookup_class(enum_name); + BG(serialize_lock)--; if (!ce) { php_error_docref(NULL, E_WARNING, "Class '%s' not found", ZSTR_VAL(enum_name)); goto fail; @@ -1758,7 +1763,10 @@ zval *value = &c->value; if (Z_TYPE_P(value) == IS_CONSTANT_AST) { - if (zval_update_constant_ex(value, c->ce) == FAILURE) { + BG(serialize_lock)++; + zend_result result = zval_update_constant_ex(value, c->ce); + BG(serialize_lock)--; + if (result == FAILURE) { return 0; } } diff -Nru php8.4-8.4.27/ext/standard/var_unserializer.re php8.4-8.4.28/ext/standard/var_unserializer.re --- php8.4-8.4.27/ext/standard/var_unserializer.re 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/standard/var_unserializer.re 2026-11-17 20:29:32.000000000 +0000 @@ -89,12 +89,13 @@ PHPAPI void php_var_unserialize_destroy(php_unserialize_data_t d) { /* fprintf(stderr, "UNSERIALIZE_DESTROY == lock: %u, level: %u\n", BG(serialize_lock), BG(unserialize).level); */ - if (BG(serialize_lock) || BG(unserialize).level == 1) { + if (BG(serialize_lock)) { var_destroy(&d); efree(d); - } - if (!BG(serialize_lock) && !--BG(unserialize).level) { + } else if (!--BG(unserialize).level) { BG(unserialize).data = NULL; + var_destroy(&d); + efree(d); } } @@ -854,10 +855,11 @@ if (UNEXPECTED(!array_finit_size_mixed(&ary, elements))) { return 0; } - if (!process_nested_array_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL(ary), elements)) { + if (!process_nested_array_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL(ary), elements) + || !finish_nested_data(UNSERIALIZE_PASSTHRU)) { ZVAL_DEREF(rval); GC_ADD_FLAGS(Z_OBJ_P(rval), IS_OBJ_DESTRUCTOR_CALLED); - zval_ptr_dtor(&ary); + ZVAL_COPY_VALUE(var_tmp_var(var_hash), &ary); return 0; } @@ -870,7 +872,7 @@ tmp++; ZVAL_COPY_VALUE(tmp, &ary); - return finish_nested_data(UNSERIALIZE_PASSTHRU); + return 1; } has_wakeup = Z_OBJCE_P(rval) != PHP_IC_ENTRY @@ -884,7 +886,8 @@ if (UNEXPECTED(zend_hash_fextend(ht, zend_hash_num_elements(ht) + elements, HT_IS_PACKED(ht)) == FAILURE)) { return 0; } - if (!process_nested_object_data(UNSERIALIZE_PASSTHRU, ht, elements, Z_OBJ_P(rval))) { + if (!process_nested_object_data(UNSERIALIZE_PASSTHRU, ht, elements, Z_OBJ_P(rval)) + || !finish_nested_data(UNSERIALIZE_PASSTHRU)) { if (has_wakeup) { ZVAL_DEREF(rval); GC_ADD_FLAGS(Z_OBJ_P(rval), IS_OBJ_DESTRUCTOR_CALLED); @@ -900,7 +903,7 @@ Z_EXTRA_P(wakeup_var) = VAR_WAKEUP_FLAG; } - return finish_nested_data(UNSERIALIZE_PASSTHRU); + return 1; } #ifdef PHP_WIN32 # pragma optimize("", on) @@ -1493,7 +1496,9 @@ return 1; } + BG(serialize_lock)++; zend_class_entry *ce = zend_lookup_class(enum_name); + BG(serialize_lock)--; if (!ce) { php_error_docref(NULL, E_WARNING, "Class '%s' not found", ZSTR_VAL(enum_name)); goto fail; @@ -1522,7 +1527,10 @@ zval *value = &c->value; if (Z_TYPE_P(value) == IS_CONSTANT_AST) { - if (zval_update_constant_ex(value, c->ce) == FAILURE) { + BG(serialize_lock)++; + zend_result result = zval_update_constant_ex(value, c->ce); + BG(serialize_lock)--; + if (result == FAILURE) { return 0; } } diff -Nru php8.4-8.4.27/ext/tidy/tests/tidy_repair_encoding_null.phpt php8.4-8.4.28/ext/tidy/tests/tidy_repair_encoding_null.phpt --- php8.4-8.4.27/ext/tidy/tests/tidy_repair_encoding_null.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/tidy/tests/tidy_repair_encoding_null.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,28 @@ +--TEST-- +tidy_repair_string() / tidy_repair_file() accept null for $encoding, as declared +--EXTENSIONS-- +tidy +--FILE-- +test'); + +var_dump(strlen(tidy_repair_string('

test', null, null)) > 0); +var_dump(strlen(tidy_repair_file($file, null, null)) > 0); +var_dump(strlen(tidy::repairString('

test', null, null)) > 0); +var_dump(strlen(tidy::repairFile($file, null, null)) > 0); + +var_dump(tidy_repair_string('

test', null, null) === tidy_repair_string('

test')); +?> +--CLEAN-- + +--EXPECT-- +bool(true) +bool(true) +bool(true) +bool(true) +bool(true) diff -Nru php8.4-8.4.27/ext/tidy/tidy.c php8.4-8.4.28/ext/tidy/tidy.c --- php8.4-8.4.27/ext/tidy/tidy.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/tidy/tidy.c 2026-11-17 20:29:32.000000000 +0000 @@ -352,7 +352,7 @@ Z_PARAM_PATH_STR(arg1) Z_PARAM_OPTIONAL Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(config_ht, config_str) - Z_PARAM_STRING(enc, enc_len) + Z_PARAM_STRING_OR_NULL(enc, enc_len) Z_PARAM_BOOL(use_include_path) ZEND_PARSE_PARAMETERS_END(); @@ -364,7 +364,7 @@ Z_PARAM_STR(arg1) Z_PARAM_OPTIONAL Z_PARAM_ARRAY_HT_OR_STR_OR_NULL(config_ht, config_str) - Z_PARAM_STRING(enc, enc_len) + Z_PARAM_STRING_OR_NULL(enc, enc_len) ZEND_PARSE_PARAMETERS_END(); data = arg1; diff -Nru php8.4-8.4.27/ext/zend_test/object_handlers.c php8.4-8.4.28/ext/zend_test/object_handlers.c --- php8.4-8.4.27/ext/zend_test/object_handlers.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/zend_test/object_handlers.c 2026-11-17 20:29:32.000000000 +0000 @@ -232,6 +232,46 @@ ZVAL_COPY(OBJ_PROP_NUM(Z_OBJ_P(ZEND_THIS), 0), n); } +/* Comparing two VmInterruptComparable objects raises EG(vm_interrupt) without a + * function call. Used by ext/opcache/tests/jit/loop_vm_interrupt_001.phpt. */ +static zend_class_entry *vm_interrupt_comparable_ce; +static zend_object_handlers vm_interrupt_comparable_object_handlers; + +static zend_object* vm_interrupt_comparable_object_create_ex(zend_class_entry* ce, zend_long l) { + zend_object *obj = zend_objects_new(ce); + object_properties_init(obj, ce); + obj->handlers = &vm_interrupt_comparable_object_handlers; + ZVAL_LONG(OBJ_PROP_NUM(obj, 0), l); + return obj; +} + +static zend_object *vm_interrupt_comparable_object_create(zend_class_entry *ce) +{ + return vm_interrupt_comparable_object_create_ex(ce, 0); +} + +static int vm_interrupt_comparable_compare(zval *op1, zval *op2) +{ + ZEND_COMPARE_OBJECTS_FALLBACK(op1, op2); + + zend_atomic_bool_store_ex(&EG(vm_interrupt), true); + + return ZEND_THREEWAY_COMPARE( + Z_LVAL_P(OBJ_PROP_NUM(Z_OBJ_P(op1), 0)), + Z_LVAL_P(OBJ_PROP_NUM(Z_OBJ_P(op2), 0))); +} + +ZEND_METHOD(VmInterruptComparable, __construct) +{ + zend_long l; + + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_LONG(l) + ZEND_PARSE_PARAMETERS_END(); + + ZVAL_LONG(OBJ_PROP_NUM(Z_OBJ_P(ZEND_THIS), 0), l); +} + static zend_class_entry *dimension_handlers_no_ArrayAccess_ce; static zend_object_handlers dimension_handlers_no_ArrayAccess_object_handlers; @@ -302,6 +342,11 @@ memcpy(&numeric_castable_no_operation_object_handlers, &std_object_handlers, sizeof(zend_object_handlers)); numeric_castable_no_operation_object_handlers.cast_object = numeric_castable_no_operation_cast_object; + vm_interrupt_comparable_ce = register_class_VmInterruptComparable(); + vm_interrupt_comparable_ce->create_object = vm_interrupt_comparable_object_create; + memcpy(&vm_interrupt_comparable_object_handlers, &std_object_handlers, sizeof(zend_object_handlers)); + vm_interrupt_comparable_object_handlers.compare = vm_interrupt_comparable_compare; + dimension_handlers_no_ArrayAccess_ce = register_class_DimensionHandlersNoArrayAccess(); dimension_handlers_no_ArrayAccess_ce->create_object = dimension_handlers_no_ArrayAccess_object_create; memcpy(&dimension_handlers_no_ArrayAccess_object_handlers, &std_object_handlers, sizeof(zend_object_handlers)); diff -Nru php8.4-8.4.27/ext/zend_test/object_handlers.stub.php php8.4-8.4.28/ext/zend_test/object_handlers.stub.php --- php8.4-8.4.27/ext/zend_test/object_handlers.stub.php 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/zend_test/object_handlers.stub.php 2026-11-17 20:29:32.000000000 +0000 @@ -23,6 +23,11 @@ public function __construct(int|float $val) {} } +final class VmInterruptComparable { + private int $val; + public function __construct(int $val) {} +} + class DimensionHandlersNoArrayAccess { public bool $read = false; public bool $write = false; diff -Nru php8.4-8.4.27/ext/zend_test/object_handlers_arginfo.h php8.4-8.4.28/ext/zend_test/object_handlers_arginfo.h --- php8.4-8.4.27/ext/zend_test/object_handlers_arginfo.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/zend_test/object_handlers_arginfo.h 2026-11-17 20:29:32.000000000 +0000 @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 81be60f2c465ffe5c036739d072ab80d9c388907 */ + * Stub hash: 1a70ed60c5af38539b1222a979f97fddf7d1826e */ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DoOperationNoCast___construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, val, IS_LONG, 0) @@ -15,10 +15,13 @@ ZEND_ARG_TYPE_MASK(0, val, MAY_BE_LONG|MAY_BE_DOUBLE, NULL) ZEND_END_ARG_INFO() +#define arginfo_class_VmInterruptComparable___construct arginfo_class_DoOperationNoCast___construct + static ZEND_METHOD(DoOperationNoCast, __construct); static ZEND_METHOD(LongCastableNoOperations, __construct); static ZEND_METHOD(FloatCastableNoOperations, __construct); static ZEND_METHOD(NumericCastableNoOperations, __construct); +static ZEND_METHOD(VmInterruptComparable, __construct); static const zend_function_entry class_DoOperationNoCast_methods[] = { ZEND_ME(DoOperationNoCast, __construct, arginfo_class_DoOperationNoCast___construct, ZEND_ACC_PUBLIC) @@ -40,6 +43,11 @@ ZEND_FE_END }; +static const zend_function_entry class_VmInterruptComparable_methods[] = { + ZEND_ME(VmInterruptComparable, __construct, arginfo_class_VmInterruptComparable___construct, ZEND_ACC_PUBLIC) + ZEND_FE_END +}; + static zend_class_entry *register_class_DoOperationNoCast(void) { zend_class_entry ce, *class_entry; @@ -102,6 +110,22 @@ zend_string_release(property_val_name); return class_entry; +} + +static zend_class_entry *register_class_VmInterruptComparable(void) +{ + zend_class_entry ce, *class_entry; + + INIT_CLASS_ENTRY(ce, "VmInterruptComparable", class_VmInterruptComparable_methods); + class_entry = zend_register_internal_class_with_flags(&ce, NULL, ZEND_ACC_FINAL); + + zval property_val_default_value; + ZVAL_UNDEF(&property_val_default_value); + zend_string *property_val_name = zend_string_init("val", sizeof("val") - 1, 1); + zend_declare_typed_property(class_entry, property_val_name, &property_val_default_value, ZEND_ACC_PRIVATE, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_LONG)); + zend_string_release(property_val_name); + + return class_entry; } static zend_class_entry *register_class_DimensionHandlersNoArrayAccess(void) diff -Nru php8.4-8.4.27/ext/zend_test/observer.c php8.4-8.4.28/ext/zend_test/observer.c --- php8.4-8.4.27/ext/zend_test/observer.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/zend_test/observer.c 2026-11-17 20:29:32.000000000 +0000 @@ -22,6 +22,7 @@ #include "zend_smart_str.h" #include "ext/standard/php_var.h" #include "zend_generators.h" +#include "zend_exceptions.h" static zend_observer_fcall_handlers observer_fcall_init(zend_execute_data *execute_data); @@ -129,6 +130,11 @@ { assert_observer_opline(execute_data); + if (ZT_G(observer_set_vm_interrupt_on_end) && !EG(exception)) { + ZT_G(observer_throw_on_vm_interrupt) = true; + zend_atomic_bool_store_ex(&EG(vm_interrupt), true); + } + if (!ZT_G(observer_show_output)) { return; } @@ -158,6 +164,11 @@ if (zend_test_prev_interrupt_function) { zend_test_prev_interrupt_function(execute_data); } + + if (ZT_G(observer_throw_on_vm_interrupt)) { + ZT_G(observer_throw_on_vm_interrupt) = false; + zend_throw_exception(NULL, "VM interrupt", 0); + } } static void observer_show_init(zend_function *fbc) @@ -377,6 +388,7 @@ STD_PHP_INI_ENTRY("zend_test.observer.show_opcode_in_user_handler", "", PHP_INI_SYSTEM, OnUpdateString, observer_show_opcode_in_user_handler, zend_zend_test_globals, zend_test_globals) STD_PHP_INI_BOOLEAN("zend_test.observer.set_vm_interrupt_on_begin", "0", PHP_INI_SYSTEM, OnUpdateBool, observer_set_vm_interrupt_on_begin, zend_zend_test_globals, zend_test_globals) STD_PHP_INI_BOOLEAN("zend_test.observer.set_vm_interrupt_on_begin_without_callback", "0", PHP_INI_SYSTEM, OnUpdateBool, observer_set_vm_interrupt_on_begin_without_callback, zend_zend_test_globals, zend_test_globals) + STD_PHP_INI_BOOLEAN("zend_test.observer.set_vm_interrupt_on_end", "0", PHP_INI_SYSTEM, OnUpdateBool, observer_set_vm_interrupt_on_end, zend_zend_test_globals, zend_test_globals) STD_PHP_INI_BOOLEAN("zend_test.observer.fiber_init", "0", PHP_INI_SYSTEM, OnUpdateBool, observer_fiber_init, zend_zend_test_globals, zend_test_globals) STD_PHP_INI_BOOLEAN("zend_test.observer.fiber_switch", "0", PHP_INI_SYSTEM, OnUpdateBool, observer_fiber_switch, zend_zend_test_globals, zend_test_globals) STD_PHP_INI_BOOLEAN("zend_test.observer.fiber_destroy", "0", PHP_INI_SYSTEM, OnUpdateBool, observer_fiber_destroy, zend_zend_test_globals, zend_test_globals) @@ -419,7 +431,7 @@ zend_execute_internal = zend_test_execute_internal; } - if (ZT_G(observer_set_vm_interrupt_on_begin)) { + if (ZT_G(observer_set_vm_interrupt_on_begin) || ZT_G(observer_set_vm_interrupt_on_end)) { zend_test_prev_interrupt_function = zend_interrupt_function; zend_interrupt_function = zend_test_interrupt_function; } diff -Nru php8.4-8.4.27/ext/zend_test/php_test.h php8.4-8.4.28/ext/zend_test/php_test.h --- php8.4-8.4.27/ext/zend_test/php_test.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/zend_test/php_test.h 2026-11-17 20:29:32.000000000 +0000 @@ -47,6 +47,8 @@ char *observer_show_opcode_in_user_handler; int observer_set_vm_interrupt_on_begin; int observer_set_vm_interrupt_on_begin_without_callback; + int observer_set_vm_interrupt_on_end; + bool observer_throw_on_vm_interrupt; int observer_nesting_depth; int observer_fiber_init; int observer_fiber_switch; @@ -56,7 +58,9 @@ HashTable *global_weakmap; int replace_zend_execute_ex; int register_passes; + bool rearm_vm_interrupt; bool print_stderr_mshutdown; + bool warn_on_startup; zend_long limit_copy_file_range; int observe_opline_in_zendmm; zend_mm_heap* zend_orig_heap; diff -Nru php8.4-8.4.27/ext/zend_test/test.c php8.4-8.4.28/ext/zend_test/test.c --- php8.4-8.4.27/ext/zend_test/test.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/zend_test/test.c 2026-11-17 20:29:32.000000000 +0000 @@ -38,6 +38,7 @@ #include "test_arginfo.h" #include "zend_call_stack.h" #include "zend_exceptions.h" +#include "zend_system_id.h" #include "zend_mm_custom_handlers.h" #include @@ -176,6 +177,37 @@ emalloc(leakbytes); } +/* Reallocate a block of old_size bytes to new_size bytes and return its block + * size, along with the block size of a fresh allocation of new_size bytes. */ +static ZEND_FUNCTION(zend_test_erealloc_block_size) +{ + zend_long old_size, new_size; + + ZEND_PARSE_PARAMETERS_START(2, 2) + Z_PARAM_LONG(old_size) + Z_PARAM_LONG(new_size) + ZEND_PARSE_PARAMETERS_END(); + + if (old_size < 1) { + zend_argument_value_error(1, "must be greater than 0"); + RETURN_THROWS(); + } + if (new_size < 1) { + zend_argument_value_error(2, "must be greater than 0"); + RETURN_THROWS(); + } + + void *ptr = erealloc(emalloc(old_size), new_size); + void *fresh = emalloc(new_size); + + array_init(return_value); + add_next_index_long(return_value, zend_mem_block_size(ptr)); + add_next_index_long(return_value, zend_mem_block_size(fresh)); + + efree(fresh); + efree(ptr); +} + static ZEND_FUNCTION(zend_test_emalloc) { zend_long size; @@ -831,6 +863,17 @@ } } +static PHP_INI_MH(OnUpdateZendTestWarnOnStartup) +{ + zend_result result = OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage); + if (result == SUCCESS) { + if (*(bool *)ZEND_INI_GET_ADDR()) { + zend_error(E_WARNING, "Test startup warning from zend_test"); + } + } + return result; +} + static ZEND_FUNCTION(zend_test_is_pcre_bundled) { ZEND_PARSE_PARAMETERS_NONE(); @@ -1024,6 +1067,24 @@ array_init_singleton(return_value); } +static ZEND_FUNCTION(zend_test_set_local_var) +{ + zend_string *name; + zval *value; + + ZEND_PARSE_PARAMETERS_START(2, 2) + Z_PARAM_STR(name) + Z_PARAM_ZVAL(value) + ZEND_PARSE_PARAMETERS_END(); + + Z_TRY_ADDREF_P(value); + if (zend_set_local_var(name, value, false) == FAILURE) { + zval_ptr_dtor(value); + RETURN_FALSE; + } + RETURN_TRUE; +} + static zend_object *zend_test_class_new(zend_class_entry *class_type) { zend_object *obj = zend_objects_new(class_type); @@ -1305,9 +1366,24 @@ zval_ptr_dtor(&rv); } +static void (*zend_test_prev_interrupt_function)(zend_execute_data *execute_data); + +/* The VM clears EG(vm_interrupt) before calling this, so setting it again + * leaves an interrupt pending at all times. The VM must still make progress. */ +static void zend_test_rearm_interrupt_function(zend_execute_data *execute_data) +{ + zend_atomic_bool_store_ex(&EG(vm_interrupt), true); + + if (zend_test_prev_interrupt_function) { + zend_test_prev_interrupt_function(execute_data); + } +} + PHP_INI_BEGIN() + PHP_INI_ENTRY("zend_test.register_system_entropy", "0", PHP_INI_SYSTEM, NULL) STD_PHP_INI_BOOLEAN("zend_test.replace_zend_execute_ex", "0", PHP_INI_SYSTEM, OnUpdateBool, replace_zend_execute_ex, zend_zend_test_globals, zend_test_globals) STD_PHP_INI_BOOLEAN("zend_test.register_passes", "0", PHP_INI_SYSTEM, OnUpdateBool, register_passes, zend_zend_test_globals, zend_test_globals) + STD_PHP_INI_BOOLEAN("zend_test.rearm_vm_interrupt", "0", PHP_INI_SYSTEM, OnUpdateBool, rearm_vm_interrupt, zend_zend_test_globals, zend_test_globals) STD_PHP_INI_BOOLEAN("zend_test.print_stderr_mshutdown", "0", PHP_INI_SYSTEM, OnUpdateBool, print_stderr_mshutdown, zend_zend_test_globals, zend_test_globals) #ifdef HAVE_COPY_FILE_RANGE STD_PHP_INI_ENTRY("zend_test.limit_copy_file_range", "-1", PHP_INI_ALL, OnUpdateLong, limit_copy_file_range, zend_zend_test_globals, zend_test_globals) @@ -1316,6 +1392,7 @@ STD_PHP_INI_ENTRY("zend_test.str_test", "", PHP_INI_ALL, OnUpdateStr, str_test, zend_zend_test_globals, zend_test_globals) STD_PHP_INI_ENTRY("zend_test.not_empty_str_test", "val", PHP_INI_ALL, OnUpdateStrNotEmpty, not_empty_str_test, zend_zend_test_globals, zend_test_globals) STD_PHP_INI_BOOLEAN("zend_test.observe_opline_in_zendmm", "0", PHP_INI_ALL, OnUpdateZendTestObserveOplineInZendMM, observe_opline_in_zendmm, zend_zend_test_globals, zend_test_globals) + STD_PHP_INI_BOOLEAN("zend_test.warn_on_startup", "0", PHP_INI_SYSTEM, OnUpdateZendTestWarnOnStartup, warn_on_startup, zend_zend_test_globals, zend_test_globals) PHP_INI_END() void (*old_zend_execute_ex)(zend_execute_data *execute_data); @@ -1504,6 +1581,10 @@ // Loading via dl() not supported with the observer API if (type != MODULE_TEMPORARY) { REGISTER_INI_ENTRIES(); + if (INI_BOOL("zend_test.register_system_entropy") && + zend_add_system_entropy("zend_test", "test", ZEND_STRL("test entropy")) == FAILURE) { + php_error_docref(NULL, E_WARNING, "Failed to register system entropy"); + } } else { (void)ini_entries; } @@ -1518,6 +1599,11 @@ zend_optimizer_register_pass(pass2); } + if (ZT_G(rearm_vm_interrupt)) { + zend_test_prev_interrupt_function = zend_interrupt_function; + zend_interrupt_function = zend_test_rearm_interrupt_function; + } + zend_test_observer_init(INIT_FUNC_ARGS_PASSTHRU); zend_test_mm_custom_handlers_minit(INIT_FUNC_ARGS_PASSTHRU); zend_test_fiber_init(); @@ -1537,6 +1623,11 @@ zend_test_observer_shutdown(SHUTDOWN_FUNC_ARGS_PASSTHRU); + if (zend_interrupt_function == zend_test_rearm_interrupt_function) { + zend_interrupt_function = zend_test_prev_interrupt_function; + zend_test_prev_interrupt_function = NULL; + } + if (ZT_G(print_stderr_mshutdown)) { fprintf(stderr, "[zend_test] MSHUTDOWN\n"); } @@ -1549,7 +1640,13 @@ ALLOC_HASHTABLE(ZT_G(global_weakmap)); zend_hash_init(ZT_G(global_weakmap), 8, NULL, ZVAL_PTR_DTOR, 0); ZT_G(observer_nesting_depth) = 0; + ZT_G(observer_throw_on_vm_interrupt) = false; zend_test_mm_custom_handlers_rinit(); + + if (ZT_G(rearm_vm_interrupt)) { + zend_atomic_bool_store_ex(&EG(vm_interrupt), true); + } + return SUCCESS; } @@ -1755,6 +1852,28 @@ ZVAL_RES(return_value, res); } +static PHP_FUNCTION(zend_test_compile_to_ast) +{ + zend_string *str; + + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_STR(str) + ZEND_PARSE_PARAMETERS_END(); + + zend_arena *ast_arena; + zend_ast *ast = zend_compile_string_to_ast(str, &ast_arena, ZSTR_EMPTY_ALLOC()); + if (!ast) { + RETURN_THROWS(); + } + + zend_string *result = zend_ast_export("", ast, ""); + + zend_ast_destroy(ast); + zend_arena_destroy(ast_arena); + + RETVAL_STR(result); +} + static PHP_FUNCTION(zend_test_gh18756) { ZEND_PARSE_PARAMETERS_NONE(); diff -Nru php8.4-8.4.27/ext/zend_test/test.stub.php php8.4-8.4.28/ext/zend_test/test.stub.php --- php8.4-8.4.27/ext/zend_test/test.stub.php 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/zend_test/test.stub.php 2026-11-17 20:29:32.000000000 +0000 @@ -246,6 +246,8 @@ function zend_leak_bytes(int $bytes = 3): void {} + function zend_test_erealloc_block_size(int $old_size, int $new_size): array {} + function zend_test_emalloc(int $size): void {} function zend_test_callback(callable $callback): void {} @@ -328,6 +330,8 @@ function zend_test_log_err_debug(string $str): void {} + function zend_test_compile_to_ast(string $str): string {} + function zend_test_gh18756(): void {} /** @compile-time-eval */ @@ -337,6 +341,8 @@ function zend_test_handle_post_data(mixed $stream, string $content_type, int $content_length): void {} function zend_new_singleton_array(): array {} + + function zend_test_set_local_var(string $name, mixed $value): bool {} } namespace ZendTestNS { diff -Nru php8.4-8.4.27/ext/zend_test/test_arginfo.h php8.4-8.4.28/ext/zend_test/test_arginfo.h --- php8.4-8.4.27/ext/zend_test/test_arginfo.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/zend_test/test_arginfo.h 2026-11-17 20:29:32.000000000 +0000 @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: f723630a2dc2078ae81e406e75a728dcf8939779 */ + * Stub hash: f25b9c451734f903ba385f9fbf05fb198ecd83af */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_array_return, 0, 0, IS_ARRAY, 0) ZEND_END_ARG_INFO() @@ -42,6 +42,11 @@ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, bytes, IS_LONG, 0, "3") ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_erealloc_block_size, 0, 2, IS_ARRAY, 0) + ZEND_ARG_TYPE_INFO(0, old_size, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, new_size, IS_LONG, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_emalloc, 0, 1, IS_VOID, 0) ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -181,6 +186,8 @@ ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0) ZEND_END_ARG_INFO() +#define arginfo_zend_test_compile_to_ast arginfo_zend_create_unterminated_string + #define arginfo_zend_test_gh18756 arginfo_zend_test_void_return #define arginfo_zend_test_gh19792 arginfo_zend_test_void_return @@ -193,6 +200,11 @@ #define arginfo_zend_new_singleton_array arginfo_zend_test_array_return +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_set_local_var, 0, 2, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0) +ZEND_END_ARG_INFO() + #define arginfo_ZendTestNS2_namespaced_func arginfo_zend_test_is_pcre_bundled #define arginfo_ZendTestNS2_namespaced_deprecated_func arginfo_zend_test_void_return @@ -288,6 +300,7 @@ static ZEND_FUNCTION(zend_terminate_string); static ZEND_FUNCTION(zend_leak_variable); static ZEND_FUNCTION(zend_leak_bytes); +static ZEND_FUNCTION(zend_test_erealloc_block_size); static ZEND_FUNCTION(zend_test_emalloc); static ZEND_FUNCTION(zend_test_callback); static ZEND_FUNCTION(zend_string_or_object); @@ -330,10 +343,12 @@ static ZEND_FUNCTION(zend_test_cast_fread); static ZEND_FUNCTION(zend_test_is_zend_ptr); static ZEND_FUNCTION(zend_test_log_err_debug); +static ZEND_FUNCTION(zend_test_compile_to_ast); static ZEND_FUNCTION(zend_test_gh18756); static ZEND_FUNCTION(zend_test_gh19792); static ZEND_FUNCTION(zend_test_handle_post_data); static ZEND_FUNCTION(zend_new_singleton_array); +static ZEND_FUNCTION(zend_test_set_local_var); static ZEND_FUNCTION(ZendTestNS2_namespaced_func); static ZEND_FUNCTION(ZendTestNS2_namespaced_deprecated_func); static ZEND_FUNCTION(ZendTestNS2_ZendSubNS_namespaced_func); @@ -400,6 +415,7 @@ ZEND_FE(zend_terminate_string, arginfo_zend_terminate_string) ZEND_FE(zend_leak_variable, arginfo_zend_leak_variable) ZEND_FE(zend_leak_bytes, arginfo_zend_leak_bytes) + ZEND_FE(zend_test_erealloc_block_size, arginfo_zend_test_erealloc_block_size) ZEND_FE(zend_test_emalloc, arginfo_zend_test_emalloc) ZEND_FE(zend_test_callback, arginfo_zend_test_callback) ZEND_FE(zend_string_or_object, arginfo_zend_string_or_object) @@ -442,6 +458,7 @@ ZEND_FE(zend_test_cast_fread, arginfo_zend_test_cast_fread) ZEND_FE(zend_test_is_zend_ptr, arginfo_zend_test_is_zend_ptr) ZEND_FE(zend_test_log_err_debug, arginfo_zend_test_log_err_debug) + ZEND_FE(zend_test_compile_to_ast, arginfo_zend_test_compile_to_ast) ZEND_FE(zend_test_gh18756, arginfo_zend_test_gh18756) #if (PHP_VERSION_ID >= 80400) ZEND_RAW_FENTRY("zend_test_gh19792", zif_zend_test_gh19792, arginfo_zend_test_gh19792, ZEND_ACC_COMPILE_TIME_EVAL, NULL, NULL) @@ -454,6 +471,7 @@ #endif ZEND_FE(zend_test_handle_post_data, arginfo_zend_test_handle_post_data) ZEND_FE(zend_new_singleton_array, arginfo_zend_new_singleton_array) + ZEND_FE(zend_test_set_local_var, arginfo_zend_test_set_local_var) #if (PHP_VERSION_ID >= 80400) ZEND_RAW_FENTRY(ZEND_NS_NAME("ZendTestNS2", "namespaced_func"), zif_ZendTestNS2_namespaced_func, arginfo_ZendTestNS2_namespaced_func, 0, NULL, NULL) #else diff -Nru php8.4-8.4.27/ext/zend_test/tests/compile_to_ast/namespace.phpt php8.4-8.4.28/ext/zend_test/tests/compile_to_ast/namespace.phpt --- php8.4-8.4.27/ext/zend_test/tests/compile_to_ast/namespace.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/zend_test/tests/compile_to_ast/namespace.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,68 @@ +--TEST-- +AST can be recreated (namespace) +--EXTENSIONS-- +zend_test +--FILE-- + +--EXPECT-- +namespace Foo { + class FooTest { + } + + function fn_foo() { + } + + function fn_bar() { + } + +} + +namespace Bar { + class BarTest { + } + + function fn_bar() { + } + +} + +namespace { + use function Bar\fn_bar; + use Foo\{function fn_foo, FooTest, function fn_bar as fn_foobar}; + new FooTest(); + fn_bar(); + fn_foobar(); + echo zend_test_compile_to_ast(file_get_contents(__FILE__)); +} diff -Nru php8.4-8.4.27/ext/zend_test/tests/gh24668.phpt php8.4-8.4.28/ext/zend_test/tests/gh24668.phpt --- php8.4-8.4.27/ext/zend_test/tests/gh24668.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/zend_test/tests/gh24668.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,33 @@ +--TEST-- +GH-24668 (zend_set_local_var() leaks the previous value of an existing CV) +--EXTENSIONS-- +zend_test +--INI-- +opcache.jit=0 +--FILE-- + +--EXPECT-- +dtor +bool(true) +int(42) +array(1) { + [0]=> + int(42) +} diff -Nru php8.4-8.4.27/ext/zend_test/tests/system_id_reinitialization.phpt php8.4-8.4.28/ext/zend_test/tests/system_id_reinitialization.phpt --- php8.4-8.4.27/ext/zend_test/tests/system_id_reinitialization.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/zend_test/tests/system_id_reinitialization.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,42 @@ +--TEST-- +System ID reinitialization accepts extension entropy after engine restart +--SKIPIF-- + +--EXTENSIONS-- +zend_test +--INI-- +zend_test.register_system_entropy=1 +--PHPDBG-- +r +clean +r +clean +r +q +--FILE-- + +--EXPECTF-- +[Successful compilation of %s] +prompt> Done +[Script ended normally] +prompt> Cleaning Execution Environment +Classes %d +Functions %d +Constants %d +Includes 0 +[Script ended normally] +prompt> Done +[Script ended normally] +prompt> Cleaning Execution Environment +Classes %d +Functions %d +Constants %d +Includes 0 +[Script ended normally] +prompt> Done +[Script ended normally] +prompt> diff -Nru php8.4-8.4.27/ext/zip/config.m4 php8.4-8.4.28/ext/zip/config.m4 --- php8.4-8.4.27/ext/zip/config.m4 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/zip/config.m4 2026-11-17 20:29:32.000000000 +0000 @@ -4,7 +4,7 @@ [Include Zip read/write support])]) if test "$PHP_ZIP" != "no"; then - PKG_CHECK_MODULES([LIBZIP], [libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0]) + PKG_CHECK_MODULES([LIBZIP], [libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0 libzip != 1.12 libzip != 1.12.0]) PHP_EVAL_INCLINE([$LIBZIP_CFLAGS]) PHP_EVAL_LIBLINE([$LIBZIP_LIBS], [ZIP_SHARED_LIBADD]) diff -Nru php8.4-8.4.27/ext/zip/config.w32 php8.4-8.4.28/ext/zip/config.w32 --- php8.4-8.4.27/ext/zip/config.w32 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/zip/config.w32 2026-11-17 20:29:32.000000000 +0000 @@ -3,11 +3,19 @@ ARG_ENABLE("zip", "ZIP support", "yes,shared"); if (PHP_ZIP != "no") { + var zipconf_dir; if (CHECK_HEADER_ADD_INCLUDE("zip.h", "CFLAGS_ZIP", PHP_PHP_BUILD + "\\include;" + PHP_EXTRA_INCLUDES) && - CHECK_HEADER_ADD_INCLUDE("zipconf.h", "CFLAGS_ZIP", PHP_PHP_BUILD + "\\lib\\libzip\\include;" + PHP_EXTRA_LIBS + "\\libzip\\include;" + PHP_ZIP) && + (zipconf_dir = CHECK_HEADER_ADD_INCLUDE("zipconf.h", "CFLAGS_ZIP", PHP_PHP_BUILD + "\\lib\\libzip\\include;" + PHP_EXTRA_LIBS + "\\libzip\\include;" + PHP_ZIP)) && (PHP_ZIP_SHARED && CHECK_LIB("libzip.lib", "zip", PHP_ZIP) || - CHECK_LIB("libzip_a.lib", "zip", PHP_ZIP) && CHECK_LIB("libbz2_a.lib", "zip", PHP_ZIP) && CHECK_LIB("zlib_a.lib", "zip", PHP_ZIP) && CHECK_LIB("liblzma_a.lib", "zip", PHP_ZIP)) + CHECK_LIB("libzip_a.lib", "zip", PHP_ZIP) && CHECK_LIB("libbz2_a.lib", "zip", PHP_ZIP) && CHECK_LIB("zlib_a.lib;zs.lib", "zip", PHP_ZIP) && CHECK_LIB("liblzma_a.lib", "zip", PHP_ZIP)) ) { + if (zipconf_dir === true) { + zipconf_dir = search_paths("zipconf.h", WshShell.Environment("Process").Item("INCLUDE"), null); + } + if (GREP_HEADER("zipconf.h", /^\s*#\s*define\s+LIBZIP_VERSION\s+"(?:1\.3\.1|1\.7\.0|1\.12(?:\.0)?)"/m, zipconf_dir)) { + ERROR("libzip 1.3.1, 1.7.0 and 1.12.0 are not supported. Please use another version."); + } + EXTENSION('zip', 'php_zip.c zip_stream.c'); ADD_EXTENSION_DEP('zip', 'pcre'); diff -Nru php8.4-8.4.27/ext/zip/php_zip.c php8.4-8.4.28/ext/zip/php_zip.c --- php8.4-8.4.27/ext/zip/php_zip.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/zip/php_zip.c 2026-11-17 20:29:32.000000000 +0000 @@ -638,6 +638,15 @@ } /* }}} */ +static bool php_zipobj_closing(ze_zip_object *obj) +{ + if (obj->archive && obj->archive->close) { + zend_throw_error(NULL, "Already being closed"); + return true; + } + return false; +} + #ifdef HAVE_GLOB /* {{{ */ #ifndef GLOB_ONLYDIR #define GLOB_ONLYDIR (1<<30) @@ -1089,6 +1098,10 @@ { php_zip_archive *archive = ptr; + if (UNEXPECTED(!EG(active))) { + return; + } + if (!Z_ISUNDEF(archive->progress_callback)) { zval_ptr_dtor(&archive->progress_callback); ZVAL_UNDEF(&archive->progress_callback); @@ -1101,6 +1114,10 @@ { php_zip_archive *archive = ptr; + if (UNEXPECTED(!EG(active))) { + return; + } + if (!Z_ISUNDEF(archive->cancel_callback)) { zval_ptr_dtor(&archive->cancel_callback); ZVAL_UNDEF(&archive->cancel_callback); @@ -1132,7 +1149,12 @@ } if (archive->za) { - if (zip_close(archive->za) != 0) { + /* Guard against a re-entrant close() or open() from a progress/cancel + * callback fired during zip_close(), which would run a nested zip_close() + * on the same archive (see ZipArchive::close()). */ + archive->close = true; + int err = zip_close(archive->za); + if (err != 0) { php_error_docref(NULL, E_WARNING, "Cannot destroy the zip context: %s", zip_strerror(archive->za)); zip_discard(archive->za); } @@ -1164,6 +1186,7 @@ ZEND_ASSERT(ze_obj->archive != NULL); ZEND_ASSERT(ze_obj->archive->za == released_za); ze_obj->archive->za = NULL; + ze_obj->archive->close = false; php_zip_archive_release(ze_obj->archive); ze_obj->archive = NULL; } @@ -1582,9 +1605,8 @@ if (ze_obj->archive) { /* we already have an opened zip, free it */ - if (ze_obj->archive->close) { + if (php_zipobj_closing(ze_obj)) { efree(resolved_path); - zend_throw_error(NULL, "Already being closed"); RETURN_THROWS(); } intern = ze_obj->archive->za; @@ -1647,6 +1669,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (password_len < 1) { RETURN_FALSE; } @@ -1676,14 +1702,12 @@ ze_obj = Z_ZIP_P(self); - if (ze_obj->archive->close) { - zend_throw_error(NULL, "Already being closed"); + if (php_zipobj_closing(ze_obj)) { RETURN_THROWS(); } ze_obj->archive->close = true; err = zip_close(intern); - ze_obj->archive->close = false; if (err) { php_error_docref(NULL, E_WARNING, "%s", zip_strerror(intern)); /* Save error for property reader */ @@ -1823,6 +1847,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (dirname_len<1) { RETURN_FALSE; } @@ -1881,6 +1909,10 @@ RETURN_THROWS(); } + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (type == 1) { found = php_zip_glob(ZSTR_VAL(pattern), ZSTR_LEN(pattern), glob_flags, return_value); } else { @@ -2015,6 +2047,10 @@ entry_name_len = ZSTR_LEN(filename); } + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (php_zip_add_file(Z_ZIP_P(self), ZSTR_VAL(filename), ZSTR_LEN(filename), entry_name, entry_name_len, offset_start, offset_len, -1, flags) < 0) { RETURN_FALSE; @@ -2048,6 +2084,10 @@ RETURN_THROWS(); } + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (php_zip_add_file(Z_ZIP_P(self), ZSTR_VAL(filename), ZSTR_LEN(filename), NULL, 0, offset_start, offset_len, index, flags) < 0) { RETURN_FALSE; @@ -2078,6 +2118,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + ze_obj = Z_ZIP_P(self); archive = ze_obj->archive; if (archive->buffers_cnt) { @@ -2220,6 +2264,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (comment_len > 0xffff) { zend_argument_value_error(1, "must be less than 65535 bytes"); RETURN_THROWS(); @@ -2268,6 +2316,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (zip_set_archive_flag(intern, flag, (int)value)) { RETURN_FALSE; } else { @@ -2311,6 +2363,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (comment_len > 0xffff) { zend_argument_value_error(2, "must be less than 65535 bytes"); RETURN_THROWS(); @@ -2342,6 +2398,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (comment_len > 0xffff) { zend_argument_value_error(2, "must be less than 65535 bytes"); RETURN_THROWS(); @@ -2374,6 +2434,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (name_len == 0) { zend_argument_must_not_be_empty_error(1); RETURN_THROWS(); @@ -2407,6 +2471,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + PHP_ZIP_STAT_INDEX(intern, index, 0, sb); if (zip_file_set_external_attributes(intern, (zip_uint64_t)index, (zip_flags_t)flags, (zip_uint8_t)(opsys&0xff), (zip_uint32_t)attr) < 0) { @@ -2502,6 +2570,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (name_len == 0) { zend_argument_must_not_be_empty_error(1); RETURN_THROWS(); @@ -2541,6 +2613,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (UNEXPECTED(zip_file_set_encryption(intern, index, ZIP_EM_NONE, NULL) < 0)) { php_error_docref(NULL, E_WARNING, "password reset failed"); RETURN_FALSE; @@ -2629,6 +2705,10 @@ ZIP_FROM_OBJECT(intern, this); + if (php_zipobj_closing(Z_ZIP_P(this))) { + RETURN_THROWS(); + } + if (name_len == 0) { zend_argument_must_not_be_empty_error(1); RETURN_THROWS(); @@ -2663,6 +2743,10 @@ ZIP_FROM_OBJECT(intern, this); + if (php_zipobj_closing(Z_ZIP_P(this))) { + RETURN_THROWS(); + } + if (zip_set_file_compression(intern, (zip_uint64_t)index, (zip_int32_t)comp_method, (zip_uint32_t)comp_flags) != 0) { RETURN_FALSE; @@ -2689,6 +2773,10 @@ ZIP_FROM_OBJECT(intern, this); + if (php_zipobj_closing(Z_ZIP_P(this))) { + RETURN_THROWS(); + } + if (name_len == 0) { zend_argument_must_not_be_empty_error(1); RETURN_THROWS(); @@ -2723,6 +2811,10 @@ ZIP_FROM_OBJECT(intern, this); + if (php_zipobj_closing(Z_ZIP_P(this))) { + RETURN_THROWS(); + } + if (zip_file_set_mtime(intern, (zip_uint64_t)index, (time_t)mtime, (zip_uint32_t)flags) != 0) { RETURN_FALSE; @@ -2745,6 +2837,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (index < 0) { RETURN_FALSE; } @@ -2772,6 +2868,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (name_len < 1) { RETURN_FALSE; } @@ -2803,6 +2903,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (new_name_len == 0) { zend_argument_must_not_be_empty_error(2); RETURN_THROWS(); @@ -2831,6 +2935,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (new_name_len == 0) { zend_argument_must_not_be_empty_error(2); RETURN_THROWS(); @@ -2859,6 +2967,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (index < 0) { RETURN_FALSE; } @@ -2886,6 +2998,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (name_len < 1) { RETURN_FALSE; } @@ -2912,6 +3028,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (zip_unchange_all(intern) != 0) { RETURN_FALSE; } else { @@ -2932,6 +3052,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + if (zip_unchange_archive(intern) != 0) { RETURN_FALSE; } else { @@ -3160,6 +3284,11 @@ ZIP_FROM_OBJECT(intern, self); + if (Z_ZIP_P(self)->archive->close) { + zend_throw_error(NULL, "Already being closed"); + RETURN_THROWS(); + } + if (type) { PHP_ZIP_STAT_PATH(intern, ZSTR_VAL(filename), ZSTR_LEN(filename), flags, sb); } else { @@ -3222,6 +3351,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + archive = Z_ZIP_P(self)->archive; /* register */ @@ -3264,6 +3397,10 @@ ZIP_FROM_OBJECT(intern, self); + if (php_zipobj_closing(Z_ZIP_P(self))) { + RETURN_THROWS(); + } + archive = Z_ZIP_P(self)->archive; /* register */ diff -Nru php8.4-8.4.27/ext/zip/tests/gh23747_close_error.phpt php8.4-8.4.28/ext/zip/tests/gh23747_close_error.phpt --- php8.4-8.4.27/ext/zip/tests/gh23747_close_error.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/zip/tests/gh23747_close_error.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,48 @@ +--TEST-- +GH-23747 (Re-entrant close from a ZipArchive close warning is rejected) +--EXTENSIONS-- +zip +--FILE-- +open($filename, ZipArchive::CREATE | ZipArchive::OVERWRITE); + $zip->addFile($source, 'file.txt'); + unlink($source); + + $weak = WeakReference::create($zip); + set_error_handler(static function (int $errno, string $message) use ($weak): bool { + try { + $weak->get()->close(); + } catch (Error $error) { + echo $error::class, ': ', $error->getMessage(), "\n"; + } + return true; + }); + + if ($operation === 'close') { + var_dump($zip->close()); + } else { + unset($zip); + echo "destroyed\n"; + } + restore_error_handler(); +} +?> +--CLEAN-- + +--EXPECT-- +close: +Error: Already being closed +bool(false) +destruct: +Error: Already being closed +destroyed diff -Nru php8.4-8.4.27/ext/zip/tests/gh23747_dtor.phpt php8.4-8.4.28/ext/zip/tests/gh23747_dtor.phpt --- php8.4-8.4.27/ext/zip/tests/gh23747_dtor.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/zip/tests/gh23747_dtor.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,58 @@ +--TEST-- +GH-23747 (Re-entrant operations during ZipArchive destruction are rejected) +--EXTENSIONS-- +zip +--SKIPIF-- + +--FILE-- +open($filename, ZipArchive::CREATE | ZipArchive::OVERWRITE); + for ($index = 0; $index < 64; $index++) { + $zip->addFromString("f$index.txt", str_repeat('x', 2000)); + } + + $weak = WeakReference::create($zip); + $callback = static function (float $rate) use ($weak, $method, $arguments): void { + static $done = false; + if ($done) { + return; + } + $done = true; + + try { + $weak->get()->$method(...$arguments); + } catch (Error $error) { + echo $method, ': ', $error->getMessage(), "\n"; + } + }; + $zip->registerProgressCallback(0.0, $callback); + unset($zip); + echo "destroyed\n"; +} +?> +--CLEAN-- + +--EXPECT-- +close: Already being closed +destroyed +getStream: Already being closed +destroyed +getStreamName: Already being closed +destroyed +getStreamIndex: Already being closed +destroyed diff -Nru php8.4-8.4.27/ext/zip/tests/oo_torrentzip.phpt php8.4-8.4.28/ext/zip/tests/oo_torrentzip.phpt --- php8.4-8.4.27/ext/zip/tests/oo_torrentzip.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/zip/tests/oo_torrentzip.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -5,6 +5,7 @@ --SKIPIF-- --FILE-- +--FILE-- +open($filename, ZipArchive::CREATE | ZipArchive::OVERWRITE); + $zip->addFromString('a.txt', str_repeat('a', 100000)); + $zip->addFromString('b.txt', str_repeat('b', 100000)); +} + +$zip = new ZipArchive(); +populate($zip, $filename); +$zip->registerProgressCallback(0.0, function ($rate) use ($zip) { + static $done = false; + if ($done || $rate <= 0) { + return; + } + $done = true; + try { + var_dump($zip->deleteIndex(0)); + } catch (Error $e) { + echo $e::class, ': ', $e->getMessage(), PHP_EOL; + } +}); +var_dump($zip->close()); + +$zip = new ZipArchive(); +populate($zip, $filename); +$mutators = [ + 'deleteIndex' => fn() => $zip->deleteIndex(0), + 'deleteName' => fn() => $zip->deleteName('a.txt'), + 'unchangeIndex' => fn() => $zip->unchangeIndex(0), + 'unchangeName' => fn() => $zip->unchangeName('a.txt'), + 'unchangeAll' => fn() => $zip->unchangeAll(), + 'unchangeArchive' => fn() => $zip->unchangeArchive(), + 'addEmptyDir' => fn() => $zip->addEmptyDir('dir'), + 'addFile' => fn() => $zip->addFile(__FILE__, 'file.phpt'), + 'addFromString' => fn() => $zip->addFromString('c.txt', 'c'), + 'addGlob' => fn() => $zip->addGlob(__FILE__), + 'addPattern' => fn() => $zip->addPattern('/\.phpt$/', __DIR__), + 'replaceFile' => fn() => $zip->replaceFile(__FILE__, 0), + 'renameIndex' => fn() => $zip->renameIndex(0, 'x.txt'), + 'renameName' => fn() => $zip->renameName('a.txt', 'x.txt'), + 'setArchiveComment' => fn() => $zip->setArchiveComment('comment'), + 'setArchiveFlag' => fn() => $zip->setArchiveFlag(ZipArchive::AFL_RDONLY, 1), + 'setCommentIndex' => fn() => $zip->setCommentIndex(0, 'comment'), + 'setCommentName' => fn() => $zip->setCommentName('a.txt', 'comment'), + 'setCompressionIndex' => fn() => $zip->setCompressionIndex(0, ZipArchive::CM_STORE), + 'setCompressionName' => fn() => $zip->setCompressionName('a.txt', ZipArchive::CM_STORE), + 'setEncryptionIndex' => fn() => $zip->setEncryptionIndex(0, ZipArchive::EM_AES_256, 'secret'), + 'setEncryptionName' => fn() => $zip->setEncryptionName('a.txt', ZipArchive::EM_AES_256, 'secret'), + 'setExternalAttributesIndex' => fn() => $zip->setExternalAttributesIndex(0, ZipArchive::OPSYS_UNIX, 0), + 'setExternalAttributesName' => fn() => $zip->setExternalAttributesName('a.txt', ZipArchive::OPSYS_UNIX, 0), + 'setMtimeIndex' => fn() => $zip->setMtimeIndex(0, 0), + 'setMtimeName' => fn() => $zip->setMtimeName('a.txt', 0), + 'setPassword' => fn() => $zip->setPassword('secret'), + 'registerCancelCallback' => fn() => $zip->registerCancelCallback(fn() => 0), + 'registerProgressCallback' => fn() => $zip->registerProgressCallback(0.5, function () {}), +]; + +$zip->registerProgressCallback(0.0, function ($rate) use ($mutators) { + static $done = false; + if ($done || $rate <= 0) { + return; + } + $done = true; + foreach ($mutators as $name => $mutator) { + try { + var_dump($mutator()); + } catch (Error $e) { + echo $name, ': ', $e::class, ': ', $e->getMessage(), PHP_EOL; + } + } +}); +var_dump($zip->close()); + +$zip = new ZipArchive(); +var_dump($zip->open($filename, ZipArchive::CHECKCONS)); +var_dump($zip->numFiles); +var_dump($zip->getFromName('a.txt') === str_repeat('a', 100000)); +var_dump($zip->getFromName('b.txt') === str_repeat('b', 100000)); +var_dump($zip->getArchiveComment()); +$zip->close(); +?> +--CLEAN-- + +--EXPECT-- +Error: Already being closed +bool(true) +deleteIndex: Error: Already being closed +deleteName: Error: Already being closed +unchangeIndex: Error: Already being closed +unchangeName: Error: Already being closed +unchangeAll: Error: Already being closed +unchangeArchive: Error: Already being closed +addEmptyDir: Error: Already being closed +addFile: Error: Already being closed +addFromString: Error: Already being closed +addGlob: Error: Already being closed +addPattern: Error: Already being closed +replaceFile: Error: Already being closed +renameIndex: Error: Already being closed +renameName: Error: Already being closed +setArchiveComment: Error: Already being closed +setArchiveFlag: Error: Already being closed +setCommentIndex: Error: Already being closed +setCommentName: Error: Already being closed +setCompressionIndex: Error: Already being closed +setCompressionName: Error: Already being closed +setEncryptionIndex: Error: Already being closed +setEncryptionName: Error: Already being closed +setExternalAttributesIndex: Error: Already being closed +setExternalAttributesName: Error: Already being closed +setMtimeIndex: Error: Already being closed +setMtimeName: Error: Already being closed +setPassword: Error: Already being closed +registerCancelCallback: Error: Already being closed +registerProgressCallback: Error: Already being closed +bool(true) +bool(true) +int(2) +bool(true) +bool(true) +string(0) "" diff -Nru php8.4-8.4.27/ext/zip/tests/zip_close_mutator_reentry_cancel.phpt php8.4-8.4.28/ext/zip/tests/zip_close_mutator_reentry_cancel.phpt --- php8.4-8.4.27/ext/zip/tests/zip_close_mutator_reentry_cancel.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/zip/tests/zip_close_mutator_reentry_cancel.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,57 @@ +--TEST-- +ZipArchive mutators throw when called from a cancel callback during close() +--EXTENSIONS-- +zip +--SKIPIF-- + +--FILE-- +open($filename, ZipArchive::CREATE | ZipArchive::OVERWRITE); +$zip->addFromString('a.txt', str_repeat('a', 100000)); +$zip->addFromString('b.txt', str_repeat('b', 100000)); +$zip->registerCancelCallback(function () use ($zip) { + static $done = false; + if ($done) { + return 0; + } + $done = true; + $mutators = [ + 'deleteIndex' => fn() => $zip->deleteIndex(0), + 'addFromString' => fn() => $zip->addFromString('c.txt', 'c'), + 'registerCancelCallback' => fn() => $zip->registerCancelCallback(fn() => 0), + ]; + foreach ($mutators as $name => $mutator) { + try { + var_dump($mutator()); + } catch (Error $e) { + echo $name, ': ', $e::class, ': ', $e->getMessage(), PHP_EOL; + } + } + return 0; +}); +var_dump($zip->close()); +var_dump($zip->open($filename, ZipArchive::CHECKCONS)); +var_dump($zip->numFiles); +var_dump($zip->getFromName('a.txt') === str_repeat('a', 100000)); +var_dump($zip->getFromName('b.txt') === str_repeat('b', 100000)); +$zip->close(); +?> +--CLEAN-- + +--EXPECT-- +deleteIndex: Error: Already being closed +addFromString: Error: Already being closed +registerCancelCallback: Error: Already being closed +bool(true) +bool(true) +int(2) +bool(true) +bool(true) diff -Nru php8.4-8.4.27/ext/zip/tests/zip_close_mutator_reentry_open.phpt php8.4-8.4.28/ext/zip/tests/zip_close_mutator_reentry_open.phpt --- php8.4-8.4.27/ext/zip/tests/zip_close_mutator_reentry_open.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/zip/tests/zip_close_mutator_reentry_open.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,69 @@ +--TEST-- +ZipArchive mutators throw when open() implicitly closes the previous archive +--EXTENSIONS-- +zip +--SKIPIF-- + +--FILE-- +open($filename, ZipArchive::CREATE | ZipArchive::OVERWRITE); +$zip->addFromString('a.txt', str_repeat('a', 100000)); +$zip->addFromString('b.txt', str_repeat('b', 100000)); +$zip->registerProgressCallback(0.0, function ($rate) use ($zip) { + static $done = false; + if ($done || $rate <= 0) { + return; + } + $done = true; + $mutators = [ + 'deleteIndex' => fn() => $zip->deleteIndex(0), + 'addFromString' => fn() => $zip->addFromString('c.txt', 'c'), + 'registerProgressCallback' => fn() => $zip->registerProgressCallback(0.5, function () {}), + ]; + foreach ($mutators as $name => $mutator) { + try { + var_dump($mutator()); + } catch (Error $e) { + echo $name, ': ', $e::class, ': ', $e->getMessage(), PHP_EOL; + } + } +}); +var_dump($zip->open($nextFilename, ZipArchive::CREATE | ZipArchive::OVERWRITE)); +var_dump($zip->addFromString('new.txt', 'new contents')); +var_dump($zip->close()); +var_dump($zip->open($filename, ZipArchive::CHECKCONS)); +var_dump($zip->numFiles); +var_dump($zip->getFromName('a.txt') === str_repeat('a', 100000)); +var_dump($zip->getFromName('b.txt') === str_repeat('b', 100000)); +$zip->close(); +var_dump($zip->open($nextFilename, ZipArchive::CHECKCONS)); +var_dump($zip->numFiles); +var_dump($zip->getFromName('new.txt') === 'new contents'); +$zip->close(); +?> +--CLEAN-- + +--EXPECT-- +deleteIndex: Error: Already being closed +addFromString: Error: Already being closed +registerProgressCallback: Error: Already being closed +bool(true) +bool(true) +bool(true) +bool(true) +int(2) +bool(true) +bool(true) +bool(true) +int(1) +bool(true) diff -Nru php8.4-8.4.27/ext/zlib/config.w32 php8.4-8.4.28/ext/zlib/config.w32 --- php8.4-8.4.27/ext/zlib/config.w32 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/zlib/config.w32 2026-11-17 20:29:32.000000000 +0000 @@ -3,7 +3,7 @@ ARG_ENABLE("zlib", "ZLIB support", "yes"); if (PHP_ZLIB == "yes") { - if (CHECK_LIB("zlib_a.lib;zlib.lib", "zlib", PHP_ZLIB) && + if (CHECK_LIB("zlib_a.lib;zlib.lib;zs.lib;z.lib", "zlib", PHP_ZLIB) && CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" + php_usual_include_suspects)) { EXTENSION("zlib", "zlib.c zlib_fopen_wrapper.c zlib_filter.c", PHP_ZLIB_SHARED, "/D ZLIB_EXPORTS /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); diff -Nru php8.4-8.4.27/ext/zlib/tests/zlib_filter_inflate_error_handler_removes_filter.phpt php8.4-8.4.28/ext/zlib/tests/zlib_filter_inflate_error_handler_removes_filter.phpt --- php8.4-8.4.27/ext/zlib/tests/zlib_filter_inflate_error_handler_removes_filter.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/ext/zlib/tests/zlib_filter_inflate_error_handler_removes_filter.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,30 @@ +--TEST-- +zlib.inflate filter removed by the error handler of its own notice +--EXTENSIONS-- +zlib +--FILE-- + +--EXPECT-- +fwrite(): zlib: data error +bool(true) +bool(false) +fread(): zlib: data error +bool(true) +bool(false) +Done diff -Nru php8.4-8.4.27/ext/zlib/zlib_filter.c php8.4-8.4.28/ext/zlib/zlib_filter.c --- php8.4-8.4.27/ext/zlib/zlib_filter.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/ext/zlib/zlib_filter.c 2026-11-17 20:29:32.000000000 +0000 @@ -94,11 +94,12 @@ exit_status = PSFS_PASS_ON; } else if (status != Z_OK && status != Z_BUF_ERROR) { /* Something bad happened */ - php_error_docref(NULL, E_NOTICE, "zlib: %s", zError(status)); php_stream_bucket_delref(bucket); /* reset these because despite the error the filter may be used again */ data->strm.next_in = data->inbuf; data->strm.avail_in = 0; + /* Last: an error handler may remove this filter and free data. */ + php_error_docref(NULL, E_NOTICE, "zlib: %s", zError(status)); return PSFS_ERR_FATAL; } desired -= data->strm.avail_in; /* desired becomes what we consumed this round through */ diff -Nru php8.4-8.4.27/main/SAPI.c php8.4-8.4.28/main/SAPI.c --- php8.4-8.4.27/main/SAPI.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/main/SAPI.c 2026-11-17 20:29:32.000000000 +0000 @@ -500,7 +500,8 @@ zend_llist_destroy(&SG(sapi_headers).headers); if (SG(request_info).request_body) { SG(request_info).request_body = NULL; - } else if (SG(server_context)) { + } + if (SG(server_context)) { if (!SG(post_read)) { /* make sure we've consumed all request input data */ char dummy[SAPI_POST_BLOCK_SIZE]; @@ -742,7 +743,7 @@ return SUCCESS; } else { /* new line/NUL character safety check */ - uint32_t i; + size_t i; for (i = 0; i < header_line_len; i++) { /* RFC 7230 ch. 3.2.4 deprecates folding support */ if (header_line[i] == '\n' || header_line[i] == '\r') { diff -Nru php8.4-8.4.27/main/fastcgi.c php8.4-8.4.28/main/fastcgi.c --- php8.4-8.4.27/main/fastcgi.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/main/fastcgi.c 2026-11-17 20:29:32.000000000 +0000 @@ -1039,6 +1039,10 @@ int len, padding; unsigned char buf[FCGI_MAX_LENGTH+8]; + if (UNEXPECTED(req->in_len != 0)) { + return 0; + } + req->keep = 0; req->ended = 0; req->in_len = 0; @@ -1290,7 +1294,7 @@ if (!force) { char buf[8]; - shutdown(req->fd, 1); + shutdown(req->fd, SHUT_WR); /* read any remaining data, it may be omitted */ while (recv(req->fd, buf, sizeof(buf), 0) > 0) {} } @@ -1300,6 +1304,8 @@ req->nodelay = 0; #endif req->fd = -1; + /* a partially read STDIN record does not outlive its connection */ + req->in_len = 0; req->hook.on_close(); } diff -Nru php8.4-8.4.27/main/main.c php8.4-8.4.28/main/main.c --- php8.4-8.4.27/main/main.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/main/main.c 2026-11-17 20:29:32.000000000 +0000 @@ -918,15 +918,7 @@ zend_string *error_time_str; time(&error_time); -#ifdef ZTS - if (!php_during_module_startup()) { - error_time_str = php_format_date("d-M-Y H:i:s e", 13, error_time, 1); - } else { - error_time_str = php_format_date("d-M-Y H:i:s e", 13, error_time, 0); - } -#else - error_time_str = php_format_date("d-M-Y H:i:s e", 13, error_time, 1); -#endif + error_time_str = php_format_date("d-M-Y H:i:s e", 13, error_time, PG(modules_activated) && EG(active)); len = spprintf(&tmp, 0, "[%s] %s%s", ZSTR_VAL(error_time_str), log_message, PHP_EOL); #ifdef PHP_WIN32 php_flock(fd, LOCK_EX); diff -Nru php8.4-8.4.27/main/network.c php8.4-8.4.28/main/network.c --- php8.4-8.4.27/main/network.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/main/network.c 2026-11-17 20:29:32.000000000 +0000 @@ -556,7 +556,7 @@ const char *colon; char *tmp; zend_result ret = FAILURE; - short port; + zend_long port; struct sockaddr_in *in4 = (struct sockaddr_in*)sa; struct sockaddr **psal; int n; @@ -574,14 +574,18 @@ if (!colon || colon[1] != ':') { return FAILURE; } - port = atoi(colon + 2); + port = ZEND_STRTOL(colon + 2, NULL, 10); addr++; } else { colon = memchr(addr, ':', addrlen); if (!colon) { return FAILURE; } - port = atoi(colon + 1); + port = ZEND_STRTOL(colon + 1, NULL, 10); + } + + if (port < 0 || port > 65535) { + return FAILURE; } tmp = estrndup(addr, colon - addr); diff -Nru php8.4-8.4.27/main/php_config.h.in php8.4-8.4.28/main/php_config.h.in --- php8.4-8.4.27/main/php_config.h.in 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/main/php_config.h.in 2026-11-17 20:29:32.000000000 +0000 @@ -2089,10 +2089,6 @@ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif -/* Enable extensions on Cosmopolitan Libc. */ -#ifndef _COSMO_SOURCE -# undef _COSMO_SOURCE -#endif /* Enable general extensions on macOS. */ #ifndef _DARWIN_C_SOURCE # undef _DARWIN_C_SOURCE diff -Nru php8.4-8.4.27/main/php_ini.c php8.4-8.4.28/main/php_ini.c --- php8.4-8.4.27/main/php_ini.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/main/php_ini.c 2026-11-17 20:29:32.000000000 +0000 @@ -563,7 +563,13 @@ fp = VCWD_FOPEN(php_ini_file_name, "r"); if (fp) { filename = expand_filepath(php_ini_file_name, NULL); - free_filename = true; + if (filename) { + free_filename = true; + } else { + /* Reject the file, like ZTS where VCWD_STAT() already fails */ + fclose(fp); + fp = NULL; + } } } } diff -Nru php8.4-8.4.27/main/php_odbc_utils.c php8.4-8.4.28/main/php_odbc_utils.c --- php8.4-8.4.27/main/php_odbc_utils.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/main/php_odbc_utils.c 2026-11-17 20:29:32.000000000 +0000 @@ -48,12 +48,13 @@ if (str[i] == '}' && str[i + 1] == '}') { /* Skip over so we don't count it again */ i++; - } else if (str[i] == '}' && str[i + 1] != '\0') { - /* If not at the end, not quoted */ - return false; + } else if (str[i] == '}') { + /* Only quoted if at the end */ + return str[i + 1] == '\0'; } } - return true; + /* No closing brace */ + return false; } /** diff -Nru php8.4-8.4.27/main/php_version.h php8.4-8.4.28/main/php_version.h --- php8.4-8.4.27/main/php_version.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/main/php_version.h 2026-11-17 20:29:32.000000000 +0000 @@ -2,7 +2,7 @@ /* edit configure.ac to change version number */ #define PHP_MAJOR_VERSION 8 #define PHP_MINOR_VERSION 4 -#define PHP_RELEASE_VERSION 27 +#define PHP_RELEASE_VERSION 28 #define PHP_EXTRA_VERSION "" -#define PHP_VERSION "8.4.27" -#define PHP_VERSION_ID 80427 +#define PHP_VERSION "8.4.28" +#define PHP_VERSION_ID 80428 diff -Nru php8.4-8.4.27/main/streams/xp_socket.c php8.4-8.4.28/main/streams/xp_socket.c --- php8.4-8.4.27/main/streams/xp_socket.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/main/streams/xp_socket.c 2026-11-17 20:29:32.000000000 +0000 @@ -615,6 +615,17 @@ } #endif +static inline bool parse_port(const char *str, int *portno) +{ + /* Like atoi(), but reject ports that do not fit in 16 bits */ + zend_long port = ZEND_STRTOL(str, NULL, 10); + if (port < 0 || port > 65535) { + return false; + } + *portno = (int) port; + return true; +} + static inline char *parse_ip_address_ex(const char *str, size_t str_len, int *portno, int get_err, zend_string **err) { const char *colon; @@ -635,7 +646,12 @@ } return NULL; } - *portno = atoi(p + 2); + if (!parse_port(p + 2, portno)) { + if (get_err) { + *err = strpprintf(0, "Failed to parse port of address \"%s\"", str); + } + return NULL; + } return estrndup(str + 1, p - str - 1); } #endif @@ -645,7 +661,12 @@ colon = NULL; } if (colon) { - *portno = atoi(colon + 1); + if (!parse_port(colon + 1, portno)) { + if (get_err) { + *err = strpprintf(0, "Failed to parse port of address \"%s\"", str); + } + return NULL; + } host = estrndup(str, colon - str); } else { if (get_err) { diff -Nru php8.4-8.4.27/pear/Makefile.frag php8.4-8.4.28/pear/Makefile.frag --- php8.4-8.4.27/pear/Makefile.frag 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/pear/Makefile.frag 2026-11-17 20:29:32.000000000 +0000 @@ -3,11 +3,8 @@ # Skip all php.ini files altogether PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0 -WGET = `which wget 2>/dev/null` -FETCH = `which fetch 2>/dev/null` PEAR_PREFIX = -dp a${program_prefix} PEAR_SUFFIX = -ds a$(program_suffix) -PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar install-pear-installer: $(SAPI_CLI_PATH) @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} @@ -15,17 +12,7 @@ install-pear: @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" @if test ! -f $(builddir)/install-pear-nozlib.phar; then \ - if test -f $(srcdir)/install-pear-nozlib.phar; then \ - cp $(srcdir)/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \ - else \ - if test ! -z "$(WGET)" && test -x "$(WGET)"; then \ - "$(WGET)" "${PEAR_INSTALLER_URL}" -nd -P $(builddir)/; \ - elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \ - "$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \ - else \ - $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \ - fi \ - fi \ + cp $(srcdir)/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \ fi @if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ $(MAKE) -s install-pear-installer; \ diff -Nru php8.4-8.4.27/pear/fetch.php php8.4-8.4.28/pear/fetch.php --- php8.4-8.4.27/pear/fetch.php 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/pear/fetch.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ - \n", $argv[0]); - exit(1); -} - -function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) { - static $filesize = null; - - switch($notification_code) { - case STREAM_NOTIFY_RESOLVE: - case STREAM_NOTIFY_AUTH_REQUIRED: - case STREAM_NOTIFY_COMPLETED: - case STREAM_NOTIFY_FAILURE: - case STREAM_NOTIFY_AUTH_RESULT: - /* Ignore */ - break; - - case STREAM_NOTIFY_REDIRECTED: - echo "Being redirected to: ", $message, "\n"; - break; - - case STREAM_NOTIFY_CONNECT: - echo "Connected...\n"; - break; - - case STREAM_NOTIFY_FILE_SIZE_IS: - $filesize = $bytes_max; - echo "Filesize: ", $filesize, "\n"; - break; - - case STREAM_NOTIFY_MIME_TYPE_IS: - echo "Mime-type: ", $message, "\n"; - break; - - case STREAM_NOTIFY_PROGRESS: - if ($bytes_transferred > 0) { - if (!isset($filesize)) { - printf("\rUnknown filesize.. %2d kb done..", $bytes_transferred/1024); - } else { - $length = (int)(($bytes_transferred/$filesize)*100); - printf("\r[%-100s] %d%% (%2d/%2d kb)", str_repeat("=", $length). ">", $length, ($bytes_transferred/1024), $filesize/1024); - } - } - break; - } -} - -isset($argv[1], $argv[2]) or usage($argv); - -if (!isset($_ENV['http_proxy'])) { - $copt = null; -} else { - $copt = array( - 'http' => array( - 'proxy' => preg_replace('/^http/i', 'tcp', $_ENV['http_proxy']), - 'request_fulluri' => true, - ), - ); -} - -$ctx = stream_context_create($copt, array("notification" => "stream_notification_callback")); - -$fp = fopen($argv[1], "r", false, $ctx); -if (is_resource($fp) && file_put_contents($argv[2], $fp)) { - echo "\nDone!\n"; - exit(0); -} - -$err = error_get_last(); -echo "\nError..\n", $err["message"], "\n"; -exit(1); diff -Nru php8.4-8.4.27/pear/install-pear.txt php8.4-8.4.28/pear/install-pear.txt --- php8.4-8.4.27/pear/install-pear.txt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/pear/install-pear.txt 2026-11-17 20:29:32.000000000 +0000 @@ -4,9 +4,7 @@ | | | PEAR: PHP Extension and Application Repository | | | -| To install these components, download | -| https://pear.php.net/install-pear-nozlib.phar to php-src/pear/ | -| become the superuser and execute: | +| To install these components, become the superuser and execute: | | | | # make install-pear | +----------------------------------------------------------------------+ diff -Nru php8.4-8.4.27/sapi/cgi/cgi_main.c php8.4-8.4.28/sapi/cgi/cgi_main.c --- php8.4-8.4.27/sapi/cgi/cgi_main.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/cgi/cgi_main.c 2026-11-17 20:29:32.000000000 +0000 @@ -1285,9 +1285,9 @@ */ size_t slen = len - strlen(pt); size_t pilen = env_path_info ? strlen(env_path_info) : 0; - char *path_info = env_path_info ? env_path_info + pilen - slen : NULL; + char *path_info = (env_path_info && pilen > slen) ? env_path_info + pilen - slen : NULL; - if (orig_path_info != path_info) { + if (path_info && orig_path_info != path_info) { if (orig_path_info) { char old; diff -Nru php8.4-8.4.27/sapi/cgi/tests/ghsa-5j3f-64r7-f564.phpt php8.4-8.4.28/sapi/cgi/tests/ghsa-5j3f-64r7-f564.phpt --- php8.4-8.4.27/sapi/cgi/tests/ghsa-5j3f-64r7-f564.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/sapi/cgi/tests/ghsa-5j3f-64r7-f564.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,60 @@ +--TEST-- +GHSA-5j3f-64r7-f564 (PATH_INFO underflow when the stripped suffix is longer than PATH_INFO) +--SKIPIF-- + +--FILE-- + getenv("PATH"), + "SystemRoot" => getenv("SystemRoot"), + ], 'is_string'); + $p = proc_open( + [$php, "-n", "-d", "cgi.fix_pathinfo=1"], + [0 => ["pipe", "r"], 1 => ["pipe", "w"]], + $pipes, + null, + $env + ["REDIRECT_STATUS" => "1", "REQUEST_METHOD" => "GET"] + $base_env + ); + fclose($pipes[0]); + $out = stream_get_contents($pipes[1]); + fclose($pipes[1]); + proc_close($p); + echo substr($out, strpos($out, "\r\n\r\n") + 4); +} + +echo "Suffix shorter than PATH_INFO\n"; +run_cgi($php, ["SCRIPT_FILENAME" => "$script/b", "PATH_INFO" => "/a/b"]); + +echo "Suffix longer than PATH_INFO\n"; +run_cgi($php, ["SCRIPT_FILENAME" => "$script/xxxxxxxxxxxxxxxx", "PATH_INFO" => "/x"]); + +echo "Suffix taken from PATH_TRANSLATED\n"; +run_cgi($php, [ + "SCRIPT_FILENAME" => $php, + "PATH_TRANSLATED" => "$script/xxxxxxxxxxxxxxxx", + "REDIRECT_URL" => "/redirected", + "PATH_INFO" => "/x", +]); +?> +--CLEAN-- + +--EXPECT-- +Suffix shorter than PATH_INFO +string(2) "/b" +string(4) "/a/b" +Suffix longer than PATH_INFO +string(2) "/x" +NULL +Suffix taken from PATH_TRANSLATED +string(2) "/x" +NULL diff -Nru php8.4-8.4.27/sapi/cli/php_cli.c php8.4-8.4.28/sapi/cli/php_cli.c --- php8.4-8.4.27/sapi/cli/php_cli.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/cli/php_cli.c 2026-11-17 20:29:32.000000000 +0000 @@ -484,6 +484,7 @@ "\n" " -a Run as interactive shell (requires readline extension)\n" " -c | Look for php.ini file in this directory\n" + " -C Do not chdir to the script's directory (no-op in CLI)\n" " -n No configuration (ini) files will be used\n" " -d foo[=bar] Define INI entry foo with value 'bar'\n" " -e Generate extended information for debugger/profiler\n" @@ -492,6 +493,7 @@ " -i PHP information\n" " -l Syntax check only (lint)\n" " -m Show compiled in modules\n" + " -q Do not output HTTP headers (no-op in CLI)\n" " -r Run PHP without using script tags \n" " -B Run PHP before processing input lines\n" " -R Run PHP for every input line\n" diff -Nru php8.4-8.4.27/sapi/cli/php_cli_server.c php8.4-8.4.28/sapi/cli/php_cli_server.c --- php8.4-8.4.27/sapi/cli/php_cli_server.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/cli/php_cli_server.c 2026-11-17 20:29:32.000000000 +0000 @@ -1408,9 +1408,8 @@ req->query_string = NULL; req->query_string_len = 0; zend_hash_init(&req->headers, 0, NULL, cli_header_value_dtor, 1); - /* No destructor is registered as the value pointed by is the same as for &req->headers */ GC_MAKE_PERSISTENT_LOCAL(&req->headers); - zend_hash_init(&req->headers_original_case, 0, NULL, NULL, 1); + zend_hash_init(&req->headers_original_case, 0, NULL, cli_header_value_dtor, 1); GC_MAKE_PERSISTENT_LOCAL(&req->headers_original_case); req->content = NULL; req->content_len = 0; @@ -1701,16 +1700,22 @@ } else { zend_string *curval = Z_STR_P(entry); zend_string *newval = zend_string_safe_alloc(1, ZSTR_LEN(curval), ZSTR_LEN(client->current_header_value) + 2, /* persistent */true); + GC_MAKE_PERSISTENT_LOCAL(newval); memcpy(ZSTR_VAL(newval), ZSTR_VAL(curval), ZSTR_LEN(curval)); memcpy(ZSTR_VAL(newval) + ZSTR_LEN(curval), ", ", 2); memcpy(ZSTR_VAL(newval) + ZSTR_LEN(curval) + 2, ZSTR_VAL(client->current_header_value), ZSTR_LEN(client->current_header_value) + 1); ZVAL_STR(&tmp, newval); + zend_string_release_ex(client->current_header_value, /* persistent */ true); } /* Add/Update the wrapped zend_string to the HashTable */ zend_hash_update(&client->request.headers, lc_header_name, &tmp); + /* Each table owns a reference to the new value. The old value can outlive the update + * above, as a repeat spelled differently keeps the first spelling's entry in + * headers_original_case. */ + zend_string_addref(Z_STR(tmp)); zend_hash_update(&client->request.headers_original_case, client->current_header_name, &tmp); zend_string_release_ex(lc_header_name, /* persistent */ true); diff -Nru php8.4-8.4.27/sapi/cli/php_http_parser.c php8.4-8.4.28/sapi/cli/php_http_parser.c --- php8.4-8.4.27/sapi/cli/php_http_parser.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/cli/php_http_parser.c 2026-11-17 20:29:32.000000000 +0000 @@ -244,7 +244,7 @@ #define start_state (parser->type == PHP_HTTP_REQUEST ? s_start_req : s_start_res) -#ifdef HTTP_PARSER_STRICT +#if HTTP_PARSER_STRICT # define STRICT_CHECK(cond) if (cond) goto error # define NEW_MESSAGE() (http_should_keep_alive(parser) ? start_state : s_dead) #else diff -Nru php8.4-8.4.27/sapi/cli/php_http_parser.h php8.4-8.4.28/sapi/cli/php_http_parser.h --- php8.4-8.4.27/sapi/cli/php_http_parser.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/cli/php_http_parser.h 2026-11-17 20:29:32.000000000 +0000 @@ -36,12 +36,10 @@ #include -/* Compile with -DPHP_HTTP_PARSER_STRICT=0 to make less checks, but run - * faster +/* Compile with -DPHP_HTTP_PARSER_STRICT=1 to enable more checks, but run + * slower */ #ifndef PHP_HTTP_PARSER_STRICT -# define PHP_HTTP_PARSER_STRICT 1 -#else # define PHP_HTTP_PARSER_STRICT 0 #endif diff -Nru php8.4-8.4.27/sapi/cli/ps_title.c php8.4-8.4.28/sapi/cli/ps_title.c --- php8.4-8.4.27/sapi/cli/ps_title.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/cli/ps_title.c 2026-11-17 20:29:32.000000000 +0000 @@ -405,7 +405,7 @@ wchar_t ps_buffer_w[MAX_PATH]; char *tmp; - if (!(ps_buffer_cur_len = GetConsoleTitleW(ps_buffer_w, (DWORD)sizeof(ps_buffer_w)))) { + if (!(ps_buffer_cur_len = GetConsoleTitleW(ps_buffer_w, (DWORD)(sizeof(ps_buffer_w) / sizeof(ps_buffer_w[0]))))) { return PS_TITLE_WINDOWS_ERROR; } diff -Nru php8.4-8.4.27/sapi/cli/tests/016.phpt php8.4-8.4.28/sapi/cli/tests/016.phpt --- php8.4-8.4.27/sapi/cli/tests/016.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/cli/tests/016.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -12,6 +12,7 @@ --FILE-- $code) { echo "\n--------------\nSnippet no. $key:\n--------------\n"; $code = escapeshellarg($code); - echo `echo $code | $php -a`, "\n"; + echo `echo $code | $php $args -a`, "\n"; } echo "\nDone\n"; diff -Nru php8.4-8.4.27/sapi/cli/tests/023.phpt php8.4-8.4.28/sapi/cli/tests/023.phpt --- php8.4-8.4.27/sapi/cli/tests/023.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/cli/tests/023.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -8,18 +8,19 @@ --FILE-- array("pipe", "w"), ); $pipes = array(); -$proc = proc_open("$php -c $ini_file_escaped -r 'echo ini_get(\"memory_limit\");'", $desc, $pipes); +$proc = proc_open("$php $args -c $ini_file_escaped -r 'echo ini_get(\"max_input_vars\");'", $desc, $pipes); if (!$proc) { exit(1); } @@ -43,5 +44,5 @@ unlink(__DIR__ . "/023.ini"); ?> --EXPECT-- -string(3) "40M" +string(1) "4" string(0) "" diff -Nru php8.4-8.4.27/sapi/cli/tests/bug65275.phpt php8.4-8.4.28/sapi/cli/tests/bug65275.phpt --- php8.4-8.4.27/sapi/cli/tests/bug65275.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/cli/tests/bug65275.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -4,7 +4,8 @@ diff -Nru php8.4-8.4.27/sapi/cli/tests/bug74600.phpt php8.4-8.4.28/sapi/cli/tests/bug74600.phpt --- php8.4-8.4.27/sapi/cli/tests/bug74600.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/cli/tests/bug74600.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -8,6 +8,7 @@ --FILE-- array("pipe", "w"), ); $pipes = array(); -$proc = proc_open("$php -c $ini_file_escaped -r 'echo \"okey\";'", $desc, $pipes); +$proc = proc_open("$php $args -c $ini_file_escaped -r 'echo \"okey\";'", $desc, $pipes); if (!$proc) { exit(1); } diff -Nru php8.4-8.4.27/sapi/cli/tests/bug78323.phpt php8.4-8.4.28/sapi/cli/tests/bug78323.phpt --- php8.4-8.4.27/sapi/cli/tests/bug78323.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/cli/tests/bug78323.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -7,6 +7,7 @@ --FILE-- &1", $exitCode); +passthru("$php $args -a:Z 2>&1", $exitCode); $output = ob_get_contents(); ob_end_clean(); @@ -28,7 +29,7 @@ // option not found ob_start(); -passthru("$php -Z 2>&1", $exitCode); +passthru("$php $args -Z 2>&1", $exitCode); $output = ob_get_contents(); ob_end_clean(); @@ -40,7 +41,7 @@ // no argument for option ob_start(); -passthru("$php --memory-limit=1G 2>&1", $exitCode); +passthru("$php $args --memory-limit=1G 2>&1", $exitCode); $output = ob_get_contents(); ob_end_clean(); @@ -52,7 +53,7 @@ // Successful execution ob_start(); -passthru("$php -dmemory-limit=1G -v", $exitCode); +passthru("$php $args -dmemory-limit=1G -v", $exitCode); $output = ob_get_contents(); ob_end_clean(); diff -Nru php8.4-8.4.27/sapi/cli/tests/gh16137_duplicate_headers.phpt php8.4-8.4.28/sapi/cli/tests/gh16137_duplicate_headers.phpt --- php8.4-8.4.27/sapi/cli/tests/gh16137_duplicate_headers.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/sapi/cli/tests/gh16137_duplicate_headers.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,36 @@ +--TEST-- +GH-16137: CLI server handling of repeated request headers +--SKIPIF-- + +--FILE-- + ['header' => [ + 'X-Foo: a', + 'X-Foo: b', + 'Cookie: Foo', + 'cOOKIE: Bar', + 'Set-Cookie: first', + 'set-cookie: second', +]]]); +echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS, false, $ctx); +echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS); +?> +--EXPECT-- +array(5) { + ["X-Foo"]=> + string(4) "a, b" + ["Cookie"]=> + string(3) "Foo" + ["cOOKIE"]=> + string(8) "Foo, Bar" + ["Set-Cookie"]=> + string(5) "first" + ["set-cookie"]=> + string(6) "second" +} +array(0) { +} diff -Nru php8.4-8.4.27/sapi/cli/tests/gh24139.phpt php8.4-8.4.28/sapi/cli/tests/gh24139.phpt --- php8.4-8.4.27/sapi/cli/tests/gh24139.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/sapi/cli/tests/gh24139.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,30 @@ +--TEST-- +GH-24139 (NULL pointer dereference in php_ini.c when expand_filepath() fails) +--SKIPIF-- + +--FILE-- + ["pipe", "w"]], + $pipes, + __DIR__ +); +echo stream_get_contents($pipes[1]); +var_dump(proc_close($proc)); +?> +--CLEAN-- + +--EXPECT-- +bool(false) +int(0) diff -Nru php8.4-8.4.27/sapi/cli/tests/gh9670.phpt php8.4-8.4.28/sapi/cli/tests/gh9670.phpt --- php8.4-8.4.27/sapi/cli/tests/gh9670.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/sapi/cli/tests/gh9670.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,21 @@ +--TEST-- +GH-9670 (php -h does not list the -C and -q options) +--SKIPIF-- + +--FILE-- + +--EXPECT-- + -C Do not chdir to the script's directory (no-op in CLI) + -q Do not output HTTP headers (no-op in CLI) diff -Nru php8.4-8.4.27/sapi/fpm/fpm/fpm_children.c php8.4-8.4.28/sapi/fpm/fpm/fpm_children.c --- php8.4-8.4.27/sapi/fpm/fpm/fpm_children.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/fpm/fpm/fpm_children.c 2026-11-17 20:29:32.000000000 +0000 @@ -87,7 +87,11 @@ fpm_event_fire(&child->ev_stdout); } if (child->fd_stdout != -1) { + if (in_event_loop) { + fpm_event_del(&child->ev_stdout); + } close(child->fd_stdout); + child->fd_stdout = -1; } } @@ -97,7 +101,11 @@ fpm_event_fire(&child->ev_stderr); } if (child->fd_stderr != -1) { + if (in_event_loop) { + fpm_event_del(&child->ev_stderr); + } close(child->fd_stderr); + child->fd_stderr = -1; } } diff -Nru php8.4-8.4.27/sapi/fpm/fpm/fpm_status.c php8.4-8.4.28/sapi/fpm/fpm/fpm_status.c --- php8.4-8.4.27/sapi/fpm/fpm/fpm_status.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/fpm/fpm/fpm_status.c 2026-11-17 20:29:32.000000000 +0000 @@ -45,6 +45,32 @@ } /* }}} */ +static char *fpm_status_escape(const char *str, bool encode_html, bool encode_json, zend_string **tmp) +{ + char *escaped; + + *tmp = NULL; + if (str[0] == '\0') { + return NULL; + } + if (encode_html) { + *tmp = php_escape_html_entities_ex((const unsigned char *) str, strlen(str), 1, + ENT_DISALLOWED | ENT_HTML_DOC_XML1 | ENT_COMPAT, NULL, /* double_encode */ 1, /* quiet */ 0); + return ZSTR_VAL(*tmp); + } + if (encode_json) { + *tmp = php_json_encode_string(str, strlen(str), PHP_JSON_INVALID_UTF8_IGNORE); + escaped = ZSTR_VAL(*tmp); + /* remove quotes around the string */ + if (ZSTR_LEN(*tmp) >= 2) { + escaped[ZSTR_LEN(*tmp) - 1] = '\0'; + ++escaped; + } + return escaped; + } + return (char *) str; +} + int fpm_status_export_to_zval(zval *status) { struct fpm_scoreboard_s *scoreboard_p; @@ -56,6 +82,9 @@ int i; scoreboard_p = fpm_scoreboard_copy(NULL, 1); + if (!scoreboard_p) { + return -1; + } now_epoch = time(NULL); fpm_clock_get(&now); @@ -180,17 +209,19 @@ sapi_add_header_ex(ZEND_STRL("Expires: Thu, 01 Jan 1970 00:00:00 GMT"), 1, 1); sapi_add_header_ex(ZEND_STRL("Cache-Control: no-cache, no-store, must-revalidate, max-age=0"), 1, 1); PUTS("Internal error. Please review log file for errors."); + zend_string_release_ex(_GET_str, 0); return 1; } if (scoreboard_p->idle < 0 || scoreboard_p->active < 0) { - fpm_scoreboard_free_copy(scoreboard_p); zlog(ZLOG_ERROR, "[pool %s] invalid status values", scoreboard_p->pool); SG(sapi_headers).http_response_code = 500; sapi_add_header_ex(ZEND_STRL("Content-Type: text/plain"), 1, 1); sapi_add_header_ex(ZEND_STRL("Expires: Thu, 01 Jan 1970 00:00:00 GMT"), 1, 1); sapi_add_header_ex(ZEND_STRL("Cache-Control: no-cache, no-store, must-revalidate, max-age=0"), 1, 1); PUTS("Internal error. Please review log file for errors."); + zend_string_release_ex(_GET_str, 0); + fpm_scoreboard_free_copy(scoreboard_p); return 1; } @@ -201,6 +232,7 @@ /* handle HEAD */ if (SG(request_info).headers_only) { + zend_string_release_ex(_GET_str, 0); fpm_scoreboard_free_copy(scoreboard_p); return 1; } @@ -522,8 +554,10 @@ if (full_syntax) { unsigned int i; int first; - zend_string *tmp_query_string, *tmp_request_uri_string; - char *query_string, *request_uri_string; + zend_string *tmp_request_method_string, *tmp_request_uri_string, *tmp_query_string; + zend_string *tmp_auth_user_string, *tmp_script_filename_string; + char *request_method_string, *request_uri_string, *query_string; + char *auth_user_string, *script_filename_string; struct timeval duration, now; float cpu; @@ -548,52 +582,11 @@ } } - request_uri_string = NULL; - tmp_request_uri_string = NULL; - if (proc->request_uri[0] != '\0') { - if (encode_html) { - tmp_request_uri_string = php_escape_html_entities_ex( - (const unsigned char *) proc->request_uri, - strlen(proc->request_uri), 1, ENT_DISALLOWED | ENT_HTML_DOC_XML1 | ENT_COMPAT, - NULL, /* double_encode */ 1, /* quiet */ 0); - request_uri_string = ZSTR_VAL(tmp_request_uri_string); - } else if (encode_json) { - tmp_request_uri_string = php_json_encode_string(proc->request_uri, - strlen(proc->request_uri), PHP_JSON_INVALID_UTF8_IGNORE); - request_uri_string = ZSTR_VAL(tmp_request_uri_string); - /* remove quotes around the string */ - if (ZSTR_LEN(tmp_request_uri_string) >= 2) { - request_uri_string[ZSTR_LEN(tmp_request_uri_string) - 1] = '\0'; - ++request_uri_string; - } - } else { - request_uri_string = proc->request_uri; - } - } - - query_string = NULL; - tmp_query_string = NULL; - if (proc->query_string[0] != '\0') { - if (encode_html) { - tmp_query_string = php_escape_html_entities_ex( - (const unsigned char *) proc->query_string, - strlen(proc->query_string), 1, ENT_DISALLOWED | ENT_HTML_DOC_XML1 | ENT_COMPAT, - NULL, /* double_encode */ 1, /* quiet */ 0); - } else if (encode_json) { - tmp_query_string = php_json_encode_string(proc->query_string, - strlen(proc->query_string), PHP_JSON_INVALID_UTF8_IGNORE); - } else { - query_string = proc->query_string; - } - if (tmp_query_string) { - query_string = ZSTR_VAL(tmp_query_string); - /* remove quotes around the string */ - if (encode_json && ZSTR_LEN(tmp_query_string) >= 2) { - query_string[ZSTR_LEN(tmp_query_string) - 1] = '\0'; - ++query_string; - } - } - } + request_method_string = fpm_status_escape(proc->request_method, encode_html, encode_json, &tmp_request_method_string); + request_uri_string = fpm_status_escape(proc->request_uri, encode_html, encode_json, &tmp_request_uri_string); + query_string = fpm_status_escape(proc->query_string, encode_html, encode_json, &tmp_query_string); + auth_user_string = fpm_status_escape(proc->auth_user, encode_html, encode_json, &tmp_auth_user_string); + script_filename_string = fpm_status_escape(proc->script_filename, encode_html, encode_json, &tmp_script_filename_string); /* prevent NaN */ if (proc->cpu_duration.tv_sec == 0 && proc->cpu_duration.tv_usec == 0) { @@ -615,24 +608,33 @@ (unsigned long) (now_epoch - proc->start_epoch), proc->requests, (unsigned long) (duration.tv_sec * 1000000UL + duration.tv_usec), - proc->request_method[0] != '\0' ? proc->request_method : "-", + request_method_string ? request_method_string : "-", request_uri_string ? request_uri_string : "-", query_string ? "?" : "", query_string ? query_string : "", proc->content_length, - proc->auth_user[0] != '\0' ? proc->auth_user : "-", - proc->script_filename[0] != '\0' ? proc->script_filename : "-", + auth_user_string ? auth_user_string : "-", + script_filename_string ? script_filename_string : "-", proc->request_stage == FPM_REQUEST_ACCEPTING ? cpu : 0., proc->request_stage == FPM_REQUEST_ACCEPTING ? proc->memory : 0); PUTS(buffer); efree(buffer); + if (tmp_request_method_string) { + zend_string_free(tmp_request_method_string); + } if (tmp_request_uri_string) { zend_string_free(tmp_request_uri_string); } if (tmp_query_string) { zend_string_free(tmp_query_string); } + if (tmp_auth_user_string) { + zend_string_free(tmp_auth_user_string); + } + if (tmp_script_filename_string) { + zend_string_free(tmp_script_filename_string); + } } if (full_post) { diff -Nru php8.4-8.4.27/sapi/fpm/fpm/zlog.c php8.4-8.4.28/sapi/fpm/fpm/zlog.c --- php8.4-8.4.27/sapi/fpm/fpm/zlog.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/fpm/fpm/zlog.c 2026-11-17 20:29:32.000000000 +0000 @@ -587,6 +587,7 @@ { char buf[MAX_WRAPPING_PREFIX_LENGTH]; size_t len; + int written; va_list args; if (!stream->decorate) { @@ -594,9 +595,16 @@ } va_start(args, fmt); - len = vsnprintf(buf, MAX_WRAPPING_PREFIX_LENGTH - 1, fmt, args); + written = vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); + if (written < 0) { + return ZLOG_FALSE; + } + /* Use only what was written to buf, and keep at least half of the log line + * for the time and level prefix and the message itself. */ + len = MIN((size_t) written, MIN(sizeof(buf) - 1, (size_t) zlog_limit / 2)); + if (stream->msg_prefix_len < len) { stream->msg_prefix = stream->msg_prefix_len ? realloc(stream->msg_prefix, len + 1) : malloc(len + 1); if (stream->msg_prefix == NULL) { @@ -607,7 +615,7 @@ stream->msg_prefix[len] = 0; stream->msg_prefix_len = len; - return len; + return ZLOG_TRUE; } /* }}} */ @@ -726,7 +734,10 @@ char sbuf[1024]; size_t len; - len = vsnprintf(sbuf, 1024, fmt, args); + len = vsnprintf(sbuf, sizeof(sbuf), fmt, args); + if (len >= sizeof(sbuf)) { + len = sizeof(sbuf) - 1; + } return zlog_stream_str(stream, sbuf, len); } diff -Nru php8.4-8.4.27/sapi/fpm/tests/bug77023-pm-dynamic-blocking-sigquit.phpt php8.4-8.4.28/sapi/fpm/tests/bug77023-pm-dynamic-blocking-sigquit.phpt --- php8.4-8.4.27/sapi/fpm/tests/bug77023-pm-dynamic-blocking-sigquit.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/fpm/tests/bug77023-pm-dynamic-blocking-sigquit.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -2,7 +2,6 @@ FPM: Blocked SIGQUIT prevents idle process to be killed --EXTENSIONS-- pcntl ---FLAKY-- --SKIPIF-- start(extensions: ['pcntl']); $tester->expectLogStartNotices(); -$tester->multiRequest(2); +$tester->request()->expectEmptyBody(); $tester->status([ 'total processes' => 2, ]); -// wait for process to be killed -sleep(7); -$tester->expectLogWarning('child \\d+ exited on signal 9 \\(SIGKILL\\) after \\d+.\\d+ seconds from start', 'unconfined'); -$tester->expectLogNotice('child \\d+ started', 'unconfined'); -$tester->expectLogWarning('child \\d+ exited on signal 9 \\(SIGKILL\\) after \\d+.\\d+ seconds from start', 'unconfined'); +$tester->expectLogWarning( + 'child \\d+ exited on signal 9 \\(SIGKILL\\) after \\d+.\\d+ seconds from start', + 'unconfined', + timeoutSeconds: 10 +); $tester->expectLogNotice('child \\d+ started', 'unconfined'); +// wait for the remaining spare process to be quit +for ($i = 0; $i < 20; $i++) { + $status = json_decode($tester->request('json', [], '/status')->getBody('application/json'), true); + if (($status['total processes'] ?? null) === 1) { + break; + } + usleep(500000); +} $tester->status([ 'total processes' => 1, ]); diff -Nru php8.4-8.4.27/sapi/fpm/tests/gh24046-stdio-pipe-double-close.phpt php8.4-8.4.28/sapi/fpm/tests/gh24046-stdio-pipe-double-close.phpt --- php8.4-8.4.27/sapi/fpm/tests/gh24046-stdio-pipe-double-close.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/sapi/fpm/tests/gh24046-stdio-pipe-double-close.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,57 @@ +--TEST-- +GH-24046 (FPM: worker stdio pipe fd closed twice when a child process outlives the worker) +--SKIPIF-- + +--FILE-- + /dev/null 2>&1 &'); +} +echo "ok"; +EOT; + +$tester = new FPM\Tester($cfg, $code); +$tester->start(); +$tester->expectLogStartNotices(); +/* The worker exits after this request while the background process still holds + * its stderr pipe open. The replacement worker gets the same pipe fd numbers. */ +$tester->request('bg=1')->expectBody('ok'); +/* Wait for the postponed free of the exited worker. */ +usleep(1500000); +$tester->request()->expectBody('ok'); +$tester->terminate(); +$tester->expectNoLogPattern('/unable to (remove|read)/'); +$tester->close(); + +?> +Done +--EXPECT-- +Done +--CLEAN-- + diff -Nru php8.4-8.4.27/sapi/fpm/tests/ghsa-3mg3-cr28-46gc-status-xss.phpt php8.4-8.4.28/sapi/fpm/tests/ghsa-3mg3-cr28-46gc-status-xss.phpt --- php8.4-8.4.27/sapi/fpm/tests/ghsa-3mg3-cr28-46gc-status-xss.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/sapi/fpm/tests/ghsa-3mg3-cr28-46gc-status-xss.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,70 @@ +--TEST-- +FPM: GHSA-3mg3-cr28-46gc - status xss via request method, auth user and script filename +--SKIPIF-- + +--FILE-- +.php'; +file_put_contents($scriptFilename, $code); + +$tester = new FPM\Tester($cfg, $code); +$tester->start(); +$tester->expectLogStartNotices(); +$responses = $tester + ->multiRequest([ + [ + 'uri' => '/ghsa-3mg3-cr28-46gc-.php', + 'headers' => [ + 'REQUEST_METHOD' => '', + 'HTTP_AUTHORIZATION' => 'Basic ' . base64_encode('":x'), + 'SCRIPT_FILENAME' => $scriptFilename, + ], + ], + ['uri' => '/status', 'query' => 'full&html', 'delay' => 100000], + ['uri' => '/status', 'query' => 'full&json', 'delay' => 100000], + ]); +var_dump(strpos($responses[1]->getBody(), 'getBody(), '<svg')); +$status = json_decode($responses[2]->getBody('application/json'), true); +foreach ($status['processes'] as $proc) { + if ($proc['request method'] === '') { + var_dump($proc['user'], $proc['script'] === $scriptFilename); + } +} +$tester->terminate(); +$tester->expectLogTerminatingNotices(); +$tester->close(); + +?> +Done +--EXPECT-- +bool(false) +int(4) +string(15) """ +bool(true) +Done +--CLEAN-- +.php'); +?> diff -Nru php8.4-8.4.27/sapi/fpm/tests/ghsa-g3vh-838c-65v7.phpt php8.4-8.4.28/sapi/fpm/tests/ghsa-g3vh-838c-65v7.phpt --- php8.4-8.4.27/sapi/fpm/tests/ghsa-g3vh-838c-65v7.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/sapi/fpm/tests/ghsa-g3vh-838c-65v7.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,94 @@ +--TEST-- +FPM: GHSA-g3vh-838c-65v7 terminates a worker after interrupted session shutdown +--EXTENSIONS-- +session +--SKIPIF-- + +--FILE-- +fp = fopen('/dev/null', 'w'); + return true; + } + + public function stream_write($data) { + return strlen($data); + } + + public function stream_close() { + trigger_error('session shutdown bailout', E_USER_ERROR); + } +} + +stream_wrapper_register('shutdown-test', ShutdownStream::class); +session_id('g3vh' . getmypid()); +session_start(); +$_SESSION['stream'] = fopen('shutdown-test://session', 'w'); +unset($_SESSION); + +// Finish the response before the fatal RSHUTDOWN callback runs. +echo 'producer'; +fastcgi_finish_request(); +PHP; + +$tester = new FPM\Tester($cfg, $code); +$tester->start(extensions: ['session']); +$tester->expectLogStartNotices(); +$pid = (int) $tester->request(address: '{{ADDR:UDS}}')->getBody(); +$tester->request(query: 'producer', address: '{{ADDR:UDS}}')->expectBody('producer'); +$tester->expectLogWarning( + 'child ' . $pid . ' exited with code 1 after \\d+\\.\\d+ seconds from start', + 'unconfined', + timeoutSeconds: 5 +); +$tester->expectLogNotice('child \\d+ started', 'unconfined'); +$replacement = (int) $tester->request(address: '{{ADDR:UDS}}')->getBody(); +var_dump($pid > 0 && $replacement > 0 && $replacement !== $pid); +$tester->terminate(); +$tester->expectLogTerminatingNotices(); +$tester->close(); +?> +Done +--EXPECT-- +bool(true) +Done +--CLEAN-- + diff -Nru php8.4-8.4.27/sapi/fpm/tests/log-bwd-long-pool-name.phpt php8.4-8.4.28/sapi/fpm/tests/log-bwd-long-pool-name.phpt --- php8.4-8.4.27/sapi/fpm/tests/log-bwd-long-pool-name.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/sapi/fpm/tests/log-bwd-long-pool-name.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,45 @@ +--TEST-- +FPM: Buffered worker output decorated log with pool name longer than the message prefix buffer +--SKIPIF-- + +--FILE-- +start(); +$tester->expectLogStartNotices(); +$tester->request()->expectEmptyBody(); +/* The message prefix is truncated to 511 bytes. */ +$tester->expectLogPattern('/^\[[^\]]+\] WARNING: \[pool p{505}"msg 1"$/'); +$tester->terminate(); +$tester->expectLogTerminatingNotices(); +$tester->close(); + +?> +Done +--EXPECT-- +Done +--CLEAN-- + diff -Nru php8.4-8.4.27/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt php8.4-8.4.28/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt --- php8.4-8.4.27/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -2,8 +2,6 @@ FPM: Buffered worker output decorated log with multiple continuous messages (stdout/stderr mixed) --SKIPIF-- ---XFAIL-- -Fails intermittently --FILE-- start(); $tester->expectLogStartNotices(); +// Check logs after each request so a slow master cannot merge the stdout msgs. $tester->request()->expectEmptyBody(); +$tester->expectLogLine('msg 1 - ', false); +$tester->expectLogLine('msg 2 - msg 3', true); $tester->request()->expectEmptyBody(); $tester->expectLogLine('msg 1 - ', false); $tester->expectLogLine('msg 2 - msg 3', true); diff -Nru php8.4-8.4.27/sapi/fpm/tests/log-dwd-long-pool-name-limit-512.phpt php8.4-8.4.28/sapi/fpm/tests/log-dwd-long-pool-name-limit-512.phpt --- php8.4-8.4.27/sapi/fpm/tests/log-dwd-long-pool-name-limit-512.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/sapi/fpm/tests/log-dwd-long-pool-name-limit-512.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,47 @@ +--TEST-- +FPM: Direct worker output decorated log with pool name longer than log_limit +--SKIPIF-- + +--FILE-- +start(); +$tester->expectLogStartNotices(); +$tester->request()->expectEmptyBody(); +/* The message prefix is truncated to half of log_limit. */ +$tester->expectLogPattern('/^\[[^\]]+\] WARNING: \[pool p{250}"msg 1"$/'); +$tester->terminate(); +$tester->expectLogTerminatingNotices(); +$tester->close(); + +?> +Done +--EXPECT-- +Done +--CLEAN-- + diff -Nru php8.4-8.4.27/sapi/fpm/tests/status-head.phpt php8.4-8.4.28/sapi/fpm/tests/status-head.phpt --- php8.4-8.4.27/sapi/fpm/tests/status-head.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/sapi/fpm/tests/status-head.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,40 @@ +--TEST-- +FPM: Status HEAD request returns headers without body +--SKIPIF-- + +--FILE-- +start(); +$tester->expectLogStartNotices(); +$tester->request()->expectEmptyBody(); + +$response = $tester->request(uri: '/status', method: 'HEAD'); +$response->expectEmptyBody(); + +$tester->terminate(); +$tester->expectLogTerminatingNotices(); +$tester->close(); + +?> +Done +--EXPECT-- +Done +--CLEAN-- + diff -Nru php8.4-8.4.27/sapi/fpm/tests/tester.inc php8.4-8.4.28/sapi/fpm/tests/tester.inc --- php8.4-8.4.27/sapi/fpm/tests/tester.inc 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/fpm/tests/tester.inc 2026-11-17 20:29:32.000000000 +0000 @@ -1119,6 +1119,9 @@ { if (is_null($pid)) { $pid = $this->getPid(); + if ($pid === 0) { + return ''; + } } $cmd = "kill -$signal $pid"; $this->trace('Sending signal using command', $cmd, true); diff -Nru php8.4-8.4.27/sapi/fpm/tests/unread-body-keep-conn.phpt php8.4-8.4.28/sapi/fpm/tests/unread-body-keep-conn.phpt --- php8.4-8.4.27/sapi/fpm/tests/unread-body-keep-conn.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/sapi/fpm/tests/unread-body-keep-conn.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,125 @@ +--TEST-- +FPM: unread request body cannot become a new request on a kept connection +--SKIPIF-- + +--FILE-- + $length < 128 + ? chr($length) + : pack('N', $length | 0x80000000); + foreach ($params as $name => $value) { + $encoded .= $encodeLength(strlen($name)) . $encodeLength(strlen($value)) . $name . $value; + } + return $encoded; +} + +function request(int $id, bool $keep, array $params, string $stdin): string +{ + return record(1, pack('nCxxxxx', 1, $keep), $id) + . record(4, params($params), $id) + . record(4, '', $id) + . record(5, $stdin, $id) + . record(5, '', $id); +} + +function transact(string $address, string $request): string +{ + [$host, $port] = explode(':', $address); + $socket = fsockopen($host, (int) $port); + stream_set_timeout($socket, 3); + $written = 0; + while ($written < strlen($request)) { + $written += fwrite($socket, substr($request, $written)); + } + stream_socket_shutdown($socket, STREAM_SHUT_WR); + $response = stream_get_contents($socket); + fclose($socket); + return $response; +} + +$config = <<makeSourceFile(); +$tester->start(); +$tester->expectLogStartNotices(); + +$hiddenParams = [ + 'GATEWAY_INTERFACE' => 'FastCGI/1.0', + 'REQUEST_METHOD' => 'GET', + 'SCRIPT_FILENAME' => $script, + 'SCRIPT_NAME' => '/smuggled.php', + 'REQUEST_URI' => '/smuggled.php', + 'SERVER_PROTOCOL' => 'HTTP/1.1', + 'REMOTE_ADDR' => '203.0.113.1', + 'CONTENT_LENGTH' => '0', +]; +$hidden = request(2, false, $hiddenParams, ''); +$body = str_pad("--B\r\nContent-Disposition: form-data\r\n\r\n", 12000, 'A'); +$body = substr_replace($body, $hidden, 5120, strlen($hidden)); + +$outerParams = [ + 'GATEWAY_INTERFACE' => 'FastCGI/1.0', + 'REQUEST_METHOD' => 'POST', + 'SCRIPT_FILENAME' => $script, + 'SCRIPT_NAME' => '/open.php', + 'REQUEST_URI' => '/open.php', + 'SERVER_PROTOCOL' => 'HTTP/1.1', + 'REMOTE_ADDR' => '127.0.0.1', + 'CONTENT_TYPE' => 'multipart/form-data; boundary=B', + 'CONTENT_LENGTH' => (string) strlen($body), +]; +foreach ([false, true] as $keep) { + $response = transact($tester->getAddr(), request(1, $keep, $outerParams, $body)); + echo 'keep ', $keep ? 'on' : 'off', ': ', + str_contains($response, 'smuggled') ? 'smuggled' : 'safe', "\n"; +} + +$body = 'A' . $hidden; +$outerParams['CONTENT_TYPE'] = 'application/octet-stream'; +$outerParams['CONTENT_LENGTH'] = '1'; +$response = transact($tester->getAddr(), request(1, true, $outerParams, $body)); +echo 'partial frame: ', + str_contains($response, 'smuggled') ? 'smuggled' : 'safe', "\n"; + +$tester->terminate(); +$tester->close(); +?> +--EXPECT-- +keep off: safe +keep on: safe +partial frame: safe +--CLEAN-- + diff -Nru php8.4-8.4.27/sapi/fpm/tests/unread-body-partial-record.phpt php8.4-8.4.28/sapi/fpm/tests/unread-body-partial-record.phpt --- php8.4-8.4.27/sapi/fpm/tests/unread-body-partial-record.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/sapi/fpm/tests/unread-body-partial-record.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,127 @@ +--TEST-- +FPM: partially read STDIN record does not make the worker reject later connections +--SKIPIF-- + +--FILE-- + $length < 128 + ? chr($length) + : pack('N', $length | 0x80000000); + foreach ($params as $name => $value) { + $encoded .= $encodeLength(strlen($name)) . $encodeLength(strlen($value)) . $name . $value; + } + return $encoded; +} + +function request(int $id, bool $keep, array $params, string $stdin): string +{ + return record(1, pack('nCxxxxx', 1, $keep), $id) + . record(4, params($params), $id) + . record(4, '', $id) + . record(5, $stdin, $id) + . record(5, '', $id); +} + +function transact(string $address, string $request): string +{ + [$host, $port] = explode(':', $address); + $socket = fsockopen($host, (int) $port); + stream_set_timeout($socket, 3); + $written = 0; + while ($written < strlen($request)) { + $written += fwrite($socket, substr($request, $written)); + } + stream_socket_shutdown($socket, STREAM_SHUT_WR); + $response = stream_get_contents($socket); + fclose($socket); + return $response; +} + +$config = <<makeSourceFile(); +$tester->start(); +$tester->expectLogStartNotices(); + +$hiddenParams = [ + 'GATEWAY_INTERFACE' => 'FastCGI/1.0', + 'REQUEST_METHOD' => 'GET', + 'SCRIPT_FILENAME' => $script, + 'SCRIPT_NAME' => '/smuggled.php', + 'REQUEST_URI' => '/smuggled.php', + 'SERVER_PROTOCOL' => 'HTTP/1.1', + 'REMOTE_ADDR' => '203.0.113.1', + 'CONTENT_LENGTH' => '0', +]; +$hidden = request(2, false, $hiddenParams, ''); +$outerParams = [ + 'GATEWAY_INTERFACE' => 'FastCGI/1.0', + 'REQUEST_METHOD' => 'POST', + 'SCRIPT_FILENAME' => $script, + 'SCRIPT_NAME' => '/open.php', + 'REQUEST_URI' => '/open.php', + 'SERVER_PROTOCOL' => 'HTTP/1.1', + 'REMOTE_ADDR' => '127.0.0.1', + 'CONTENT_TYPE' => 'application/octet-stream', + 'CONTENT_LENGTH' => '1', +]; +$plainParams = ['REQUEST_METHOD' => 'GET', 'CONTENT_LENGTH' => '0'] + $outerParams; +unset($plainParams['CONTENT_TYPE']); + +/* The STDIN record is longer than CONTENT_LENGTH so it is left partially read. */ +foreach ([false, true] as $keep) { + $response = transact($tester->getAddr(), request(1, $keep, $outerParams, 'A' . $hidden)); + echo 'keep ', $keep ? 'on' : 'off', ': ', + str_contains($response, 'smuggled') ? 'smuggled' : 'safe', ', ', + str_contains($response, 'outer 1') ? 'served' : 'not served', "\n"; + /* The only worker must still serve new connections. */ + foreach ([1, 2] as $n) { + $response = transact($tester->getAddr(), request(1, false, $plainParams, '')); + echo " next connection $n: ", str_contains($response, 'outer 0') ? 'served' : 'not served', "\n"; + } +} + +$tester->terminate(); +$tester->close(); +?> +--EXPECT-- +keep off: safe, served + next connection 1: served + next connection 2: served +keep on: safe, served + next connection 1: served + next connection 2: served +--CLEAN-- + diff -Nru php8.4-8.4.27/sapi/phpdbg/phpdbg.c php8.4-8.4.28/sapi/phpdbg/phpdbg.c --- php8.4-8.4.27/sapi/phpdbg/phpdbg.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/phpdbg/phpdbg.c 2026-11-17 20:29:32.000000000 +0000 @@ -241,6 +241,13 @@ return SUCCESS; } /* }}} */ +static ZEND_MODULE_POST_ZEND_DEACTIVATE_D(phpdbg) /* {{{ */ +{ + phpdbg_release_watch_elements(); + + return SUCCESS; +} /* }}} */ + /* {{{ Attempt to set the execution context for phpdbg If the execution context was set previously it is returned If the execution context was not set previously boolean true is returned @@ -688,7 +695,9 @@ PHP_RSHUTDOWN(phpdbg), NULL, PHPDBG_VERSION, - STANDARD_MODULE_PROPERTIES + NO_MODULE_GLOBALS, + ZEND_MODULE_POST_ZEND_DEACTIVATE_N(phpdbg), + STANDARD_MODULE_PROPERTIES_EX }; static inline int php_sapi_phpdbg_module_startup(sapi_module_struct *module) /* {{{ */ diff -Nru php8.4-8.4.27/sapi/phpdbg/phpdbg_break.c php8.4-8.4.28/sapi/phpdbg/phpdbg_break.c --- php8.4-8.4.27/sapi/phpdbg/phpdbg_break.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/phpdbg/phpdbg_break.c 2026-11-17 20:29:32.000000000 +0000 @@ -26,7 +26,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg) #define PHPDBG_BREAK_COMMAND_D(f, h, a, m, l, s, flags) \ - PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[9], flags) + PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[11], flags) /** * Commands diff -Nru php8.4-8.4.27/sapi/phpdbg/phpdbg_btree.c php8.4-8.4.28/sapi/phpdbg/phpdbg_btree.c --- php8.4-8.4.27/sapi/phpdbg/phpdbg_btree.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/phpdbg/phpdbg_btree.c 2026-11-17 20:29:32.000000000 +0000 @@ -158,13 +158,18 @@ } { - phpdbg_btree_branch *memory = *branch = pemalloc((i + 2) * sizeof(phpdbg_btree_branch), tree->persistent); + phpdbg_btree_branch *memory = pemalloc((i + 2) * sizeof(phpdbg_btree_branch), tree->persistent); + phpdbg_btree_branch *node = memory; do { - (*branch)->branches[!((idx >> i) % 2)] = NULL; - branch = &(*branch)->branches[(idx >> i) % 2]; - *branch = ++memory; + node->branches[!((idx >> i) % 2)] = NULL; + node->branches[(idx >> i) % 2] = node + 1; + node++; } while (i--); + node->result.idx = idx; + node->result.ptr = ptr; + *branch = memory; tree->count++; + return SUCCESS; } } else if (!(flags & PHPDBG_BTREE_UPDATE)) { return FAILURE; diff -Nru php8.4-8.4.27/sapi/phpdbg/phpdbg_info.c php8.4-8.4.28/sapi/phpdbg/phpdbg_info.c --- php8.4-8.4.27/sapi/phpdbg/phpdbg_info.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/phpdbg/phpdbg_info.c 2026-11-17 20:29:32.000000000 +0000 @@ -26,7 +26,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg) #define PHPDBG_INFO_COMMAND_D(f, h, a, m, l, s, flags) \ - PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[13], flags) + PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[15], flags) const phpdbg_command_t phpdbg_info_commands[] = { PHPDBG_INFO_COMMAND_D(break, "show breakpoints", 'b', info_break, NULL, 0, PHPDBG_ASYNC_SAFE), diff -Nru php8.4-8.4.27/sapi/phpdbg/phpdbg_list.c php8.4-8.4.28/sapi/phpdbg/phpdbg_list.c --- php8.4-8.4.27/sapi/phpdbg/phpdbg_list.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/phpdbg/phpdbg_list.c 2026-11-17 20:29:32.000000000 +0000 @@ -34,7 +34,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg) #define PHPDBG_LIST_COMMAND_D(f, h, a, m, l, s, flags) \ - PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[12], flags) + PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[14], flags) const phpdbg_command_t phpdbg_list_commands[] = { PHPDBG_LIST_COMMAND_D(lines, "lists the specified lines", 'l', list_lines, NULL, "l", PHPDBG_ASYNC_SAFE), diff -Nru php8.4-8.4.27/sapi/phpdbg/phpdbg_print.c php8.4-8.4.28/sapi/phpdbg/phpdbg_print.c --- php8.4-8.4.27/sapi/phpdbg/phpdbg_print.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/phpdbg/phpdbg_print.c 2026-11-17 20:29:32.000000000 +0000 @@ -26,7 +26,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg) #define PHPDBG_PRINT_COMMAND_D(f, h, a, m, l, s, flags) \ - PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[8], flags) + PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[10], flags) const phpdbg_command_t phpdbg_print_commands[] = { PHPDBG_PRINT_COMMAND_D(exec, "print out the instructions in the main execution context", 'e', print_exec, NULL, 0, PHPDBG_ASYNC_SAFE), diff -Nru php8.4-8.4.27/sapi/phpdbg/phpdbg_set.c php8.4-8.4.28/sapi/phpdbg/phpdbg_set.c --- php8.4-8.4.27/sapi/phpdbg/phpdbg_set.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/phpdbg/phpdbg_set.c 2026-11-17 20:29:32.000000000 +0000 @@ -26,7 +26,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg) #define PHPDBG_SET_COMMAND_D(f, h, a, m, l, s, flags) \ - PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[17], flags) + PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[19], flags) const phpdbg_command_t phpdbg_set_commands[] = { PHPDBG_SET_COMMAND_D(prompt, "usage: set prompt []", 'p', set_prompt, NULL, "|s", 0), diff -Nru php8.4-8.4.27/sapi/phpdbg/phpdbg_watch.c php8.4-8.4.28/sapi/phpdbg/phpdbg_watch.c --- php8.4-8.4.27/sapi/phpdbg/phpdbg_watch.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/phpdbg/phpdbg_watch.c 2026-11-17 20:29:32.000000000 +0000 @@ -135,6 +135,16 @@ #define HT_WATCH_HT(watch) HT_PTR_HT((watch)->addr.ptr) /* ### PRINTING POINTER DIFFERENCES ### */ +static bool phpdbg_check_zval_watch_diff(zval *oldPtr, zval *newPtr) { + if (Z_TYPE_INFO_P(oldPtr) != Z_TYPE_INFO_P(newPtr)) { + return true; + } + if (Z_TYPE_P(oldPtr) < IS_LONG) { + return false; + } + return memcmp(oldPtr, newPtr, sizeof(zend_value)) != 0; +} + bool phpdbg_check_watch_diff(phpdbg_watchtype type, void *oldPtr, void *newPtr) { switch (type) { case WATCH_ON_BUCKET: @@ -144,7 +154,7 @@ /* TODO: Is this intentional? */ ZEND_FALLTHROUGH; case WATCH_ON_ZVAL: - return memcmp(oldPtr, newPtr, sizeof(zend_value) + sizeof(uint32_t) /* value + typeinfo */) != 0; + return phpdbg_check_zval_watch_diff((zval *) oldPtr, (zval *) newPtr); case WATCH_ON_HASHTABLE: return zend_hash_num_elements(HT_PTR_HT(oldPtr)) != zend_hash_num_elements(HT_PTR_HT(newPtr)); case WATCH_ON_REFCOUNTED: @@ -503,8 +513,39 @@ void phpdbg_remove_watchpoint(phpdbg_watchpoint_t *watch); void phpdbg_watch_parent_ht(phpdbg_watch_element *element); -phpdbg_watch_element *phpdbg_add_watch_element(phpdbg_watchpoint_t *watch, phpdbg_watch_element *element) { +static bool phpdbg_watch_element_collides(void *addr, phpdbg_watchtype type, phpdbg_watch_element *element) { + phpdbg_watch_element *old; + phpdbg_btree_result *res = phpdbg_btree_find(&PHPDBG_G(watchpoint_tree), (zend_ulong) addr); + + if (res) { + phpdbg_watchpoint_t *watch = res->ptr; + if (watch->type == type && (old = zend_hash_find_ptr(&watch->elements, element->str)) && old != element) { + return true; + } + } + + return (old = zend_hash_find_ptr(&PHPDBG_G(watch_recreation), element->str)) && old != element; +} + +static bool phpdbg_ht_watch_element_collides(zval *zv, phpdbg_watch_element *element) { + HashTable *ht = HT_FROM_ZVP(zv); + + if (!ht) { + return false; + } + + return phpdbg_watch_element_collides(HT_WATCH_OFFSET + (char *) ht, WATCH_ON_HASHTABLE, element); +} + +static bool phpdbg_bucket_watch_element_collides(zval *zv, phpdbg_watch_element *element) { + return phpdbg_watch_element_collides((Bucket *) zv, WATCH_ON_BUCKET, element); +} + +phpdbg_watch_element *phpdbg_add_watch_element(phpdbg_watchpoint_t *watch, phpdbg_watch_element *element, bool *is_new) { phpdbg_btree_result *res; + if (is_new) { + *is_new = true; + } if ((res = phpdbg_btree_find(&PHPDBG_G(watchpoint_tree), (zend_ulong) watch->addr.ptr)) == NULL) { phpdbg_watchpoint_t *mem = emalloc(sizeof(*mem)); *mem = *watch; @@ -522,6 +563,9 @@ if (element != old_element) { phpdbg_free_watch_element(element); } + if (is_new) { + *is_new = false; + } return old_element; } } @@ -536,25 +580,52 @@ return element; } -phpdbg_watch_element *phpdbg_add_bucket_watch_element(Bucket *bucket, phpdbg_watch_element *element) { +static bool phpdbg_zval_is_bucket_of(HashTable *ht, zval *zv) { + if (!ht || HT_IS_PACKED(ht)) { + return false; + } + if ((uintptr_t) zv < (uintptr_t) ht->arData + || (uintptr_t) zv >= (uintptr_t) (ht->arData + ht->nNumUsed)) { + return false; + } + ZEND_ASSERT(((uintptr_t) zv - (uintptr_t) ht->arData) % sizeof(Bucket) == 0); + return true; +} + +phpdbg_watch_element *phpdbg_add_bucket_watch_element(zval *zv, phpdbg_watch_element *element, bool *is_new) { phpdbg_watchpoint_t watch; - phpdbg_set_bucket_watchpoint(bucket, &watch); - element = phpdbg_add_watch_element(&watch, element); - phpdbg_watch_parent_ht(element); - return element; + + if (phpdbg_zval_is_bucket_of(element->parent_container, zv)) { + phpdbg_set_bucket_watchpoint((Bucket *) zv, &watch); + } else { + phpdbg_set_zval_watchpoint(zv, &watch); + } + bool added_new; + phpdbg_watch_element *added = phpdbg_add_watch_element(&watch, element, &added_new); + if (added_new) { + phpdbg_watch_parent_ht(added); + } + if (is_new) { + *is_new = added_new; + } + return added; } -phpdbg_watch_element *phpdbg_add_ht_watch_element(zval *zv, phpdbg_watch_element *element) { +phpdbg_watch_element *phpdbg_add_ht_watch_element(zval *zv, phpdbg_watch_element *element, bool *is_new) { phpdbg_watchpoint_t watch; HashTable *ht = HT_FROM_ZVP(zv); + if (is_new) { + *is_new = false; + } + if (!ht) { return NULL; } element->flags |= Z_TYPE_P(zv) == IS_ARRAY ? PHPDBG_WATCH_ARRAY : PHPDBG_WATCH_OBJECT; phpdbg_set_ht_watchpoint(ht, &watch); - return phpdbg_add_watch_element(&watch, element); + return phpdbg_add_watch_element(&watch, element, is_new); } bool phpdbg_is_recursively_watched(void *ptr, phpdbg_watch_element *element) { @@ -590,8 +661,15 @@ child->parent = element; child->child = NULL; child->parent_container = HT_WATCH_HT(element->watch); - zend_hash_add_ptr(&element->child_container, child->str, child); - phpdbg_add_bucket_watch_element((Bucket *) zv, child); + if (phpdbg_bucket_watch_element_collides(zv, child)) { + phpdbg_free_watch_element(child); + return; + } + bool added_new; + phpdbg_add_bucket_watch_element(zv, child, &added_new); + if (added_new) { + zend_hash_add_ptr(&element->child_container, child->str, child); + } } void phpdbg_recurse_watch_element(phpdbg_watch_element *element) { @@ -629,8 +707,13 @@ child->child = NULL; element->child = child; } + if (phpdbg_ht_watch_element_collides(zv, child)) { + phpdbg_free_watch_element(child); + element->child = NULL; + return; + } zend_hash_init(&child->child_container, 8, NULL, NULL, 0); - phpdbg_add_ht_watch_element(zv, child); + phpdbg_add_ht_watch_element(zv, child, NULL); } else if (zend_hash_num_elements(&element->child_container) == 0) { zend_string *str; zend_long idx; @@ -643,7 +726,7 @@ } void phpdbg_watch_parent_ht(phpdbg_watch_element *element) { - if (element->watch->type == WATCH_ON_BUCKET) { + if (element->watch->type == WATCH_ON_BUCKET || element->watch->type == WATCH_ON_ZVAL) { phpdbg_btree_result *res; phpdbg_watch_ht_info *hti; ZEND_ASSERT(element->parent_container); @@ -662,14 +745,17 @@ hti = (phpdbg_watch_ht_info *) res->ptr; } - zend_hash_add_ptr(&hti->watches, element->name_in_parent, element); + if (zend_hash_add_ptr(&hti->watches, element->name_in_parent, element)) { + element->flags |= PHPDBG_WATCH_HT_REGISTERED; + } } } void phpdbg_unwatch_parent_ht(phpdbg_watch_element *element) { - if (element->watch && element->watch->type == WATCH_ON_BUCKET) { + if (element->flags & PHPDBG_WATCH_HT_REGISTERED) { phpdbg_btree_result *res = phpdbg_btree_find(&PHPDBG_G(watch_HashTables), (zend_ulong) element->parent_container); ZEND_ASSERT(element->parent_container); + element->flags &= ~PHPDBG_WATCH_HT_REGISTERED; if (res) { phpdbg_watch_ht_info *hti = res->ptr; @@ -729,7 +815,10 @@ phpdbg_print_watch_diff(WATCH_ON_HASHTABLE, element->str, oldPtr, htPtr); } - phpdbg_add_ht_watch_element(parent, element); + if ((element->flags & PHPDBG_WATCH_RECURSIVE) && phpdbg_ht_watch_element_collides(parent, element)) { + return false; + } + element = phpdbg_add_ht_watch_element(parent, element, NULL); } else if ((zv = zend_symtable_find(ht, element->name_in_parent))) { if (element->flags & PHPDBG_WATCH_IMPLICIT) { zval *next = zv; @@ -748,9 +837,11 @@ phpdbg_print_watch_diff(WATCH_ON_ZVAL, element->str, &element->backup.zv, zv); } + if ((element->flags & PHPDBG_WATCH_RECURSIVE) && phpdbg_bucket_watch_element_collides(zv, element)) { + return false; + } element->parent_container = ht; - phpdbg_add_bucket_watch_element((Bucket *) zv, element); - phpdbg_watch_parent_ht(element); + element = phpdbg_add_bucket_watch_element(zv, element, NULL); } else { return 0; } @@ -758,8 +849,36 @@ return 1; } +/* watch_recreation is keyed by element->str, so a parent and its child are stored + * under distinct keys and the deduplication in phpdbg_queue_element_for_recreation() + * cannot notice that they belong to the same chain. As phpdbg_free_watch_element_tree() + * frees the whole chain, any other entry referencing a member of it must be dropped + * first, or the chain gets freed twice. The buckets are only nulled out as the hash is + * being iterated over by the callers; they clean it right after. */ +static void phpdbg_forget_queued_watch_element(phpdbg_watch_element *element) { + zval *zv = zend_hash_find(&PHPDBG_G(watch_recreation), element->str); + if (zv && Z_PTR_P(zv) == element) { + Z_PTR_P(zv) = NULL; + } +} + +static void phpdbg_dequeue_watch_element_tree(phpdbg_watch_element *element) { + phpdbg_watch_element *cur; + + for (cur = element->parent; cur; cur = cur->parent) { + phpdbg_forget_queued_watch_element(cur); + } + for (cur = element->child; cur; cur = cur->child) { + phpdbg_forget_queued_watch_element(cur); + } + phpdbg_forget_queued_watch_element(element); +} + void phpdbg_automatic_dequeue_free(phpdbg_watch_element *element) { phpdbg_watch_element *child = element; + + phpdbg_dequeue_watch_element_tree(element); + while (child->child && !(child->flags & PHPDBG_WATCH_RECURSIVE_ROOT)) { child = child->child; } @@ -774,6 +893,10 @@ phpdbg_watch_element *element; ZEND_HASH_MAP_FOREACH_PTR(&PHPDBG_G(watch_recreation), element) { + if (!element) { + /* freed along with an already dequeued element of the same chain */ + continue; + } ZEND_ASSERT(element->flags & (PHPDBG_WATCH_IMPLICIT | PHPDBG_WATCH_RECURSIVE_ROOT | PHPDBG_WATCH_SIMPLE)); if (element->parent || zend_hash_index_find(&PHPDBG_G(watch_free), (zend_ulong) element->parent_container)) { zval _zv, *zv = &_zv; @@ -1012,7 +1135,8 @@ zend_string *name = NULL; void *comparePtr; - if (watch->type == WATCH_ON_HASHTABLE) { + if (watch->type == WATCH_ON_HASHTABLE + && phpdbg_check_watch_diff(WATCH_ON_HASHTABLE, (char *) &watch->backup.ht + HT_WATCH_OFFSET, watch->addr.ptr)) { phpdbg_watch_element *element; zend_string *str; zend_long idx; @@ -1250,49 +1374,80 @@ } ZEND_HASH_FOREACH_END(); } -static int phpdbg_create_simple_watchpoint(zval *zv, phpdbg_watch_element *element) { - element->flags = PHPDBG_WATCH_SIMPLE; - phpdbg_add_bucket_watch_element((Bucket *) zv, element); - return SUCCESS; -} - -static int phpdbg_create_array_watchpoint(zval *zv, phpdbg_watch_element *element) { - phpdbg_watch_element *new; +typedef enum { + PHPDBG_WATCH_ADD_OK, + PHPDBG_WATCH_ADD_FAILED, + PHPDBG_WATCH_ADD_DUPLICATE, +} phpdbg_watch_add_result; + +static phpdbg_watch_add_result phpdbg_create_simple_watchpoint(zval *zv, phpdbg_watch_element **element) { + phpdbg_watch_element *added; + (*element)->flags = PHPDBG_WATCH_SIMPLE; + bool added_new; + added = phpdbg_add_bucket_watch_element(zv, *element, &added_new); + if (!added_new) { + *element = added; + return PHPDBG_WATCH_ADD_DUPLICATE; + } + return PHPDBG_WATCH_ADD_OK; +} + +static phpdbg_watch_add_result phpdbg_create_array_watchpoint(zval *zv, phpdbg_watch_element **element_ptr) { + phpdbg_watch_element *element = *element_ptr; + phpdbg_watch_element *new, *added; zend_string *str; zval *orig_zv = zv; ZVAL_DEREF(zv); if (Z_TYPE_P(zv) != IS_ARRAY && Z_TYPE_P(zv) != IS_OBJECT) { - return FAILURE; + return PHPDBG_WATCH_ADD_FAILED; } - new = ecalloc(1, sizeof(phpdbg_watch_element)); - str = strpprintf(0, "%.*s[]", (int) ZSTR_LEN(element->str), ZSTR_VAL(element->str)); zend_string_release(element->str); element->str = str; element->flags = PHPDBG_WATCH_IMPLICIT; - phpdbg_add_bucket_watch_element((Bucket *) orig_zv, element); - element->child = new; + bool added_new; + added = phpdbg_add_bucket_watch_element(orig_zv, element, &added_new); + if (!added_new) { + *element_ptr = added; + return PHPDBG_WATCH_ADD_DUPLICATE; + } + element = added; + new = ecalloc(1, sizeof(phpdbg_watch_element)); new->flags = PHPDBG_WATCH_SIMPLE; new->str = zend_string_copy(str); new->parent = element; - phpdbg_add_ht_watch_element(zv, new); - return SUCCESS; + added = phpdbg_add_ht_watch_element(zv, new, &added_new); + if (added != NULL && !added_new) { + phpdbg_clean_watch_element(element); + phpdbg_free_watch_element(element); + *element_ptr = added; + return PHPDBG_WATCH_ADD_DUPLICATE; + } + element->child = new; + *element_ptr = element; + return PHPDBG_WATCH_ADD_OK; } -static int phpdbg_create_recursive_watchpoint(zval *zv, phpdbg_watch_element *element) { - element->flags = PHPDBG_WATCH_RECURSIVE | PHPDBG_WATCH_RECURSIVE_ROOT; - element->child = NULL; - phpdbg_add_bucket_watch_element((Bucket *) zv, element); - return SUCCESS; +static phpdbg_watch_add_result phpdbg_create_recursive_watchpoint(zval *zv, phpdbg_watch_element **element) { + phpdbg_watch_element *added; + (*element)->flags = PHPDBG_WATCH_RECURSIVE | PHPDBG_WATCH_RECURSIVE_ROOT; + (*element)->child = NULL; + bool added_new; + added = phpdbg_add_bucket_watch_element(zv, *element, &added_new); + if (!added_new) { + *element = added; + return PHPDBG_WATCH_ADD_DUPLICATE; + } + return PHPDBG_WATCH_ADD_OK; } -typedef struct { int (*callback)(zval *zv, phpdbg_watch_element *); zend_string *str; } phpdbg_watch_parse_struct; +typedef struct { phpdbg_watch_add_result (*callback)(zval *zv, phpdbg_watch_element **); zend_string *str; } phpdbg_watch_parse_struct; static int phpdbg_watchpoint_parse_wrapper(char *name, size_t namelen, char *key, size_t keylen, HashTable *parent, zval *zv, phpdbg_watch_parse_struct *info) { - int ret; + int ret = SUCCESS; phpdbg_watch_element *element = ecalloc(1, sizeof(phpdbg_watch_element)); element->str = zend_string_init(name, namelen, 0); element->name_in_parent = zend_string_init(key, keylen, 0); @@ -1300,13 +1455,25 @@ element->parent = PHPDBG_G(watch_tmp); element->child = NULL; - ret = info->callback(zv, element); + phpdbg_watch_add_result result = info->callback(zv, &element); efree(name); efree(key); - if (ret != SUCCESS) { + if (result == PHPDBG_WATCH_ADD_FAILED) { phpdbg_remove_watch_element(element); + ret = FAILURE; + } else if (result == PHPDBG_WATCH_ADD_DUPLICATE) { + phpdbg_notice("%.*s is already being watched", (int) ZSTR_LEN(element->str), ZSTR_VAL(element->str)); + while (PHPDBG_G(watch_tmp) && PHPDBG_G(watch_tmp)->child == NULL) { + phpdbg_watch_element *parent = PHPDBG_G(watch_tmp)->parent; + phpdbg_clean_watch_element(PHPDBG_G(watch_tmp)); + phpdbg_free_watch_element(PHPDBG_G(watch_tmp)); + if (parent) { + parent->child = NULL; + } + PHPDBG_G(watch_tmp) = parent; + } } else { if (PHPDBG_G(watch_tmp)) { PHPDBG_G(watch_tmp)->child = element; @@ -1348,7 +1515,7 @@ element->name_in_parent = zend_string_init(key, keylen, 0); element->parent_container = parent; element->parent = PHPDBG_G(watch_tmp); - element = phpdbg_add_bucket_watch_element((Bucket *) zv, element); + element = phpdbg_add_bucket_watch_element(zv, element, NULL); efree(name); efree(key); @@ -1361,7 +1528,7 @@ return SUCCESS; } -static int phpdbg_watchpoint_parse_symtables(char *input, size_t len, int (*callback)(zval *, phpdbg_watch_element *)) { +static int phpdbg_watchpoint_parse_symtables(char *input, size_t len, phpdbg_watch_add_result (*callback)(zval *, phpdbg_watch_element **)) { zend_class_entry *scope = zend_get_executed_scope(); phpdbg_watch_parse_struct info; int ret; @@ -1508,7 +1675,9 @@ /* unconditionally free all remaining elements to avoid memory leaks */ ZEND_HASH_MAP_FOREACH_PTR(&PHPDBG_G(watch_recreation), element) { - phpdbg_automatic_dequeue_free(element); + if (element) { + phpdbg_automatic_dequeue_free(element); + } } ZEND_HASH_FOREACH_END(); /* upon fatal errors etc. (i.e. CG(unclean_shutdown) == 1), some watchpoints may still be active. Ensure memory is not watched anymore for next run. Do not care about memory freeing here, shutdown is unclean and near anyway. */ @@ -1531,6 +1700,39 @@ free(PHPDBG_G(watchlist_mem_backup)); } +void phpdbg_release_watch_elements(void) { + phpdbg_watch_element *element; + uint32_t guard; + + ZEND_HASH_MAP_FOREACH_PTR(&PHPDBG_G(watch_recreation), element) { + if (element) { + phpdbg_automatic_dequeue_free(element); + } + } ZEND_HASH_FOREACH_END(); + zend_hash_clean(&PHPDBG_G(watch_recreation)); + + guard = zend_hash_num_elements(&PHPDBG_G(watch_elements)) + 1; + while (zend_hash_num_elements(&PHPDBG_G(watch_elements)) > 0 && guard-- > 0) { + ZEND_HASH_FOREACH_PTR(&PHPDBG_G(watch_elements), element) { + phpdbg_remove_watch_element(element); + break; + } ZEND_HASH_FOREACH_END(); + } + zend_hash_clean(&PHPDBG_G(watch_recreation)); + + phpdbg_btree_clean(&PHPDBG_G(watchpoint_tree)); + phpdbg_btree_clean(&PHPDBG_G(watch_HashTables)); + + zend_hash_destroy(&PHPDBG_G(watch_elements)); + zend_hash_init(&PHPDBG_G(watch_elements), 8, NULL, NULL, 0); + zend_hash_destroy(&PHPDBG_G(watch_recreation)); + zend_hash_init(&PHPDBG_G(watch_recreation), 8, NULL, NULL, 0); + zend_hash_destroy(&PHPDBG_G(watch_free)); + zend_hash_init(&PHPDBG_G(watch_free), 8, NULL, NULL, 0); + zend_hash_destroy(&PHPDBG_G(watch_collisions)); + zend_hash_init(&PHPDBG_G(watch_collisions), 8, NULL, NULL, 0); +} + void phpdbg_purge_watchpoint_tree(void) { phpdbg_btree_position pos; phpdbg_btree_result *res; diff -Nru php8.4-8.4.27/sapi/phpdbg/phpdbg_watch.h php8.4-8.4.28/sapi/phpdbg/phpdbg_watch.h --- php8.4-8.4.27/sapi/phpdbg/phpdbg_watch.h 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/phpdbg/phpdbg_watch.h 2026-11-17 20:29:32.000000000 +0000 @@ -56,6 +56,7 @@ #define PHPDBG_WATCH_NORMAL (PHPDBG_WATCH_SIMPLE | PHPDBG_WATCH_RECURSIVE) #define PHPDBG_WATCH_IMPLICIT 0x10 #define PHPDBG_WATCH_RECURSIVE_ROOT 0x20 +#define PHPDBG_WATCH_HT_REGISTERED 0x40 typedef struct _phpdbg_watch_collision phpdbg_watch_collision; @@ -112,6 +113,7 @@ void phpdbg_setup_watchpoints(void); void phpdbg_destroy_watchpoints(void); +void phpdbg_release_watch_elements(void); void phpdbg_purge_watchpoint_tree(void); #ifndef _WIN32 diff -Nru php8.4-8.4.27/sapi/phpdbg/tests/gh22480.phpt php8.4-8.4.28/sapi/phpdbg/tests/gh22480.phpt --- php8.4-8.4.27/sapi/phpdbg/tests/gh22480.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/sapi/phpdbg/tests/gh22480.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,34 @@ +--TEST-- +GH-22480 (Use-after-free when re-watching an already-watched variable) +--PHPDBG-- +b 6 +r +w a $a +w a $a +c + +q +--EXPECTF-- +[Successful compilation of %s] +prompt> [Breakpoint #0 added at %s:6] +prompt> [Breakpoint #0 at %s:6, hits: 1] +>00006: $a[0] = 2; + 00007: + 00008: $a = [0 => 3, 1 => 4]; +prompt> [Added watchpoint #0 for $a[]] +prompt> [$a[] is already being watched] +prompt> [Breaking on watchpoint $a[]] +1 elements were added to the array +>00009: +prompt> [$a[] has been removed, removing watchpoint] +[Script ended normally] +prompt> +--FILE-- + 3, 1 => 4]; diff -Nru php8.4-8.4.27/sapi/phpdbg/tests/gh22480_2.phpt php8.4-8.4.28/sapi/phpdbg/tests/gh22480_2.phpt --- php8.4-8.4.27/sapi/phpdbg/tests/gh22480_2.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/sapi/phpdbg/tests/gh22480_2.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,30 @@ +--TEST-- +GH-22480 (Use-after-free re-watching a sub-path of a recursive watchpoint) +--INI-- +opcache.optimization_level=0 +--PHPDBG-- +b 5 +r +w r $a +w $a[x] +c +q +--EXPECTF-- +[Successful compilation of %s] +prompt> [Breakpoint #0 added at %s:5] +prompt> [Breakpoint #0 at %s:5, hits: 1] +>00005: $a['x'] = 2; + 00006: +prompt> [Added watchpoint #0 for $a[]] +prompt> [$a[x] is already being watched] +prompt> [Breaking on watchpoint $a] +Old value%s +New value: Array ([x] => 2) +>00006: +prompt> [$a has been removed, removing watchpoint recursively] +--FILE-- + 1]; + +$a['x'] = 2; diff -Nru php8.4-8.4.27/sapi/phpdbg/tests/subcommand_parent_name.phpt php8.4-8.4.28/sapi/phpdbg/tests/subcommand_parent_name.phpt --- php8.4-8.4.27/sapi/phpdbg/tests/subcommand_parent_name.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php8.4-8.4.28/sapi/phpdbg/tests/subcommand_parent_name.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -0,0 +1,16 @@ +--TEST-- +Subcommand error messages name the correct parent command +--PHPDBG-- +list lines +print func +break at +info literal 1 +set prompt 1 +q +--EXPECT-- +prompt> [The command "list lines" expected at least 1 arguments (l) and received 0] +prompt> [The command "print func" expected string and got nothing at parameter 1] +prompt> [The command "break at" expected at least 2 arguments (*c) and received 0] +prompt> [The command "info literal" expected no arguments] +prompt> [The command "set prompt" expected string and got numeric at parameter 1] +prompt> diff -Nru php8.4-8.4.27/sapi/phpdbg/tests/watch_005.phpt php8.4-8.4.28/sapi/phpdbg/tests/watch_005.phpt --- php8.4-8.4.27/sapi/phpdbg/tests/watch_005.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/phpdbg/tests/watch_005.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -1,14 +1,5 @@ --TEST-- Test proper watch comparisons when having multiple levels of indirection from a zval to its value ---SKIPIF-- - --PHPDBG-- b 3 r diff -Nru php8.4-8.4.27/sapi/phpdbg/tests/watch_006.phpt php8.4-8.4.28/sapi/phpdbg/tests/watch_006.phpt --- php8.4-8.4.27/sapi/phpdbg/tests/watch_006.phpt 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/sapi/phpdbg/tests/watch_006.phpt 2026-11-17 20:29:32.000000000 +0000 @@ -1,14 +1,5 @@ --TEST-- Test multiple watch elements pointing to the same watchpoint ---SKIPIF-- - --PHPDBG-- b 4 r @@ -20,7 +11,6 @@ - q --EXPECTF-- [Successful compilation of %s] @@ -57,11 +47,6 @@ 00010: prompt> [Breaking on watchpoint $b] Old value inaccessible or destroyed -New value (reference): Array ([0] => 2,[1] => 3) ->00009: $b = &$c; - 00010: -prompt> [Breaking on watchpoint $b] -Old value inaccessible or destroyed New value (reference): Array ([0] => 1) >00010: prompt> [$b has been removed, removing watchpoint recursively] diff -Nru php8.4-8.4.27/scripts/dev/makedist php8.4-8.4.28/scripts/dev/makedist --- php8.4-8.4.27/scripts/dev/makedist 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/scripts/dev/makedist 2026-11-17 20:29:32.000000000 +0000 @@ -160,22 +160,9 @@ # Remove not needed files. rm -rf autom4te.cache/ -# Download PEAR. -echo "" -echo "makedist: Attempting to download PEAR's phar archive." -if test ! -x wget; then - wget https://pear.php.net/install-pear-nozlib.phar -nd -P pear/ - if [ "x$?" != "x0" ]; then - echo "makedist: PEAR download failed." >&2 - exit 1 - fi -else - echo "makedist: Missing wget binary needed for PEAR download." >&2 - exit 1 -fi - # Reset the modification and access times of all files to be packaged. commitDate="$(git log -1 --format=%cI $treeish)" +echo "" echo "makedist: Resetting the modification and access times of package files to $commitDate" "$touch" -c -d"$commitDate" NEWS find . -exec "$touch" -r NEWS -c {} \; diff -Nru php8.4-8.4.27/win32/build/Makefile php8.4-8.4.28/win32/build/Makefile --- php8.4-8.4.27/win32/build/Makefile 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/win32/build/Makefile 2026-11-17 20:29:32.000000000 +0000 @@ -25,7 +25,7 @@ !if "$(PHP_SIMD_SCALE)" == "" SIMD_SUFFIX= !else -!if "$(PHP_SIMD_SCALE)" == "SSE2" +!if "$(PHP_SIMD_SCALE)" == "SSE2" || "$(PHP_SIMD_SCALE)" == "NEON" SIMD_SUFFIX= !else SIMD_SUFFIX=-$(PHP_SIMD_SCALE) diff -Nru php8.4-8.4.27/win32/build/config.w32.h.in php8.4-8.4.28/win32/build/config.w32.h.in --- php8.4-8.4.27/win32/build/config.w32.h.in 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/win32/build/config.w32.h.in 2026-11-17 20:29:32.000000000 +0000 @@ -25,6 +25,11 @@ #define DEFAULT_SHORT_OPEN_TAG "1" /* Platform-Specific Configuration. Should not be changed. */ +/* Match -ffp-contract=off on toolsets that enable ARM64 contractions by default. */ +#if defined(_MSC_VER) && _MSC_VER < 1930 && defined(_M_ARM64) && !defined(__clang__) +# pragma fp_contract(off) +#endif + /* Alignment for Zend memory allocator */ #define ZEND_MM_ALIGNMENT (size_t)8 #define ZEND_MM_ALIGNMENT_LOG2 (size_t)3 diff -Nru php8.4-8.4.27/win32/time.c php8.4-8.4.28/win32/time.c --- php8.4-8.4.27/win32/time.c 2026-10-19 14:38:59.000000000 +0000 +++ php8.4-8.4.28/win32/time.c 2026-11-17 20:29:32.000000000 +0000 @@ -22,6 +22,7 @@ #include #include #include "php_win32_globals.h" +#include "zend_hrtime.h" static zend_always_inline void getfilesystemtime(struct timeval *tv) {/*{{{*/ @@ -63,17 +64,44 @@ return 0; }/*}}}*/ +static DWORD wait_timer_alertable(HANDLE timer) +{/*{{{*/ + DWORD result; + +#ifdef ZTS + /* Threads that PHP does not manage have no executor globals, and their APCs cannot run PHP code */ + if (!tsrm_is_managed_thread()) { + return WaitForSingleObjectEx(timer, INFINITE, TRUE); + } +#endif + + /* APCs can run PHP code that bails out. Close the timer before propagating the bailout. */ + zend_try { + result = WaitForSingleObjectEx(timer, INFINITE, TRUE); + } zend_catch { + CloseHandle(timer); + zend_bailout(); + } zend_end_try(); + + return result; +}/*}}}*/ + PHPAPI int usleep(unsigned int useconds) {/*{{{*/ HANDLE timer; LARGE_INTEGER due; + DWORD result; due.QuadPart = -(10 * (__int64)useconds); timer = CreateWaitableTimer(NULL, TRUE, NULL); SetWaitableTimer(timer, &due, 0, NULL, NULL, 0); - WaitForSingleObject(timer, INFINITE); + result = wait_timer_alertable(timer); CloseHandle(timer); + if (result == WAIT_IO_COMPLETION) { + errno = EINTR; + return -1; + } return 0; }/*}}}*/ @@ -84,5 +112,30 @@ errno = EINVAL; return -1; } - return usleep( rqtp->tv_sec * 1000000 + rqtp->tv_nsec / 1000 ); + /* Run already queued APCs first, so that their runtime doesn't count as time slept */ + if (SleepEx(0, TRUE) == WAIT_IO_COMPLETION) { + if (rmtp != NULL) { + *rmtp = *rqtp; + } + errno = EINTR; + return -1; + } + zend_hrtime_t start = zend_hrtime(); + int result = usleep(rqtp->tv_sec * 1000000 + rqtp->tv_nsec / 1000); + if (result == -1 && errno == EINTR && rmtp != NULL) { + zend_hrtime_t elapsed = zend_hrtime() - start; + time_t seconds = rqtp->tv_sec - (time_t) (elapsed / ZEND_NANO_IN_SEC); + long nanoseconds = rqtp->tv_nsec - (long) (elapsed % ZEND_NANO_IN_SEC); + if (nanoseconds < 0) { + seconds--; + nanoseconds += (long) ZEND_NANO_IN_SEC; + } + if (seconds < 0) { + seconds = 0; + nanoseconds = 0; + } + rmtp->tv_sec = seconds; + rmtp->tv_nsec = nanoseconds; + } + return result; }/*}}}*/