[Pkg-php-commits] [php/debian-sid] Imported Upstream version 5.3.0~RC4
Sean Finney
seanius at debian.org
Sun Feb 7 23:19:13 UTC 2010
---
EXTENSIONS | 6 +-
NEWS | 157 +-
README.PARAMETER_PARSING_API | 1 +
README.RELEASE_PROCESS | 45 +-
README.UPDATE_5_2 | 1022 -
README.namespaces | 70 +-
TSRM/tsrm_virtual_cwd.c | 161 +-
TSRM/tsrm_virtual_cwd.h | 9 +-
TSRM/tsrm_win32.c | 163 +-
TSRM/tsrm_win32.h | 3 +-
UPGRADING | 73 +-
Zend/Zend.m4 | 34 +-
Zend/tests/017.phpt | 2 +-
Zend/tests/029.phpt | 34 -
Zend/tests/bug39018.phpt | 2 +-
Zend/tests/bug42143.phpt | 38 +
Zend/tests/bug43027.phpt | 1 -
Zend/tests/bug47516.phpt | 36 +
Zend/tests/bug47596.phpt | 63 +
Zend/tests/bug47699.phpt | 18 +
Zend/tests/bug47714.phpt | 27 +
Zend/tests/bug47771.phpt | 30 +
Zend/tests/bug47801.phpt | 31 +
Zend/tests/bug47836.phpt | 16 +
Zend/tests/bug47880.phpt | 15 +
Zend/tests/bug47981.phpt | 19 +
Zend/tests/bug48004.phpt | 21 +
Zend/tests/bug48215.phpt | 38 +
Zend/tests/bug48228.phpt | 32 +
Zend/tests/bug48248.phpt | 27 +
Zend/tests/bug48408.phpt | 30 +
Zend/tests/bug48409.phpt | 67 +
Zend/tests/bug48428.phpt | 13 +
Zend/tests/bug48533.phpt | 41 +
Zend/tests/call_static_006.phpt | 2 +-
Zend/tests/exception_010.phpt | 30 +
Zend/tests/function_exists_basic.phpt | 39 +
Zend/tests/function_exists_error.phpt | 37 +
Zend/tests/function_exists_variation1.phpt | 138 +
Zend/tests/get_class_vars_003.phpt | 4 +-
Zend/tests/get_class_vars_006.phpt | 4 +-
Zend/tests/get_defined_functions_basic.phpt | 59 +
Zend/tests/get_defined_functions_error.phpt | 29 +
Zend/tests/int_overflow_64bit.phpt | 8 +-
Zend/tests/int_underflow_32bit.phpt | 10 +-
Zend/tests/jump12.phpt | 1 -
Zend/tests/magic_methods_002.phpt | 2 +-
Zend/tests/magic_methods_003.phpt | 2 +-
Zend/tests/magic_methods_004.phpt | 2 +-
Zend/tests/magic_methods_005.phpt | 2 +-
Zend/tests/magic_methods_007.phpt | 2 +-
Zend/tests/magic_methods_008.phpt | 2 +-
Zend/tests/magic_methods_010.phpt | 2 +-
Zend/tests/unset_cv05.phpt | 1 +
Zend/tests/unset_cv06.phpt | 1 +
Zend/zend.c | 12 +-
Zend/zend.h | 19 +-
Zend/zend_API.c | 39 +-
Zend/zend_alloc.c | 13 +-
Zend/zend_builtin_functions.c | 91 +-
Zend/zend_compile.c | 74 +-
Zend/zend_compile.h | 4 +-
Zend/zend_exceptions.c | 18 +-
Zend/zend_execute.c | 25 +-
Zend/zend_execute.h | 25 +-
Zend/zend_execute_API.c | 40 +-
Zend/zend_extensions.c | 7 +-
Zend/zend_extensions.h | 9 +-
Zend/zend_gc.c | 279 +-
Zend/zend_globals.h | 4 +-
Zend/zend_hash.c | 6 +-
Zend/zend_hash.h | 65 +-
Zend/zend_highlight.c | 25 +-
Zend/zend_ini_scanner.c | 339 +-
Zend/zend_ini_scanner.l | 4 +-
Zend/zend_ini_scanner_defs.h | 2 +-
Zend/zend_interfaces.c | 12 +-
Zend/zend_language_parser.c | 8 +-
Zend/zend_language_parser.y | 8 +-
Zend/zend_language_scanner.c | 8805 ++--
Zend/zend_language_scanner.l | 656 +-
Zend/zend_language_scanner_defs.h | 6 +-
Zend/zend_object_handlers.c | 81 +-
Zend/zend_opcode.c | 4 +-
Zend/zend_operators.c | 527 +-
Zend/zend_operators.h | 133 +-
Zend/zend_ptr_stack.h | 2 +-
Zend/zend_stream.c | 9 +-
Zend/zend_stream.h | 4 +-
Zend/zend_types.h | 2 +-
Zend/zend_variables.h | 6 +-
Zend/zend_vm_def.h | 74 +-
Zend/zend_vm_execute.h | 454 +-
acinclude.m4 | 19 +-
aclocal.m4 | 19 +-
build/order_by_dep.awk | 5 +-
configure | 7309 ++--
configure.in | 16 +-
ext/bcmath/libbcmath/src/bcmath.h | 2 +-
ext/bz2/bz2.c | 10 +-
ext/bz2/config.w32 | 4 +-
ext/com_dotnet/com_handlers.c | 6 +-
ext/com_dotnet/com_iterator.c | 4 +-
ext/com_dotnet/com_persist.c | 4 +-
ext/com_dotnet/com_saproxy.c | 18 +-
ext/curl/config.m4 | 119 +-
ext/curl/config.w32 | 6 +-
ext/curl/interface.c | 549 +-
ext/curl/php_curl.h | 10 +-
ext/curl/streams.c | 55 +-
ext/curl/tests/bug45161.phpt | 16 +
ext/curl/tests/bug46711.phpt | 13 +-
ext/curl/tests/bug46739.phpt | 9 +
ext/curl/tests/bug48203.phpt | 33 +
ext/curl/tests/bug48514.phpt | 27 +
ext/curl/tests/curl_001.phpt | 41 -
ext/curl/tests/curl_002.phpt | 37 -
ext/curl/tests/curl_003.phpt | 52 -
ext/curl/tests/curl_004.phpt | 37 -
ext/curl/tests/curl_005.phpt | 37 -
ext/curl/tests/curl_006.phpt | 35 -
ext/curl/tests/curl_basic_001.phpt | 45 +
ext/curl/tests/curl_basic_002.phpt | 41 +
ext/curl/tests/curl_basic_003.phpt | 56 +
ext/curl/tests/curl_basic_004.phpt | 41 +
ext/curl/tests/curl_basic_005.phpt | 41 +
ext/curl/tests/curl_basic_006.phpt | 41 +
ext/curl/tests/curl_basic_007.phpt | 24 +
ext/curl/tests/curl_basic_008.phpt | 23 +
ext/curl/tests/curl_basic_009.phpt | 23 +
ext/curl/tests/curl_basic_010.phpt | 24 +
ext/curl/tests/curl_basic_011.phpt | 38 +
ext/curl/tests/curl_basic_012.phpt | 38 +
ext/curl/tests/curl_basic_013.phpt | 38 +
ext/curl/tests/curl_basic_014.phpt | 15 +
ext/curl/tests/curl_basic_015.phpt | 16 +
ext/curl/tests/curl_basic_016.phpt | 57 +
ext/curl/tests/curl_basic_017.phpt | 69 +
ext/curl/tests/curl_basic_018.phpt | 72 +
ext/curl/tests/curl_basic_019.phpt | 28 +
ext/curl/tests/curl_basic_020.phpt | 25 +
ext/curl/tests/curl_basic_021.phpt | 24 +
ext/curl/tests/responder/get.php | 48 +-
ext/date/config.m4 | 25 -
ext/date/config0.m4 | 25 +
ext/date/lib/parse_iso_intervals.c | 48 +-
ext/date/lib/parse_tz.c | 22 +-
ext/date/lib/timelib_structs.h | 43 +-
ext/date/lib/timezonedb.h | 2560 +-
ext/date/lib/tm2unixtime.c | 24 +-
ext/date/php_date.c | 117 +-
ext/date/php_date.h | 5 +-
ext/date/tests/002.phpt | 6 +-
ext/date/tests/009_win32.phpt | 8 +-
ext/date/tests/DateTimeZone_getOffset_basic1.phpt | 2 +-
ext/date/tests/bug13142.phpt | 4 +-
ext/date/tests/bug14561.phpt | 3 +-
ext/date/tests/bug17988.phpt | 3 +-
ext/date/tests/bug20382-1.phpt | 3 +-
ext/date/tests/bug20382-2.phpt | 2 +-
ext/date/tests/bug21399.phpt | 3 +-
ext/date/tests/bug21966.phpt | 4 +-
ext/date/tests/bug26090.phpt | 3 +-
ext/date/tests/bug26317.phpt | 3 +-
ext/date/tests/bug26320.phpt | 3 +-
ext/date/tests/bug26694.phpt | 3 +-
ext/date/tests/bug27719.phpt | 12 +-
ext/date/tests/bug27780.phpt | 2 +-
ext/date/tests/bug28024.phpt | 3 +-
ext/date/tests/bug29150.phpt | 3 +-
ext/date/tests/bug30532.phpt | 4 +-
ext/date/tests/bug32086.phpt | 4 +-
ext/date/tests/bug32270.phpt | 3 +-
ext/date/tests/bug32555.phpt | 3 +-
ext/date/tests/bug32588.phpt | 3 +-
ext/date/tests/bug33414-1.phpt | 49 +-
ext/date/tests/bug33414-2.phpt | 18 +-
ext/date/tests/bug33415-1.phpt | 4 +-
ext/date/tests/bug33532.phpt | 4 +-
ext/date/tests/bug35425.phpt | 3 +-
ext/date/tests/bug45682.phpt | 32 +
ext/date/tests/bug46108.phpt | 19 +
ext/date/tests/bug48058.phpt | 29 +
ext/date/tests/bug48097.phpt | 38 +
ext/date/tests/date_add_basic2.phpt | 14 +
ext/date/tests/date_create-relative.phpt | 93 +
ext/date/tests/date_create_from_format_basic.phpt | 14 +
ext/date/tests/date_create_from_format_basic2.phpt | 13 +
ext/date/tests/date_default_timezone_get-3.phpt | 3 +-
ext/date/tests/date_get_last_errors_basic.phpt | 13 +
ext/date/tests/date_parse_from_format_basic.phpt | 14 +
ext/date/tests/date_sunrise_variation9.phpt | 12 +-
ext/date/tests/date_sunset_variation9.phpt | 12 +-
ext/date/tests/getdate_variation7.phpt | 34 +-
ext/date/tests/gmdate_variation14.phpt | 4 +-
ext/date/tests/gmstrftime_variation2.phpt | 4 +-
ext/date/tests/idate_variation3.phpt | 4 +-
ext/date/tests/localtime_variation3.phpt | 56 +-
ext/date/tests/strftime_variation23.phpt | 4 +-
ext/date/tests/strtotime-relative.phpt | 98 +
ext/date/tests/strtotime_basic2.phpt | 13 +
ext/date/tests/timezone_offset_get_basic1.phpt | 2 +-
ext/dba/dba_db4.c | 4 +-
ext/dba/tests/bug48240.phpt | 25 +
ext/dba/tests/dba_cdb_make.phpt | 3 +-
ext/dom/document.c | 11 +-
ext/dom/tests/DOMAttr_construct_error_001.phpt | 17 +
ext/dom/tests/DOMAttr_name_basic_001.phpt | 14 +
ext/dom/tests/DOMAttr_ownerElement_error_001.phpt | 23 +
ext/dom/tests/DOMAttr_value_basic_002.phpt | 15 +
.../tests/DOMCDATASection_construct_error_001.phpt | 21 +
.../DOMCharacterData_appendData_error_001.phpt | 19 +
ext/dom/tests/DOMCharacterData_data_error_002.phpt | 14 +
.../DOMCharacterData_deleteData_basic_001.phpt | 20 +
.../DOMCharacterData_deleteData_error_001.phpt | 19 +
.../DOMCharacterData_deleteData_error_002.phpt | 23 +
.../DOMCharacterData_insertData_error_001.phpt | 19 +
.../DOMCharacterData_replaceData_error_001.phpt | 19 +
ext/dom/tests/DOMComment_construct_basic_001.phpt | 19 +
ext/dom/tests/DOMComment_construct_error_001.phpt | 17 +
.../DOMDocumentFragment_appendXML_basic_001.phpt | 22 +
.../DOMDocumentFragment_appendXML_error_001.phpt | 14 +
.../DOMDocumentFragment_appendXML_error_002.phpt | 19 +
.../DOMDocumentFragment_appendXML_error_003.phpt | 19 +
.../DOMDocumentFragment_construct_basic_001.phpt | 15 +
.../DOMDocumentFragment_construct_basic_002.phpt | 16 +
.../DOMDocumentFragment_construct_error_001.phpt | 17 +
ext/dom/tests/DOMDocumentType_basic_001.phpt | 48 +
.../tests/DOMDocumentType_entities_error_001.phpt | 14 +
.../DOMDocumentType_internalSubset_error_001.phpt | 14 +
ext/dom/tests/DOMDocumentType_name_error_001.phpt | 14 +
.../tests/DOMDocumentType_notations_error_001.phpt | 14 +
.../tests/DOMDocumentType_publicId_basic_001.phpt | 19 +
.../tests/DOMDocumentType_publicId_error_001.phpt | 14 +
.../tests/DOMDocumentType_systemId_basic_001.phpt | 19 +
.../tests/DOMDocumentType_systemId_error_001.phpt | 14 +
ext/dom/tests/bug47849.phpt | 22 +
ext/dom/xpath.c | 4 +-
ext/ereg/ereg.c | 53 +-
ext/ereg/php_ereg.h | 3 +-
ext/ereg/tests/split_variation_004.phpt | 12 +-
ext/ereg/tests/spliti_variation_004.phpt | 12 +-
ext/exif/exif.c | 14 +-
ext/exif/tests/bug48378.jpeg | Bin 0 -> 2566 bytes
ext/exif/tests/bug48378.phpt | 19 +
ext/exif/tests/exif006.phpt | 1 +
ext/fileinfo/data_file.c |66579 ++++++++++----------
ext/fileinfo/libmagic/apprentice.c | 56 +-
ext/fileinfo/libmagic/apptype.c | 2 +-
ext/fileinfo/libmagic/cdf.c | 318 +-
ext/fileinfo/libmagic/cdf.h | 41 +-
ext/fileinfo/libmagic/compress.c | 3 +
ext/fileinfo/libmagic/file.h | 7 +-
ext/fileinfo/libmagic/funcs.c | 6 +-
ext/fileinfo/libmagic/magic.c | 17 +-
ext/fileinfo/libmagic/patchlevel.h | 8 +-
ext/fileinfo/libmagic/readcdf.c | 88 +-
ext/fileinfo/libmagic/softmagic.c | 9 +-
ext/filter/filter.c | 18 +-
ext/filter/logical_filters.c | 39 +-
ext/filter/tests/046.phpt | 4 -
ext/filter/tests/bug39763.phpt | 3 +-
ext/filter/tests/bug46973.phpt | 4 +-
ext/filter/tests/bug47745.phpt | 11 +
ext/gd/config.m4 | 16 +-
ext/gd/config.w32 | 17 +-
ext/gd/gd.c | 107 +-
ext/gd/libgd/gd.c | 1096 +-
ext/gd/libgd/gd.h | 5 +
ext/gd/libgd/gd_arc.c | 110 +
ext/gd/libgd/gd_color.c | 67 +
ext/gd/libgd/gd_compat.c | 35 +
ext/gd/libgd/gd_compat.h | 59 +
ext/gd/libgd/gd_filter.c | 461 +
ext/gd/libgd/gd_intern.h | 13 +
ext/gd/libgd/gd_jpeg.c | 12 +
ext/gd/libgd/gd_png.c | 30 +-
ext/gd/libgd/gd_rotate.c | 557 +
ext/gd/libgd/gd_topal.c | 56 -
ext/gd/php_gd.h | 17 +-
ext/gd/tests/gd_info_variation1.phpt | 2 +-
ext/gettext/tests/gettext_basic-enus.phpt | 28 +
.../gettext_bind_textdomain_codeset-retval.phpt | 22 +
...ettext_bind_textdomain_codeset-wrongparams.phpt | 23 +
ext/gettext/tests/gettext_bindtextdomain-cwd.phpt | 27 +
.../tests/gettext_bindtextdomain-emptydomain.phpt | 16 +
ext/gettext/tests/gettext_bindtextdomain-path.phpt | 16 +
.../tests/gettext_bindtextdomain-wrongparams.phpt | 19 +
.../tests/gettext_dcgettext-wrongparams.phpt | 16 +
ext/gettext/tests/gettext_dcgettext.phpt | 25 +
ext/gettext/tests/gettext_dgettext.phpt | 30 +
.../tests/gettext_dgettext_error_wrongparams.phpt | 34 +
ext/gettext/tests/gettext_dngettext-plural.phpt | 24 +
.../tests/gettext_dngettext-wrongparams.phpt | 23 +
.../tests/gettext_gettext_error_wrongparams.phpt | 17 +
.../tests/gettext_ngettext-wrongparams.phpt | 33 +
ext/gettext/tests/gettext_ngettext.phpt | 26 +
ext/gettext/tests/gettext_phpinfo.phpt | 19 +
ext/gettext/tests/gettext_textdomain-retval.phpt | 29 +
.../tests/gettext_textdomain-wrongparams.phpt | 25 +
.../tests/locale/en/LC_CTYPE/dgettextTest.mo | Bin 0 -> 84 bytes
.../tests/locale/en/LC_CTYPE/dgettextTest.po | 4 +
.../locale/en/LC_CTYPE/dgettextTest_switch.mo | Bin 0 -> 102 bytes
.../locale/en/LC_CTYPE/dgettextTest_switch.po | 4 +
.../locale/en/LC_CTYPE/dgettextTest_switched.po | 2 +
.../tests/locale/en/LC_CTYPE/dngettextTest.mo | Bin 0 -> 86 bytes
.../tests/locale/en/LC_CTYPE/dngettextTest.po | 4 +
.../tests/locale/en/LC_MESSAGES/dgettextTest.mo | Bin 0 -> 84 bytes
.../tests/locale/en/LC_MESSAGES/dgettextTest.po | 4 +
.../locale/en/LC_MESSAGES/dgettextTest_switch.mo | Bin 0 -> 102 bytes
.../locale/en/LC_MESSAGES/dgettextTest_switch.po | 4 +
.../tests/locale/en/LC_MESSAGES/dngettextTest.mo | Bin 0 -> 84 bytes
.../tests/locale/en/LC_MESSAGES/dngettextTest.po | 4 +
.../tests/locale/en/LC_MESSAGES/messages.mo | Bin 0 -> 201 bytes
.../tests/locale/en/LC_MESSAGES/messages.po | 15 +
ext/gmp/config.w32 | 6 +-
ext/hash/hash.c | 21 +-
ext/iconv/tests/iconv_basic.phpt | 72 +
ext/iconv/tests/iconv_encoding_basic.phpt | 94 +
ext/iconv/tests/iconv_get_encoding_error.phpt | 177 +
.../iconv_mime_decode_headers_variation1.phpt | 218 +
.../iconv_mime_decode_headers_variation2.phpt | 479 +
.../iconv_mime_decode_headers_variation3.phpt | 482 +
ext/iconv/tests/iconv_mime_decode_variation1.phpt | 183 +
ext/iconv/tests/iconv_mime_decode_variation2.phpt | 195 +
ext/iconv/tests/iconv_mime_decode_variation3.phpt | 222 +
ext/iconv/tests/iconv_set_encoding_error.phpt | 177 +
ext/iconv/tests/iconv_set_encoding_variation.phpt | 307 +
ext/iconv/tests/iconv_stream_filter.phpt | 14 +-
ext/iconv/tests/iconv_stream_filter_delimiter.phpt | 50 +
ext/iconv/tests/iconv_strlen_basic.phpt | 40 +
ext/iconv/tests/iconv_strlen_error1.phpt | 45 +
ext/iconv/tests/iconv_strlen_error2.phpt | 34 +
ext/iconv/tests/iconv_strlen_variation1.phpt | 193 +
ext/iconv/tests/iconv_strlen_variation2.phpt | 204 +
ext/iconv/tests/iconv_strpos_basic.phpt | 57 +
ext/iconv/tests/iconv_strpos_error1.phpt | 50 +
ext/iconv/tests/iconv_strpos_error2.phpt | 34 +
ext/iconv/tests/iconv_strpos_variation1.phpt | 182 +
ext/iconv/tests/iconv_strpos_variation2.phpt | 182 +
ext/iconv/tests/iconv_strpos_variation3.phpt | 201 +
ext/iconv/tests/iconv_strpos_variation3_64bit.phpt | 199 +
ext/iconv/tests/iconv_strpos_variation4.phpt | 207 +
ext/iconv/tests/iconv_strpos_variation5.phpt | 101 +
ext/iconv/tests/iconv_strrpos_basic.phpt | 58 +
ext/iconv/tests/iconv_strrpos_error1.phpt | 49 +
ext/iconv/tests/iconv_strrpos_error2.phpt | 35 +
ext/iconv/tests/iconv_strrpos_variation1.phpt | 180 +
ext/iconv/tests/iconv_strrpos_variation2.phpt | 182 +
ext/iconv/tests/iconv_strrpos_variation3.phpt | 205 +
ext/iconv/tests/iconv_substr_basic.phpt | 55 +
ext/iconv/tests/iconv_substr_error1.phpt | 50 +
ext/iconv/tests/iconv_substr_error2.phpt | 36 +
ext/imap/config.m4 | 20 +-
ext/imap/config.w32 | 11 +-
ext/imap/php_imap.c | 622 +-
ext/imap/php_imap.h | 7 +-
ext/imap/tests/clean.inc | 48 +-
ext/imap/tests/imap_8bit_basic.phpt | 66 +-
ext/imap/tests/imap_append_basic.phpt | 144 +-
ext/imap/tests/imap_base64_basic.phpt | 90 +-
ext/imap/tests/imap_body.phpt | 27 +
ext/imap/tests/imap_body_basic.phpt | 86 +-
ext/imap/tests/imap_clearflag_full_basic.phpt | 254 +-
ext/imap/tests/imap_close_basic.phpt | 78 +-
ext/imap/tests/imap_close_error.phpt | 34 +-
ext/imap/tests/imap_close_variation1.phpt | 148 +-
ext/imap/tests/imap_close_variation3.phpt | 56 +-
ext/imap/tests/imap_createmailbox_basic.phpt | 136 +-
ext/imap/tests/imap_errors_basic.phpt | 106 +-
ext/imap/tests/imap_expunge_error.phpt | 27 +
ext/imap/tests/imap_fetch_overview_error.phpt | 22 +-
ext/imap/tests/imap_fetchbody_error.phpt | 26 +-
ext/imap/tests/imap_fetchbody_variation1.phpt | 158 +-
ext/imap/tests/imap_fetchheader_variation4.phpt | 52 +-
ext/imap/tests/imap_gc_error.phpt | 28 +
ext/imap/tests/imap_headers.phpt | 28 +
ext/imap/tests/imap_mutf7_to_utf8.phpt | 23 +
ext/imap/tests/imap_num_msg_error.phpt | 28 +
ext/imap/tests/imap_num_recent_error.phpt | 27 +
ext/imap/tests/imap_open_error.phpt | 42 +
ext/imap/tests/imap_ping_error.phpt | 27 +
ext/imap/tests/imap_utf8_to_mutf7_basic.phpt | 23 +
ext/imap/tests/skipif.inc | 32 +-
ext/interbase/php_ibase_udf.c | 4 +-
ext/intl/collator/collator_locale.c | 2 +-
ext/intl/formatter/formatter_format.c | 6 +-
ext/intl/grapheme/grapheme_string.c | 7 +-
ext/intl/idn/idn.c | 6 +-
ext/intl/intl_data.h | 2 +-
ext/intl/intl_error.c | 12 +-
ext/intl/msgformat/msgformat_attr.c | 3 -
ext/intl/tests/bug48227.phpt | 19 +
ext/intl/tests/grapheme.phpt | 7 +-
ext/json/CREDITS | 2 +-
ext/json/JSON_parser.c | 10 +-
ext/json/JSON_parser.h | 6 +-
ext/json/json.c | 102 +-
ext/json/php_json.h | 6 +-
ext/json/tests/json_decode_basic.phpt | 187 +
ext/json/tests/json_decode_error.phpt | 39 +
ext/json/tests/json_encode_basic.phpt | 158 +
ext/json/tests/json_encode_basic_utf8.phpt | 26 +
ext/json/tests/json_encode_error.phpt | 40 +
ext/ldap/ldap.c | 154 +-
ext/ldap/tests/bug48441.phpt | 169 +
ext/ldap/tests/connect.inc | 61 +
ext/ldap/tests/skipifbindfailure.inc | 13 +
ext/mbstring/config.m4 | 4 +-
ext/mbstring/config.w32 | 6 +-
ext/mbstring/mbstring.c | 345 +-
ext/mbstring/php_mbregex.c | 6 +-
.../tests/mb_convert_encoding_stateful.phpt | 37 +
.../tests/mb_substitute_character_variation1.phpt | 6 -
ext/mbstring/tests/zend_multibyte-02.phpt | 5 +-
ext/mbstring/tests/zend_multibyte-03.phpt | 5 +-
ext/mbstring/tests/zend_multibyte-04.phpt | 5 +-
ext/mbstring/tests/zend_multibyte-05.phpt | 5 +-
ext/mbstring/tests/zend_multibyte-06.phpt | 5 +-
ext/mbstring/tests/zend_multibyte-07.phpt | 5 +-
ext/mbstring/tests/zend_multibyte-08.phpt | 5 +-
ext/mbstring/tests/zend_multibyte-09.phpt | 5 +-
ext/mbstring/tests/zend_multibyte-10.phpt | 5 +-
ext/mbstring/tests/zend_multibyte-11.phpt | 5 +-
ext/mbstring/tests/zend_multibyte-12.phpt | 5 +-
ext/mbstring/tests/zend_multibyte-13.phpt | 5 +-
ext/mbstring/tests/zend_multibyte-14.phpt | 5 +-
ext/mcrypt/mcrypt.c | 6 +-
ext/mssql/php_mssql.c | 4 +-
ext/mssql/php_mssql.h | 4 +-
ext/mysql/php_mysql.c | 8 +-
ext/mysql/tests/mysql_db_query.phpt | 6 +-
ext/mysqli/config.m4 | 12 +-
ext/mysqli/mysqli_api.c | 14 +-
ext/mysqli/mysqli_mysqlnd.h | 2 +
ext/mysqli/mysqli_prop.c | 31 +-
ext/mysqli/php_mysqli_structs.h | 14 +-
ext/mysqli/tests/002.phpt | 32 +-
ext/mysqli/tests/003.phpt | 32 +-
ext/mysqli/tests/004.phpt | 42 +-
ext/mysqli/tests/005.phpt | 12 +-
ext/mysqli/tests/009.phpt | 26 +-
ext/mysqli/tests/010.phpt | 2 +-
ext/mysqli/tests/011.phpt | 22 +-
ext/mysqli/tests/012.phpt | 22 +-
ext/mysqli/tests/014.phpt | 23 +-
ext/mysqli/tests/015.phpt | 22 +-
ext/mysqli/tests/016.phpt | 17 +-
ext/mysqli/tests/017.phpt | 16 +-
ext/mysqli/tests/019.phpt | 30 +-
ext/mysqli/tests/020.phpt | 4 -
ext/mysqli/tests/021.phpt | 12 +-
ext/mysqli/tests/022.phpt | 10 +-
ext/mysqli/tests/026.phpt | 12 +-
ext/mysqli/tests/028.phpt | 9 +-
ext/mysqli/tests/031.phpt | 8 +-
ext/mysqli/tests/032.phpt | 5 +-
ext/mysqli/tests/033.phpt | 9 +-
ext/mysqli/tests/042.phpt | 44 +-
ext/mysqli/tests/043.phpt | 6 -
ext/mysqli/tests/045.phpt | 16 +-
ext/mysqli/tests/047.phpt | 359 +-
ext/mysqli/tests/048.phpt | 30 +-
ext/mysqli/tests/049.phpt | 12 +-
ext/mysqli/tests/056.phpt | 10 +-
ext/mysqli/tests/057.phpt | 51 +-
ext/mysqli/tests/058.phpt | 20 +-
ext/mysqli/tests/059.phpt | 11 +-
ext/mysqli/tests/060.phpt | 51 +-
ext/mysqli/tests/061.phpt | 12 +-
ext/mysqli/tests/062.phpt | 12 +-
ext/mysqli/tests/063.phpt | 12 +-
ext/mysqli/tests/065.phpt | 4 +-
ext/mysqli/tests/068.phpt | 6 +-
ext/mysqli/tests/069.phpt | 18 +-
ext/mysqli/tests/072.phpt | 14 +-
ext/mysqli/tests/073.phpt | 10 +-
ext/mysqli/tests/074.phpt | 19 +-
ext/mysqli/tests/bug34810.phpt | 116 +-
ext/mysqli/tests/bug35517.phpt | 2 +-
ext/mysqli/tests/bug44897.phpt | 10 +-
ext/mysqli/tests/bug45019.phpt | 24 +-
ext/mysqli/tests/bug45289.phpt | 31 +
ext/mysqli/tests/bug47050.phpt | 3 +
ext/mysqli/tests/local_infile_tools.inc | 4 +-
ext/mysqli/tests/mysqli_affected_rows.phpt | 10 +-
ext/mysqli/tests/mysqli_affected_rows_oo.phpt | 6 +-
ext/mysqli/tests/mysqli_change_user_insert_id.phpt | 17 +-
.../mysqli_change_user_prepared_statements.phpt | 2 +-
ext/mysqli/tests/mysqli_change_user_set_names.phpt | 16 +-
ext/mysqli/tests/mysqli_character_set.phpt | 15 +-
.../mysqli_class_mysqli_driver_interface.phpt | 11 +-
.../tests/mysqli_class_mysqli_interface.phpt | 91 +-
.../mysqli_class_mysqli_result_interface.phpt | 43 +-
.../tests/mysqli_class_mysqli_stmt_interface.phpt | 60 +-
ext/mysqli/tests/mysqli_connect.phpt | 45 +-
ext/mysqli/tests/mysqli_connect_oo_defaults.phpt | 52 +-
ext/mysqli/tests/mysqli_connect_oo_warnings.phpt | 12 +-
ext/mysqli/tests/mysqli_connect_twice.phpt | 24 +-
ext/mysqli/tests/mysqli_constants.phpt | 22 +-
ext/mysqli/tests/mysqli_debug_ini.phpt | 5 +-
ext/mysqli/tests/mysqli_error_unicode.phpt | 16 +-
ext/mysqli/tests/mysqli_fetch_all.phpt | 233 +-
ext/mysqli/tests/mysqli_fetch_all_oo.phpt | 231 +-
ext/mysqli/tests/mysqli_fetch_array.phpt | 156 +-
ext/mysqli/tests/mysqli_fetch_array_assoc.phpt | 32 +-
ext/mysqli/tests/mysqli_fetch_array_oo.phpt | 156 +-
ext/mysqli/tests/mysqli_fetch_assoc.phpt | 96 +-
ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt | 98 +-
.../tests/mysqli_fetch_assoc_no_alias_utf8.phpt | 204 +-
ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt | 52 +-
ext/mysqli/tests/mysqli_fetch_field.phpt | 181 +-
ext/mysqli/tests/mysqli_fetch_field_direct.phpt | 65 +-
ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt | 65 +-
ext/mysqli/tests/mysqli_fetch_field_oo.phpt | 122 +-
ext/mysqli/tests/mysqli_fetch_field_types.phpt | 2 +-
ext/mysqli/tests/mysqli_fetch_fields.phpt | 118 +-
.../tests/mysqli_fetch_object_no_constructor.phpt | 19 +-
ext/mysqli/tests/mysqli_fetch_row.phpt | 22 +-
ext/mysqli/tests/mysqli_field_count.phpt | 2 +-
ext/mysqli/tests/mysqli_field_seek.phpt | 252 +-
ext/mysqli/tests/mysqli_field_tell.phpt | 78 +-
ext/mysqli/tests/mysqli_fork.phpt | 14 -
ext/mysqli/tests/mysqli_get_cache_stats.phpt | 35 +-
.../mysqli_get_cache_stats_free_buffered.phpt | 3 -
ext/mysqli/tests/mysqli_get_charset.phpt | 6 +-
ext/mysqli/tests/mysqli_get_client_stats.phpt | 733 +-
ext/mysqli/tests/mysqli_info.phpt | 12 +-
ext/mysqli/tests/mysqli_kill.phpt | 90 +-
ext/mysqli/tests/mysqli_options.phpt | 6 +-
ext/mysqli/tests/mysqli_pconn_disabled.phpt | 4 +-
ext/mysqli/tests/mysqli_pconn_kill.phpt | 4 +-
ext/mysqli/tests/mysqli_pconn_limits.phpt | 11 +-
ext/mysqli/tests/mysqli_pconn_max_links.phpt | 68 +-
ext/mysqli/tests/mysqli_pconn_reuse.phpt | 4 +-
ext/mysqli/tests/mysqli_poll_kill.phpt | 6 +-
.../tests/mysqli_poll_mixing_insert_select.phpt | 12 +-
ext/mysqli/tests/mysqli_poll_reference.phpt | 17 +-
ext/mysqli/tests/mysqli_prepare.phpt | 6 +-
ext/mysqli/tests/mysqli_query.phpt | 33 +-
ext/mysqli/tests/mysqli_query_stored_proc.phpt | 74 +-
ext/mysqli/tests/mysqli_query_unicode.phpt | 18 +-
ext/mysqli/tests/mysqli_real_connect.phpt | 40 +-
.../tests/mysqli_real_escape_string_big5.phpt | 4 +-
.../tests/mysqli_real_escape_string_eucjpms.phpt | 4 +-
.../tests/mysqli_real_escape_string_euckr.phpt | 4 +-
.../tests/mysqli_real_escape_string_gb2312.phpt | 4 +-
.../tests/mysqli_real_escape_string_gbk.phpt | 10 +-
.../mysqli_real_escape_string_nobackslash.phpt | 12 +-
.../tests/mysqli_real_escape_string_sjis.phpt | 9 +-
ext/mysqli/tests/mysqli_real_query.phpt | 20 +-
ext/mysqli/tests/mysqli_report.phpt | 2 +-
ext/mysqli/tests/mysqli_result_references.phpt | 126 +-
.../tests/mysqli_result_references_mysqlnd.phpt | 93 +-
ext/mysqli/tests/mysqli_set_charset.phpt | 6 +-
.../tests/mysqli_set_local_infile_handler.phpt | 61 +-
...li_set_local_infile_handler_replace_buffer.phpt | 2 +-
...li_set_opt_numeric_and_datetime_as_unicode.phpt | 11 +-
ext/mysqli/tests/mysqli_stmt_affected_rows.phpt | 17 +-
ext/mysqli/tests/mysqli_stmt_attr_set.phpt | 2 +-
.../mysqli_stmt_bind_param_call_user_func.phpt | 54 +-
.../mysqli_stmt_bind_param_type_juggling.phpt | 2 -
ext/mysqli/tests/mysqli_stmt_bind_result.phpt | 14 +-
ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt | 2 -
.../tests/mysqli_stmt_bind_result_references.phpt | 125 +-
ext/mysqli/tests/mysqli_stmt_datatype_change.phpt | 32 +-
ext/mysqli/tests/mysqli_stmt_execute.phpt | 43 +-
.../tests/mysqli_stmt_execute_stored_proc.phpt | 2 +-
ext/mysqli/tests/mysqli_stmt_field_count.phpt | 2 +-
ext/mysqli/tests/mysqli_stmt_get_result.phpt | 34 +-
ext/mysqli/tests/mysqli_stmt_get_result2.phpt | 33 +-
.../tests/mysqli_stmt_get_result_metadata.phpt | 32 +-
.../tests/mysqli_stmt_get_result_non_select.phpt | 2 -
ext/mysqli/tests/mysqli_stmt_get_result_types.phpt | 2 +-
ext/mysqli/tests/mysqli_stmt_result_metadata.phpt | 63 +-
.../mysqli_stmt_result_metadata_sqltests.phpt | 6 +-
ext/mysqli/tests/mysqli_stmt_send_long_data.phpt | 6 +-
...i_stmt_send_long_data_packet_size_libmysql.phpt | 2 +-
...li_stmt_send_long_data_packet_size_mysqlnd.phpt | 2 +-
ext/mysqli/tests/mysqli_stmt_store_result.phpt | 2 +-
ext/mysqli/tests/skipifunicode.inc | 4 +-
ext/mysqli/tests/table.inc | 2 +-
ext/mysqlnd/mysqlnd.c | 8 +-
ext/mysqlnd/mysqlnd.h | 12 +-
ext/mysqlnd/mysqlnd_block_alloc.c | 23 +-
ext/mysqlnd/mysqlnd_block_alloc.h | 5 +-
ext/mysqlnd/mysqlnd_charset.c | 3 +-
ext/mysqlnd/mysqlnd_debug.c | 23 +-
ext/mysqlnd/mysqlnd_debug.h | 4 +-
ext/mysqlnd/mysqlnd_enum_n_def.h | 11 +-
ext/mysqlnd/mysqlnd_libmysql_compat.h | 2 +
ext/mysqlnd/mysqlnd_palloc.c | 120 +-
ext/mysqlnd/mysqlnd_portability.h | 5 +
ext/mysqlnd/mysqlnd_ps.c | 81 +-
ext/mysqlnd/mysqlnd_ps_codec.c | 8 +-
ext/mysqlnd/mysqlnd_result.c | 198 +-
ext/mysqlnd/mysqlnd_result_meta.c | 69 +-
ext/mysqlnd/mysqlnd_statistics.c | 34 +-
ext/mysqlnd/mysqlnd_statistics.h | 121 +-
ext/mysqlnd/mysqlnd_structs.h | 8 +-
ext/mysqlnd/mysqlnd_wireprotocol.c | 45 +-
ext/mysqlnd/php_mysqlnd.c | 24 +-
ext/oci8/package.xml | 899 +-
ext/oci8/package2.xml | 627 -
ext/oci8/tests/bind_long.phpt | 4 +-
ext/oci8/tests/test.txt | 16 +-
ext/odbc/birdstep.c | 4 +-
ext/odbc/php_odbc.c | 67 +-
ext/odbc/tests/config.inc | 8 +
ext/odbc/tests/odbc_columnprivileges_001.phpt | 28 +
ext/odbc/tests/odbc_columns_001.phpt | 32 +
ext/odbc/tests/odbc_data_source_001.phpt | 25 +
ext/odbc/tests/odbc_exec_001.phpt | 40 +
ext/odbc/tests/odbc_exec_002.phpt | 36 +
ext/odbc/tests/odbc_free_result_001.phpt | 50 +
ext/odbc/tests/odbc_tables_001.phpt | 29 +
ext/odbc/tests/skipif.inc | 10 +
ext/openssl/openssl.c | 9 +-
ext/openssl/tests/bug47828.phpt | 40 +
ext/pcntl/pcntl.c | 88 +-
ext/pcntl/tests/001.phpt | 2 +-
ext/pcntl/tests/002.phpt | 3 +-
ext/pcntl/tests/003.phpt | 32 +
ext/pcntl/tests/bug47566.phpt | 19 +
ext/pcntl/tests/signal_closure_handler.phpt | 1 -
ext/pcre/pcrelib/AUTHORS | 2 +-
ext/pcre/pcrelib/ChangeLog | 122 +
ext/pcre/pcrelib/LICENCE | 2 +-
ext/pcre/pcrelib/NEWS | 5 +
ext/pcre/pcrelib/NON-UNIX-USE | 13 +-
ext/pcre/pcrelib/README | 27 +-
ext/pcre/pcrelib/config.h | 16 +-
ext/pcre/pcrelib/dftables.c | 2 +-
ext/pcre/pcrelib/doc/pcre.txt | 1894 +-
ext/pcre/pcrelib/pcre.h | 9 +-
ext/pcre/pcrelib/pcre_compile.c | 861 +-
ext/pcre/pcrelib/pcre_config.c | 4 +-
ext/pcre/pcrelib/pcre_exec.c | 233 +-
ext/pcre/pcrelib/pcre_fullinfo.c | 2 +-
ext/pcre/pcrelib/pcre_get.c | 2 +-
ext/pcre/pcrelib/pcre_globals.c | 2 +-
ext/pcre/pcrelib/pcre_info.c | 2 +-
ext/pcre/pcrelib/pcre_internal.h | 588 +-
ext/pcre/pcrelib/pcre_maketables.c | 2 +-
ext/pcre/pcrelib/pcre_newline.c | 6 +-
ext/pcre/pcrelib/pcre_ord2utf8.c | 2 +-
ext/pcre/pcrelib/pcre_printint.src | 6 +-
ext/pcre/pcrelib/pcre_refcount.c | 2 +-
ext/pcre/pcrelib/pcre_study.c | 2 +-
ext/pcre/pcrelib/pcre_tables.c | 358 +-
ext/pcre/pcrelib/pcre_try_flipped.c | 2 +-
ext/pcre/pcrelib/pcre_valid_utf8.c | 4 +-
ext/pcre/pcrelib/pcre_version.c | 2 +-
ext/pcre/pcrelib/pcre_xclass.c | 7 +-
ext/pcre/pcrelib/pcreposix.c | 1 +
ext/pcre/pcrelib/pcreposix.h | 1 +
ext/pcre/pcrelib/testdata/grepinputx | 1 +
ext/pcre/pcrelib/testdata/grepoutput | 27 +-
ext/pcre/pcrelib/testdata/testinput1 | 25 +
ext/pcre/pcrelib/testdata/testinput2 | 47 +
ext/pcre/pcrelib/testdata/testinput5 | 5 +
ext/pcre/pcrelib/testdata/testinput6 | 8 +
ext/pcre/pcrelib/testdata/testinput7 | 33 +-
ext/pcre/pcrelib/testdata/testoutput1 | 37 +
ext/pcre/pcrelib/testdata/testoutput2 | 202 +
ext/pcre/pcrelib/testdata/testoutput5 | 11 +
ext/pcre/pcrelib/testdata/testoutput6 | 10 +
ext/pcre/pcrelib/testdata/testoutput7 | 120 +-
ext/pcre/pcrelib/ucp.h | 5 +-
ext/pcre/php_pcre.c | 6 +-
ext/pcre/tests/bug33200.phpt | 3 +-
ext/pcre/tests/bug47229.phpt | 10 +-
ext/pcre/tests/bug47662.phpt | 18 +
ext/pcre/tests/invalid_utf8_offset.phpt | 6 +-
ext/pdo/pdo_dbh.c | 24 +-
ext/pdo/pdo_stmt.c | 157 +-
ext/pdo/tests/bug47769.phpt | 32 +
ext/pdo/tests/bug_44173.phpt | 78 +
ext/pdo/tests/bug_44409.phpt | 51 +
ext/pdo/tests/bug_44861.phpt | 104 +
ext/pdo_dblib/config.w32 | 10 +-
ext/pdo_dblib/pdo_dblib.c | 10 +-
ext/pdo_dblib/php_pdo_dblib.h | 8 +-
ext/pdo_firebird/config.m4 | 14 +-
ext/pdo_firebird/firebird_driver.c | 5 +-
ext/pdo_mysql/mysql_statement.c | 33 +-
.../tests/pdo_mysql_stmt_fetch_serialize.phpt | 1 -
.../pdo_mysql_stmt_fetch_serialize_simple.phpt | 3 -
ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt | 2 +-
ext/pdo_oci/oci_driver.c | 12 +-
ext/pdo_oci/tests/bug46274.phpt | 71 +
ext/pdo_oci/tests/bug46274_2.phpt | 77 +
ext/pdo_odbc/config.w32 | 4 +-
ext/pdo_odbc/odbc_stmt.c | 6 +-
ext/pdo_pgsql/config.m4 | 23 +-
ext/pdo_pgsql/config.w32 | 7 +-
ext/pdo_pgsql/pdo_pgsql.c | 9 +-
ext/pdo_pgsql/pgsql_driver.c | 43 +-
ext/pdo_pgsql/pgsql_statement.c | 188 +-
ext/pdo_pgsql/php_pdo_pgsql_int.h | 8 +-
ext/pdo_pgsql/tests/bug46274_2.phpt | 16 +-
ext/pdo_sqlite/sqlite_statement.c | 20 +-
ext/pdo_sqlite/tests/bug43831.phpt | 2 +
ext/pdo_sqlite/tests/bug46542.phpt | 6 +-
.../tests/pdo_sqlite_createaggregate.phpt | 2 +
.../tests/pdo_sqlite_createfunction.phpt | 2 +
ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt | 2 +
ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt | 2 +
ext/pgsql/config.w32 | 4 +-
ext/pgsql/pgsql.c | 4 +-
ext/pgsql/tests/80_bug14383.phpt | 15 +
ext/phar/config.w32 | 4 +-
ext/phar/func_interceptors.c | 5 +-
ext/phar/phar.c | 43 +-
ext/phar/phar/pharcommand.inc | 11 +-
ext/phar/phar_internal.h | 23 +-
ext/phar/phar_object.c | 69 +-
ext/phar/tar.c | 55 +-
ext/phar/tests/fatal_error_webphar.phpt | 18 +
ext/phar/tests/files/pear2coverage.phar.php | Bin 0 -> 55262 bytes
ext/phar/tests/phar_construct_invalidurl.phpt | 30 +
ext/phar/tests/phar_oo_010.phpt | 4 +-
ext/phar/tests/phar_oo_011.phpt | 8 +-
ext/phar/tests/phpinfo_001.phpt | 4 +-
ext/phar/tests/phpinfo_002.phpt | 2 +-
ext/phar/tests/phpinfo_003.phpt | 2 +-
ext/phar/tests/phpinfo_004.phpt | 6 +-
ext/phar/tests/tar/bignames_overflow.phpt | 40 +
ext/phar/tests/tar/files/Net_URL-1.0.15.tgz | Bin 0 -> 6303 bytes
.../tests/tar/files/make.dangerous.tar.php.inc | 170 +
ext/phar/tests/tar/phar_convert_phar.phpt | 2 +-
ext/phar/tests/tar/phar_convert_phar4.phpt | 71 +
ext/phar/tests/tar/require_hash.phpt | 1 +
ext/phar/tests/tar/tar_nohash.phpt | 23 +
ext/phar/util.c | 8 +-
ext/phar/zip.c | 22 +-
ext/posix/posix.c | 6 +-
ext/posix/tests/posix_access.phpt | 51 +
ext/posix/tests/posix_access_error_modes.phpt | 45 +
.../tests/posix_access_error_wrongparams.phpt | 43 +
ext/posix/tests/posix_access_safemode.phpt | 24 +
ext/posix/tests/posix_ctermid.phpt | 26 +
ext/posix/tests/posix_getcwd_basic.phpt | 22 +
ext/posix/tests/posix_getgrgid.phpt | 45 +
ext/posix/tests/posix_getgrgid_basic.phpt | 30 +
ext/posix/tests/posix_getgrgid_macosx.phpt | 23 +
ext/posix/tests/posix_getgrgid_wrongparams.phpt | 28 +
ext/posix/tests/posix_getgrnam_basic.phpt | 23 +
ext/posix/tests/posix_getgroups_basic.phpt | 24 +
ext/posix/tests/posix_getpgid_basic.phpt | 23 +
ext/posix/tests/posix_getpgrp_basic.phpt | 21 +
ext/posix/tests/posix_getpid_basic.phpt | 21 +
ext/posix/tests/posix_getppid_basic.phpt | 21 +
ext/posix/tests/posix_getpwnam_basic.phpt | 23 +
ext/posix/tests/posix_getpwuid_basic.phpt | 30 +
ext/posix/tests/posix_getrlimit_basic.phpt | 20 +
ext/posix/tests/posix_getsid.phpt | 28 +
ext/posix/tests/posix_getsid_basic.phpt | 22 +
ext/posix/tests/posix_getsid_error.phpt | 28 +
ext/posix/tests/posix_initgroups_basic.phpt | 22 +
ext/posix/tests/posix_kill_basic.phpt | 39 +
ext/posix/tests/posix_mkfifo_safemode.phpt | 44 +
ext/posix/tests/posix_mkfifo_wrongparams.phpt | 21 +
ext/posix/tests/posix_mknod_basic.phpt | 18 +
ext/posix/tests/posix_times.phpt | 33 +
ext/posix/tests/posix_times_basic.phpt | 37 +
ext/posix/tests/posix_ttyname.phpt | 26 +
.../tests/posix_ttyname_error_wrongparams.phpt | 37 +
ext/posix/tests/posix_uname.phpt | 33 +
ext/posix/tests/posix_uname_basic.phpt | 28 +
ext/readline/config.m4 | 11 +-
ext/reflection/php_reflection.c | 41 +-
ext/reflection/tests/002.phpt | 14 +-
.../tests/ReflectionClass_FileInfo_basic.phpt | 33 +
.../tests/ReflectionClass_FileInfo_error.phpt | 37 +
.../tests/ReflectionClass_constructor_001.phpt | 33 +
.../tests/ReflectionClass_constructor_002.phpt | 67 +
.../tests/ReflectionClass_export_basic1.phpt | 62 +
.../tests/ReflectionClass_export_basic2.phpt | 54 +
.../tests/ReflectionClass_getConstant_basic.phpt | 41 +
.../tests/ReflectionClass_getConstant_error.phpt | 37 +
.../tests/ReflectionClass_getConstants_basic.phpt | 48 +
.../tests/ReflectionClass_getConstants_error.phpt | 24 +
.../ReflectionClass_getConstructor_basic.phpt | 82 +
.../ReflectionClass_getConstructor_error.phpt | 23 +
.../ReflectionClass_getExtensionName_basic.phpt | 14 +
...ReflectionClass_getExtensionName_variation.phpt | 18 +
.../tests/ReflectionClass_getExtension_basic.phpt | 17 +
.../ReflectionClass_getExtension_variation.phpt | 18 +
.../ReflectionClass_getInterfaceNames_basic.phpt | 23 +
.../tests/ReflectionClass_getMethod_001.phpt | 146 +-
.../tests/ReflectionClass_getMethods_001.phpt | 98 +-
.../ReflectionClass_getModifierNames_basic.phpt | 139 +
.../tests/ReflectionClass_getModifiers_basic.phpt | 37 +
.../tests/ReflectionClass_getName_basic.phpt | 25 +
.../tests/ReflectionClass_getName_error.phpt | 16 +
.../tests/ReflectionClass_getName_error1.phpt | 8 +
.../tests/ReflectionClass_getNamespaceName.phpt | 30 +
.../tests/ReflectionClass_getParentClass.phpt | 21 +
.../tests/ReflectionClass_getProperties_001.phpt | 82 +-
.../tests/ReflectionClass_getProperty_001.phpt | 90 +-
.../tests/ReflectionClass_getProperty_003.phpt | 152 +-
.../tests/ReflectionClass_getProperty_004.phpt | 152 +-
.../tests/ReflectionClass_hasConstant_basic.phpt | 23 +
.../tests/ReflectionClass_hasMethod_basic.phpt | 57 +
.../tests/ReflectionClass_hasProperty_basic.phpt | 38 +
.../tests/ReflectionClass_isAbstract_basic.phpt | 21 +
.../tests/ReflectionClass_isFinal_basic.phpt | 21 +
.../tests/ReflectionClass_isInstance_basic.phpt | 51 +
.../tests/ReflectionClass_isInstance_error.phpt | 39 +
.../ReflectionClass_isInstantiable_basic.phpt | 40 +
.../ReflectionClass_isInstantiable_error.phpt | 19 +
.../ReflectionClass_isInstantiable_variation.phpt | 50 +
.../tests/ReflectionClass_isInterface_basic.phpt | 25 +
.../tests/ReflectionClass_isInternal_basic.phpt | 22 +
.../tests/ReflectionClass_isInternal_error.phpt | 14 +
.../tests/ReflectionClass_isIterateable_basic.phpt | 34 +
.../ReflectionClass_isIterateable_variation1.phpt | 25 +
.../tests/ReflectionClass_isSubclassOf_basic.phpt | 103 +
.../tests/ReflectionClass_isSubclassOf_error.phpt | 17 +
.../tests/ReflectionClass_isSubclassOf_error1.phpt | 16 +
.../tests/ReflectionClass_isUserDefined_basic.phpt | 22 +
.../tests/ReflectionClass_isUserDefined_error.phpt | 14 +
.../ReflectionExtension_constructor_basic.phpt | 15 +
.../ReflectionExtension_constructor_error.phpt | 16 +
.../tests/ReflectionExtension_export_basic.phpt | 22 +
.../ReflectionExtension_getClassNames_basic.phpt | 20 +
...flectionExtension_getClassNames_variation1.phpt | 14 +
.../ReflectionExtension_getClasses_basic.phpt | 69 +
.../ReflectionExtension_getDependencies_basic.phpt | 22 +
...ectionExtension_getDependencies_variation2.phpt | 16 +
.../tests/ReflectionExtension_getName_basic.phpt | 14 +
.../ReflectionExtension_getVersion_basic.phpt | 16 +
.../tests/ReflectionExtension_info_basic.phpt | 19 +
.../tests/ReflectionMethod_getModifiers_basic.phpt | 34 +-
.../tests/ReflectionObject_FileInfo_basic.phpt | 25 +
.../tests/ReflectionObject_FileInfo_error.phpt | 37 +
.../tests/ReflectionObject___toString_basic1.phpt | 36 +
.../tests/ReflectionObject___toString_basic2.phpt | 39 +
.../tests/ReflectionObject_constructor_basic.phpt | 28 +
.../tests/ReflectionObject_constructor_error.phpt | 49 +
.../tests/ReflectionObject_export_basic1.phpt | 36 +
.../tests/ReflectionObject_export_basic2.phpt | 39 +
.../tests/ReflectionObject_export_basic3.phpt | 38 +
.../tests/ReflectionObject_getConstant_basic.phpt | 41 +
.../tests/ReflectionObject_getConstant_error.phpt | 34 +
.../tests/ReflectionObject_getConstants_basic.phpt | 49 +
.../tests/ReflectionObject_getConstants_error.phpt | 17 +
.../ReflectionObject_getConstructor_basic.phpt | 82 +
.../ReflectionObject_getConstructor_error.phpt | 23 +
.../tests/ReflectionObject_getName_basic.phpt | 27 +
.../tests/ReflectionObject_getName_error.phpt | 23 +
.../tests/ReflectionObject_getName_error1.phpt | 8 +
.../tests/ReflectionObject_isInstance_basic.phpt | 33 +
.../tests/ReflectionObject_isInstance_error.phpt | 38 +
.../ReflectionObject_isInstantiable_basic.phpt | 36 +
.../ReflectionObject_isInstantiable_error.phpt | 22 +
.../ReflectionObject_isInstantiable_variation.phpt | 78 +
.../tests/ReflectionObject_isInternal_basic.phpt | 23 +
.../tests/ReflectionObject_isInternal_error.phpt | 15 +
.../tests/ReflectionObject_isSubclassOf_basic.phpt | 116 +
.../tests/ReflectionObject_isSubclassOf_error.phpt | 24 +
.../ReflectionObject_isUserDefined_basic.phpt | 23 +
.../ReflectionObject_isUserDefined_error.phpt | 15 +
.../tests/ReflectionParameter_export_basic.phpt | 19 +
.../tests/ReflectionParameter_export_error.phpt | 21 +
.../tests/ReflectionParameter_export_error2.phpt | 31 +
.../tests/ReflectionParameter_export_error3.phpt | 22 +
...ectionParameter_getDeclaringFunction_basic.phpt | 37 +
.../ReflectionParameter_getPosition_basic.phpt | 21 +
...ectionParameter_invalidMethodInConstructor.phpt | 31 +
.../tests/ReflectionParameter_toString_basic.phpt | 20 +
.../tests/ReflectionProperty_basic1.phpt | 160 +
.../tests/ReflectionProperty_basic2.phpt | 103 +
.../ReflectionProperty_constructor_error.phpt | 44 +
.../ReflectionProperty_constructor_variation1.phpt | 58 +
ext/reflection/tests/ReflectionProperty_error.phpt | 67 +
.../tests/ReflectionProperty_export_basic.phpt | 16 +
.../tests/ReflectionProperty_export_error.phpt | 54 +
...ctionProperty_getDeclaringClass_variation1.phpt | 27 +
.../ReflectionProperty_getDocComment_basic.phpt | 100 +
.../ReflectionProperty_getDocComment_error.phpt | 28 +
.../ReflectionProperty_getModifiers_basic.phpt | 46 +
.../tests/ReflectionProperty_getValue_error.phpt | 81 +
.../tests/ReflectionProperty_isDefault_basic.phpt | 63 +
.../tests/ReflectionProperty_setAccessible.phpt | 139 +
.../tests/ReflectionProperty_setValue_error.phpt | 100 +
ext/reflection/tests/bug48336.phpt | 44 +
.../tests/reflectionClass_FileInfo_basic.phpt | 33 -
.../tests/reflectionClass_FileInfo_error.phpt | 37 -
.../tests/reflectionClass_constructor_001.phpt | 33 -
.../tests/reflectionClass_constructor_002.phpt | 67 -
.../tests/reflectionClass_export_basic1.phpt | 62 -
.../tests/reflectionClass_export_basic2.phpt | 54 -
.../tests/reflectionClass_getConstant_basic.phpt | 41 -
.../tests/reflectionClass_getConstant_error.phpt | 37 -
.../tests/reflectionClass_getConstants_basic.phpt | 48 -
.../tests/reflectionClass_getConstants_error.phpt | 24 -
.../reflectionClass_getConstructor_basic.phpt | 82 -
.../reflectionClass_getConstructor_error.phpt | 23 -
.../reflectionClass_getExtensionName_basic.phpt | 14 -
...reflectionClass_getExtensionName_variation.phpt | 18 -
.../tests/reflectionClass_getExtension_basic.phpt | 17 -
.../reflectionClass_getExtension_variation.phpt | 18 -
.../reflectionClass_getInterfaceNames_basic.phpt | 23 -
.../reflectionClass_getModifierNames_basic.phpt | 139 -
.../tests/reflectionClass_getModifiers_basic.phpt | 37 -
.../tests/reflectionClass_getName_basic.phpt | 25 -
.../tests/reflectionClass_getName_error.phpt | 16 -
.../tests/reflectionClass_getName_error1.phpt | 8 -
.../tests/reflectionClass_getNamespaceName.phpt | 30 -
.../tests/reflectionClass_getParentClass.phpt | 21 -
.../tests/reflectionClass_hasConstant_basic.phpt | 23 -
.../tests/reflectionClass_hasMethod_basic.phpt | 57 -
.../tests/reflectionClass_hasProperty_basic.phpt | 38 -
.../tests/reflectionClass_isAbstract_basic.phpt | 21 -
.../tests/reflectionClass_isFinal_basic.phpt | 21 -
.../tests/reflectionClass_isInstance_basic.phpt | 51 -
.../tests/reflectionClass_isInstance_error.phpt | 39 -
.../reflectionClass_isInstantiable_basic.phpt | 40 -
.../reflectionClass_isInstantiable_error.phpt | 19 -
.../reflectionClass_isInstantiable_variation.phpt | 50 -
.../tests/reflectionClass_isInterface_basic.phpt | 25 -
.../tests/reflectionClass_isInternal_basic.phpt | 22 -
.../tests/reflectionClass_isInternal_error.phpt | 14 -
.../tests/reflectionClass_isIterateable_basic.phpt | 34 -
.../reflectionClass_isIterateable_variation1.phpt | 25 -
.../tests/reflectionClass_isSubclassOf_basic.phpt | 103 -
.../tests/reflectionClass_isSubclassOf_error.phpt | 17 -
.../tests/reflectionClass_isSubclassOf_error1.phpt | 16 -
.../tests/reflectionClass_isUserDefined_basic.phpt | 22 -
.../tests/reflectionClass_isUserDefined_error.phpt | 14 -
.../reflectionExtension_constructor_basic.phpt | 15 -
.../reflectionExtension_constructor_error.phpt | 16 -
.../tests/reflectionExtension_export_basic.phpt | 22 -
.../reflectionExtension_getClassNames_basic.phpt | 20 -
...flectionExtension_getClassNames_variation1.phpt | 14 -
.../reflectionExtension_getClasses_basic.phpt | 69 -
.../reflectionExtension_getDependencies_basic.phpt | 22 -
...ectionExtension_getDependencies_variation2.phpt | 16 -
.../tests/reflectionExtension_getName_basic.phpt | 14 -
.../reflectionExtension_getVersion_basic.phpt | 16 -
.../tests/reflectionExtension_info_basic.phpt | 19 -
.../tests/reflectionObject_FileInfo_basic.phpt | 25 -
.../tests/reflectionObject_FileInfo_error.phpt | 37 -
.../tests/reflectionObject___toString_basic1.phpt | 36 -
.../tests/reflectionObject___toString_basic2.phpt | 39 -
.../tests/reflectionObject_constructor_basic.phpt | 28 -
.../tests/reflectionObject_constructor_error.phpt | 49 -
.../tests/reflectionObject_export_basic1.phpt | 36 -
.../tests/reflectionObject_export_basic2.phpt | 39 -
.../tests/reflectionObject_export_basic3.phpt | 38 -
.../tests/reflectionObject_getConstant_basic.phpt | 41 -
.../tests/reflectionObject_getConstant_error.phpt | 34 -
.../tests/reflectionObject_getConstants_basic.phpt | 49 -
.../tests/reflectionObject_getConstants_error.phpt | 17 -
.../reflectionObject_getConstructor_basic.phpt | 82 -
.../reflectionObject_getConstructor_error.phpt | 23 -
.../tests/reflectionObject_getName_basic.phpt | 27 -
.../tests/reflectionObject_getName_error.phpt | 23 -
.../tests/reflectionObject_getName_error1.phpt | 8 -
.../tests/reflectionObject_isInstance_basic.phpt | 33 -
.../tests/reflectionObject_isInstance_error.phpt | 38 -
.../reflectionObject_isInstantiable_basic.phpt | 36 -
.../reflectionObject_isInstantiable_error.phpt | 22 -
.../reflectionObject_isInstantiable_variation.phpt | 78 -
.../tests/reflectionObject_isInternal_basic.phpt | 23 -
.../tests/reflectionObject_isInternal_error.phpt | 15 -
.../tests/reflectionObject_isSubclassOf_basic.phpt | 116 -
.../tests/reflectionObject_isSubclassOf_error.phpt | 24 -
.../reflectionObject_isUserDefined_basic.phpt | 23 -
.../reflectionObject_isUserDefined_error.phpt | 15 -
.../tests/reflectionParameter_export_basic.phpt | 19 -
.../tests/reflectionParameter_export_error.phpt | 21 -
.../tests/reflectionParameter_export_error2.phpt | 31 -
.../tests/reflectionParameter_export_error3.phpt | 22 -
...ectionParameter_getDeclaringFunction_basic.phpt | 37 -
.../reflectionParameter_getPosition_basic.phpt | 21 -
...ectionParameter_invalidMethodInConstructor.phpt | 31 -
.../tests/reflectionParameter_toString_basic.phpt | 20 -
.../tests/reflectionProperty_basic1.phpt | 160 -
.../tests/reflectionProperty_basic2.phpt | 103 -
.../reflectionProperty_constructor_error.phpt | 44 -
.../reflectionProperty_constructor_variation1.phpt | 58 -
ext/reflection/tests/reflectionProperty_error.phpt | 67 -
.../tests/reflectionProperty_export_basic.phpt | 16 -
.../tests/reflectionProperty_export_error.phpt | 54 -
...ctionProperty_getDeclaringClass_variation1.phpt | 27 -
.../reflectionProperty_getDocComment_basic.phpt | 100 -
.../reflectionProperty_getDocComment_error.phpt | 28 -
.../reflectionProperty_getModifiers_basic.phpt | 46 -
.../tests/reflectionProperty_getValue_error.phpt | 81 -
.../tests/reflectionProperty_isDefault_basic.phpt | 63 -
.../tests/reflectionProperty_setAccessible.phpt | 82 -
.../tests/reflectionProperty_setValue_error.phpt | 100 -
ext/session/mod_files.c | 61 +-
ext/session/mod_mm.c | 127 +-
ext/session/mod_user.c | 76 +-
ext/session/php_session.h | 22 +-
ext/session/session.c | 158 +-
ext/session/tests/001.phpt | 2 +
ext/session/tests/003.phpt | 2 +
ext/session/tests/004.phpt | 1 +
ext/session/tests/005.phpt | 2 +
ext/session/tests/006.phpt | 2 +
ext/session/tests/007.phpt | 3 +
ext/session/tests/008-php4.2.3.phpt | 2 +
ext/session/tests/009.phpt | 2 +
ext/session/tests/012.phpt | 2 +
ext/session/tests/013.phpt | 1 +
ext/session/tests/014.phpt | 1 +
ext/session/tests/019.phpt | 3 +
ext/session/tests/bug42596.phpt | 33 +
ext/shmop/shmop.c | 4 +-
ext/simplexml/simplexml.c | 5 +-
ext/snmp/snmp.c | 29 +-
ext/soap/config.w32 | 7 +-
ext/soap/php_encoding.c | 4 +-
ext/soap/php_http.c | 7 +-
ext/soap/tests/bug48557.phpt | 71 +
ext/soap/tests/bug48557.wsdl | 31 +
.../tests/interop/Round2/Base/r2_base_005p.phpt | 1 +
.../tests/interop/Round2/Base/r2_base_005s.phpt | 1 +
.../tests/interop/Round2/Base/r2_base_005w.phpt | 1 +
ext/sockets/sockets.c | 12 +-
ext/sockets/tests/ipv6_skipif.inc | 8 +
ext/sockets/tests/ipv6loop.phpt | 4 +-
ext/sockets/tests/socket_accept-wrongparams.phpt | 16 +
ext/sockets/tests/socket_create_listen-nobind.phpt | 25 +
.../tests/socket_create_listen-wrongparams.phpt | 18 +
ext/sockets/tests/socket_create_listen.phpt | 18 +
.../tests/socket_create_pair-wrongparams.phpt | 41 +
ext/sockets/tests/socket_create_pair.phpt | 24 +
ext/sockets/tests/socket_listen-wrongparams.phpt | 21 +
ext/sockets/tests/socket_select-wrongparams-1.phpt | 27 +
ext/sockets/tests/socket_select-wrongparams-2.phpt | 23 +
ext/sockets/tests/socket_select-wrongparams-3.phpt | 28 +
ext/sockets/tests/socket_select-wrongparams-4.phpt | 29 +
ext/sockets/tests/socket_select.phpt | 25 +
.../tests/socket_sentto_recvfrom_ipv4_udp.phpt | 57 +
.../tests/socket_sentto_recvfrom_ipv6_udp.phpt | 58 +
ext/sockets/tests/socket_sentto_recvfrom_unix.phpt | 55 +
ext/sockets/tests/socket_set_block-retval.phpt | 28 +
.../tests/socket_set_block-wrongparams.phpt | 18 +
ext/sockets/tests/socket_set_nonblock-retval.phpt | 28 +
.../tests/socket_set_nonblock-wrongparams.phpt | 13 +
.../socket_set_option_error_socket_option.phpt | 33 +
ext/sockets/tests/socket_set_option_rcvtimeo.phpt | 39 +
ext/sockets/tests/socket_set_option_seolinger.phpt | 47 +
ext/sockets/tests/socket_set_option_sndtimeo.phpt | 39 +
ext/spl/internal/appenditerator.inc | 2 +-
ext/spl/internal/cachingiterator.inc | 312 +-
ext/spl/internal/emptyiterator.inc | 122 +-
ext/spl/internal/filteriterator.inc | 236 +-
ext/spl/internal/infiniteiterator.inc | 94 +-
ext/spl/internal/iteratoriterator.inc | 242 +-
ext/spl/internal/limititerator.inc | 250 +-
ext/spl/internal/multipleiterator.inc | 2 +-
ext/spl/internal/norewinditerator.inc | 54 +-
ext/spl/internal/outeriterator.inc | 32 +-
ext/spl/internal/parentiterator.inc | 46 +-
ext/spl/internal/recursivearrayiterator.inc | 116 +-
ext/spl/internal/recursivecachingiterator.inc | 180 +-
ext/spl/internal/recursivefilteriterator.inc | 122 +-
ext/spl/internal/recursiveiterator.inc | 42 +-
ext/spl/internal/recursiveiteratoriterator.inc | 472 +-
ext/spl/internal/recursiveregexiterator.inc | 104 +-
ext/spl/internal/recursivetreeiterator.inc | 2 +-
ext/spl/internal/regexiterator.inc | 310 +-
ext/spl/internal/seekableiterator.inc | 78 +-
ext/spl/internal/spldoublylinkedlist.inc | 2 +-
ext/spl/internal/splfileobject.inc | 754 +-
ext/spl/internal/splobjectstorage.inc | 358 +-
ext/spl/internal/splqueue.inc | 2 +-
ext/spl/internal/splstack.inc | 2 +-
ext/spl/php_spl.c | 24 +-
ext/spl/spl_array.c | 10 +-
ext/spl/spl_directory.c | 45 +-
ext/spl/spl_directory.h | 3 +-
ext/spl/spl_dllist.c | 14 +-
ext/spl/spl_fixedarray.c | 23 +-
ext/spl/spl_iterators.c | 26 +-
.../DirectoryIterator_getBasename_basic_test.phpt | 23 +
.../DirectoryIterator_getBasename_pass_array.phpt | 23 +
ext/spl/tests/SplArray_fromArray.phpt | 17 +
.../SplDoublyLinkedList_bottom_pass_array.phpt | 14 +
.../SplDoublyLinkedList_bottom_pass_float.phpt | 14 +
.../SplDoublyLinkedList_bottom_pass_integer.phpt | 14 +
.../SplDoublyLinkedList_bottom_pass_null.phpt | 14 +
ext/spl/tests/SplDoublyLinkedList_count.phpt | 12 +
...LinkedList_count_param_SplDoublyLinkedList.phpt | 11 +
ext/spl/tests/SplDoublyLinkedList_current.phpt | 11 +
.../tests/SplDoublyLinkedList_current_empty.phpt | 13 +
ext/spl/tests/SplDoublyLinkedList_debug-info.phpt | 29 +
.../tests/SplDoublyLinkedList_getIteratorMode.phpt | 12 +
.../SplDoublyLinkedList_getIteratorMode_error.phpt | 12 +
...blyLinkedList_isEmpty_empty-with-parameter.phpt | 14 +
.../tests/SplDoublyLinkedList_isEmpty_empty.phpt | 13 +
...inkedList_isEmpty_not-empty-with-parameter.phpt | 20 +
.../SplDoublyLinkedList_isEmpty_not-empty.phpt | 19 +
ext/spl/tests/SplDoublyLinkedList_lifoMode.phpt | 23 +
...yLinkedList_offsetExists_invalid_parameter.phpt | 15 +
.../SplDoublyLinkedList_offsetExists_success.phpt | 31 +
.../tests/SplDoublyLinkedList_offsetGet_empty.phpt | 14 +
...plDoublyLinkedList_offsetGet_missing_param.phpt | 15 +
.../SplDoublyLinkedList_offsetGet_param_array.phpt | 18 +
...SplDoublyLinkedList_offsetGet_param_string.phpt | 18 +
...ublyLinkedList_offsetSet_invalid_parameter.phpt | 15 +
...LinkedList_offsetSet_one_invalid_parameter.phpt | 15 +
...nkedList_offsetUnset_greater_than_elements.phpt | 27 +
...yLinkedList_offsetUnset_negative-parameter.phpt | 23 +
..._offsetUnset_parameter-larger-num-elements.phpt | 23 +
.../tests/SplDoublyLinkedList_pop_noParams.phpt | 15 +
ext/spl/tests/SplDoublyLinkedList_pop_params.phpt | 14 +
...SplDoublyLinkedList_push_missing_parameter.phpt | 13 +
..._setIteratorMode_param_SplDoublyLinkedList.phpt | 11 +
.../tests/SplDoublyLinkedList_shift_noParams.phpt | 15 +
.../tests/SplDoublyLinkedList_top_pass_array.phpt | 14 +
.../tests/SplDoublyLinkedList_top_pass_float.phpt | 14 +
.../SplDoublyLinkedList_top_pass_integer.phpt | 14 +
.../tests/SplDoublyLinkedList_top_pass_null.phpt | 14 +
...DoublyLinkedList_unshift_missing_parameter.phpt | 13 +
.../SplDoublylinkedlist_offsetunset_first.phpt | 25 +
.../SplDoublylinkedlist_offsetunset_first002.phpt | 17 +
.../SplDoublylinkedlist_offsetunset_last.phpt | 25 +
ext/spl/tests/SplFileObject_fflush_basic_001.phpt | 35 +
ext/spl/tests/SplFileObject_fpassthru_basic.phpt | 13 +
ext/spl/tests/SplFileObject_fscanf_basic.phpt | 12 +
ext/spl/tests/SplFileObject_fseek_error_001.phpt | 12 +
.../tests/SplFileObject_ftruncate_error_001.phpt | 29 +
ext/spl/tests/SplFileObject_fwrite_error_001.phpt | 12 +
.../tests/SplFileObject_fwrite_variation_001.phpt | 17 +
.../tests/SplFileObject_fwrite_variation_002.phpt | 17 +
.../tests/SplFileObject_fwrite_variation_003.phpt | 18 +
.../SplFileObject_getCsvControl_basic_001.phpt | 15 +
ext/spl/tests/SplFileObject_seek_error_001.phpt | 19 +
ext/spl/tests/SplFileObject_testinput.csv | 5 +
.../SplFixedArray__construct_param_array.phpt | 12 +
.../SplFixedArray__construct_param_float.phpt | 14 +
.../tests/SplFixedArray__construct_param_null.phpt | 16 +
.../SplFixedArray__construct_param_string.phpt | 12 +
...plFixedArray_construct_param_SplFixedArray.phpt | 13 +
ext/spl/tests/SplFixedArray_count_checkParams.phpt | 16 +
ext/spl/tests/SplFixedArray_count_param_int.phpt | 11 +
ext/spl/tests/SplFixedArray_current_param.phpt | 24 +
...FixedArray_fromArray_invalid_parameter_001.phpt | 10 +
...FixedArray_fromArray_invalid_parameter_002.phpt | 10 +
ext/spl/tests/SplFixedArray_fromarray_indexes.phpt | 22 +
.../tests/SplFixedArray_fromarray_non_indexes.phpt | 21 +
.../SplFixedArray_fromarray_param_boolean.phpt | 10 +
.../SplFixedArray_fromarray_param_multiarray.phpt | 17 +
.../tests/SplFixedArray_getSize_pass_param.phpt | 12 +
ext/spl/tests/SplFixedArray_key_param.phpt | 24 +
ext/spl/tests/SplFixedArray_key_setsize.phpt | 20 +
ext/spl/tests/SplFixedArray_next_param.phpt | 18 +
...lFixedArray_offsetExists_invalid_parameter.phpt | 15 +
.../SplFixedArray_offsetExists_less_than_zero.phpt | 13 +
.../SplFixedArray_offsetGet_invalid_parameter.phpt | 16 +
.../SplFixedArray_offsetSet_invalid_parameter.phpt | 15 +
...FixedArray_offsetSet_one_invalid_parameter.phpt | 15 +
...plFixedArray_offsetUnset_invalid_parameter.phpt | 15 +
.../tests/SplFixedArray_offsetUnset_string.phpt | 33 +
ext/spl/tests/SplFixedArray_rewind_param.phpt | 18 +
.../SplFixedArray_setSize_filled_to_smaller.phpt | 22 +
.../tests/SplFixedArray_setSize_param_array.phpt | 18 +
.../tests/SplFixedArray_setSize_param_float.phpt | 19 +
.../tests/SplFixedArray_setSize_param_null.phpt | 13 +
ext/spl/tests/SplFixedArray_setSize_reduce.phpt | 22 +
ext/spl/tests/SplFixedArray_setsize_001.phpt | 22 +
ext/spl/tests/SplFixedArray_setsize_grow.phpt | 30 +
ext/spl/tests/SplFixedArray_setsize_shrink.phpt | 28 +
.../tests/SplFixedArray_toArray_with-params.phpt | 19 +
.../tests/SplFixedarray_offsetExists_larger.phpt | 15 +
ext/spl/tests/SplHeap_count_invalid_parameter.phpt | 47 +
.../tests/SplHeap_extract_invalid_parameter.phpt | 47 +
.../tests/SplHeap_insert_invalid_parameter.phpt | 16 +
ext/spl/tests/SplHeap_isEmpty.phpt | 15 +
.../tests/SplHeap_isEmpty_invalid_parameter.phpt | 47 +
.../SplObjectStorage_addAll_invalid_parameter.phpt | 43 +
.../SplObjectStorage_attach_invalid_parameter.phpt | 20 +
...plObjectStorage_contains_invalid_parameter.phpt | 43 +
.../SplObjectStorage_current_empty_storage.phpt | 15 +
.../SplObjectStorage_detach_invalid_parameter.phpt | 43 +
.../SplObjectStorage_getInfo_empty_storage.phpt | 15 +
ext/spl/tests/SplObjectStorage_offsetGet.phpt | 17 +
...lObjectStorage_offsetGet_invalid_parameter.phpt | 45 +
.../SplObjectStorage_offsetGet_missing_object.phpt | 20 +
...lObjectStorage_removeAll_invalid_parameter.phpt | 43 +
.../SplObjectStorage_setInfo_empty_storage.phpt | 15 +
...SplObjectStorage_setInfo_invalid_parameter.phpt | 16 +
...jectStorage_unserialize_invalid_parameter1.phpt | 27 +
...jectStorage_unserialize_invalid_parameter2.phpt | 34 +
...jectStorage_unserialize_invalid_parameter3.phpt | 19 +
...SplPriorityQueue_extract_invalid_parameter.phpt | 47 +
.../SplPriorityQueue_insert_invalid_parameter.phpt | 16 +
ext/spl/tests/SplQueue_setIteratorMode.phpt | 15 +
.../tests/SplQueue_setIteratorMode_param_lifo.phpt | 19 +
ext/spl/tests/SplStack_setIteratorMode.phpt | 15 +
ext/spl/tests/arrayObject_magicMethods6.phpt | 3 -
ext/spl/tests/bug38325.phpt | 4 +-
ext/spl/tests/bug45622b.phpt | 33 +
ext/spl/tests/bug47534.phpt | 14 +
ext/spl/tests/bug48023.phpt | 12 +
ext/spl/tests/bug48493.phpt | 26 +
ext/spl/tests/dit_003.phpt | 2 +-
ext/spl/tests/dllist_010.phpt | 33 +
ext/spl/tests/dllist_011.phpt | 13 +
ext/spl/tests/dllist_memleak.phpt | 24 +
ext/spl/tests/heap_corruption.phpt | 62 +
ext/spl/tests/heap_current_variation_001.phpt | 22 +
ext/spl/tests/heap_isempty_variation_001.phpt | 16 +
ext/spl/tests/heap_it_current_empty.phpt | 12 +
ext/spl/tests/heap_top_variation_001.phpt | 14 +
ext/spl/tests/heap_top_variation_002.phpt | 31 +
ext/spl/tests/heap_top_variation_003.phpt | 16 +
ext/spl/tests/iterator_count.phpt | 26 +
ext/spl/tests/iterator_to_array.phpt | 25 +
ext/spl/tests/limititerator_seek.phpt | 18 +
ext/spl/tests/pqueue_compare_basic.phpt | 19 +
ext/spl/tests/pqueue_compare_error.phpt | 19 +
ext/spl/tests/pqueue_current_error.phpt | 12 +
.../recursive_tree_iterator_setprefixpart.phpt | 32 +
...rsiveiteratoriterator_beginiteration_basic.phpt | 32 +
...cursiveiteratoriterator_enditeration_basic.phpt | 32 +
...rsiveiteratoriterator_getsubiterator_basic.phpt | 20 +
...rsiveiteratoriterator_getsubiterator_error.phpt | 15 +
...eiteratoriterator_getsubiterator_variation.phpt | 42 +
...ratoriterator_getsubiterator_variation_002.phpt | 20 +
...ratoriterator_getsubiterator_variation_003.phpt | 42 +
...ecursiveiteratoriterator_nextelement_basic.phpt | 39 +
ext/spl/tests/regexiterator_getpregflags.phpt | 33 +
.../tests/regexiterator_setflags_exception.phpt | 35 +
ext/spl/tests/regexiterator_setpregflags.phpt | 34 +
.../regexiterator_setpregflags_exception.phpt | 36 +
ext/spl/tests/spl_autoload_bug48541.phpt | 24 +
.../spl_caching_iterator_constructor_flags.phpt | 25 +
.../spl_cachingiterator___toString_basic.phpt | 16 +
.../tests/spl_cachingiterator_setFlags_basic.phpt | 16 +
ext/spl/tests/spl_classes.phpt | 13 +
.../tests/spl_fileinfo_getlinktarget_basic.phpt | 22 +
ext/spl/tests/spl_heap_count_basic.phpt | 35 +
ext/spl/tests/spl_heap_count_error.phpt | 12 +
.../tests/spl_heap_extract_parameter_error.phpt | 27 +
ext/spl/tests/spl_heap_insert_basic.phpt | 20 +
ext/spl/tests/spl_heap_is_empty_basic.phpt | 31 +
ext/spl/tests/spl_heap_isempty.phpt | 21 +
ext/spl/tests/spl_heap_iteration_error.phpt | 53 +
.../spl_heap_recoverfromcorruption_arguments.phpt | 15 +
ext/spl/tests/spl_iterator_apply_error.phpt | 26 +
ext/spl/tests/spl_iterator_apply_error_001.phpt | 20 +
.../tests/spl_iterator_caching_count_basic.phpt | 21 +
.../tests/spl_iterator_caching_count_error.phpt | 21 +
.../tests/spl_iterator_caching_getcache_error.phpt | 21 +
ext/spl/tests/spl_iterator_getcallchildren.phpt | 39 +
.../tests/spl_iterator_iterator_constructor.phpt | 30 +
.../spl_iterator_recursive_getiterator_error.phpt | 16 +
ext/spl/tests/spl_iterator_to_array_basic.phpt | 13 +
ext/spl/tests/spl_iterator_to_array_error.phpt | 33 +
ext/spl/tests/spl_limit_iterator_check_limits.phpt | 37 +
ext/spl/tests/spl_maxheap_compare_basic.phpt | 22 +
ext/spl/tests/spl_minheap_compare_error.phpt | 31 +
ext/spl/tests/spl_pq_top_basic.phpt | 42 +
ext/spl/tests/spl_pq_top_error_args.phpt | 12 +
ext/spl/tests/spl_pq_top_error_corrupt.phpt | 37 +
ext/spl/tests/spl_pq_top_error_empty.phpt | 19 +
.../spl_priorityqeue_insert_two_params_error.phpt | 31 +
...eratorIterator_setMaxDepth_parameter_count.phpt | 28 +
.../spl_recursive_iterator_iterator_key_case.phpt | 33 +
ext/spl/tests/splpriorityqueue_extract.phpt | 19 +
.../tests/splpriorityqueue_setextractflags.phpt | 17 +
ext/sqlite/libsqlite/src/date.c | 2 +-
ext/sqlite3/config.w32 | 4 +-
ext/sqlite3/config0.m4 | 7 +-
ext/sqlite3/libsqlite/sqlite3.c |22021 ++++---
ext/sqlite3/libsqlite/sqlite3.h | 2505 +-
ext/sqlite3/libsqlite/sqlite3ext.h | 2 +-
ext/sqlite3/php_sqlite3_structs.h | 3 +-
ext/sqlite3/sqlite3.c | 171 +-
ext/sqlite3/tests/sqlite3_02_open.phpt | 19 +
ext/sqlite3/tests/sqlite3_21_security.phpt | 6 +-
ext/sqlite3/tests/sqlite3_31_changes.phpt | 20 +
ext/sqlite3/tests/sqlite3_31_open.phpt | 22 +
ext/sqlite3/tests/sqlite3_32_changes.phpt | 17 +
.../sqlite3_32_createAggregate_paramCount.phpt | 21 +
.../tests/sqlite3_32_last_insert_rowid_param.phpt | 40 +
.../sqlite3_33_createAggregate_notcallable.phpt | 29 +
.../tests/sqlite3_33_load_extension_param.phpt | 23 +
ext/sqlite3/tests/sqlite3_33_reset.phpt | 27 +
.../tests/sqlite3_34_load_extension_ext_dir.phpt | 21 +
ext/sqlite3/tests/sqlite3_close_error.phpt | 21 +
ext/sqlite3/tests/sqlite3_close_with_params.phpt | 18 +
ext/sqlite3/tests/sqlite3_enable_exceptions.phpt | 36 +
ext/sqlite3/tests/sqlite3_exec_wrongparams.phpt | 16 +
.../tests/sqlite3_lasterrorcode_with_params.phpt | 18 +
.../tests/sqlite3_lasterrormsg_with_params.phpt | 17 +
.../sqlite3_loadextension_with_wrong_param.phpt | 18 +
ext/sqlite3/tests/sqlite3_open_empty_string.phpt | 19 +
.../tests/sqlite3_openblob_wrongparams.phpt | 79 +
ext/sqlite3/tests/sqlite3_prepare_faultystmt.phpt | 20 +
.../tests/sqlite3_prepare_with_empty_string.phpt | 16 +
ext/sqlite3/tests/sqlite3_prepare_wrongparams.phpt | 19 +
.../sqlite3_prepared_stmt_clear_with_params.phpt | 34 +
ext/sqlite3/tests/sqlite3_query_error.phpt | 32 +
ext/sqlite3/tests/sqlite3_querysingle_error.phpt | 31 +
ext/sqlite3/tests/sqlite3_version_noparam.phpt | 16 +
...te3result_fetcharray_with_two_params_fails.phpt | 20 +
.../tests/sqlite3result_numcolumns_error.phpt | 33 +
.../sqlite3result_reset_with_params_fails.phpt | 19 +
ext/sqlite3/tests/sqlite3stmt_reset_params.phpt | 47 +
ext/standard/CREDITS | 3 -
ext/standard/array.c | 10 +-
ext/standard/assert.c | 4 +-
ext/standard/basic_functions.c | 23 +-
ext/standard/browscap.c | 4 +-
ext/standard/credits_ext.h | 6 +-
ext/standard/crypt_blowfish.c | 4 +-
ext/standard/dns.c | 9 +-
ext/standard/dns.h | 5 +-
ext/standard/dns_win32.c | 3 +-
ext/standard/exec.c | 15 +-
ext/standard/file.c | 168 +-
ext/standard/filters.c | 217 +-
ext/standard/head.c | 6 +-
ext/standard/http_fopen_wrapper.c | 93 +-
ext/standard/link_win32.c | 29 +-
ext/standard/mail.c | 4 +-
ext/standard/microtime.c | 5 +-
ext/standard/pack.c | 9 +-
ext/standard/php_string.h | 4 +-
ext/standard/proc_open.c | 12 +-
ext/standard/scanf.c | 4 +-
ext/standard/streamsfuncs.c | 11 +-
ext/standard/string.c | 38 +-
ext/standard/strnatcmp.c | 6 +-
.../tests/array/array_fill_variation1.phpt | 4 +-
.../tests/array/array_key_exists_object1.phpt | 22 +-
.../tests/array/array_key_exists_object2.phpt | 22 +-
.../tests/array/array_multisort_variation11.phpt | 21 +
ext/standard/tests/array/array_push_error2.phpt | 23 +-
.../tests/array/array_slice_variation2.phpt | 12 +-
.../tests/array/array_slice_variation3.phpt | 2 +
.../tests/array/array_unique_variation2.phpt | 76 +-
.../tests/array/array_unique_variation6.phpt | 2 +-
ext/standard/tests/array/array_walk_object1.phpt | Bin 1391 -> 1441 bytes
ext/standard/tests/array/array_walk_objects.phpt | Bin 798 -> 937 bytes
.../tests/array/array_walk_rec_objects.phpt | Bin 858 -> 997 bytes
.../tests/array/array_walk_recursive_object1.phpt | Bin 1441 -> 1491 bytes
ext/standard/tests/array/bug44929.phpt | 31 +
ext/standard/tests/array/bug48224.phpt | 15 +
ext/standard/tests/array/count_recursive.phpt | 1 -
ext/standard/tests/array/end.phpt | 3 +-
ext/standard/tests/class_object/AutoInterface.inc | 5 +
ext/standard/tests/class_object/AutoLoaded.inc | 5 +
ext/standard/tests/class_object/AutoTest.inc | 13 +
.../tests/class_object/get_class_vars_error.phpt | 38 +
.../class_object/get_class_vars_variation1.phpt | 181 +
.../class_object/get_class_vars_variation2.phpt | 168 +
.../get_declared_classes_variation1.phpt | 37 +
.../get_declared_interfaces_variation1.phpt | 37 +
.../tests/class_object/interface_exists_error.phpt | 38 +
.../class_object/interface_exists_variation1.phpt | 184 +
.../class_object/interface_exists_variation2.phpt | 204 +
.../class_object/interface_exists_variation3.phpt | 35 +
.../class_object/interface_exists_variation4.phpt | 27 +
.../class_object/is_subclass_of_variation_004.phpt | 175 +
.../tests/class_object/property_exists_error.phpt | 47 +
.../class_object/property_exists_variation1.phpt | 33 +
ext/standard/tests/dir/dir_variation8.phpt | 9 -
ext/standard/tests/file/005_variation.phpt | 28 +-
ext/standard/tests/file/007_variation15.phpt | 6 +-
ext/standard/tests/file/007_variation23.phpt | 6 +-
ext/standard/tests/file/007_variation7.phpt | 6 +-
ext/standard/tests/file/bug27508.phpt | 11 +-
ext/standard/tests/file/bug41874.phpt | 15 +
ext/standard/tests/file/bug41874_1.phpt | 16 +
ext/standard/tests/file/bug41874_2.phpt | 17 +
ext/standard/tests/file/bug41874_3.phpt | 16 +
ext/standard/tests/file/bug44034.phpt | 39 +
ext/standard/tests/file/bug46347.phpt | 6 +-
ext/standard/tests/file/bug47767.phpt | 45 +
ext/standard/tests/file/copy_variation12.phpt | 1 -
ext/standard/tests/file/fgetcsv_variation14.phpt | 30 +-
ext/standard/tests/file/fgetcsv_variation21.phpt | 30 +-
.../tests/file/file_get_contents_basic.phpt | 6 -
.../tests/file/file_get_contents_error.phpt | 11 +-
.../tests/file/file_get_contents_variation5.phpt | 14 +-
.../tests/file/file_get_contents_variation9.phpt | 8 +-
.../tests/file/file_put_contents_variation2.phpt | 4 +-
ext/standard/tests/file/filetype_variation2.phpt | 3 +-
ext/standard/tests/file/fscanf_variation51.phpt | 4 +-
ext/standard/tests/file/fscanf_variation52.phpt | 4 +-
ext/standard/tests/file/fscanf_variation53.phpt | 4 +-
ext/standard/tests/file/fwrite_variation5.phpt | 2 +-
ext/standard/tests/file/include_streams.phpt | 6 +-
ext/standard/tests/file/is_dir_variation1.phpt | 1 -
ext/standard/tests/file/is_dir_variation2.phpt | 24 +-
ext/standard/tests/file/is_file_error.phpt | 8 +-
ext/standard/tests/file/link_win32.phpt | 26 +
.../tests/file/mkdir_rmdir_variation2.phpt | 1 -
.../tests/file/parse_ini_file_variation4.phpt | 16 +-
ext/standard/tests/file/pathinfo_basic.phpt | 508 +-
ext/standard/tests/file/pathinfo_basic1.phpt | 837 +-
ext/standard/tests/file/pathinfo_basic2.phpt | 353 +-
ext/standard/tests/file/proc_open01.phpt | 6 +-
.../tests/file/readlink_realpath_variation3.phpt | 9 -
ext/standard/tests/file/rename_basic.phpt | 1 -
ext/standard/tests/file/rename_variation.phpt | 7 -
ext/standard/tests/file/rename_variation1.phpt | 2 -
ext/standard/tests/file/rename_variation2.phpt | 6 +-
ext/standard/tests/file/rename_variation3.phpt | 4 -
ext/standard/tests/file/rename_variation4.phpt | 3 -
ext/standard/tests/file/rename_variation8.phpt | 1 -
.../file/symlink_link_linkinfo_is_link_basic2.phpt | 1 -
.../symlink_link_linkinfo_is_link_variation6.phpt | 4 +
ext/standard/tests/file/unlink_error.phpt | 2 +-
ext/standard/tests/file/windows_acls/bug44859.phpt | 62 +
.../tests/file/windows_acls/bug44859_2.phpt | 62 +
.../tests/file/windows_acls/bug44859_3.phpt | 36 +
.../tests/file/windows_acls/bug44859_4.phpt | 64 +
ext/standard/tests/file/windows_acls/common.inc | 176 +
ext/standard/tests/file/windows_acls/tiny.bat | 1 +
ext/standard/tests/file/windows_acls/tiny.exe | Bin 0 -> 133 bytes
ext/standard/tests/filters/chunked_001.phpt | 33 +
ext/standard/tests/filters/filter_errors.inc | 3 +
ext/standard/tests/general_functions/bug41037.phpt | 3 -
.../tests/general_functions/bug44394_2.phpt | 1 -
ext/standard/tests/general_functions/bug47857.phpt | 23 +
ext/standard/tests/general_functions/bug47859.phpt | 42 +
.../tests/general_functions/call_user_method.phpt | 20 +
.../tests/general_functions/closures_002.phpt | 3 -
.../gettype_settype_variation2.phpt | 12 +-
ext/standard/tests/general_functions/intval.phpt | 4 +-
.../tests/general_functions/intval_variation1.phpt | 203 +
.../tests/general_functions/intval_variation2.phpt | 195 +
ext/standard/tests/general_functions/is_array.phpt | 4 +-
ext/standard/tests/general_functions/is_bool.phpt | 3 +-
.../general_functions/is_callable_basic2.phpt | 48 -
ext/standard/tests/general_functions/is_float.phpt | 3 +-
ext/standard/tests/general_functions/is_int.phpt | 3 +-
ext/standard/tests/general_functions/is_null.phpt | 3 +-
.../tests/general_functions/is_numeric.phpt | 3 +-
.../tests/general_functions/is_object.phpt | 3 +-
.../tests/general_functions/is_scalar.phpt | 3 +-
.../tests/general_functions/is_string.phpt | 3 +-
.../tests/general_functions/putenv_error1.phpt | 2 +
.../tests/general_functions/putenv_error2.phpt | 2 +
ext/standard/tests/general_functions/strval.phpt | 3 +-
ext/standard/tests/http/bug38802.phpt | 172 +
ext/standard/tests/http/ignore_errors.phpt | 124 +
ext/standard/tests/http/server.inc | 92 +
.../tests/mail/ezmlm_hash_basic_64bit.phpt | 4 +-
ext/standard/tests/mail/mail_basic2.phpt | 8 +-
ext/standard/tests/mail/mail_variation2.phpt | 4 +-
ext/standard/tests/math/abs_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/acos_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/acosh_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/asin_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/asinh_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/atan2_basiclong_64bit.phpt | 364 +
ext/standard/tests/math/atan_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/atanh_basiclong_64bit.phpt | 60 +
.../tests/math/bindec_basiclong_64bit.phpt | 51 +
ext/standard/tests/math/ceil_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/cos_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/cosh_basiclong_64bit.phpt | 60 +
.../tests/math/decbin_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/decbin_variation1.phpt | 4 +-
.../tests/math/decbin_variation1_64bit.phpt | 4 +-
.../tests/math/dechex_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/dechex_variation1.phpt | 4 +-
.../tests/math/dechex_variation1_64bit.phpt | 4 +-
.../tests/math/decoct_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/decoct_variation1.phpt | 4 +-
.../tests/math/decoct_variation1_64bit.phpt | 4 +-
.../tests/math/deg2rad_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/exp_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/expm1_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/floor_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/fmod_basiclong_64bit.phpt | 364 +
.../tests/math/hexdec_basiclong_64bit.phpt | 51 +
ext/standard/tests/math/hypot_basiclong_64bit.phpt | 364 +
.../tests/math/is_finite_basiclong_64bit.phpt | 60 +
.../tests/math/is_infinite_basiclong_64bit.phpt | 60 +
.../tests/math/is_nan_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/log10_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/log1p_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/log_basiclong_64bit.phpt | 60 +
.../tests/math/octdec_basiclong_64bit.phpt | 51 +
ext/standard/tests/math/pow_basic.phpt | 41 +-
ext/standard/tests/math/pow_basic_64bit.phpt | 35 +-
ext/standard/tests/math/pow_basiclong_64bit.phpt | 364 +
.../tests/math/rad2deg_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/round_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/sin_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/sinh_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/sqrt_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/tan_basiclong_64bit.phpt | 60 +
ext/standard/tests/math/tanh_basiclong_64bit.phpt | 60 +
ext/standard/tests/misc/browsernames.inc | 51 +
ext/standard/tests/misc/browsernames.php | 51 -
ext/standard/tests/misc/get_browser_basic.phpt | 4 +-
ext/standard/tests/misc/get_browser_error.phpt | 2 +-
.../tests/misc/get_browser_variation1.phpt | 2 +-
.../tests/misc/syslog_vars_variation1.phpt | 1 +
ext/standard/tests/misc/time_nanosleep_basic.phpt | 23 +
ext/standard/tests/misc/time_nanosleep_error1.phpt | 14 +
ext/standard/tests/misc/time_nanosleep_error2.phpt | 14 +
ext/standard/tests/misc/time_nanosleep_error3.phpt | 17 +
ext/standard/tests/misc/time_nanosleep_error4.phpt | 17 +
ext/standard/tests/misc/time_nanosleep_error5.phpt | 14 +
ext/standard/tests/network/bug20134.phpt | 2 +-
.../define_syslog_variables_variation-win32.phpt | 1 +
.../network/define_syslog_variables_variation.phpt | 1 +
.../tests/network/gethostbyname_basic001.phpt | 10 +
.../tests/network/gethostbyname_basic002.phpt | 11 +
.../tests/network/gethostbyname_error001.phpt | 10 +
.../tests/network/gethostbyname_error002.phpt | 10 +
.../tests/network/gethostbyname_error003.phpt | 10 +
.../tests/network/gethostbyname_error004.phpt | 11 +
.../tests/network/gethostbyname_error005.phpt | 12 +
.../tests/network/gethostbyname_error006.phpt | 10 +
ext/standard/tests/network/inet.phpt | 42 +-
ext/standard/tests/network/ip2long_variation1.phpt | 14 +-
ext/standard/tests/serialize/bug43614.phpt | 2 +-
ext/standard/tests/streams/bug46426.phpt | 2 +-
ext/standard/tests/streams/bug47997.phpt | 13 +
ext/standard/tests/streams/bug48309.phpt | 33 +
.../streams/stream_copy_to_stream_socket.phpt | 30 +
.../tests/streams/stream_get_contents_001.phpt | 2 +-
ext/standard/tests/strings/bug38770.phpt | 2 +-
ext/standard/tests/strings/bug40754.phpt | 4 +-
ext/standard/tests/strings/bug40915.phpt | Bin 347 -> 377 bytes
ext/standard/tests/strings/bug44703.phpt | 24 +-
ext/standard/tests/strings/bug47546.phpt | 24 -
.../tests/strings/chunk_split_variation2.phpt | 4 +-
ext/standard/tests/strings/explode.phpt | 16 +-
ext/standard/tests/strings/explode1.phpt | 36 +-
ext/standard/tests/strings/explode_variation5.phpt | 4 +-
ext/standard/tests/strings/explode_variation6.phpt | 1 -
ext/standard/tests/strings/highlight_file.phpt | 2 +-
ext/standard/tests/strings/htmlentities01.phpt | 4 +-
.../htmlspecialchars_decode_variation2.phpt | 2 +-
ext/standard/tests/strings/pack.phpt | 10 +-
.../tests/strings/sprintf_variation35.phpt | 20 +-
ext/standard/tests/strings/sprintf_variation4.phpt | 18 +-
.../tests/strings/sprintf_variation41.phpt | 18 +-
ext/standard/tests/strings/str_getcsv_001.phpt | 4 +-
.../tests/strings/str_split_variation2.phpt | 7 +-
ext/standard/tests/strings/strcoll.phpt | 21 +
ext/standard/tests/strings/strcoll_error.phpt | 44 +
ext/standard/tests/strings/strstr.phpt | Bin 10353 -> 10343 bytes
ext/standard/tests/strings/vfprintf_error1.phpt | 2 +-
ext/standard/tests/strings/vfprintf_error2.phpt | 2 +-
ext/standard/tests/strings/vfprintf_error3.phpt | 2 +-
ext/standard/tests/strings/vfprintf_error4.phpt | 2 +-
.../tests/strings/vfprintf_variation15.phpt | 4 +-
.../tests/strings/vfprintf_variation16.phpt | 4 +-
.../tests/strings/vfprintf_variation4.phpt | 2 +-
.../tests/strings/vprintf_variation15.phpt | 4 +-
.../tests/strings/vprintf_variation15_64bit.phpt | 4 +-
.../tests/strings/vprintf_variation16.phpt | 4 +-
ext/standard/tests/strings/vprintf_variation4.phpt | 4 +-
.../tests/strings/vsprintf_variation15.phpt | 2 +-
.../tests/strings/vsprintf_variation15_64bit.phpt | 2 +-
.../tests/strings/vsprintf_variation16.phpt | 4 +-
.../tests/strings/vsprintf_variation4.phpt | 4 +-
ext/standard/tests/url/bug47174.phpt | 4 +-
.../tests/url/parse_url_variation_002.phpt | 182 -
.../tests/url/parse_url_variation_002_32bit.phpt | 200 +
.../tests/url/parse_url_variation_002_64bit.phpt | 184 +
ext/standard/tests/versioning/php_sapi_name.phpt | 9 +
.../versioning/php_sapi_name_variation001.phpt | 14 +
ext/standard/type.c | 18 +-
ext/standard/uuencode.c | 6 +-
ext/standard/var_unserializer.c | 4 +-
ext/standard/var_unserializer.c.orig | 4 +-
ext/sysvshm/sysvshm.c | 4 +-
ext/sysvshm/tests/002.phpt | 10 +-
ext/tokenizer/tokenizer.c | 7 +-
ext/wddx/tests/bug48562.phpt | 22 +
ext/wddx/wddx.c | 18 +-
ext/xmlrpc/config.m4 | 24 +-
ext/xmlrpc/tests/bug44996.phpt | 49 +
ext/xmlrpc/tests/bug47818.phpt | 39 +
ext/xmlrpc/xmlrpc-epi-php.c | 11 +-
ext/xmlwriter/php_xmlwriter.c | 36 +-
ext/xmlwriter/tests/bug48204.phpt | 17 +
.../tests/xmlwriter_open_uri_error_001.phpt | 16 +
.../tests/xmlwriter_open_uri_error_002.phpt | 16 +
.../tests/xmlwriter_open_uri_error_003.phpt | 16 +
.../tests/xmlwriter_open_uri_error_004.phpt | 16 +
.../tests/xmlwriter_open_uri_error_005.phpt | 16 +
.../xmlwriter_set_indent_string_basic_001.phpt | 24 +
.../xmlwriter_set_indent_string_error_001.phpt | 24 +
.../xmlwriter_write_attribute_ns_basic_001.phpt | 28 +
.../xmlwriter_write_attribute_ns_error_001.phpt | 35 +
.../tests/xmlwriter_write_dtd_basic_001.phpt | 22 +
.../tests/xmlwriter_write_dtd_error_001.phpt | 15 +
ext/xsl/tests/bug26384.phpt | 2 +-
ext/xsl/tests/bug48221.phpt | 17 +
ext/xsl/tests/phpfunc-nostring.xsl | 10 +
ext/xsl/tests/phpfunc-undef.xsl | 10 +
ext/xsl/tests/phpfunc.xsl | 11 +
ext/xsl/tests/xsl-phpinfo.phpt | 18 +
ext/xsl/tests/xslt001.phpt | 2 +-
ext/xsl/tests/xslt002.phpt | 2 +-
ext/xsl/tests/xslt003.phpt | 2 +-
ext/xsl/tests/xslt004.phpt | 2 +-
ext/xsl/tests/xslt005.phpt | 2 +-
ext/xsl/tests/xslt006.phpt | 2 +-
ext/xsl/tests/xslt007.phpt | 2 +-
ext/xsl/tests/xslt008.phpt | 2 +-
ext/xsl/tests/xslt009.phpt | 2 +-
ext/xsl/tests/xslt010.phpt | 3 +-
ext/xsl/tests/xslt011.phpt | 4 +-
ext/xsl/tests/xslt012.phpt | 2 +-
.../xsltprocessor_getParameter-invalidparam.phpt | 17 +
.../xsltprocessor_getParameter-wrongparam.phpt | 26 +
ext/xsl/tests/xsltprocessor_getParameter.phpt | 19 +
...sltprocessor_registerPHPFunctions-allfuncs.phpt | 30 +
...cessor_registerPHPFunctions-array-multiple.phpt | 34 +
...ssor_registerPHPFunctions-array-notallowed.phpt | 28 +
.../xsltprocessor_registerPHPFunctions-array.phpt | 26 +
...rocessor_registerPHPFunctions-funcnostring.phpt | 37 +
...ltprocessor_registerPHPFunctions-funcundef.phpt | 36 +
.../xsltprocessor_registerPHPFunctions-null.phpt | 32 +
...essor_registerPHPFunctions-string-multiple.phpt | 32 +
...sor_registerPHPFunctions-string-notallowed.phpt | 28 +
.../xsltprocessor_registerPHPFunctions-string.phpt | 26 +
...xsltprocessor_removeParameter-invalidparam.phpt | 18 +
.../xsltprocessor_removeParameter-wrongparams.phpt | 23 +
ext/xsl/tests/xsltprocessor_removeParameter.phpt | 20 +
.../xsltprocessor_setparameter-errorquote.phpt | 21 +
.../tests/xsltprocessor_setparameter-nostring.phpt | 22 +
ext/xsl/xsltprocessor.c | 11 +-
ext/zlib/tests/008.phpt | 11 +
ext/zlib/tests/bug.tar | Bin 4720640 -> 0 bytes
ext/zlib/tests/bug_40189.phpt | 2 +-
ext/zlib/tests/bug_40189_2.phpt | 14 -
ext/zlib/zlib.c | 155 +-
generated_lists | 2 +-
main/SAPI.c | 11 +-
main/SAPI.h | 5 +-
main/fopen_wrappers.c | 6 +-
main/main.c | 69 +-
main/network.c | 15 +-
main/output.c | 6 +-
main/php_config.h.in | 76 +-
main/php_content_types.c | 4 +-
main/php_ini.c | 16 +-
main/php_sprintf.c | 6 +-
main/php_streams.h | 5 +-
main/php_version.h | 4 +-
main/streams/cast.c | 10 +-
main/streams/memory.c | 3 +-
main/streams/mmap.c | 16 +-
main/streams/php_stream_mmap.h | 7 +-
main/streams/plain_wrapper.c | 8 +-
main/streams/streams.c | 70 +-
main/streams/userspace.c | 15 +-
pear/install-pear-nozlib.phar |56776 +++++++++--------
php.ini-development | 433 +-
php.ini-production | 433 +-
run-tests.php | 34 +-
sapi/cgi/cgi_main.c | 224 +-
sapi/cgi/tests/002.phpt | 18 +-
sapi/cgi/tests/003.phpt | 6 +-
sapi/cgi/tests/008.phpt | 4 +-
sapi/cgi/tests/009.phpt | 2 +-
sapi/cli/php.1.in | 4 +-
sapi/cli/php_cli.c | 45 +-
sapi/cli/tests/006.phpt | 2 +-
sapi/isapi/php5isapi.c | 4 +-
sapi/nsapi/nsapi.c | 10 +-
scripts/dev/generate-phpt.phar | Bin 0 -> 52353 bytes
scripts/dev/generate-phpt/build.xml | 15 +
scripts/dev/generate-phpt/gtPackage.php | 30 +
.../dev/generate-phpt/src/codeSnippets/array.txt | 9 +
.../dev/generate-phpt/src/codeSnippets/boolean.txt | 6 +
.../generate-phpt/src/codeSnippets/commentEnd.txt | 2 +
.../src/codeSnippets/commentStart.txt | 2 +
.../src/codeSnippets/emptyUnsetUndefNull.txt | 11 +
.../dev/generate-phpt/src/codeSnippets/float.txt | 7 +
scripts/dev/generate-phpt/src/codeSnippets/int.txt | 6 +
.../generate-phpt/src/codeSnippets/loopClose.txt | 1 +
.../generate-phpt/src/codeSnippets/loopStart.txt | 1 +
.../dev/generate-phpt/src/codeSnippets/object.txt | 25 +
.../generate-phpt/src/codeSnippets/skipif64b.txt | 1 +
.../src/codeSnippets/skipifnot64b.txt | 1 +
.../src/codeSnippets/skipifnotwin.txt | 1 +
.../generate-phpt/src/codeSnippets/skipifwin.txt | 1 +
.../dev/generate-phpt/src/codeSnippets/string.txt | 10 +
scripts/dev/generate-phpt/src/generate-phpt.php | 115 +
scripts/dev/generate-phpt/src/gtAutoload.php | 63 +
scripts/dev/generate-phpt/src/gtClassMap.php | 48 +
scripts/dev/generate-phpt/src/gtCodeSnippet.php | 72 +
scripts/dev/generate-phpt/src/gtFunction.php | 48 +
scripts/dev/generate-phpt/src/gtMethod.php | 139 +
scripts/dev/generate-phpt/src/gtTestCaseWriter.php | 27 +
scripts/dev/generate-phpt/src/gtTestSubject.php | 166 +
scripts/dev/generate-phpt/src/gtText.php | 27 +
.../exceptions/gtMissingArgumentException.php | 7 +
.../setup/exceptions/gtMissingOptionsException.php | 7 +
.../setup/exceptions/gtUnknownOptionException.php | 7 +
.../setup/exceptions/gtUnknownSectionException.php | 6 +
.../src/setup/gtCommandLineOptions.php | 98 +
.../generate-phpt/src/setup/gtOptionalSections.php | 85 +
.../dev/generate-phpt/src/setup/gtPreCondition.php | 14 +
.../generate-phpt/src/setup/gtPreConditionList.php | 33 +
.../src/setup/preconditions/gtIfClassHasMethod.php | 24 +
.../gtIsSpecifiedFunctionOrMethod.php | 21 +
.../setup/preconditions/gtIsSpecifiedTestType.php | 21 +
.../src/setup/preconditions/gtIsValidClass.php | 24 +
.../src/setup/preconditions/gtIsValidFunction.php | 25 +
.../src/setup/preconditions/gtIsValidMethod.php | 28 +
.../generate-phpt/src/testcase/gtBasicTestCase.php | 37 +
.../src/testcase/gtBasicTestCaseFunction.php | 62 +
.../src/testcase/gtBasicTestCaseMethod.php | 52 +
.../generate-phpt/src/testcase/gtErrorTestCase.php | 53 +
.../src/testcase/gtErrorTestCaseFunction.php | 57 +
.../src/testcase/gtErrorTestCaseMethod.php | 59 +
.../dev/generate-phpt/src/testcase/gtTestCase.php | 230 +
.../src/testcase/gtVariationContainer.php | 54 +
.../src/testcase/gtVariationContainerFunction.php | 43 +
.../src/testcase/gtVariationContainerMethod.php | 46 +
.../src/testcase/gtVariationTestCase.php | 55 +
.../src/testcase/gtVariationTestCaseFunction.php | 64 +
.../src/testcase/gtVariationTestCaseMethod.php | 68 +
.../src/texts/functionOrMethodNotSpecified.txt | 3 +
scripts/dev/generate-phpt/src/texts/help.txt | 14 +
.../generate-phpt/src/texts/methodNotSpecified.txt | 4 +
.../src/texts/testTypeNotSpecified.txt | 3 +
.../dev/generate-phpt/src/texts/unknownClass.txt | 4 +
.../generate-phpt/src/texts/unknownFunction.txt | 4 +
.../dev/generate-phpt/src/texts/unknownMethod.txt | 4 +
.../tests/gtBasicTestCaseFunctionTest.php | 24 +
.../tests/gtBasicTestCaseMethodTest.php | 28 +
.../dev/generate-phpt/tests/gtCodeSnippetTest.php | 15 +
.../tests/gtCommandLineOptionsTest.php | 46 +
.../tests/gtErrorTestCaseFunctionTest.php | 28 +
.../tests/gtErrorTestCaseMethodTest.php | 30 +
scripts/dev/generate-phpt/tests/gtFunctionTest.php | 71 +
.../generate-phpt/tests/gtIfClassHasMethodTest.php | 41 +
.../tests/gtIsSpecifiedFunctionOrMethodTest.php | 41 +
.../tests/gtIsSpecifiedTestTypeTest.php | 32 +
.../dev/generate-phpt/tests/gtIsValidClassTest.php | 41 +
.../generate-phpt/tests/gtIsValidFunctionTest.php | 40 +
.../generate-phpt/tests/gtIsValidMethodTest.php | 40 +
scripts/dev/generate-phpt/tests/gtMethodTest.php | 82 +
.../generate-phpt/tests/gtOptionalSectionsTest.php | 58 +
.../tests/gtVariationTestCaseFunctionTest.php | 59 +
.../tests/gtVariationTestCaseMethodTest.php | 27 +
scripts/dev/generate_phpt.php | 1148 -
scripts/phpize.in | 30 +-
scripts/phpize.m4 | 11 +-
tests/basic/bug46313-win.phpt | 3 +
tests/classes/__call_005.phpt | 2 +-
tests/classes/__call_007.phpt | 2 +-
tests/classes/inheritance_007.phpt | 20 +-
tests/classes/interface_optional_arg_003.inc | 4 +
tests/classes/interface_optional_arg_003.phpt | 17 +
tests/classes/iterators_008.phpt | 45 +
.../static_properties_undeclared_assign.phpt | 9 +
.../static_properties_undeclared_assignInc.phpt | 9 +
.../static_properties_undeclared_assignRef.phpt | 10 +
.../classes/static_properties_undeclared_inc.phpt | 9 +
.../static_properties_undeclared_isset.phpt | 9 +
.../classes/static_properties_undeclared_read.phpt | 9 +
tests/func/ini_alter.phpt | 19 +
tests/lang/045.phpt | 23 +
tests/lang/bug45392.phpt | 3 -
tests/lang/compare_objects_basic1.phpt | 60 +
tests/lang/compare_objects_basic2.phpt | 28 +
tests/lang/engine_assignExecutionOrder_001.phpt | 152 +
tests/lang/engine_assignExecutionOrder_002.phpt | 135 +
tests/lang/engine_assignExecutionOrder_003.phpt | 96 +
tests/lang/engine_assignExecutionOrder_004.phpt | 52 +
tests/lang/engine_assignExecutionOrder_005.phpt | 74 +
tests/lang/engine_assignExecutionOrder_006.phpt | 138 +
tests/lang/engine_assignExecutionOrder_007.phpt | 46 +
tests/lang/engine_assignExecutionOrder_008.phpt | 75 +
tests/lang/engine_assignExecutionOrder_009.phpt | 36 +
tests/lang/execution_order.phpt | 198 +
tests/lang/foreachLoop.001.phpt | 64 +
tests/lang/foreachLoop.002.phpt | 173 +
tests/lang/foreachLoop.003.phpt | 46 +
tests/lang/foreachLoop.004.phpt | 76 +
tests/lang/foreachLoop.005.phpt | 23 +
tests/lang/foreachLoop.006.phpt | 11 +
tests/lang/foreachLoop.007.phpt | 11 +
tests/lang/foreachLoop.008.phpt | 10 +
tests/lang/foreachLoop.009.phpt | 82 +
tests/lang/foreachLoop.010.phpt | 40 +
tests/lang/foreachLoop.011.phpt | 34 +
tests/lang/foreachLoop.012.phpt | 494 +
tests/lang/foreachLoop.013.phpt | 555 +
tests/lang/foreachLoop.014.phpt | 556 +
tests/lang/foreachLoop.015.phpt | 557 +
tests/lang/foreachLoop.016.phpt | 198 +
tests/lang/foreachLoop.017.phpt | 11 +
tests/lang/foreachLoopIterator.001.phpt | 134 +
tests/lang/foreachLoopIterator.002.phpt | 24 +
tests/lang/foreachLoopIteratorAggregate.001.phpt | 270 +
tests/lang/foreachLoopIteratorAggregate.002.phpt | 53 +
tests/lang/foreachLoopIteratorAggregate.003.phpt | 133 +
tests/lang/foreachLoopIteratorAggregate.004.phpt | 104 +
tests/lang/foreachLoopObjects.001.phpt | 69 +
tests/lang/foreachLoopObjects.002.phpt | 587 +
tests/lang/foreachLoopObjects.003.phpt | 250 +
tests/lang/foreachLoopObjects.004.phpt | 55 +
tests/lang/foreachLoopObjects.005.phpt | 78 +
tests/lang/foreachLoopObjects.006.phpt | 147 +
tests/lang/operators/add_basiclong_64bit.phpt | 582 +
tests/lang/operators/add_variationStr.phpt | 416 +
.../lang/operators/bitwiseAnd_basiclong_64bit.phpt | 582 +
tests/lang/operators/bitwiseAnd_variationStr.phpt | 416 +
.../lang/operators/bitwiseNot_basiclong_64bit.phpt | 60 +
tests/lang/operators/bitwiseNot_variationStr.phpt | 48 +
.../lang/operators/bitwiseOr_basiclong_64bit.phpt | 583 +
tests/lang/operators/bitwiseOr_variationStr.phpt | 416 +
.../bitwiseShiftLeft_basiclong_64bit.phpt | 583 +
.../operators/bitwiseShiftLeft_variationStr.phpt | 421 +
.../bitwiseShiftLeft_variationStr_64bit.phpt | 420 +
.../bitwiseShiftRight_basiclong_64bit.phpt | 583 +
.../operators/bitwiseShiftRight_variationStr.phpt | 416 +
.../lang/operators/bitwiseXor_basiclong_64bit.phpt | 583 +
tests/lang/operators/bitwiseXor_variationStr.phpt | 416 +
tests/lang/operators/divide_basiclong_64bit.phpt | 582 +
tests/lang/operators/divide_variationStr.phpt | 416 +
tests/lang/operators/modulus_basiclong_64bit.phpt | 582 +
tests/lang/operators/modulus_variationStr.phpt | 416 +
tests/lang/operators/multiply_basiclong_64bit.phpt | 582 +
tests/lang/operators/multiply_variationStr.phpt | 416 +
tests/lang/operators/negate_basiclong_64bit.phpt | 60 +
tests/lang/operators/negate_variationStr.phpt | 48 +
tests/lang/operators/operator_equals_basic.phpt | 65 +
.../lang/operators/operator_equals_variation.phpt | 63 +
.../operators/operator_equals_variation_64bit.phpt | 65 +
tests/lang/operators/operator_gt_basic.phpt | 65 +
.../lang/operators/operator_gt_or_equal_basic.phpt | 65 +
.../operators/operator_gt_or_equal_variation.phpt | 63 +
.../operator_gt_or_equal_variation_64bit.phpt | 63 +
tests/lang/operators/operator_gt_variation.phpt | 62 +
.../operators/operator_gt_variation_64bit.phpt | 62 +
tests/lang/operators/operator_identical_basic.phpt | 65 +
.../operators/operator_identical_variation.phpt | 63 +
.../operator_identical_variation_64bit.phpt | 65 +
tests/lang/operators/operator_lt_basic.phpt | 62 +
.../lang/operators/operator_lt_or_equal_basic.phpt | 64 +
.../operators/operator_lt_or_equal_variation.phpt | 63 +
.../operator_lt_or_equal_variation_64bit.phpt | 63 +
tests/lang/operators/operator_lt_variation.phpt | 60 +
.../operators/operator_lt_variation_64bit.phpt | 60 +
tests/lang/operators/operator_notequals_basic.phpt | 65 +
.../operators/operator_notequals_variation.phpt | 63 +
.../operator_notequals_variation_64bit.phpt | 65 +
.../operators/operator_notidentical_basic.phpt | 65 +
.../operators/operator_notidentical_variation.phpt | 64 +
.../operator_notidentical_variation_64bit.phpt | 65 +
tests/lang/operators/postdec_basiclong_64bit.phpt | 61 +
tests/lang/operators/postdec_variationStr.phpt | 49 +
tests/lang/operators/postinc_basiclong_64bit.phpt | 61 +
tests/lang/operators/postinc_variationStr.phpt | 49 +
tests/lang/operators/predec_basiclong_64bit.phpt | 60 +
tests/lang/operators/predec_variationStr.phpt | 48 +
tests/lang/operators/preinc_basiclong_64bit.phpt | 60 +
tests/lang/operators/preinc_variationStr.phpt | 48 +
tests/lang/operators/subtract_basiclong_64bit.phpt | 582 +
tests/lang/operators/subtract_variationStr.phpt | 416 +
tests/lang/returnByReference.001.phpt | 20 +
tests/lang/returnByReference.002.phpt | 29 +
tests/lang/returnByReference.003.phpt | 55 +
tests/lang/returnByReference.004.phpt | 57 +
tests/lang/returnByReference.005.phpt | 58 +
tests/lang/returnByReference.006.phpt | 60 +
tests/lang/returnByReference.007.phpt | 63 +
tests/lang/returnByReference.008.phpt | 64 +
tests/lang/returnByReference.009.phpt | 39 +
tests/output/ob_001.phpt | 8 +
tests/output/ob_002.phpt | 9 +
tests/output/ob_003.phpt | 13 +
tests/output/ob_004.phpt | 11 +
tests/output/ob_005.phpt | 14 +
tests/output/ob_006.phpt | 12 +
tests/output/ob_007.phpt | 11 +
tests/output/ob_008.phpt | 11 +
tests/output/ob_009.phpt | 12 +
tests/output/ob_010.phpt | 13 +
tests/output/ob_get_status.phpt | 34 +
tests/output/ob_start_basic_unerasable_005.phpt | 8 +-
win32/build/Makefile | 9 +-
win32/build/config.w32 | 20 +-
win32/build/config.w32.h.in | 6 +-
win32/build/confutils.js | 7 +-
win32/build/mkdist.php | 42 +-
win32/build/registersyslog.php | 2 +-
win32/build/template.rc | 6 +-
win32/php_stdint.h | 2 +
1898 files changed, 155365 insertions(+), 106554 deletions(-)
delete mode 100644 README.UPDATE_5_2
create mode 100644 Zend/tests/bug42143.phpt
create mode 100644 Zend/tests/bug47516.phpt
create mode 100644 Zend/tests/bug47596.phpt
create mode 100644 Zend/tests/bug47699.phpt
create mode 100644 Zend/tests/bug47714.phpt
create mode 100644 Zend/tests/bug47771.phpt
create mode 100644 Zend/tests/bug47801.phpt
create mode 100644 Zend/tests/bug47836.phpt
create mode 100644 Zend/tests/bug47880.phpt
create mode 100644 Zend/tests/bug47981.phpt
create mode 100644 Zend/tests/bug48004.phpt
create mode 100644 Zend/tests/bug48215.phpt
create mode 100644 Zend/tests/bug48228.phpt
create mode 100644 Zend/tests/bug48248.phpt
create mode 100644 Zend/tests/bug48408.phpt
create mode 100644 Zend/tests/bug48409.phpt
create mode 100644 Zend/tests/bug48428.phpt
create mode 100644 Zend/tests/bug48533.phpt
create mode 100644 Zend/tests/exception_010.phpt
create mode 100644 Zend/tests/function_exists_basic.phpt
create mode 100644 Zend/tests/function_exists_error.phpt
create mode 100644 Zend/tests/function_exists_variation1.phpt
create mode 100644 Zend/tests/get_defined_functions_basic.phpt
create mode 100644 Zend/tests/get_defined_functions_error.phpt
create mode 100644 ext/curl/tests/bug48203.phpt
create mode 100644 ext/curl/tests/bug48514.phpt
delete mode 100644 ext/curl/tests/curl_001.phpt
delete mode 100644 ext/curl/tests/curl_002.phpt
delete mode 100644 ext/curl/tests/curl_003.phpt
delete mode 100644 ext/curl/tests/curl_004.phpt
delete mode 100644 ext/curl/tests/curl_005.phpt
delete mode 100755 ext/curl/tests/curl_006.phpt
create mode 100644 ext/curl/tests/curl_basic_001.phpt
create mode 100644 ext/curl/tests/curl_basic_002.phpt
create mode 100644 ext/curl/tests/curl_basic_003.phpt
create mode 100644 ext/curl/tests/curl_basic_004.phpt
create mode 100644 ext/curl/tests/curl_basic_005.phpt
create mode 100755 ext/curl/tests/curl_basic_006.phpt
create mode 100755 ext/curl/tests/curl_basic_007.phpt
create mode 100755 ext/curl/tests/curl_basic_008.phpt
create mode 100644 ext/curl/tests/curl_basic_009.phpt
create mode 100644 ext/curl/tests/curl_basic_010.phpt
create mode 100644 ext/curl/tests/curl_basic_011.phpt
create mode 100644 ext/curl/tests/curl_basic_012.phpt
create mode 100644 ext/curl/tests/curl_basic_013.phpt
create mode 100644 ext/curl/tests/curl_basic_014.phpt
create mode 100644 ext/curl/tests/curl_basic_015.phpt
create mode 100644 ext/curl/tests/curl_basic_016.phpt
create mode 100644 ext/curl/tests/curl_basic_017.phpt
create mode 100644 ext/curl/tests/curl_basic_018.phpt
create mode 100644 ext/curl/tests/curl_basic_019.phpt
create mode 100644 ext/curl/tests/curl_basic_020.phpt
create mode 100644 ext/curl/tests/curl_basic_021.phpt
delete mode 100644 ext/date/config.m4
create mode 100644 ext/date/config0.m4
create mode 100644 ext/date/tests/bug45682.phpt
create mode 100644 ext/date/tests/bug46108.phpt
create mode 100644 ext/date/tests/bug48058.phpt
create mode 100644 ext/date/tests/bug48097.phpt
create mode 100644 ext/date/tests/date_add_basic2.phpt
create mode 100644 ext/date/tests/date_create-relative.phpt
create mode 100644 ext/date/tests/date_create_from_format_basic.phpt
create mode 100644 ext/date/tests/date_create_from_format_basic2.phpt
create mode 100644 ext/date/tests/date_get_last_errors_basic.phpt
create mode 100644 ext/date/tests/date_parse_from_format_basic.phpt
create mode 100644 ext/date/tests/strtotime-relative.phpt
create mode 100644 ext/date/tests/strtotime_basic2.phpt
create mode 100644 ext/dba/tests/bug48240.phpt
create mode 100644 ext/dom/tests/DOMAttr_construct_error_001.phpt
create mode 100644 ext/dom/tests/DOMAttr_name_basic_001.phpt
create mode 100755 ext/dom/tests/DOMAttr_ownerElement_error_001.phpt
create mode 100644 ext/dom/tests/DOMAttr_value_basic_002.phpt
create mode 100644 ext/dom/tests/DOMCDATASection_construct_error_001.phpt
create mode 100644 ext/dom/tests/DOMCharacterData_appendData_error_001.phpt
create mode 100755 ext/dom/tests/DOMCharacterData_data_error_002.phpt
create mode 100644 ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt
create mode 100644 ext/dom/tests/DOMCharacterData_deleteData_error_001.phpt
create mode 100644 ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt
create mode 100644 ext/dom/tests/DOMCharacterData_insertData_error_001.phpt
create mode 100644 ext/dom/tests/DOMCharacterData_replaceData_error_001.phpt
create mode 100644 ext/dom/tests/DOMComment_construct_basic_001.phpt
create mode 100644 ext/dom/tests/DOMComment_construct_error_001.phpt
create mode 100644 ext/dom/tests/DOMDocumentFragment_appendXML_basic_001.phpt
create mode 100644 ext/dom/tests/DOMDocumentFragment_appendXML_error_001.phpt
create mode 100644 ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt
create mode 100644 ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt
create mode 100644 ext/dom/tests/DOMDocumentFragment_construct_basic_001.phpt
create mode 100644 ext/dom/tests/DOMDocumentFragment_construct_basic_002.phpt
create mode 100644 ext/dom/tests/DOMDocumentFragment_construct_error_001.phpt
create mode 100644 ext/dom/tests/DOMDocumentType_basic_001.phpt
create mode 100644 ext/dom/tests/DOMDocumentType_entities_error_001.phpt
create mode 100644 ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt
create mode 100644 ext/dom/tests/DOMDocumentType_name_error_001.phpt
create mode 100644 ext/dom/tests/DOMDocumentType_notations_error_001.phpt
create mode 100644 ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt
create mode 100644 ext/dom/tests/DOMDocumentType_publicId_error_001.phpt
create mode 100644 ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt
create mode 100644 ext/dom/tests/DOMDocumentType_systemId_error_001.phpt
create mode 100644 ext/dom/tests/bug47849.phpt
create mode 100644 ext/exif/tests/bug48378.jpeg
create mode 100644 ext/exif/tests/bug48378.phpt
create mode 100644 ext/filter/tests/bug47745.phpt
create mode 100644 ext/gd/libgd/gd_arc.c
create mode 100644 ext/gd/libgd/gd_color.c
create mode 100644 ext/gd/libgd/gd_compat.c
create mode 100644 ext/gd/libgd/gd_compat.h
create mode 100644 ext/gd/libgd/gd_filter.c
create mode 100644 ext/gd/libgd/gd_intern.h
create mode 100644 ext/gd/libgd/gd_rotate.c
create mode 100644 ext/gettext/tests/gettext_basic-enus.phpt
create mode 100644 ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt
create mode 100644 ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt
create mode 100644 ext/gettext/tests/gettext_bindtextdomain-cwd.phpt
create mode 100644 ext/gettext/tests/gettext_bindtextdomain-emptydomain.phpt
create mode 100644 ext/gettext/tests/gettext_bindtextdomain-path.phpt
create mode 100644 ext/gettext/tests/gettext_bindtextdomain-wrongparams.phpt
create mode 100644 ext/gettext/tests/gettext_dcgettext-wrongparams.phpt
create mode 100644 ext/gettext/tests/gettext_dcgettext.phpt
create mode 100644 ext/gettext/tests/gettext_dgettext.phpt
create mode 100644 ext/gettext/tests/gettext_dgettext_error_wrongparams.phpt
create mode 100644 ext/gettext/tests/gettext_dngettext-plural.phpt
create mode 100644 ext/gettext/tests/gettext_dngettext-wrongparams.phpt
create mode 100644 ext/gettext/tests/gettext_gettext_error_wrongparams.phpt
create mode 100644 ext/gettext/tests/gettext_ngettext-wrongparams.phpt
create mode 100644 ext/gettext/tests/gettext_ngettext.phpt
create mode 100644 ext/gettext/tests/gettext_phpinfo.phpt
create mode 100644 ext/gettext/tests/gettext_textdomain-retval.phpt
create mode 100644 ext/gettext/tests/gettext_textdomain-wrongparams.phpt
create mode 100644 ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest.mo
create mode 100644 ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest.po
create mode 100644 ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest_switch.mo
create mode 100644 ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest_switch.po
create mode 100644 ext/gettext/tests/locale/en/LC_CTYPE/dgettextTest_switched.po
create mode 100644 ext/gettext/tests/locale/en/LC_CTYPE/dngettextTest.mo
create mode 100644 ext/gettext/tests/locale/en/LC_CTYPE/dngettextTest.po
create mode 100644 ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest.mo
create mode 100644 ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest.po
create mode 100644 ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest_switch.mo
create mode 100644 ext/gettext/tests/locale/en/LC_MESSAGES/dgettextTest_switch.po
create mode 100644 ext/gettext/tests/locale/en/LC_MESSAGES/dngettextTest.mo
create mode 100644 ext/gettext/tests/locale/en/LC_MESSAGES/dngettextTest.po
create mode 100644 ext/gettext/tests/locale/en/LC_MESSAGES/messages.mo
create mode 100644 ext/gettext/tests/locale/en/LC_MESSAGES/messages.po
create mode 100644 ext/iconv/tests/iconv_basic.phpt
create mode 100644 ext/iconv/tests/iconv_encoding_basic.phpt
create mode 100644 ext/iconv/tests/iconv_get_encoding_error.phpt
create mode 100644 ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt
create mode 100644 ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
create mode 100644 ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
create mode 100644 ext/iconv/tests/iconv_mime_decode_variation1.phpt
create mode 100644 ext/iconv/tests/iconv_mime_decode_variation2.phpt
create mode 100644 ext/iconv/tests/iconv_mime_decode_variation3.phpt
create mode 100644 ext/iconv/tests/iconv_set_encoding_error.phpt
create mode 100644 ext/iconv/tests/iconv_set_encoding_variation.phpt
create mode 100644 ext/iconv/tests/iconv_stream_filter_delimiter.phpt
create mode 100644 ext/iconv/tests/iconv_strlen_basic.phpt
create mode 100644 ext/iconv/tests/iconv_strlen_error1.phpt
create mode 100644 ext/iconv/tests/iconv_strlen_error2.phpt
create mode 100644 ext/iconv/tests/iconv_strlen_variation1.phpt
create mode 100644 ext/iconv/tests/iconv_strlen_variation2.phpt
create mode 100644 ext/iconv/tests/iconv_strpos_basic.phpt
create mode 100644 ext/iconv/tests/iconv_strpos_error1.phpt
create mode 100644 ext/iconv/tests/iconv_strpos_error2.phpt
create mode 100644 ext/iconv/tests/iconv_strpos_variation1.phpt
create mode 100644 ext/iconv/tests/iconv_strpos_variation2.phpt
create mode 100644 ext/iconv/tests/iconv_strpos_variation3.phpt
create mode 100644 ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
create mode 100644 ext/iconv/tests/iconv_strpos_variation4.phpt
create mode 100644 ext/iconv/tests/iconv_strpos_variation5.phpt
create mode 100644 ext/iconv/tests/iconv_strrpos_basic.phpt
create mode 100644 ext/iconv/tests/iconv_strrpos_error1.phpt
create mode 100644 ext/iconv/tests/iconv_strrpos_error2.phpt
create mode 100644 ext/iconv/tests/iconv_strrpos_variation1.phpt
create mode 100644 ext/iconv/tests/iconv_strrpos_variation2.phpt
create mode 100644 ext/iconv/tests/iconv_strrpos_variation3.phpt
create mode 100644 ext/iconv/tests/iconv_substr_basic.phpt
create mode 100644 ext/iconv/tests/iconv_substr_error1.phpt
create mode 100644 ext/iconv/tests/iconv_substr_error2.phpt
create mode 100644 ext/imap/tests/imap_body.phpt
create mode 100644 ext/imap/tests/imap_expunge_error.phpt
create mode 100644 ext/imap/tests/imap_gc_error.phpt
create mode 100644 ext/imap/tests/imap_headers.phpt
create mode 100644 ext/imap/tests/imap_mutf7_to_utf8.phpt
create mode 100644 ext/imap/tests/imap_num_msg_error.phpt
create mode 100644 ext/imap/tests/imap_num_recent_error.phpt
create mode 100644 ext/imap/tests/imap_open_error.phpt
create mode 100644 ext/imap/tests/imap_ping_error.phpt
create mode 100644 ext/imap/tests/imap_utf8_to_mutf7_basic.phpt
create mode 100644 ext/intl/tests/bug48227.phpt
create mode 100644 ext/json/tests/json_decode_basic.phpt
create mode 100644 ext/json/tests/json_decode_error.phpt
create mode 100644 ext/json/tests/json_encode_basic.phpt
create mode 100644 ext/json/tests/json_encode_basic_utf8.phpt
create mode 100644 ext/json/tests/json_encode_error.phpt
create mode 100644 ext/ldap/tests/bug48441.phpt
create mode 100644 ext/ldap/tests/connect.inc
create mode 100644 ext/ldap/tests/skipifbindfailure.inc
create mode 100644 ext/mbstring/tests/mb_convert_encoding_stateful.phpt
create mode 100644 ext/mysqli/tests/bug45289.phpt
delete mode 100644 ext/oci8/package2.xml
create mode 100644 ext/odbc/tests/config.inc
create mode 100644 ext/odbc/tests/odbc_columnprivileges_001.phpt
create mode 100644 ext/odbc/tests/odbc_columns_001.phpt
create mode 100644 ext/odbc/tests/odbc_data_source_001.phpt
create mode 100644 ext/odbc/tests/odbc_exec_001.phpt
create mode 100644 ext/odbc/tests/odbc_exec_002.phpt
create mode 100644 ext/odbc/tests/odbc_free_result_001.phpt
create mode 100644 ext/odbc/tests/odbc_tables_001.phpt
create mode 100644 ext/odbc/tests/skipif.inc
create mode 100644 ext/openssl/tests/bug47828.phpt
create mode 100644 ext/pcntl/tests/003.phpt
create mode 100644 ext/pcntl/tests/bug47566.phpt
create mode 100644 ext/pcre/tests/bug47662.phpt
create mode 100644 ext/pdo/tests/bug47769.phpt
create mode 100644 ext/pdo/tests/bug_44173.phpt
create mode 100644 ext/pdo/tests/bug_44409.phpt
create mode 100644 ext/pdo/tests/bug_44861.phpt
create mode 100644 ext/pdo_oci/tests/bug46274.phpt
create mode 100644 ext/pdo_oci/tests/bug46274_2.phpt
create mode 100644 ext/phar/tests/fatal_error_webphar.phpt
create mode 100644 ext/phar/tests/files/pear2coverage.phar.php
create mode 100644 ext/phar/tests/phar_construct_invalidurl.phpt
create mode 100644 ext/phar/tests/tar/bignames_overflow.phpt
create mode 100644 ext/phar/tests/tar/files/Net_URL-1.0.15.tgz
create mode 100644 ext/phar/tests/tar/files/make.dangerous.tar.php.inc
create mode 100644 ext/phar/tests/tar/phar_convert_phar4.phpt
create mode 100644 ext/phar/tests/tar/tar_nohash.phpt
create mode 100644 ext/posix/tests/posix_access.phpt
create mode 100644 ext/posix/tests/posix_access_error_modes.phpt
create mode 100644 ext/posix/tests/posix_access_error_wrongparams.phpt
create mode 100644 ext/posix/tests/posix_access_safemode.phpt
create mode 100644 ext/posix/tests/posix_ctermid.phpt
create mode 100644 ext/posix/tests/posix_getcwd_basic.phpt
create mode 100644 ext/posix/tests/posix_getgrgid.phpt
create mode 100644 ext/posix/tests/posix_getgrgid_basic.phpt
create mode 100644 ext/posix/tests/posix_getgrgid_macosx.phpt
create mode 100644 ext/posix/tests/posix_getgrgid_wrongparams.phpt
create mode 100644 ext/posix/tests/posix_getgrnam_basic.phpt
create mode 100644 ext/posix/tests/posix_getgroups_basic.phpt
create mode 100644 ext/posix/tests/posix_getpgid_basic.phpt
create mode 100644 ext/posix/tests/posix_getpgrp_basic.phpt
create mode 100644 ext/posix/tests/posix_getpid_basic.phpt
create mode 100644 ext/posix/tests/posix_getppid_basic.phpt
create mode 100644 ext/posix/tests/posix_getpwnam_basic.phpt
create mode 100644 ext/posix/tests/posix_getpwuid_basic.phpt
create mode 100644 ext/posix/tests/posix_getrlimit_basic.phpt
create mode 100644 ext/posix/tests/posix_getsid.phpt
create mode 100644 ext/posix/tests/posix_getsid_basic.phpt
create mode 100644 ext/posix/tests/posix_getsid_error.phpt
create mode 100644 ext/posix/tests/posix_initgroups_basic.phpt
create mode 100644 ext/posix/tests/posix_kill_basic.phpt
create mode 100644 ext/posix/tests/posix_mkfifo_safemode.phpt
create mode 100644 ext/posix/tests/posix_mkfifo_wrongparams.phpt
create mode 100644 ext/posix/tests/posix_mknod_basic.phpt
create mode 100644 ext/posix/tests/posix_times.phpt
create mode 100644 ext/posix/tests/posix_times_basic.phpt
create mode 100644 ext/posix/tests/posix_ttyname.phpt
create mode 100644 ext/posix/tests/posix_ttyname_error_wrongparams.phpt
create mode 100644 ext/posix/tests/posix_uname.phpt
create mode 100644 ext/posix/tests/posix_uname_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_FileInfo_error.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_constructor_001.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_constructor_002.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_export_basic1.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_export_basic2.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_getConstant_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_getConstant_error.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_getConstants_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_getConstants_error.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_getConstructor_error.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_getExtensionName_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_getExtensionName_variation.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_getExtension_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_getExtension_variation.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_getInterfaceNames_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_getModifierNames_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_getModifiers_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_getName_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_getName_error.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_getName_error1.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_getNamespaceName.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_getParentClass.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_isAbstract_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_isFinal_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_isInstance_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_isInstance_error.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_isInstantiable_error.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_isInterface_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_isInternal_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_isInternal_error.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_isIterateable_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_isIterateable_variation1.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_isSubclassOf_error.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_isSubclassOf_error1.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionClass_isUserDefined_error.phpt
create mode 100644 ext/reflection/tests/ReflectionExtension_constructor_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionExtension_constructor_error.phpt
create mode 100644 ext/reflection/tests/ReflectionExtension_export_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionExtension_getClassNames_variation1.phpt
create mode 100644 ext/reflection/tests/ReflectionExtension_getClasses_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionExtension_getDependencies_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionExtension_getDependencies_variation2.phpt
create mode 100644 ext/reflection/tests/ReflectionExtension_getName_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionExtension_getVersion_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionExtension_info_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_FileInfo_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_FileInfo_error.phpt
create mode 100644 ext/reflection/tests/ReflectionObject___toString_basic1.phpt
create mode 100644 ext/reflection/tests/ReflectionObject___toString_basic2.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_constructor_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_constructor_error.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_export_basic1.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_export_basic2.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_export_basic3.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_getConstant_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_getConstant_error.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_getConstants_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_getConstants_error.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_getConstructor_error.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_getName_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_getName_error.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_getName_error1.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_isInstance_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_isInstance_error.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_isInternal_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_isInternal_error.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_isSubclassOf_error.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionObject_isUserDefined_error.phpt
create mode 100644 ext/reflection/tests/ReflectionParameter_export_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionParameter_export_error.phpt
create mode 100644 ext/reflection/tests/ReflectionParameter_export_error2.phpt
create mode 100644 ext/reflection/tests/ReflectionParameter_export_error3.phpt
create mode 100644 ext/reflection/tests/ReflectionParameter_getDeclaringFunction_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionParameter_getPosition_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt
create mode 100644 ext/reflection/tests/ReflectionParameter_toString_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionProperty_basic1.phpt
create mode 100644 ext/reflection/tests/ReflectionProperty_basic2.phpt
create mode 100644 ext/reflection/tests/ReflectionProperty_constructor_error.phpt
create mode 100644 ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt
create mode 100644 ext/reflection/tests/ReflectionProperty_error.phpt
create mode 100644 ext/reflection/tests/ReflectionProperty_export_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionProperty_export_error.phpt
create mode 100644 ext/reflection/tests/ReflectionProperty_getDeclaringClass_variation1.phpt
create mode 100644 ext/reflection/tests/ReflectionProperty_getDocComment_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionProperty_getDocComment_error.phpt
create mode 100644 ext/reflection/tests/ReflectionProperty_getModifiers_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionProperty_getValue_error.phpt
create mode 100644 ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt
create mode 100644 ext/reflection/tests/ReflectionProperty_setAccessible.phpt
create mode 100644 ext/reflection/tests/ReflectionProperty_setValue_error.phpt
create mode 100644 ext/reflection/tests/bug48336.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_FileInfo_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_FileInfo_error.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_constructor_001.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_constructor_002.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_export_basic1.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_export_basic2.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_getConstant_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_getConstant_error.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_getConstants_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_getConstants_error.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_getConstructor_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_getConstructor_error.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_getExtensionName_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_getExtensionName_variation.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_getExtension_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_getExtension_variation.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_getInterfaceNames_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_getModifierNames_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_getModifiers_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_getName_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_getName_error.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_getName_error1.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_getNamespaceName.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_getParentClass.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_hasConstant_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_hasMethod_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_hasProperty_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_isAbstract_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_isFinal_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_isInstance_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_isInstance_error.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_isInstantiable_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_isInstantiable_error.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_isInstantiable_variation.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_isInterface_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_isInternal_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_isInternal_error.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_isIterateable_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_isIterateable_variation1.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_isSubclassOf_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_isSubclassOf_error.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_isSubclassOf_error1.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_isUserDefined_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionClass_isUserDefined_error.phpt
delete mode 100644 ext/reflection/tests/reflectionExtension_constructor_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionExtension_constructor_error.phpt
delete mode 100644 ext/reflection/tests/reflectionExtension_export_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionExtension_getClassNames_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionExtension_getClassNames_variation1.phpt
delete mode 100644 ext/reflection/tests/reflectionExtension_getClasses_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionExtension_getDependencies_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionExtension_getDependencies_variation2.phpt
delete mode 100644 ext/reflection/tests/reflectionExtension_getName_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionExtension_getVersion_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionExtension_info_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_FileInfo_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_FileInfo_error.phpt
delete mode 100644 ext/reflection/tests/reflectionObject___toString_basic1.phpt
delete mode 100644 ext/reflection/tests/reflectionObject___toString_basic2.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_constructor_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_constructor_error.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_export_basic1.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_export_basic2.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_export_basic3.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_getConstant_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_getConstant_error.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_getConstants_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_getConstants_error.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_getConstructor_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_getConstructor_error.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_getName_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_getName_error.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_getName_error1.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_isInstance_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_isInstance_error.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_isInstantiable_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_isInstantiable_error.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_isInstantiable_variation.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_isInternal_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_isInternal_error.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_isSubclassOf_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_isSubclassOf_error.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_isUserDefined_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionObject_isUserDefined_error.phpt
delete mode 100644 ext/reflection/tests/reflectionParameter_export_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionParameter_export_error.phpt
delete mode 100644 ext/reflection/tests/reflectionParameter_export_error2.phpt
delete mode 100644 ext/reflection/tests/reflectionParameter_export_error3.phpt
delete mode 100644 ext/reflection/tests/reflectionParameter_getDeclaringFunction_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionParameter_getPosition_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionParameter_invalidMethodInConstructor.phpt
delete mode 100644 ext/reflection/tests/reflectionParameter_toString_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionProperty_basic1.phpt
delete mode 100644 ext/reflection/tests/reflectionProperty_basic2.phpt
delete mode 100644 ext/reflection/tests/reflectionProperty_constructor_error.phpt
delete mode 100644 ext/reflection/tests/reflectionProperty_constructor_variation1.phpt
delete mode 100644 ext/reflection/tests/reflectionProperty_error.phpt
delete mode 100644 ext/reflection/tests/reflectionProperty_export_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionProperty_export_error.phpt
delete mode 100644 ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt
delete mode 100644 ext/reflection/tests/reflectionProperty_getDocComment_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionProperty_getDocComment_error.phpt
delete mode 100644 ext/reflection/tests/reflectionProperty_getModifiers_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionProperty_getValue_error.phpt
delete mode 100644 ext/reflection/tests/reflectionProperty_isDefault_basic.phpt
delete mode 100644 ext/reflection/tests/reflectionProperty_setAccessible.phpt
delete mode 100644 ext/reflection/tests/reflectionProperty_setValue_error.phpt
create mode 100644 ext/session/tests/bug42596.phpt
create mode 100644 ext/soap/tests/bug48557.phpt
create mode 100644 ext/soap/tests/bug48557.wsdl
create mode 100644 ext/sockets/tests/ipv6_skipif.inc
create mode 100644 ext/sockets/tests/socket_accept-wrongparams.phpt
create mode 100644 ext/sockets/tests/socket_create_listen-nobind.phpt
create mode 100644 ext/sockets/tests/socket_create_listen-wrongparams.phpt
create mode 100644 ext/sockets/tests/socket_create_listen.phpt
create mode 100644 ext/sockets/tests/socket_create_pair-wrongparams.phpt
create mode 100644 ext/sockets/tests/socket_create_pair.phpt
create mode 100644 ext/sockets/tests/socket_listen-wrongparams.phpt
create mode 100644 ext/sockets/tests/socket_select-wrongparams-1.phpt
create mode 100644 ext/sockets/tests/socket_select-wrongparams-2.phpt
create mode 100644 ext/sockets/tests/socket_select-wrongparams-3.phpt
create mode 100644 ext/sockets/tests/socket_select-wrongparams-4.phpt
create mode 100644 ext/sockets/tests/socket_select.phpt
create mode 100644 ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
create mode 100644 ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
create mode 100644 ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
create mode 100644 ext/sockets/tests/socket_set_block-retval.phpt
create mode 100644 ext/sockets/tests/socket_set_block-wrongparams.phpt
create mode 100644 ext/sockets/tests/socket_set_nonblock-retval.phpt
create mode 100644 ext/sockets/tests/socket_set_nonblock-wrongparams.phpt
create mode 100644 ext/sockets/tests/socket_set_option_error_socket_option.phpt
create mode 100644 ext/sockets/tests/socket_set_option_rcvtimeo.phpt
create mode 100644 ext/sockets/tests/socket_set_option_seolinger.phpt
create mode 100644 ext/sockets/tests/socket_set_option_sndtimeo.phpt
create mode 100644 ext/spl/tests/DirectoryIterator_getBasename_basic_test.phpt
create mode 100644 ext/spl/tests/DirectoryIterator_getBasename_pass_array.phpt
create mode 100644 ext/spl/tests/SplArray_fromArray.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_bottom_pass_array.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_bottom_pass_float.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_bottom_pass_integer.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_bottom_pass_null.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_count.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_current.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_current_empty.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_debug-info.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_getIteratorMode.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_getIteratorMode_error.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_isEmpty_empty.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_lifoMode.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_offsetExists_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_offsetExists_success.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_offsetGet_empty.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_offsetGet_missing_param.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_offsetSet_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_offsetSet_one_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_offsetUnset_greater_than_elements.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_offsetUnset_negative-parameter.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_offsetUnset_parameter-larger-num-elements.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_pop_noParams.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_pop_params.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_push_missing_parameter.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_shift_noParams.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_top_pass_array.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_top_pass_float.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_top_pass_integer.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_top_pass_null.phpt
create mode 100644 ext/spl/tests/SplDoublyLinkedList_unshift_missing_parameter.phpt
create mode 100644 ext/spl/tests/SplDoublylinkedlist_offsetunset_first.phpt
create mode 100644 ext/spl/tests/SplDoublylinkedlist_offsetunset_first002.phpt
create mode 100644 ext/spl/tests/SplDoublylinkedlist_offsetunset_last.phpt
create mode 100644 ext/spl/tests/SplFileObject_fflush_basic_001.phpt
create mode 100644 ext/spl/tests/SplFileObject_fpassthru_basic.phpt
create mode 100644 ext/spl/tests/SplFileObject_fscanf_basic.phpt
create mode 100644 ext/spl/tests/SplFileObject_fseek_error_001.phpt
create mode 100644 ext/spl/tests/SplFileObject_ftruncate_error_001.phpt
create mode 100644 ext/spl/tests/SplFileObject_fwrite_error_001.phpt
create mode 100644 ext/spl/tests/SplFileObject_fwrite_variation_001.phpt
create mode 100644 ext/spl/tests/SplFileObject_fwrite_variation_002.phpt
create mode 100644 ext/spl/tests/SplFileObject_fwrite_variation_003.phpt
create mode 100644 ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt
create mode 100644 ext/spl/tests/SplFileObject_seek_error_001.phpt
create mode 100644 ext/spl/tests/SplFileObject_testinput.csv
create mode 100644 ext/spl/tests/SplFixedArray__construct_param_array.phpt
create mode 100644 ext/spl/tests/SplFixedArray__construct_param_float.phpt
create mode 100644 ext/spl/tests/SplFixedArray__construct_param_null.phpt
create mode 100644 ext/spl/tests/SplFixedArray__construct_param_string.phpt
create mode 100644 ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
create mode 100644 ext/spl/tests/SplFixedArray_count_checkParams.phpt
create mode 100644 ext/spl/tests/SplFixedArray_count_param_int.phpt
create mode 100644 ext/spl/tests/SplFixedArray_current_param.phpt
create mode 100644 ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_001.phpt
create mode 100644 ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_002.phpt
create mode 100644 ext/spl/tests/SplFixedArray_fromarray_indexes.phpt
create mode 100644 ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt
create mode 100644 ext/spl/tests/SplFixedArray_fromarray_param_boolean.phpt
create mode 100644 ext/spl/tests/SplFixedArray_fromarray_param_multiarray.phpt
create mode 100644 ext/spl/tests/SplFixedArray_getSize_pass_param.phpt
create mode 100644 ext/spl/tests/SplFixedArray_key_param.phpt
create mode 100644 ext/spl/tests/SplFixedArray_key_setsize.phpt
create mode 100644 ext/spl/tests/SplFixedArray_next_param.phpt
create mode 100644 ext/spl/tests/SplFixedArray_offsetExists_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplFixedArray_offsetExists_less_than_zero.phpt
create mode 100644 ext/spl/tests/SplFixedArray_offsetGet_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplFixedArray_offsetSet_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplFixedArray_offsetSet_one_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplFixedArray_offsetUnset_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplFixedArray_offsetUnset_string.phpt
create mode 100644 ext/spl/tests/SplFixedArray_rewind_param.phpt
create mode 100644 ext/spl/tests/SplFixedArray_setSize_filled_to_smaller.phpt
create mode 100644 ext/spl/tests/SplFixedArray_setSize_param_array.phpt
create mode 100644 ext/spl/tests/SplFixedArray_setSize_param_float.phpt
create mode 100644 ext/spl/tests/SplFixedArray_setSize_param_null.phpt
create mode 100644 ext/spl/tests/SplFixedArray_setSize_reduce.phpt
create mode 100644 ext/spl/tests/SplFixedArray_setsize_001.phpt
create mode 100644 ext/spl/tests/SplFixedArray_setsize_grow.phpt
create mode 100644 ext/spl/tests/SplFixedArray_setsize_shrink.phpt
create mode 100644 ext/spl/tests/SplFixedArray_toArray_with-params.phpt
create mode 100644 ext/spl/tests/SplFixedarray_offsetExists_larger.phpt
create mode 100644 ext/spl/tests/SplHeap_count_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplHeap_extract_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplHeap_insert_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplHeap_isEmpty.phpt
create mode 100644 ext/spl/tests/SplHeap_isEmpty_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplObjectStorage_attach_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplObjectStorage_current_empty_storage.phpt
create mode 100644 ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplObjectStorage_getInfo_empty_storage.phpt
create mode 100644 ext/spl/tests/SplObjectStorage_offsetGet.phpt
create mode 100644 ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplObjectStorage_offsetGet_missing_object.phpt
create mode 100644 ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplObjectStorage_setInfo_empty_storage.phpt
create mode 100644 ext/spl/tests/SplObjectStorage_setInfo_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter1.phpt
create mode 100644 ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter2.phpt
create mode 100644 ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter3.phpt
create mode 100644 ext/spl/tests/SplPriorityQueue_extract_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplPriorityQueue_insert_invalid_parameter.phpt
create mode 100644 ext/spl/tests/SplQueue_setIteratorMode.phpt
create mode 100644 ext/spl/tests/SplQueue_setIteratorMode_param_lifo.phpt
create mode 100644 ext/spl/tests/SplStack_setIteratorMode.phpt
create mode 100644 ext/spl/tests/bug45622b.phpt
create mode 100644 ext/spl/tests/bug47534.phpt
create mode 100644 ext/spl/tests/bug48023.phpt
create mode 100644 ext/spl/tests/bug48493.phpt
create mode 100644 ext/spl/tests/dllist_010.phpt
create mode 100644 ext/spl/tests/dllist_011.phpt
create mode 100644 ext/spl/tests/dllist_memleak.phpt
create mode 100644 ext/spl/tests/heap_corruption.phpt
create mode 100644 ext/spl/tests/heap_current_variation_001.phpt
create mode 100644 ext/spl/tests/heap_isempty_variation_001.phpt
create mode 100644 ext/spl/tests/heap_it_current_empty.phpt
create mode 100644 ext/spl/tests/heap_top_variation_001.phpt
create mode 100644 ext/spl/tests/heap_top_variation_002.phpt
create mode 100644 ext/spl/tests/heap_top_variation_003.phpt
create mode 100644 ext/spl/tests/iterator_count.phpt
create mode 100644 ext/spl/tests/iterator_to_array.phpt
create mode 100644 ext/spl/tests/limititerator_seek.phpt
create mode 100644 ext/spl/tests/pqueue_compare_basic.phpt
create mode 100644 ext/spl/tests/pqueue_compare_error.phpt
create mode 100644 ext/spl/tests/pqueue_current_error.phpt
create mode 100644 ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt
create mode 100644 ext/spl/tests/recursiveiteratoriterator_beginiteration_basic.phpt
create mode 100644 ext/spl/tests/recursiveiteratoriterator_enditeration_basic.phpt
create mode 100644 ext/spl/tests/recursiveiteratoriterator_getsubiterator_basic.phpt
create mode 100644 ext/spl/tests/recursiveiteratoriterator_getsubiterator_error.phpt
create mode 100644 ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt
create mode 100644 ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_002.phpt
create mode 100644 ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation_003.phpt
create mode 100644 ext/spl/tests/recursiveiteratoriterator_nextelement_basic.phpt
create mode 100644 ext/spl/tests/regexiterator_getpregflags.phpt
create mode 100644 ext/spl/tests/regexiterator_setflags_exception.phpt
create mode 100644 ext/spl/tests/regexiterator_setpregflags.phpt
create mode 100644 ext/spl/tests/regexiterator_setpregflags_exception.phpt
create mode 100644 ext/spl/tests/spl_autoload_bug48541.phpt
create mode 100644 ext/spl/tests/spl_caching_iterator_constructor_flags.phpt
create mode 100644 ext/spl/tests/spl_cachingiterator___toString_basic.phpt
create mode 100644 ext/spl/tests/spl_cachingiterator_setFlags_basic.phpt
create mode 100644 ext/spl/tests/spl_classes.phpt
create mode 100755 ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt
create mode 100644 ext/spl/tests/spl_heap_count_basic.phpt
create mode 100644 ext/spl/tests/spl_heap_count_error.phpt
create mode 100644 ext/spl/tests/spl_heap_extract_parameter_error.phpt
create mode 100644 ext/spl/tests/spl_heap_insert_basic.phpt
create mode 100644 ext/spl/tests/spl_heap_is_empty_basic.phpt
create mode 100644 ext/spl/tests/spl_heap_isempty.phpt
create mode 100644 ext/spl/tests/spl_heap_iteration_error.phpt
create mode 100644 ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt
create mode 100755 ext/spl/tests/spl_iterator_apply_error.phpt
create mode 100755 ext/spl/tests/spl_iterator_apply_error_001.phpt
create mode 100644 ext/spl/tests/spl_iterator_caching_count_basic.phpt
create mode 100644 ext/spl/tests/spl_iterator_caching_count_error.phpt
create mode 100644 ext/spl/tests/spl_iterator_caching_getcache_error.phpt
create mode 100644 ext/spl/tests/spl_iterator_getcallchildren.phpt
create mode 100644 ext/spl/tests/spl_iterator_iterator_constructor.phpt
create mode 100644 ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt
create mode 100644 ext/spl/tests/spl_iterator_to_array_basic.phpt
create mode 100755 ext/spl/tests/spl_iterator_to_array_error.phpt
create mode 100644 ext/spl/tests/spl_limit_iterator_check_limits.phpt
create mode 100644 ext/spl/tests/spl_maxheap_compare_basic.phpt
create mode 100644 ext/spl/tests/spl_minheap_compare_error.phpt
create mode 100644 ext/spl/tests/spl_pq_top_basic.phpt
create mode 100644 ext/spl/tests/spl_pq_top_error_args.phpt
create mode 100644 ext/spl/tests/spl_pq_top_error_corrupt.phpt
create mode 100644 ext/spl/tests/spl_pq_top_error_empty.phpt
create mode 100644 ext/spl/tests/spl_priorityqeue_insert_two_params_error.phpt
create mode 100644 ext/spl/tests/spl_recursiveIteratorIterator_setMaxDepth_parameter_count.phpt
create mode 100644 ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt
create mode 100644 ext/spl/tests/splpriorityqueue_extract.phpt
create mode 100644 ext/spl/tests/splpriorityqueue_setextractflags.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_02_open.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_31_changes.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_31_open.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_32_changes.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_32_createAggregate_paramCount.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_32_last_insert_rowid_param.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_33_reset.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_close_error.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_close_with_params.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_enable_exceptions.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_exec_wrongparams.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_lasterrorcode_with_params.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_lasterrormsg_with_params.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_open_empty_string.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_openblob_wrongparams.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_prepare_faultystmt.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_prepare_with_empty_string.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_prepare_wrongparams.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_prepared_stmt_clear_with_params.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_query_error.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_querysingle_error.phpt
create mode 100644 ext/sqlite3/tests/sqlite3_version_noparam.phpt
create mode 100644 ext/sqlite3/tests/sqlite3result_fetcharray_with_two_params_fails.phpt
create mode 100644 ext/sqlite3/tests/sqlite3result_numcolumns_error.phpt
create mode 100644 ext/sqlite3/tests/sqlite3result_reset_with_params_fails.phpt
create mode 100644 ext/sqlite3/tests/sqlite3stmt_reset_params.phpt
delete mode 100644 ext/standard/CREDITS
create mode 100644 ext/standard/tests/array/array_multisort_variation11.phpt
create mode 100644 ext/standard/tests/array/bug44929.phpt
create mode 100644 ext/standard/tests/array/bug48224.phpt
create mode 100644 ext/standard/tests/class_object/AutoInterface.inc
create mode 100644 ext/standard/tests/class_object/AutoLoaded.inc
create mode 100644 ext/standard/tests/class_object/AutoTest.inc
create mode 100644 ext/standard/tests/class_object/get_class_vars_error.phpt
create mode 100644 ext/standard/tests/class_object/get_class_vars_variation1.phpt
create mode 100644 ext/standard/tests/class_object/get_class_vars_variation2.phpt
create mode 100644 ext/standard/tests/class_object/get_declared_classes_variation1.phpt
create mode 100644 ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt
create mode 100644 ext/standard/tests/class_object/interface_exists_error.phpt
create mode 100644 ext/standard/tests/class_object/interface_exists_variation1.phpt
create mode 100644 ext/standard/tests/class_object/interface_exists_variation2.phpt
create mode 100644 ext/standard/tests/class_object/interface_exists_variation3.phpt
create mode 100644 ext/standard/tests/class_object/interface_exists_variation4.phpt
create mode 100644 ext/standard/tests/class_object/is_subclass_of_variation_004.phpt
create mode 100644 ext/standard/tests/class_object/property_exists_error.phpt
create mode 100644 ext/standard/tests/class_object/property_exists_variation1.phpt
create mode 100644 ext/standard/tests/file/bug41874.phpt
create mode 100644 ext/standard/tests/file/bug41874_1.phpt
create mode 100644 ext/standard/tests/file/bug41874_2.phpt
create mode 100644 ext/standard/tests/file/bug41874_3.phpt
create mode 100644 ext/standard/tests/file/bug44034.phpt
create mode 100644 ext/standard/tests/file/bug47767.phpt
create mode 100644 ext/standard/tests/file/link_win32.phpt
create mode 100644 ext/standard/tests/file/windows_acls/bug44859.phpt
create mode 100644 ext/standard/tests/file/windows_acls/bug44859_2.phpt
create mode 100644 ext/standard/tests/file/windows_acls/bug44859_3.phpt
create mode 100644 ext/standard/tests/file/windows_acls/bug44859_4.phpt
create mode 100644 ext/standard/tests/file/windows_acls/common.inc
create mode 100644 ext/standard/tests/file/windows_acls/tiny.bat
create mode 100644 ext/standard/tests/file/windows_acls/tiny.exe
create mode 100644 ext/standard/tests/filters/chunked_001.phpt
create mode 100644 ext/standard/tests/general_functions/bug47857.phpt
create mode 100644 ext/standard/tests/general_functions/bug47859.phpt
create mode 100644 ext/standard/tests/general_functions/call_user_method.phpt
create mode 100644 ext/standard/tests/general_functions/intval_variation1.phpt
create mode 100644 ext/standard/tests/general_functions/intval_variation2.phpt
create mode 100644 ext/standard/tests/http/bug38802.phpt
create mode 100644 ext/standard/tests/http/ignore_errors.phpt
create mode 100644 ext/standard/tests/http/server.inc
create mode 100644 ext/standard/tests/math/abs_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/acos_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/acosh_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/asin_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/asinh_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/atan2_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/atan_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/atanh_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/bindec_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/ceil_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/cos_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/cosh_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/decbin_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/dechex_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/decoct_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/deg2rad_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/exp_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/expm1_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/floor_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/fmod_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/hexdec_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/hypot_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/is_finite_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/is_infinite_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/is_nan_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/log10_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/log1p_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/log_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/octdec_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/pow_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/rad2deg_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/round_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/sin_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/sinh_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/sqrt_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/tan_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/math/tanh_basiclong_64bit.phpt
create mode 100644 ext/standard/tests/misc/browsernames.inc
delete mode 100644 ext/standard/tests/misc/browsernames.php
create mode 100644 ext/standard/tests/misc/time_nanosleep_basic.phpt
create mode 100644 ext/standard/tests/misc/time_nanosleep_error1.phpt
create mode 100644 ext/standard/tests/misc/time_nanosleep_error2.phpt
create mode 100644 ext/standard/tests/misc/time_nanosleep_error3.phpt
create mode 100644 ext/standard/tests/misc/time_nanosleep_error4.phpt
create mode 100644 ext/standard/tests/misc/time_nanosleep_error5.phpt
create mode 100644 ext/standard/tests/network/gethostbyname_basic001.phpt
create mode 100644 ext/standard/tests/network/gethostbyname_basic002.phpt
create mode 100644 ext/standard/tests/network/gethostbyname_error001.phpt
create mode 100644 ext/standard/tests/network/gethostbyname_error002.phpt
create mode 100644 ext/standard/tests/network/gethostbyname_error003.phpt
create mode 100644 ext/standard/tests/network/gethostbyname_error004.phpt
create mode 100644 ext/standard/tests/network/gethostbyname_error005.phpt
create mode 100644 ext/standard/tests/network/gethostbyname_error006.phpt
create mode 100644 ext/standard/tests/streams/bug47997.phpt
create mode 100644 ext/standard/tests/streams/bug48309.phpt
create mode 100644 ext/standard/tests/streams/stream_copy_to_stream_socket.phpt
delete mode 100644 ext/standard/tests/strings/bug47546.phpt
create mode 100644 ext/standard/tests/strings/strcoll.phpt
create mode 100644 ext/standard/tests/strings/strcoll_error.phpt
delete mode 100644 ext/standard/tests/url/parse_url_variation_002.phpt
create mode 100644 ext/standard/tests/url/parse_url_variation_002_32bit.phpt
create mode 100644 ext/standard/tests/url/parse_url_variation_002_64bit.phpt
create mode 100644 ext/standard/tests/versioning/php_sapi_name.phpt
create mode 100644 ext/standard/tests/versioning/php_sapi_name_variation001.phpt
create mode 100644 ext/wddx/tests/bug48562.phpt
create mode 100644 ext/xmlrpc/tests/bug44996.phpt
create mode 100644 ext/xmlrpc/tests/bug47818.phpt
create mode 100644 ext/xmlwriter/tests/bug48204.phpt
create mode 100644 ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt
create mode 100644 ext/xmlwriter/tests/xmlwriter_open_uri_error_002.phpt
create mode 100644 ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt
create mode 100644 ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt
create mode 100644 ext/xmlwriter/tests/xmlwriter_open_uri_error_005.phpt
create mode 100644 ext/xmlwriter/tests/xmlwriter_set_indent_string_basic_001.phpt
create mode 100644 ext/xmlwriter/tests/xmlwriter_set_indent_string_error_001.phpt
create mode 100644 ext/xmlwriter/tests/xmlwriter_write_attribute_ns_basic_001.phpt
create mode 100644 ext/xmlwriter/tests/xmlwriter_write_attribute_ns_error_001.phpt
create mode 100644 ext/xmlwriter/tests/xmlwriter_write_dtd_basic_001.phpt
create mode 100644 ext/xmlwriter/tests/xmlwriter_write_dtd_error_001.phpt
create mode 100644 ext/xsl/tests/bug48221.phpt
create mode 100644 ext/xsl/tests/phpfunc-nostring.xsl
create mode 100644 ext/xsl/tests/phpfunc-undef.xsl
create mode 100644 ext/xsl/tests/phpfunc.xsl
create mode 100644 ext/xsl/tests/xsl-phpinfo.phpt
create mode 100644 ext/xsl/tests/xsltprocessor_getParameter-invalidparam.phpt
create mode 100644 ext/xsl/tests/xsltprocessor_getParameter-wrongparam.phpt
create mode 100644 ext/xsl/tests/xsltprocessor_getParameter.phpt
create mode 100644 ext/xsl/tests/xsltprocessor_registerPHPFunctions-allfuncs.phpt
create mode 100644 ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-multiple.phpt
create mode 100644 ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-notallowed.phpt
create mode 100644 ext/xsl/tests/xsltprocessor_registerPHPFunctions-array.phpt
create mode 100644 ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt
create mode 100644 ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt
create mode 100644 ext/xsl/tests/xsltprocessor_registerPHPFunctions-null.phpt
create mode 100644 ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-multiple.phpt
create mode 100644 ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-notallowed.phpt
create mode 100644 ext/xsl/tests/xsltprocessor_registerPHPFunctions-string.phpt
create mode 100644 ext/xsl/tests/xsltprocessor_removeParameter-invalidparam.phpt
create mode 100644 ext/xsl/tests/xsltprocessor_removeParameter-wrongparams.phpt
create mode 100644 ext/xsl/tests/xsltprocessor_removeParameter.phpt
create mode 100644 ext/xsl/tests/xsltprocessor_setparameter-errorquote.phpt
create mode 100644 ext/xsl/tests/xsltprocessor_setparameter-nostring.phpt
create mode 100644 ext/zlib/tests/008.phpt
delete mode 100644 ext/zlib/tests/bug.tar
delete mode 100644 ext/zlib/tests/bug_40189_2.phpt
create mode 100644 scripts/dev/generate-phpt.phar
create mode 100755 scripts/dev/generate-phpt/build.xml
create mode 100644 scripts/dev/generate-phpt/gtPackage.php
create mode 100644 scripts/dev/generate-phpt/src/codeSnippets/array.txt
create mode 100644 scripts/dev/generate-phpt/src/codeSnippets/boolean.txt
create mode 100644 scripts/dev/generate-phpt/src/codeSnippets/commentEnd.txt
create mode 100644 scripts/dev/generate-phpt/src/codeSnippets/commentStart.txt
create mode 100644 scripts/dev/generate-phpt/src/codeSnippets/emptyUnsetUndefNull.txt
create mode 100644 scripts/dev/generate-phpt/src/codeSnippets/float.txt
create mode 100644 scripts/dev/generate-phpt/src/codeSnippets/int.txt
create mode 100644 scripts/dev/generate-phpt/src/codeSnippets/loopClose.txt
create mode 100644 scripts/dev/generate-phpt/src/codeSnippets/loopStart.txt
create mode 100644 scripts/dev/generate-phpt/src/codeSnippets/object.txt
create mode 100644 scripts/dev/generate-phpt/src/codeSnippets/skipif64b.txt
create mode 100644 scripts/dev/generate-phpt/src/codeSnippets/skipifnot64b.txt
create mode 100644 scripts/dev/generate-phpt/src/codeSnippets/skipifnotwin.txt
create mode 100644 scripts/dev/generate-phpt/src/codeSnippets/skipifwin.txt
create mode 100644 scripts/dev/generate-phpt/src/codeSnippets/string.txt
create mode 100644 scripts/dev/generate-phpt/src/generate-phpt.php
create mode 100644 scripts/dev/generate-phpt/src/gtAutoload.php
create mode 100644 scripts/dev/generate-phpt/src/gtClassMap.php
create mode 100644 scripts/dev/generate-phpt/src/gtCodeSnippet.php
create mode 100644 scripts/dev/generate-phpt/src/gtFunction.php
create mode 100644 scripts/dev/generate-phpt/src/gtMethod.php
create mode 100644 scripts/dev/generate-phpt/src/gtTestCaseWriter.php
create mode 100644 scripts/dev/generate-phpt/src/gtTestSubject.php
create mode 100644 scripts/dev/generate-phpt/src/gtText.php
create mode 100644 scripts/dev/generate-phpt/src/setup/exceptions/gtMissingArgumentException.php
create mode 100644 scripts/dev/generate-phpt/src/setup/exceptions/gtMissingOptionsException.php
create mode 100644 scripts/dev/generate-phpt/src/setup/exceptions/gtUnknownOptionException.php
create mode 100644 scripts/dev/generate-phpt/src/setup/exceptions/gtUnknownSectionException.php
create mode 100644 scripts/dev/generate-phpt/src/setup/gtCommandLineOptions.php
create mode 100644 scripts/dev/generate-phpt/src/setup/gtOptionalSections.php
create mode 100644 scripts/dev/generate-phpt/src/setup/gtPreCondition.php
create mode 100644 scripts/dev/generate-phpt/src/setup/gtPreConditionList.php
create mode 100644 scripts/dev/generate-phpt/src/setup/preconditions/gtIfClassHasMethod.php
create mode 100644 scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedFunctionOrMethod.php
create mode 100644 scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedTestType.php
create mode 100644 scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidClass.php
create mode 100644 scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidFunction.php
create mode 100644 scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php
create mode 100644 scripts/dev/generate-phpt/src/testcase/gtBasicTestCase.php
create mode 100644 scripts/dev/generate-phpt/src/testcase/gtBasicTestCaseFunction.php
create mode 100644 scripts/dev/generate-phpt/src/testcase/gtBasicTestCaseMethod.php
create mode 100644 scripts/dev/generate-phpt/src/testcase/gtErrorTestCase.php
create mode 100644 scripts/dev/generate-phpt/src/testcase/gtErrorTestCaseFunction.php
create mode 100644 scripts/dev/generate-phpt/src/testcase/gtErrorTestCaseMethod.php
create mode 100644 scripts/dev/generate-phpt/src/testcase/gtTestCase.php
create mode 100644 scripts/dev/generate-phpt/src/testcase/gtVariationContainer.php
create mode 100644 scripts/dev/generate-phpt/src/testcase/gtVariationContainerFunction.php
create mode 100644 scripts/dev/generate-phpt/src/testcase/gtVariationContainerMethod.php
create mode 100644 scripts/dev/generate-phpt/src/testcase/gtVariationTestCase.php
create mode 100644 scripts/dev/generate-phpt/src/testcase/gtVariationTestCaseFunction.php
create mode 100644 scripts/dev/generate-phpt/src/testcase/gtVariationTestCaseMethod.php
create mode 100644 scripts/dev/generate-phpt/src/texts/functionOrMethodNotSpecified.txt
create mode 100644 scripts/dev/generate-phpt/src/texts/help.txt
create mode 100644 scripts/dev/generate-phpt/src/texts/methodNotSpecified.txt
create mode 100644 scripts/dev/generate-phpt/src/texts/testTypeNotSpecified.txt
create mode 100644 scripts/dev/generate-phpt/src/texts/unknownClass.txt
create mode 100644 scripts/dev/generate-phpt/src/texts/unknownFunction.txt
create mode 100644 scripts/dev/generate-phpt/src/texts/unknownMethod.txt
create mode 100644 scripts/dev/generate-phpt/tests/gtBasicTestCaseFunctionTest.php
create mode 100644 scripts/dev/generate-phpt/tests/gtBasicTestCaseMethodTest.php
create mode 100644 scripts/dev/generate-phpt/tests/gtCodeSnippetTest.php
create mode 100644 scripts/dev/generate-phpt/tests/gtCommandLineOptionsTest.php
create mode 100644 scripts/dev/generate-phpt/tests/gtErrorTestCaseFunctionTest.php
create mode 100644 scripts/dev/generate-phpt/tests/gtErrorTestCaseMethodTest.php
create mode 100644 scripts/dev/generate-phpt/tests/gtFunctionTest.php
create mode 100644 scripts/dev/generate-phpt/tests/gtIfClassHasMethodTest.php
create mode 100644 scripts/dev/generate-phpt/tests/gtIsSpecifiedFunctionOrMethodTest.php
create mode 100644 scripts/dev/generate-phpt/tests/gtIsSpecifiedTestTypeTest.php
create mode 100644 scripts/dev/generate-phpt/tests/gtIsValidClassTest.php
create mode 100644 scripts/dev/generate-phpt/tests/gtIsValidFunctionTest.php
create mode 100644 scripts/dev/generate-phpt/tests/gtIsValidMethodTest.php
create mode 100644 scripts/dev/generate-phpt/tests/gtMethodTest.php
create mode 100644 scripts/dev/generate-phpt/tests/gtOptionalSectionsTest.php
create mode 100644 scripts/dev/generate-phpt/tests/gtVariationTestCaseFunctionTest.php
create mode 100644 scripts/dev/generate-phpt/tests/gtVariationTestCaseMethodTest.php
delete mode 100644 scripts/dev/generate_phpt.php
create mode 100644 tests/classes/interface_optional_arg_003.inc
create mode 100644 tests/classes/interface_optional_arg_003.phpt
create mode 100644 tests/classes/iterators_008.phpt
create mode 100644 tests/classes/static_properties_undeclared_assign.phpt
create mode 100644 tests/classes/static_properties_undeclared_assignInc.phpt
create mode 100644 tests/classes/static_properties_undeclared_assignRef.phpt
create mode 100644 tests/classes/static_properties_undeclared_inc.phpt
create mode 100644 tests/classes/static_properties_undeclared_isset.phpt
create mode 100644 tests/classes/static_properties_undeclared_read.phpt
create mode 100644 tests/func/ini_alter.phpt
create mode 100644 tests/lang/045.phpt
create mode 100644 tests/lang/compare_objects_basic1.phpt
create mode 100644 tests/lang/compare_objects_basic2.phpt
create mode 100644 tests/lang/engine_assignExecutionOrder_001.phpt
create mode 100644 tests/lang/engine_assignExecutionOrder_002.phpt
create mode 100644 tests/lang/engine_assignExecutionOrder_003.phpt
create mode 100644 tests/lang/engine_assignExecutionOrder_004.phpt
create mode 100644 tests/lang/engine_assignExecutionOrder_005.phpt
create mode 100644 tests/lang/engine_assignExecutionOrder_006.phpt
create mode 100644 tests/lang/engine_assignExecutionOrder_007.phpt
create mode 100644 tests/lang/engine_assignExecutionOrder_008.phpt
create mode 100644 tests/lang/engine_assignExecutionOrder_009.phpt
create mode 100644 tests/lang/execution_order.phpt
create mode 100644 tests/lang/foreachLoop.001.phpt
create mode 100644 tests/lang/foreachLoop.002.phpt
create mode 100644 tests/lang/foreachLoop.003.phpt
create mode 100644 tests/lang/foreachLoop.004.phpt
create mode 100644 tests/lang/foreachLoop.005.phpt
create mode 100644 tests/lang/foreachLoop.006.phpt
create mode 100644 tests/lang/foreachLoop.007.phpt
create mode 100644 tests/lang/foreachLoop.008.phpt
create mode 100644 tests/lang/foreachLoop.009.phpt
create mode 100644 tests/lang/foreachLoop.010.phpt
create mode 100644 tests/lang/foreachLoop.011.phpt
create mode 100644 tests/lang/foreachLoop.012.phpt
create mode 100644 tests/lang/foreachLoop.013.phpt
create mode 100644 tests/lang/foreachLoop.014.phpt
create mode 100644 tests/lang/foreachLoop.015.phpt
create mode 100644 tests/lang/foreachLoop.016.phpt
create mode 100644 tests/lang/foreachLoop.017.phpt
create mode 100644 tests/lang/foreachLoopIterator.001.phpt
create mode 100644 tests/lang/foreachLoopIterator.002.phpt
create mode 100644 tests/lang/foreachLoopIteratorAggregate.001.phpt
create mode 100644 tests/lang/foreachLoopIteratorAggregate.002.phpt
create mode 100644 tests/lang/foreachLoopIteratorAggregate.003.phpt
create mode 100644 tests/lang/foreachLoopIteratorAggregate.004.phpt
create mode 100644 tests/lang/foreachLoopObjects.001.phpt
create mode 100644 tests/lang/foreachLoopObjects.002.phpt
create mode 100644 tests/lang/foreachLoopObjects.003.phpt
create mode 100644 tests/lang/foreachLoopObjects.004.phpt
create mode 100644 tests/lang/foreachLoopObjects.005.phpt
create mode 100644 tests/lang/foreachLoopObjects.006.phpt
create mode 100644 tests/lang/operators/add_basiclong_64bit.phpt
create mode 100644 tests/lang/operators/add_variationStr.phpt
create mode 100644 tests/lang/operators/bitwiseAnd_basiclong_64bit.phpt
create mode 100644 tests/lang/operators/bitwiseAnd_variationStr.phpt
create mode 100644 tests/lang/operators/bitwiseNot_basiclong_64bit.phpt
create mode 100644 tests/lang/operators/bitwiseNot_variationStr.phpt
create mode 100644 tests/lang/operators/bitwiseOr_basiclong_64bit.phpt
create mode 100644 tests/lang/operators/bitwiseOr_variationStr.phpt
create mode 100644 tests/lang/operators/bitwiseShiftLeft_basiclong_64bit.phpt
create mode 100644 tests/lang/operators/bitwiseShiftLeft_variationStr.phpt
create mode 100644 tests/lang/operators/bitwiseShiftLeft_variationStr_64bit.phpt
create mode 100644 tests/lang/operators/bitwiseShiftRight_basiclong_64bit.phpt
create mode 100644 tests/lang/operators/bitwiseShiftRight_variationStr.phpt
create mode 100644 tests/lang/operators/bitwiseXor_basiclong_64bit.phpt
create mode 100644 tests/lang/operators/bitwiseXor_variationStr.phpt
create mode 100644 tests/lang/operators/divide_basiclong_64bit.phpt
create mode 100644 tests/lang/operators/divide_variationStr.phpt
create mode 100644 tests/lang/operators/modulus_basiclong_64bit.phpt
create mode 100644 tests/lang/operators/modulus_variationStr.phpt
create mode 100644 tests/lang/operators/multiply_basiclong_64bit.phpt
create mode 100644 tests/lang/operators/multiply_variationStr.phpt
create mode 100644 tests/lang/operators/negate_basiclong_64bit.phpt
create mode 100644 tests/lang/operators/negate_variationStr.phpt
create mode 100644 tests/lang/operators/operator_equals_basic.phpt
create mode 100644 tests/lang/operators/operator_equals_variation.phpt
create mode 100644 tests/lang/operators/operator_equals_variation_64bit.phpt
create mode 100644 tests/lang/operators/operator_gt_basic.phpt
create mode 100644 tests/lang/operators/operator_gt_or_equal_basic.phpt
create mode 100644 tests/lang/operators/operator_gt_or_equal_variation.phpt
create mode 100644 tests/lang/operators/operator_gt_or_equal_variation_64bit.phpt
create mode 100644 tests/lang/operators/operator_gt_variation.phpt
create mode 100644 tests/lang/operators/operator_gt_variation_64bit.phpt
create mode 100644 tests/lang/operators/operator_identical_basic.phpt
create mode 100644 tests/lang/operators/operator_identical_variation.phpt
create mode 100644 tests/lang/operators/operator_identical_variation_64bit.phpt
create mode 100644 tests/lang/operators/operator_lt_basic.phpt
create mode 100644 tests/lang/operators/operator_lt_or_equal_basic.phpt
create mode 100644 tests/lang/operators/operator_lt_or_equal_variation.phpt
create mode 100644 tests/lang/operators/operator_lt_or_equal_variation_64bit.phpt
create mode 100644 tests/lang/operators/operator_lt_variation.phpt
create mode 100644 tests/lang/operators/operator_lt_variation_64bit.phpt
create mode 100644 tests/lang/operators/operator_notequals_basic.phpt
create mode 100644 tests/lang/operators/operator_notequals_variation.phpt
create mode 100644 tests/lang/operators/operator_notequals_variation_64bit.phpt
create mode 100644 tests/lang/operators/operator_notidentical_basic.phpt
create mode 100644 tests/lang/operators/operator_notidentical_variation.phpt
create mode 100644 tests/lang/operators/operator_notidentical_variation_64bit.phpt
create mode 100644 tests/lang/operators/postdec_basiclong_64bit.phpt
create mode 100644 tests/lang/operators/postdec_variationStr.phpt
create mode 100644 tests/lang/operators/postinc_basiclong_64bit.phpt
create mode 100644 tests/lang/operators/postinc_variationStr.phpt
create mode 100644 tests/lang/operators/predec_basiclong_64bit.phpt
create mode 100644 tests/lang/operators/predec_variationStr.phpt
create mode 100644 tests/lang/operators/preinc_basiclong_64bit.phpt
create mode 100644 tests/lang/operators/preinc_variationStr.phpt
create mode 100644 tests/lang/operators/subtract_basiclong_64bit.phpt
create mode 100644 tests/lang/operators/subtract_variationStr.phpt
create mode 100644 tests/lang/returnByReference.001.phpt
create mode 100644 tests/lang/returnByReference.002.phpt
create mode 100644 tests/lang/returnByReference.003.phpt
create mode 100644 tests/lang/returnByReference.004.phpt
create mode 100644 tests/lang/returnByReference.005.phpt
create mode 100644 tests/lang/returnByReference.006.phpt
create mode 100644 tests/lang/returnByReference.007.phpt
create mode 100644 tests/lang/returnByReference.008.phpt
create mode 100644 tests/lang/returnByReference.009.phpt
create mode 100644 tests/output/ob_001.phpt
create mode 100644 tests/output/ob_002.phpt
create mode 100644 tests/output/ob_003.phpt
create mode 100644 tests/output/ob_004.phpt
create mode 100644 tests/output/ob_005.phpt
create mode 100644 tests/output/ob_006.phpt
create mode 100644 tests/output/ob_007.phpt
create mode 100644 tests/output/ob_008.phpt
create mode 100644 tests/output/ob_009.phpt
create mode 100644 tests/output/ob_010.phpt
create mode 100644 tests/output/ob_get_status.phpt
diff --git a/EXTENSIONS b/EXTENSIONS
index 60811e5..0ccacf8 100644
--- a/EXTENSIONS
+++ b/EXTENSIONS
@@ -169,7 +169,7 @@ STATUS: Working
COMMENT: Working
-------------------------------------------------------------------------------
EXTENSION: pdo
-PRIMARY MAINTAINER: Unknown
+PRIMARY MAINTAINER: Ilia Alshanetsky <iliaa at php.net>, Wez Furlong <wez at php.net>
MAINTENANCE: Odd fixes
STATUS: Working
SINCE: 5.1
@@ -211,7 +211,7 @@ STATUS: Working
SINCE: 5.1
-------------------------------------------------------------------------------
EXTENSION: pdo_sqlite
-PRIMARY MAINTAINER: Unknown
+PRIMARY MAINTAINER: Ilia Alshanetsky <iliaa at php.net>
MAINTENANCE: Odd fixes
STATUS: Working
SINCE: 5.1
@@ -223,7 +223,7 @@ STATUS: Working
COMMENT: Use PostgreSQL 7.0.x or later. PostgreSQL 6.5.3 or less have fatal bug.
-------------------------------------------------------------------------------
EXTENSION: sqlite
-PRIMARY MAINTAINER: Marcus Boerger <helly at php.net>, Wez Furlong <wez at php.net>
+PRIMARY MAINTAINER: Marcus Boerger <helly at php.net>, Wez Furlong <wez at php.net>, Ilia Alshanetsky <iliaa at php.net>
MAINTENANCE: Maintained
STATUS: Working
SINCE: 5.0 (Since 4.3.2 in PECL)
diff --git a/NEWS b/NEWS
index 15ac567..fbdcf87 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,140 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+18 Jun 2009, PHP 5.3.0 RC 4
+- Upgraded bundled sqlite to version 3.6.15. (Scott)
+
+- Added phar.phar generation for Windows. (Greg)
+- Added ACL Cache support on Windows.
+ (Kanwaljeet Singla, Pierre, Venkat Raman Don)
+
+- Fixed readlink on Windows in thread safe SAPI (apache2.x etc.). (Pierre)
+
+- Fixed bug #48578 (Can't build 5.3 on FBSD 4.11). (Rasmus)
+- Fixed bug #48541 (spl_autoload_register only registers first closure, then
+ leaks the others). (Greg)
+- Fixed bug #48535 (file_exists returns false when impersonate is used).
+ (Kanwaljeet Singla, Venkat Raman Don)
+- Fixed bug #48533 (__callStatic is not invoked for private/protected methods).
+ (Felipe)
+- Fixed bug #47767 (include_once does not resolve windows symlinks or junctions)
+ (Kanwaljeet Singla, Venkat Raman Don)
+- Fixed bug #47318 (UMR when trying to activate user config). (Pierre)
+
+11 Jun 2009, PHP 5.3.0 RC 3
+- Upgraded bundled sqlite to version 3.6.14.2. (Scott, Ilia)
+- Upgraded bundled libmagic to 5.03 in the fileinfo extension. (Scott)
+
+- Removed all zend_extension_* php.ini directives. Zend extensions are now
+ always loaded using zend_extension directive. (Derick)
+
+- Changed SQLite3::loadExtension() to be disabled for threaded SAPIs. (Scott)
+
+- Added constants based on Windows' GetVersionEx information.
+ PHP_WINDOWS_VERSION_* and PHP_WINDOWS_NT_*. (Pierre)
+- Added the ability for json_decode() to take a user specified depth. (Scott)
+- Added support for the mysql_stmt_next_result() function from libmysql.
+ (Andrey)
+- Added support for ACL (is_writable, is_readable, reports now correct results)
+ on Windows. (Pierre, Venkat Raman Don, Kanwaljeet Singla)
+
+- Fixed bug #48493 (spl_autoload_register() doesn't work correctly when
+ prepending functions). (Scott)
+- Fixed bug #48257 (PharData throws exception with non-phar tar). (Greg)
+- Fixed bug #48227 (NumberFormatter::format leaks memory). (Felipe)
+- Fixed bug #48200 (compile failure with mbstring.c when
+ --enable-zend-multibyte is used). (Jani)
+- Fixed bug #48188 (Cannot execute a scrollable cursors twice with
+ PDO_PGSQL). (Matteo)
+- Fixed bug #41874 (separate STDOUT and STDERR in exec functions).
+ (Kanwaljeet Singla, Venkat Raman Don, Pierre)
+- Fixed bug #38802 (max_redirects and ignore_errors).
+ (patch by datibbaw at php.net)
+- Fixed isset() on phar sub-directories (isset($phar["blah"]) if
+ file "blah/foo.php" exists in the phar archive). (Greg)
+- Fixed security vulnerability in phar's handling of long tar filenames. (Greg)
+- Fixed potential segfault with converting phars containing metadata to other
+ formats. (Greg)
+
+
+07 May 2009, PHP 5.3.0 RC 2
+- Upgraded bundled sqlite to version 3.6.13. (Ilia)
+- Upgraded bundled PCRE to version 7.9. (Nuno)
+- Upgraded bundled libmagic to 5.02 in the fileinfo extension. (Scott)
+
+- Undeprecated ticks. (Arnaud)
+
+- Improved IMAP support (Pierre):
+ . Added imap_gc() to clear the imap cache
+ . Added imap_utf8_to_mutf7() and imap_mutf7_to_utf8()
+
+- Implemented FR #41712 (curl progress callback: CURLOPT_PROGRESSFUNCTION).
+ (sdteffen[at]gmail[dot].com, Pierre)
+- Implemented FR #47739 (Missing cURL option do disable IPv6). (Pierre)
+- Implemented FR #39637 (Missing cURL option CURLOPT_FTP_FILEMETHOD). (Pierre)
+
+- Added timezone_version_get() to retrieve the version of the used timezone
+ database. (Derick)
+- Added 'n' flag to fopen to allow passing O_NONBLOCK to the underlying
+ open(2) system call. (Mikko)
+- Added "dechunk" filter which can decode HTTP responses with chunked
+ transfer-encoding. HTTP streams use this filter automatically in case
+ "Transfer-Encoding: chunked" header is present in response. It's possible to
+ disable this behaviour using "http"=>array("auto_decode"=>0) in stream
+ context. (Dmitry)
+- Added ability to throw exceptions from SQLite3 instead of warnings. (Scott)
+- Added startup notices for deprecated ini settings. (Kalle)
+
+- Fixed bug #48185 (warning: value computed is not used in
+ pdo_sqlite_stmt_get_col line 271). (Matteo)
+- Fixed bug #48087 (call_user_method() invalid free of arguments). (Felipe)
+- Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo)
+- Fixed bug #48034 (PHP crashes when script is 8192 (8KB) bytes long). (Dmitry)
+- Fixed bug #48023 (spl_autoload_register didn't store closures). (Etienne)
+- Fixed bug #48004 (Error handler prevents creation of default object).
+ (Dmitry)
+- Fixed bug #47880 (crashes in call_user_func_array()). (Dmitry)
+- Fixed bug #47856 (stristr() converts needle to lower-case). (Ilia)
+- Fixed bug #47851 (is_callable throws fatal error). (Dmitry)
+- Fixed bug #47819 (Getting pdo_mysql.so: undefined symbol: mysqlnd_debug_init
+ at startup). (Johannes)
+- Fixed bug #47816 (pcntl tests failing on NetBSD). (Matteo)
+- Fixed bug #47779 (Wrong value for SIG_UNBLOCK and SIG_SETMASK constants).
+ (Matteo)
+- Fixed bug #47771 (Exception during object construction from arg call calls
+ object's destructor). (Dmitry)
+- Fixed bug #47745 (FILTER_VALIDATE_INT doesn't allow minimum integer).
+ (Dmitry)
+- Fixed bug #47714 (autoloading classes inside exception_handler leads to
+ crashes). (Dmitry)
+- Fixed bug #47699 (autoload and late static binding). (Dmitry)
+- Fixed bug #47662 (Support more than 127 subpatterns in preg_match). (Nuno)
+- Fixed bug #47596 (Bus error on parsing file). (Dmitry)
+- Fixed bug #47560 (explode()'s limit parameter odd behaviour). (Matt)
+- Fixed bug #47535 (Compilation failure in ps_fetch_from_1_to_8_bytes()).
+ (Johannes)
+- Fixed bug #47534 (RecursiveDiteratoryIterator::getChildren ignoring
+ CURRENT_AS_PATHNAME). (Etienne)
+- Fixed bug #47516 (nowdoc can not be embed in heredoc but can be embed in
+ double quote). (Dmitry)
+- Fixed bug #47038 (Memory leak in include). (Dmitry)
+- Fixed bug #47021 (SoapClient stumbles over WSDL delivered with
+ "Transfer-Encoding: chunked"). (Dmitry)
+- Fixed bug #46817 (tokenizer misses last single-line comment (PHP 5.3+, with
+ re2c lexer)). (Matt, Shire)
+- Fixed bug #46108 (DateTime - Memory leak when unserializing). (Felipe)
+- Fixed bug #44861 (scrollable cursor don't work with pgsql). (Matteo)
+- Fixed bug #44409 (PDO::FETCH_SERIALIZE calls __construct()). (Matteo)
+- Fixed bug #44173 (PDO->query() parameter parsing/checking needs an
+ update). (Matteo)
+- Fixed bug #42362 (HTTP status codes 204 and 304 should not be gzipped).
+ (Scott, Edward Z. Yang)
+- Fixed PECL bug #16338 (phar extension uses php_stream_copy_to_stream). (Greg)
+- Fixed PECL bug #14646 (phar error message unclear with php stream wrappers).
+ (Greg)
+- Fixed an issue with ReflectionProperty::setAccessible().
+ (Sebastian, Roman Borschel)
+
+
24 Mar 2009, PHP 5.3.0 RC 1
- Upgraded bundled sqlite to version 3.6.11. (Scott)
- Upgraded bundled libmagic to 5.00 in the fileinfo extension. (Scott)
@@ -12,6 +147,7 @@ PHP NEWS
- Added support for CP850 encoding in mbstring extension.
(Denis Giffeler, Moriyoshi)
+- Fixed bug #47757 (rename JPG to JPEG in phpinfo). (Pierre)
- Fixed bug #47678 (Allow loadExtension to be disabled in SQLite3). (Scott)
- Fixed bug #47671 (Cloning SplObjectStorage instances). (Etienne)
- Fixed bug #47664 (get_class returns NULL instead of FALSE). (Dmitry)
@@ -20,7 +156,7 @@ PHP NEWS
- Fixed bug #47572 (Undefined constant causes segmentation fault). (Felipe)
- Fixed bug #47549 (get_defined_constants() return array with broken
array categories). (Ilia)
-- Fixed Bug #47443 (metaphone('scratch') returns wrong result). (Felipe)
+- Fixed bug #47443 (metaphone('scratch') returns wrong result). (Felipe)
- Fixed bug #47438 (mysql_fetch_field ignores zero offset). (Johannes)
- Fixed bug #47398 (PDO_Firebird doesn't implements quoter correctly). (Felipe)
- Fixed bug #47390 (odbc_fetch_into - BC in php 5.3.0). (Felipe)
@@ -49,7 +185,7 @@ PHP NEWS
- Fixed bug #46347 (parse_ini_file() doesn't support * in keys). (Nuno)
- Fixed bug #46048 (SimpleXML top-level @attributes not part of iterator).
(David C.)
-- Fixed bug #45877 (Array key '2147483647' left as string). (Matt)
+- Fixed bug #45682 (Unable to var_dump(DateInterval)). (Derick)
- Fixed bug #45432 (PDO: persistent connection leak). (Felipe)
- Fixed bug #43831 ($this gets mangled when extending PDO with persistent
connection). (Felipe)
@@ -60,6 +196,7 @@ PHP NEWS
- Fixed PECL Bug #14268 (Allow "pecl install oci8" command to "autodetect" an
Instant Client RPM install) (Chris Jones/Oracle Corp.)
+
29 Jan 2009, PHP 5.3.0 Beta 1
- Upgraded bundled sqlite to version 3.6.10. (Scott, Ilia)
@@ -155,6 +292,7 @@ PHP NEWS
- Fixed bug #45820 (Allow empty keys in ArrayObject). (Etienne)
- Fixed bug #45791 (json_decode() doesn't convert 0e0 to a double). (Scott)
+
04 Dec 2008, PHP 5.3.0 Alpha 3
- Upgraded bundled PCRE to version 7.8. (Nuno)
- Upgraded bundled sqlite to version 3.6.6.2. (Scott, Ilia)
@@ -188,9 +326,6 @@ PHP NEWS
(Keisial at gmail dot com, Greg)
- Added support for using compressed connections with PDO_mysql. (Johannes)
-- Implemented FR #46595 (Use cc as the default compiler). (David Soria Parra)
-- Implemented FR #46513 (Missing compiler flags for suncc). (David Soria Parra)
-
- Deprecated define_syslog_variables(). (Kalle)
- Deprecated ereg extension. (Felipe)
@@ -436,7 +571,6 @@ PHP NEWS
- Improved streams:
. Fixed confusing error message on failure when no errors are logged. (Greg)
. Added stream_supports_lock() function. (Benjamin Schulz)
- . Added "ignore_errors" option to http fopen wrapper. (David Zulke, Sara)
. Added context parameter for copy() function. (Sara)
. Added "glob://" stream wrapper. (Marcus)
. Added "params" as optional parameter for stream_context_create(). (Sara)
@@ -485,7 +619,7 @@ PHP NEWS
. Added pcntl_sigtimedwait().
- Improved SOAP extension:
- . Added support for element names in context of XMLShema's <any>. (Dmitry)
+ . Added support for element names in context of XMLSchema's <any>. (Dmitry)
. Added ability to use Traversable objects instead of plain arrays.
(Joshua Reese, Dmitry)
. Fixed possible crash bug caused by an uninitialized value. (Zdash Urf)
@@ -610,13 +744,8 @@ PHP NEWS
- Fixed PECL bug #12794 (PDOStatement->nextRowset() doesn't work). (Johannes)
- Fixed PECL bug #12401 (Add support for ATTR_FETCH_TABLE_NAMES). (Johannes)
-- Fixed bug #45622 (isset($arrayObject->p) misbehaves with ArrayObject::
- ARRAY_AS_PROPS set). (robin_fernandes at uk dot ibm dot com, Arnaud)
-- Fixed bug #45614 (ArrayIterator::current(), ::key() can show 1st private
- prop of wrapped object). (robin_fernandes at uk dot ibm dot com, Arnaud)
- Fixed bug #45571 (ReflectionClass::export() shows superclasses' private
static methods). (robin_fernandes at uk dot ibm dot com)
-- Fixed bug #45540 (stream_context_create creates bad http request). (Arnaud)
- Fixed bug #45430 (windows implementation of crypt is not thread safe).
(Pierre)
- Fixed bug #45345 (SPLFileInfo::getPathInfo() returning dir info instead of
@@ -651,8 +780,6 @@ PHP NEWS
connections). (Martin Jansen)
- Fixed bug #44257 (timelib_tz_lookup_table must use float for gmtoffset).
(Derick, iuri dot fiedoruk at hp dot com).
-- Fixed bug #44214 (Crash using preg_replace_callback() and global variable).
- (Nuno, Scott)
- Fixed bug #44034 (FILE_IGNORE_NEW_LINES in file() does not work as expected
when lines end in \r\n). (Ilia)
- Fixed bug #43960 (strtotime() returns timestamp in the future when given a
@@ -683,8 +810,6 @@ PHP NEWS
- Fixed bug #42848 (Status: header incorrect under FastCGI). (Dmitry)
- Fixed bug #42773 (WSDL error causes HTTP 500 Response). (Dmitry)
- Fixed bug #42736 (xmlrpc_server_call_method() crashes). (Tony)
-- Fixed bug #42663 (gzinflate() try to allocate all memory with truncated
- data). (Arnaud)
- Fixed bug #42657 (ini_get() returns incorrect value when default is NULL).
(Jani, Scott)
- Fixed bug #42637 (SoapFault : Only http and https are allowed). (Bill Moran)
diff --git a/README.PARAMETER_PARSING_API b/README.PARAMETER_PARSING_API
index 530b2b5..8d29767 100644
--- a/README.PARAMETER_PARSING_API
+++ b/README.PARAMETER_PARSING_API
@@ -48,6 +48,7 @@ Type specifiers
h - array (returned as HashTable*)
H - array or HASH_OF(object) (returned as HashTable*)
l - long (long)
+ L - long, limits out-of-range numbers to LONG_MAX/LONG_MIN (long)
o - object of any type (zval*)
O - object of specific type given by class entry (zval*, zend_class_entry)
r - resource (zval*)
diff --git a/README.RELEASE_PROCESS b/README.RELEASE_PROCESS
index a2733ce..25f9ec1 100644
--- a/README.RELEASE_PROCESS
+++ b/README.RELEASE_PROCESS
@@ -114,21 +114,17 @@ commit this.
1. Update in ``php-bugs-web/include/functions.inc`` the ``show_version_option``
function to include the new RC and commit.
-2. Run the bumpRelease script for phpweb in your local checkout
-
- a. ``php bin/bumpRelease 5`` (or ``php bin/bumpRelease 4`` for PHP4)
-
-3. Update ``phpweb/include/version.inc`` (x=major version number)
+2. Update ``phpweb/include/version.inc`` (x=major version number)
a. ``$PHP_x_RC`` = "5.3.0RC1"
b. ``$PHP_x_RC_DATE`` = "06 September 2007"
-4. Commit those changes:
+3. Commit those changes:
a. ``cvs commit include/version.inc include/releases.inc``
-5. For the first RC, write the doc team (phpdoc at lists.php.net) about updating the
+4. For the first RC, write the doc team (phpdoc at lists.php.net) about updating the
INSTALL and win32/install.txt files which are generated from the PHP manual sources.
Rolling a stable release
@@ -252,4 +248,37 @@ number, and remove the RC from there.
II. For PHP5: Set $CURRENT_QA_RELEASE_5 to false
-12. Rebuild the English and Japanese docs (ask Derick)
+
+Re-releasing the same version (or -pl)
+------------------------------------
+
+1. Commit the new binaries to ``phpweb/distributions/``
+
+2. Edit ``phpweb/include/version.inc`` and change (X=major release number):
+
+ a. If only releasing for one OS, make sure you edit only those variables
+
+ b. ``$PHP_X_VERSION`` to the correct version
+
+ c. ``$PHP_X_DATE`` to the release date
+
+ d. ``$PHP_X_MD5`` array and update all the md5 sums
+
+ e. Make sure there are no outdated "notes" or edited "date" keys in the
+ ``$RELEASES[X][$PHP_X_VERSION]["source"]`` array
+
+3. Add a short notice to phpweb stating that there is a new release, and
+highlight the major important things (security fixes) and when it is important
+to upgrade.
+
+ a. Call php bin/createNewsEntry in your local phpweb checkout
+
+ b. Add the content for the news entry
+
+4. Commit all the changes (``include/version.inc``, ``archive/archive.xml``,
+``archive/entries/YYYY-MM-DD-N.xml``)
+
+5. Wait an hour or two, then send a mail to php-announce at lists.php.net,
+php-general at lists.php.net and internals at lists.php.net with a text similar to
+the news entry.
+
diff --git a/README.UPDATE_5_2 b/README.UPDATE_5_2
deleted file mode 100644
index a7dfe7b..0000000
--- a/README.UPDATE_5_2
+++ /dev/null
@@ -1,1022 +0,0 @@
-PHP 5.2 UPDATE INFO
-
-===============================
-Changes in PHP datetime support
-===============================
-
-Since PHP 5.1, there has been an extension named 'date' in the PHP core. This
-is the new implementation of PHP's datetime support. Although it will attempt
-to guess your system's timezone setting, you should set the timezone manually.
-You can do this in any of three ways:
-
-1) in your php.ini using the date.timezone INI directive
-2) on your system using the TZ environmental variable
-3) from your script using the convenience function date_default_timezone_set()
-
-All supported timezones are listed in the PHP Manual at
-http://www.php.net/manual/timezones.php.
-
-With the advent of PHP 5.2, there are object representations of the date and
-timezone, named DateTime and DateTimeZone respectively. You can see the methods
-and constants available to the new classes by running
-
-php --rc DateTime
-php --rc DateTimeZone
-
-under PHP CLI - or see the PHP Manual under Date/Time functions, or the 'NEW
-FEATURES' section below. All methods map to existing procedural date functions.
-
-==================================
-Items from the NEWS file explained
-==================================
-
-- Added new error mode E_RECOVERABLE_ERROR. (Derick, Marcus, Tony)
-
- Some of the existing E_ERROR conditions have been converted to something that
- you can catch with a user-defined error handler. If an E_RECOVERABLE_ERROR is
- not handled, it will behave in the same way as E_ERROR behaves in all versions
- of PHP. Errors of this type are logged as 'Catchable fatal error'.
-
-
-- Changed E_ALL error reporting mode to include E_RECOVERABLE_ERROR. (Marcus)
-
- This change means that the value of the E_ALL error_reporting constant is now
- 6143, where the previous value was 2047. If you are setting the error_reporting
- mode from either the Apache config file or the .htaccess files, you will need
- to adjust the value accordingly. The same applies if you use the numeric value
- rather than the constant in your PHP scripts.
-
-
-- Added support for constructors in interfaces to force constructor signature
- checks in implementations. (Marcus)
-
- Starting with PHP 5.2, interfaces can have constructors. However, if you choose
- to declare a constructor in an interface, each class implementing that interface
- MUST include a constructor with a signature matching that of the base interface
- constructor. By 'signature' we mean the parameter and return type definitions,
- including any type hints and including whether the data is passed by reference
- or by value.
-
-
-- Changed __toString to be called wherever applicable. (Marcus)
-
- The magic method __toString() will now be called in a string context, that
- is, anywhere an object is used as a string. When implementing your __toString()
- method in a class, you should be aware that the script will terminate if
- your function throws an exception.
-
- The PHP 5.0/5.1 fallback - returning a string that contains the object
- identifier - has been dropped in PHP 5.2. It became problematic because
- an object identifier cannot be considered unique. This change will mean
- that your application is flawed if you have relied on the object identifier
- as a return value. An attempt to use that value as a string will now result
- in a catchable fatal error (see above).
-
- Even with __toString(), objects cannot be used as array indices or keys. We
- may add built-in hash support for this at a later date, but for PHP 5.2 you
- will need to either provide your own hashing or use the new SPL function
- spl_object_hash().
-
-
-- Added RFC2397 (data: stream) support. (Marcus)
-
- The introduction of the 'data' URL scheme has the potential to lead to a
- change of behaviour under Windows. If you are working with an NTFS
- file system and making use of meta streams in your application, and if you
- just happen to be using a file with the name 'data:' that is accessed without
- any path information - it won't work any more. The fix is to use the 'file:'
- protocol when accessing it.
-
- There is information about the RFC at http://www.faqs.org/rfcs/rfc2397.html.
-
-
-- Added allow_url_include ini directive to complement allow_url_fopen. (Rasmus)
-
- This useful option makes it possible to differentiate between standard
- file operations on remote files, and the inclusion of remote files. While the
- former is usually desirable, the latter can be a security risk if used naively.
- Starting with PHP 5.2, you can allow remote file operations while
- disallowing the inclusion of remote files in local scripts. In fact, this
- is the default configuration.
-
-
-- Dropped abstract static class functions. (Marcus)
-
- Due to an oversight, PHP 5.0 and 5.1 allowed abstract static functions in
- classes. In PHP 5.2, only interfaces can have them.
-
-
-- Removed extensions (Derick, Tony)
-
- The filepro and hwapi extensions have been moved to PECL and are no longer
- part of the PHP distribution. The PECL package version of these extensions
- will be created according to user demand.
-
-
-- Added extensions (Rasmus, Derick, Pierre)
-
- The JSON extension implements the JavaScript Object Notation (JSON)
- data interchange format. This extension is enabled by default.
-
- The Filter extension validates and filters data, and is designed for
- use with insecure data such as user input. This extension is enabled
- by default; the default mode RAW does not impact input data in any way.
-
- The Zip extension enables you to transparently read or write ZIP
- compressed archives and the files inside them.
-
- Please refer to the NEW FEATURES section below or to the PHP Manual
- for details.
-
-
-- Improved memory manager and increased default memory limit (Dmitry)
-
- The new memory manager allocates less memory and works faster than the
- previous incarnation. It allocates memory from the system in large blocks,
- and then manages the heap by itself. The memory_limit value in php.ini is
- checked, not for each emalloc() call (as before), but for actual blocks
- requested from the system. This means that memory_limit is far more
- accurate than it used to be, since the old memory manager didn't calculate
- all the memory overhead used by the malloc library.
-
- Thanks to this new-found accuracy memory usage may appear to have increased,
- although actually it has not. To accommodate this apparent increase, the
- default memory_limit setting was also increased - from 8 to 16 megabytes.
-
-
-- Changed priority of PHPRC environment variable on win32 (Dmitry)
-
- The PHPRC environment variable now takes priority over the path stored
- in the Windows registry.
-
-
-- CLI SAPI no longer checks cwd for php.ini or the php-cli.ini file (Edin)
-
- In PHP 5.1 an undocumented feature was added that made the CLI binary check
- the current working directory for a PHP configuration file, potentially
- leading to unpredictable behavior if an unexpected configuration file were
- read. This functionality was removed in 5.2, and PHP will no longer search
- CWD for the presence of php.ini or php-cli.ini files.
-
-
-- Added a notice when performing modulus 0 operation (Tony)
-
- In earlier versions of PHP, performing integer % 0 did not emit any
- warning messages, instead returning an unexpected return value of FALSE.
- As of PHP 5.2 this operation will emit an E_WARNING, as is the case in all
- other instances where division by zero is performed.
-
-
-- As a side-effect of a change made to prevent duplicate error messages
- when error_tracking is On [Ilia], it is now necessary to return FALSE
- from your error handler in order to populate $php_errormsg. This allows
- you to fine-grain the levels of the messages stored.
-
-
-==============================
-Backwards incompatible changes
-==============================
-
-In the PHP core
-===============
-getrusage() will return NULL when passed incompatible arguments
-As of 5.2.1 #See http://cvs.php.net/viewvc.cgi/php-src/ext/standard/microtime.c?r1=1.57&r2=1.58 && ?r1=1.53.2.2&r2=1.53.2.2.2.1
-
-In ext/zip
-==========
-ZipArchive::setCommentName() now returns TRUE on success
-ZipArchive::setCommentIndex() now return TRUE on success
-As of 5.2.1 #See http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.15&r2=1.1.2.16
-
-In ext/spl
-==========
-SplFileObject::getFilename() now returns the filename, not relative/path/to/file
-As of 5.2.1 #See http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.10&r2=1.45.2.27.2.11
-==================
-NEW ERROR MESSAGES
-==================
-
-In the PHP core
-===============
-
-<?php
-
-print 10%0;
-/* Warning: Division by zero in filename on line n */
-
-echo " ";
-session_regenerate_id();
-/* Warning: session_regenerate_id(): Cannot regenerate session id - headers already sent in filename on line n */
-
-str_word_count("string", 4);
-/* Warning: str_word_count(): Invalid format value 4 in filename on line n */
-
-strripos("foo", "f", 4);
-/* Notice: strripos(): Offset is greater than the length of haystack string in filename on line n */
-
-strrpos("foo", "f", 4);
-/* Notice: strrpos(): Offset is greater than the length of haystack string in filename on line n */
-
-/* when allow_url_include is OFF (default) */
-include "data:;base64,PD9waHAgcGhwaW5mbygpOz8+";
-/* Warning: include(): URL file-access is disabled in the server configuration in filename on line n */
-
-/* when allow_url_include is OFF (default) */
-include "php://input";
-/* Warning: include(): URL file-access is disabled in the server configuration in filename on line n */
-As of 5.2.1 #See http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_fopen_wrapper.c?r1=1.45.2.4.2.3&r2=1.45.2.4.2.4
-
-?>
-
-OO related in the PHP core
-==========================
-
-<?php
-
-interface foo {
-}
-class bar implements foo, foo {
-}
-/* Fatal error: Class bar cannot implement previously implemented interface foo in filename on line n */
-
-
-class foo {
- public $bar;
- function __get($var)
- {
- return $this->bar;
- }
-}
-
-$foo = new foo;
-$bar =& $foo->prop;
-/* Notice: Indirect modification of overloaded property foo::$prop has no effect in filename on line n */
-
-
-class foo implements iterator {
- public function current() {
-
- }
- public function next() {
-
- }
- public function key() {
-
- }
- public function valid() {
-
- }
- public function rewind() {
-
- }
-}
-
-$foo = new foo();
-foreach($foo as &$ref) {}
-/* Fatal error: An iterator cannot be used with foreach by reference in filename on line n */
-
-
-class foo {
- private function __construct() {
- }
-}
-class bar extends foo {
- public function __construct() {
- parent::__construct();
- /* Fatal error: Cannot call private foo::__construct() in filename on line n */
- }
-}
-new bar;
-
-
-abstract class foo {
- abstract static function bar();
- /* Strict Standards: Static function foo::bar() should not be abstract in filename on line n */
-}
-
-
-stream_filter_register("", "class");
-/* Warning: stream_filter_register(): Filter name cannot be empty in filename on line n */
-
-stream_filter_register("filter", "");
-/* Warning: stream_filter_register(): Class name cannot be empty in filename on line n */
-
-
-class foo {
- public function __toString() {
- throw new Exception;
- }
-}
-try {
- print new foo;
- /* Fatal error: Method foo::__toString() must not throw an exception in filename on line n */
-} catch(Exception $e) {}
-
-
-class foo {}
-$foo = new foo;
-print $foo;
-/* Catchable fatal error: Object of class foo could not be converted to string in filename on line n */
-
-?>
-
-In the bzip2 extension
-======================
-
-<?php
-
-bzopen("", "w");
-/* Warning: bzopen(): filename cannot be empty in filename on line n */
-
-bzopen("foo", "a");
-/* Warning: bzopen(): 'a' is not a valid mode for bzopen(). Only 'w' and 'r' are supported in filename on line n */
-
-$fp = fopen("foo", "w");
-bzopen($fp, "r");
-/* Warning: bzopen(): cannot read from a stream opened in write only mode in filename on line n */
-
-?>
-
-In the date extension
-=====================
-
-<?php
-
-strtotime("today", "now");'
-/* Warning: strtotime() expects parameter 2 to be long, string given in filename on line n */
-
-new DateTime(new stdclass);
-/* Fatal error: Uncaught exception 'Exception' with message 'DateTime::__construct() expects parameter 1 to be string, object given' in filename:n */
-As of 5.2.1 #See http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.33&r2=1.43.2.45.2.34
-?>
-
-In the dBase extension
-======================
-
-<?php
-
-dbase_open("foo", -1);
-/* Warning: Invalid access mode -1 in filename on line n */
-
-dbase_open("foo", null);
-/* Warning: The filename cannot be empty in filename on line n */
-As of 5.2.1 #See http://cvs.php.net/viewvc.cgi/php-src/ext/dbase/dbase.c?r1=1.74.2.2.2.5&r2=1.74.2.2.2.6&diff_format=u
-?>
-
-In the mcrypt extension
-=======================
-
-<?php
-
-$key = "this is a secret key";
-
-$td = mcrypt_module_open('tripledes', '', 'ecb', '');
-$iv = mcrypt_create_iv (mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
-mcrypt_generic_init($td, $key, $iv);
-$encrypted_data = mcrypt_generic($td, "");
-/* Warning: mcrypt_generic(): An empty string was passed in filename on line n */
-
-?>
-
-In the oci8 extension
-=====================
-
-<?php
-
-oci_connect("user", "pass", "db", "bogus_charset");
-/* Warning: Invalid character set name: bogus_charset in filename on line n */
-
-$oci = oci_connect("user", "pass", "db");
-oci_password_change($oci, "", "old", "new");
-/* Warning: username cannot be empty in filename on line n */
-
-oci_password_change($oci, "user", "", "new");
-/* Warning: old password cannot be empty in filename on line n */
-
-oci_password_change($oci, "user", "old", "");
-/* Warning: new password cannot be empty in filename on line n */
-
-?>
-
-In the SPL extension
-====================
-
-<?php
-
-$obj = new SplFileObject(__FILE__);
-$obj->fgetcsv("foo");
-/* Warning: SplFileObject::fgetcsv(): delimiter must be a character in filename on line n */
-
-$obj->fgetcsv(",", "foo");
-/* Warning: SplFileObject::fgetcsv(): enclosure must be a character in filename on line n */
-
-?>
-
-In the sysvmsg extension
-========================
-<?php
-
-/* Warning: maximum size of the message has to be greater then zero in filename on line n */
-
-?>
-
-In the Zip extension
-====================
-<?php
-$obj = new ZipArchive();
-$obj->open("archive.zip");
-$obj->setCommentName("", "comment");'
-/* Notice: ZipArchive::setCommentName(): Empty string as entry name in filename on line n */
-
-$obj->getCommentName("");
-/* Notice: ZipArchive::getCommentName(): Empty string as entry name in filename on line n */
-As of 5.2.1 #See http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.15&r2=1.1.2.16
-?>
-
-
-============
-NEW FEATURES
-============
-
-New extensions
-==============
-
- Filter
- Methods:
- mixed filter_has_var(constant type, string variable_name)
- - Returns true if the variable with the name 'name' exists in source
- int filter_id(string filtername)
- - Returns the filter ID belonging to a named filter
- mixed filter_input(constant type, string variable_name [, long filter [, mixed options]])
- - Returns the filtered variable 'name'* from source `type`
- mixed filter_input_array(constant type, [, mixed options]])
- - Returns an array with all arguments defined in 'definition'
- array filter_list()
- - Returns a list of all supported filters
- mixed filter_var(mixed variable [, long filter [, mixed options]])
- - Returns the filtered version of the variable.
- mixed filter_var_array(array data, [, mixed options]])
- - Returns an array with all arguments defined in 'definition'
-
- JSON
- Methods:
- mixed json_decode(string json[, boolean assoc=0])
- - Decodes a JSON string into a PHP object/associative array
- string json_encode(mixed parameter)
- - Takes a object or an array and returns a JSON encoded string
-
- Zip
- Class constants:
- ZipArchive::CHECKCONS
- ZipArchive::CM_DEFAULT
- ZipArchive::CM_DEFLATE
- ZipArchive::CM_DEFLATE64
- ZipArchive::CM_IMPLODE
- ZipArchive::CM_PKWARE_IMPLODE
- ZipArchive::CM_REDUCE_1
- ZipArchive::CM_REDUCE_2
- ZipArchive::CM_REDUCE_3
- ZipArchive::CM_REDUCE_4
- ZipArchive::CM_SHRINK
- ZipArchive::CM_STORE
- ZipArchive::CREATE
- ZipArchive::ER_CHANGED
- ZipArchive::ER_CLOSE
- ZipArchive::ER_COMPNOTSUPP
- ZipArchive::ER_CRC
- ZipArchive::ER_DELETED
- ZipArchive::ER_EOF
- ZipArchive::ER_EXISTS
- ZipArchive::ER_INCONS
- ZipArchive::ER_INTERNAL
- ZipArchive::ER_INVAL
- ZipArchive::ER_MEMORY
- ZipArchive::ER_MULTIDISK
- ZipArchive::ER_NOENT
- ZipArchive::ER_NOZIP
- ZipArchive::ER_OK
- ZipArchive::ER_OPEN
- ZipArchive::ER_READ
- ZipArchive::ER_REMOVE
- ZipArchive::ER_RENAME
- ZipArchive::ER_SEEK
- ZipArchive::ER_TMPOPEN
- ZipArchive::ER_WRITE
- ZipArchive::ER_ZIPCLOSED
- ZipArchive::ER_ZLIB
- ZipArchive::EXCL
- ZipArchive::FL_COMPRESSED
- ZipArchive::FL_NOCASE
- ZipArchive::FL_NODIR
- ZipArchive::FL_UNCHANGED
- ZipArchive::OVERWRITE
-
- Functions:
- void zip_close(resource zip)
- - Close a Zip archive
- void zip_entry_close(resource zip_ent)
- - Close a zip entry
- int zip_entry_compressedsize(resource zip_entry)
- - Return the compressed size of a Zip entry
- string zip_entry_compressionmethod(resource zip_entry)
- - Return a string containing the compression method used on a particular entry
- int zip_entry_filesize(resource zip_entry)
- - Return the actual filesize of a Zip entry
- string zip_entry_name(resource zip_entry)
- - Return the name given a Zip entry
- bool zip_entry_open(resource zip_dp, resource zip_entry [, string mode])
- - Open a Zip File, pointed by the resource entry
- mixed zip_entry_read(resource zip_entry [, int len])
- - Read from an open directory entry
- resource zip_open(string filename)
- - Create new zip using source URI for output
- resource zip_read(resource zip)
- - Returns the next file in the archive
- Methods:
- bool ZipArchive::addFile(string filepath[, string entryname[, int start [, int length]]])
- - Add a file in a Zip archive using its path and the name to use
- bool ZipArchive::addFromString(string name, string content)
- - Add a file using content and the entry name
- void ZipArchive::close()
- - close the zip archive
- bool ZipArchive::deleteIndex(int index)
- - Delete a file using its index
- bool ZipArchive::deleteName(string name)
- - Delete a file using its index
- bool ZipArchive::extractTo(string pathto[, mixed files])
- - Extract one or more file from a zip archive to a specified destination
- string ZipArchive::getArchiveComment()
- - Returns the Zip archive comment
- string ZipArchive::getCommentIndex(int index)
- - Returns the comment of an entry using its index
- string ZipArchive::getCommentName(string name)
- - Returns the comment of an entry using its name
- string ZipArchive::getFromName(string entryname[, int len [, int flags]])
- - get the contents of an entry using its name
- string ZipArchive::getFromIndex(string entryname[, int len [, int flags]])
- - get the contents of an entry using its index
- string ZipArchive::getNameIndex(int index [, int flags])
- - Returns the name of the file at position index
- resource ZipArchive::getStream(string entryname)
- - Get a stream for an entry using its name
- int ZipArchive::locateName(string filename[, int flags])
- - Returns the index of the entry named filename in the archive
- mixed ZipArchive::open(string source [, int flags])
- - Create new zip using source URI for output, return TRUE on success or the error code
- bool ZipArchive::renameIndex(int index, string new_name)
- - Rename an entry selected by its index to new_name
- bool ZipArchive::renameName(string name, string new_name)
- - Rename an entry selected by its name to new_name
- bool ZipArchive::setArchiveComment(string name, string comment)
- - Set or remove (NULL/'') the comment of the archive
- bool ZipArchive::setCommentIndex(int index, string comment)
- - Set or remove (NULL/'') the comment of an entry using its index
- bool ZipArchive::setCommentName(string name, string comment)
- - Set or remove (NULL/'') the comment of an entry using its Name
- array ZipArchive::statIndex(int index[, int flags])
- - Returns the zip entry information using its index
- array ZipArchive::statName(string filename[, int flags])
- - Returns the information about a the zip entry filename
- bool ZipArchive::unchangeAll()
- - All changes made to the archive are reverted
- bool ZipArchive::unchangeArchive()
- - Revert all global changes to the archive. For now, this only reverts archive comment changes
- bool ZipArchive::unchangeIndex(int index)
- - Changes to the file at position index are reverted
- bool ZipArchive::unchangeName(string name)
- - Changes to the file named 'name' are reverted
-
-
-New classes
-===========
-
- DateTime:
- Constants:
- DateTime::ATOM
- DateTime::COOKIE
- DateTime::ISO8601
- DateTime::RFC822
- DateTime::RFC850
- DateTime::RFC1036
- DateTime::RFC1123
- DateTime::RFC2822
- DateTime::RFC3339
- DateTime::RSS
- DateTime::W3C
- Methods:
- DateTime::__construct([string time[, DateTimeZone object]])
- - Returns new DateTime object
- string DateTime::format(string format)
- - Returns date formatted according to given format
- long DateTime::getOffset()
- - Returns the DST offset
- DateTimeZone DateTime::getTimezone()
- - Return new DateTimeZone object relative to give DateTime
- void DateTime::modify(string modify)
- - Alters the timestamp
- array DateTime::parse(string date)
- - Returns associative array with detailed info about given date
- void DateTime::setDate(long year, long month, long day)
- - Sets the date
- void DateTime::setISODate(long year, long week[, long day])
- - Sets the ISO date
- void DateTime::setTime(long hour, long minute[, long second])
- - Sets the time
- void DateTime::setTimezone(DateTimeZone object)
- - Sets the timezone for the DateTime object
-
- DateTimeZone:
- Methods:
- DateTimeZone DateTimeZone::__construct(string timezone)
- - Returns new DateTimeZone object
- string DateTimeZone::getName()
- - Returns the name of the timezone
- long DateTimeZone::getOffset(DateTime object)
- - Returns the timezone offset
- array DateTimeZone::getTransitions()
- - Returns numerically indexed array containing associative array for all transitions for the timezone
-
- RecursiveRegexIterator:
- extends RegexIterator
- implements OuterIterator, Traversable, Iterator, RecursiveIterator
- Methods:
- RecursiveRegexIterator::__construct(RecursiveIterator it, string regex [, int mode [, int flags [, int preg_flags]]])
- Create an RecursiveRegexIterator from another recursive iterator and a regular expression
- RecursiveRegexIterator RecursiveRegexIterator::getChildren()
- Return the inner iterator's children contained in a RecursiveRegexIterator
- bool RecursiveRegexIterator::hasChildren()
- Check whether the inner iterator's current element has children
-
- RegexIterator:
- extends FilterIterator
- implements Iterator, Traversable, OuterIterator
- Constants:
- RecursiveRegexIterator::ALL_MATCHES
- RecursiveRegexIterator::GET_MATCH
- RecursiveRegexIterator::MATCH
- RecursiveRegexIterator::REPLACE
- RecursiveRegexIterator::SPLIT
- RecursiveRegexIterator::USE_KEY
- Properties:
- public $replacement
- Methods:
- RegexIterator::__construct(Iterator it, string regex [, int mode [, int flags [, int preg_flags]]])
- - Create an RegexIterator from another iterator and a regular expression
- bool RegexIterator::accept()
- - Match (string)current() against regular expression
- bool RegexIterator::getFlags()
- - Returns current operation flags
- bool RegexIterator::getMode()
- - Returns current operation mode
- bool RegexIterator::getPregFlags()
- - Returns current PREG flags (if in use or NULL)
- bool RegexIterator::setFlags(int new_flags)
- - Set operation flags
- bool RegexIterator::setMode(int new_mode)
- - Set new operation mode
- bool RegexIterator::setPregFlags(int new_flags)
- - Set PREG flags
-
-
-New methods
-===========
-
-In ext/dom
-==========
- DOMDocument:
- DOMDocument::registerNodeClass(string baseclass, string extendedclass)
- - Register extended class used to create base node type
-
- DOMElement:
- DOMElement::setIDAttribute(string name, boolean isId)
- - Declares the attribute specified by name to be of type ID
- DOMElement::setIDAttributeNode(DOMAttr idAttr, boolean isId)
- - Declares the attribute specified by node to be of type ID
- DOMElement::setIDAttributeNS(string namespaceURI, string localName, boolean isId)
- - Declares the attribute specified by local name and namespace URI to be of type ID
-
- DOMNode:
- DOMNode::C14N([bool exclusive [, bool with_comments [, array xpath [, array ns_prefixes]]]])
- - Canonicalize nodes to a string
- DOMNode::C14NFile(string uri [, bool exclusive [, bool with_comments [, array xpath [, array ns_prefixes]]]])
- - Canonicalize nodes to a file
- DOMNode::getNodePath()
- - Gets an xpath for a node
-
-In ext/soap
-===========
- SoapServer:
- SoapServer::setObject(object obj)
- - Sets object which will handle SOAP requests
-
-In ext/spl
-==========
- ArrayObject:
- int ArrayObject::asort(void)
- - Sort the entries by values
- int ArrayObject::ksort(void)
- - Sort the entries by key
- int ArrayObject::natcasesort(void)
- - Sort the entries by key using case insensitive "natural order" algorithm.
- int ArrayObject::natsort(void)
- - Sort the entries by values using "natural order" algorithm.
- int ArrayObject::uasort(callback cmp_function)
- - Sort the entries by values user defined function
- int ArrayObject::uksort(callback cmp_function)
- - Sort the entries by key using user defined function.
-
- AppendIterator:
- ArrayIterator AppendIterator::getArrayIterator()
- Get access to inner ArrayIterator
- int AppendIterator::getIteratorIndex()
- Get index of iterator
-
- CachingIterator:
- bool CachingIterator::getCache()
- Return the cache
- int CachingIterator::getFlags()
- Return the internal flags
- bool CachingIterator::offsetExists(mixed index)
- Return whether the requested index exists
- string CachingIterator::offsetGet(mixed index)
- - Return the internal cache if used
- void CachingIterator::offsetSet(mixed index, mixed newval)
- - Set given index in cache
- void CachingIterator::offsetUnset(mixed index)
- - Unset given index in cache
- void CachingIterator::setFlags()
- Set the internal flags
-
- SplFileObject:
- array("delimiter" =>, "enclosure" =>) SplFileObject::getCsvControl(void)
- - Get the delimiter and enclosure character used in fgetcsv
- void SplFileObject::setCsvControl([string delimiter = ',' [, string enclosure = '"']])
- - Set the delimiter and enclosure character used in fgetcsv
-
- XMLReader:
- boolean XMLReader::setSchema(string filename)
- Use W3C XSD schema to validate the document as it is processed. Activation is only possible before the first Read()
-
-In ext/zip
-==========
- ZipArchive:
- bool addEmptyDir(string dirname)
- Creates an empty directory in the archive
-As of 5.2.1 #See http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.15&r2=1.1.2.16
-
-New class constants
-===================
-
-In ext/pdo
-==========
- PDO::ATTR_DEFAULT_FETCH_MODE
- PDO::FETCH_PROPS_LATE
-
-In ext/spl
-==========
- CachingIterator::FULL_CACHE
- CachingIterator::TOSTRING_USE_INNER
-
- SplFileObject::READ_AHEAD
- SplFileObject::READ_CSV
- SplFileObject::SKIP_EMPTY
-
-
-New functions
-=============
-
-In the PHP core
-===============
- array array_fill_keys(array keys, mixed val)
- - Create an array using the elements of the first parameter as keys, each initialized to val
- array error_get_last()
- - Get the last occurred error as associative array. Returns NULL if there hasn't been an error yet
- string image_type_to_extension(int imagetype [, bool include_dot])
- - Get file extension for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype
- int memory_get_peak_usage([real_usage])
- - Returns the peak allocated by PHP memory
- array timezone_abbreviations_list()
- - Returns associative array containing DST, offset and the timezone name
- array timezone_identifiers_list()
- - Returns numerically indexed array with all timezone identifiers
- string timezone_name_from_abbr(string abbr[, long gmtOffset[, long isdst]])
- - Returns the timezone name from abbreviation
-As of 5.2.1: #See http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.9&r2=1.58.2.6.2.10&diff_format=u
- int stream_socket_shutdown(resource stream, int how)
- - Causes all or part of a full-duplex connection on the socket associated with stream to be shut down
-
-In ext/mbstring
-===============
- array mb_list_encodings_alias_names([string encoding])
- - Returns an array of all supported entity encodings
- mixed mb_list_mime_names([string encoding])
- - Returns an array or string of all supported mime names
- int mb_stripos(string haystack, string needle [, int offset [, string encoding]])
- - Finds position of first occurrence of a string within another, case insensitive
- string mb_stristr(string haystack, string needle[, bool part[, string encoding]])
- - Finds first occurrence of a string within another, case insensitive
- string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
- - Finds the last occurrence of a character in a string within another
- string mb_strrichr(string haystack, string needle[, bool part[, string encoding]])
- - Finds the last occurrence of a character in a string within another, case insensitive
- int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
- - Finds position of last occurrence of a string within another, case insensitive
- string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
- - Finds first occurrence of a string within another
-
-In ext/ming
-===========
-As of 5.2.1: See http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.79.2.4.2.4&r2=1.79.2.4.2.5&diff_format=u
- void ming_setSWFCompression(int num)
- - Sets output compression
- void swfmovie::namedanchor(string name)
- - Creates anchor
- void swfmovie::protect([string pasword])
- - Protects
-
-In ext/openssl
-==============
- resource openssl_csr_get_public_key(mixed csr)
- - Extracts public key from a CERT and prepares it for use
- array openssl_csr_get_subject(mixed csr [, bool use_short_names])
- - Returns the subject of a CERT
- array openssl_pkey_get_details(resource key)
- - returns an array with the key details (bits, pkey, type)
-
-In ext/spl
-==========
- string spl_object_hash(object obj)
- - Return hash id for given object
- int iterator_apply(Traversable it, mixed function [, mixed params])
- - Calls a function for every element in an iterator
-
-In ext/pcre
-===========
- int preg_last_error(void)
- - Returns the error code of the last regex execution
-
-In ext/pgsql
-============
- mixed pg_field_table(resource result, int field_number[, bool oid_only])
- - Returns the name of the table field belongs to, or table's oid if oid_only is true
-
-In ext/posix
-============
- bool posix_initgroups(string name, int base_group_id)
- - Calculate the group access list for the user specified in name
-
-In ext/gmp
-==========
- resource gmp_nextprime(resource a)
- - Finds next prime of a
-
-In ext/xmlwriter
-================
- bool xmlwriter_full_end_element(resource xmlwriter)
- - End current element - returns FALSE on error
- bool xmlwriter_write_raw(resource xmlwriter, string content)
- - Write text - returns FALSE on error
-As of 5.2.1 #See http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.8&r2=1.20.2.12.2.9
- bool xmlwriter_start_dtd_entity(resource xmlwriter, string name, bool isparam)
- - Create start DTD Entity - returns FALSE on error
- bool xmlwriter_end_dtd_entity(resource xmlwriter)
- - End current DTD Entity - returns FALSE on error
- bool xmlwriter_write_dtd_entity(resource xmlwriter, string name, string content [, bool pe [, string pubid [, string sysid [, string ndataid]]]])
- - Write full DTD Entity tag - returns FALSE on error
-
-
-New optional parameters
-=======================
-
-In the PHP core
-===============
- - string base64_decode(string str[, bool strict=false]) (strict)
- - bool setcookie(string name [, string value [, int expires [, string path [, string domain [, bool secure[, bool httponly=false]]]]]] (httponly)
- - bool setrawcookie(string name [, string value [, int expires [, string path [, string domain [, bool secure[, bool httponly=false]]]]]] (httponly)
- - void session_set_cookie_params(int lifetime [, string path [, string domain [, bool secure[, bool httponly]]]]) (httponly)
- - int memory_get_usage([bool real_usage=false]) (real_usage)
-
-In ext/curl
-===========
- - array curl_multi_info_read(resource mh [, long msgs_in_queue]) (msgs_in_queue)
-
-In ext/imap
-===========
- - resource imap_open ( string mailbox, string username, string password [, int options[, int n_retries]]) (n_retries)
- - bool imap_reopen(resource stream_id, string mailbox [, int options [, int n_retries]]) (n_retries)
-As of 5.2.1 #See http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.7&r2=1.208.2.7.2.8
-
-In ext/mbstring
-===============
- - int mb_strrpos(string haystack, string needle [, int offset [, string encoding]]) (offset)
-
-In ext/ming
-===========
- - int swfmovie::streamMP3(mixed file [, float skip]) (skip)
-As of 5.2.1 #See http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.79.2.4.2.3&r2=1.79.2.4.2.4
-
-In ext/openssl
-==============
- - int openssl_verify(string data, string signature, mixed key [, int signature_algo]) (signature_algo)
-
-In ext/pgsql
-============
- - string pg_escape_bytea([resource connection,] string data) (connection)
- - string pg_escape_string([resource connection,] string data) (connection)
-
-In ext/simplexml
-================
- - SimpleXMLElement::__construct(string data [, int options [, bool data_is_url [, string ns [, bool is_prefix]]]]) (ns, is_prefix)
- - SimpleXMLElement SimpleXMLElement::attributes([string ns [, bool is_prefix]]) (is_prefix)
- - SimpleXMLElement SimpleXMLElement::children([string ns [, bool is_prefix]]) (is_prefix)
- - SimpleXMLElement simplexml_load_file(string filename [, string class_name [, int options [, string ns [, bool is_prefix]]]]) (ns, is_prefix)
- - SimpleXMLElement simplexml_load_string(string data [, string class_name [, int options [, string ns [, bool is_prefix]]]]) (ns, is_prefix)
-
-In ext/spl
-==========
- - array iterator_to_array(Traversable it [, bool use_keys = true]) (use_keys)
-As of 5.2.1 #See http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.20&r2=1.73.2.30.2.21
-
-In ext/xmlreader
-================
- - boolean XMLReader::open(string URI [, string encoding [, int options]]) (encoding, options)
- - boolean XMLReader::XML(string source [, string encoding [, int options]]) (encoding, options)
-
-
-New INI settings
-================
-allow_url_include PHP_INI_SYSTEM, default: false
-pcre.backtrack_limit PHP_INI_ALL, default: 100000
-pcre.recursion_limit PHP_INI_ALL, default: 100000
-session.cookie_httponly PHP_INI_ALL, default: false
-
-
-New global constants
-====================
-
-In the PHP core
-===============
- - M_EULER
- - M_LNPI
- - M_SQRT3
- - M_SQRTPI
- - PATHINFO_FILENAME
- - PREG_BACKTRACK_LIMIT_ERROR
- - PREG_BAD_UTF8_ERROR
- - PREG_INTERNAL_ERROR
- - PREG_NO_ERROR
- - PREG_RECURSION_LIMIT_ERROR
- - UPLOAD_ERR_EXTENSION
-As of 5.2.1: (See http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.13&r2=1.409.2.6.2.14&diff_format=u)
- - STREAM_SHUT_RD
- - STREAM_SHUT_WR
- - STREAM_SHUT_RDWR
-
-In ext/curl
-===========
- - CURLE_FILESIZE_EXCEEDED
- - CURLE_FTP_SSL_FAILED
- - CURLE_LDAP_INVALID_URL
- - CURLFTPAUTH_DEFAULT
- - CURLFTPAUTH_SSL
- - CURLFTPAUTH_TLS
- - CURLFTPSSL_ALL
- - CURLFTPSSL_CONTROL
- - CURLFTPSSL_NONE
- - CURLFTPSSL_TRY
- - CURLOPT_FTP_SSL
- - CURLOPT_FTPSSLAUTH
-
-In ext/ming
-===========
-As of 5.2.1: See http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.79.2.4.2.4&r2=1.79.2.4.2.5&diff_format=u
- - SWFTEXTFIELD_USEFONT
- - SWFTEXTFIELD_AUTOSIZE
- - SWF_SOUND_NOT_COMPRESSED
- - SWF_SOUND_ADPCM_COMPRESSED
- - SWF_SOUND_MP3_COMPRESSED
- - SWF_SOUND_NOT_COMPRESSED_LE
- - SWF_SOUND_NELLY_COMPRESSED
- - SWF_SOUND_5KHZ
- - SWF_SOUND_11KHZ
- - SWF_SOUND_22KHZ
- - SWF_SOUND_44KHZ
- - SWF_SOUND_8BITS
- - SWF_SOUND_16BITS
- - SWF_SOUND_MONO
- - SWF_SOUND_STEREO
-
-In ext/openssl
-==============
- - OPENSSL_VERSION_NUMBER
- - OPENSSL_VERSION_TEXT
-
-In ext/snmp
-===========
- - SNMP_OID_OUTPUT_FULL
- - SNMP_OID_OUTPUT_NUMERIC
-
-In ext/sysvmsg
-==============
- - MSG_EAGAIN
- - MSG_ENOMSG
diff --git a/README.namespaces b/README.namespaces
index 310adcc..9c427b6 100755
--- a/README.namespaces
+++ b/README.namespaces
@@ -10,7 +10,7 @@ Namespaces are defined the following way:
Zend/DB/Connection.php:
<?php
-namespace Zend::DB;
+namespace Zend\DB;
class Connection {
}
@@ -27,55 +27,55 @@ The namespace declaration statement must be the very first statement in
the file. The only exception is "declare" statement that can be used before.
Every class and function in a namespace can be referred to by the full name
-- e.g. Zend::DB::Connection or Zend::DB::connect - at any time.
+- e.g. Zend\DB\Connection or Zend\DB\connect - at any time.
<?php
require 'Zend/Db/Connection.php';
-$x = new Zend::DB::Connection;
-Zend::DB::connect();
+$x = new Zend\DB\Connection;
+Zend\DB\connect();
?>
Namespace or class name can be imported:
<?php
require 'Zend/Db/Connection.php';
-use Zend::DB;
-use Zend::DB::Connection as DbConnection;
+use Zend\DB;
+use Zend\DB\Connection as DbConnection;
-$x = new Zend::DB::Connection();
-$y = new DB::connection();
+$x = new Zend\DB\Connection();
+$y = new DB\connection();
$z = new DbConnection();
-DB::connect();
+DB\connect();
?>
The use statement only defines name aliasing. It may create name alias for
-namespace or class. The simple form of statement "use A::B::C::D;" is
-equivalent to "use A::B::C::D as D;". The use statement can be used at any
+namespace or class. The simple form of statement "use A\B\C\D;" is
+equivalent to "use A\B\C\D as D;". The use statement can be used at any
time in the global scope (not inside function/class) and takes effect from
the point of definition down to the end of file. It is recommended however to
place the use statements at the beginning of the file. The use statements have
effect only on the file where they appear.
-The special "empty" namespace (:: prefix) is useful as explicit global
-namespace qualification. All class and function names started from ::
+The special "empty" namespace (\ prefix) is useful as explicit global
+namespace qualification. All class and function names started from \
interpreted as global.
<?php
-namespace A::B::C;
+namespace A\B\C;
-$con = ::mysql_connect(...);
+$con = \mysql_connect(...);
?>
A special constant __NAMESPACE__ contains the name of the current namespace.
It can be used to construct fully-qualified names to pass them as callbacks.
<?php
-namespace A::B::C;
+namespace A\B\C;
function foo() {
}
-set_error_handler(__NAMESPACE__ . "::foo");
+set_error_handler(__NAMESPACE__ . "\foo");
?>
In global namespace __NAMESPACE__ constant has the value of empty string.
@@ -83,32 +83,32 @@ In global namespace __NAMESPACE__ constant has the value of empty string.
Names inside namespace are resolved according to the following rules:
1) all qualified names are translated during compilation according to
-current import rules. So if we have "use A::B::C" and then "C::D::e()"
-it is translated to "A::B::C::D::e()".
+current import rules. So if we have "use A\B\C" and then "C\D\e()"
+it is translated to "A\B\C\D\e()".
2) unqualified class names translated during compilation according to
-current import rules. So if we have "use A::B::C" and then "new C()" it
-is translated to "new A::B::C()".
+current import rules. So if we have "use A\B\C" and then "new C()" it
+is translated to "new A\B\C()".
3) inside namespace, calls to unqualified functions that are defined in
current namespace (and are known at the time the call is parsed) are
interpreted as calls to these namespace functions.
4) inside namespace, calls to unqualified functions that are not defined
in current namespace are resolved at run-time. The call to function foo()
-inside namespace (A::B) first tries to find and call function from current
-namespace A::B::foo() and if it doesn't exist PHP tries to call internal
+inside namespace (A\B) first tries to find and call function from current
+namespace A\B\foo() and if it doesn't exist PHP tries to call internal
function foo(). Note that using foo() inside namespace you can call only
-internal PHP functions, however using ::foo() you are able to call any
+internal PHP functions, however using \foo() you are able to call any
function from the global namespace.
5) unqualified class names are resolved at run-time. E.q. "new Exception()"
first tries to use (and autoload) class from current namespace and in case
of failure uses internal PHP class. Note that using "new A" in namespace
you can only create class from this namespace or internal PHP class, however
-using "new ::A" you are able to create any class from the global namespace.
+using "new \A" you are able to create any class from the global namespace.
6) Calls to qualified functions are resolved at run-time. Call to
-A::B::foo() first tries to call function foo() from namespace A::B, then
-it tries to find class A::B (__autoload() it if necessary) and call its
+A\B\foo() first tries to call function foo() from namespace A\B, then
+it tries to find class A\B (__autoload() it if necessary) and call its
static method foo()
7) qualified class names are interpreted as class from corresponding
-namespace. So "new A::B::C()" refers to class C from namespace A::B.
+namespace. So "new A\B\C()" refers to class C from namespace A\B.
Examples
--------
@@ -116,38 +116,38 @@ Examples
namespace A;
foo(); // first tries to call "foo" defined in namespace "A"
// then calls internal function "foo"
-::foo(); // calls function "foo" defined in global scope
+\foo(); // calls function "foo" defined in global scope
?>
<?php
namespace A;
new B(); // first tries to create object of class "B" defined in namespace "A"
// then creates object of internal class "B"
-new ::B(); // creates object of class "B" defined in global scope
+new \B(); // creates object of class "B" defined in global scope
?>
<?php
namespace A;
-new A(); // first tries to create object of class "A" from namespace "A" (A::A)
+new A(); // first tries to create object of class "A" from namespace "A" (A\A)
// then creates object of internal class "A"
?>
<?php
namespace A;
-B::foo(); // first tries to call function "foo" from namespace "A::B"
+B\foo(); // first tries to call function "foo" from namespace "A\B"
// then calls method "foo" of internal class "B"
-::B::foo(); // first tries to call function "foo" from namespace "B"
+\B\foo(); // first tries to call function "foo" from namespace "B"
// then calls method "foo" of class "B" from global scope
?>
The worst case if class name conflicts with namespace name
<?php
namespace A;
-A::foo(); // first tries to call function "foo" from namespace "A::A"
+A\foo(); // first tries to call function "foo" from namespace "A\A"
// then tries to call method "foo" of class "A" from namespace "A"
// then tries to call function "foo" from namespace "A"
// then calls method "foo" of internal class "A"
-::A::foo(); // first tries to call function "foo" from namespace "A"
+\A\foo(); // first tries to call function "foo" from namespace "A"
// then calls method "foo" of class "A" from global scope
?>
diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index 6a13f03..964f2de 100644
--- a/TSRM/tsrm_virtual_cwd.c
+++ b/TSRM/tsrm_virtual_cwd.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.35.2.17 2009/01/21 19:07:35 dmitry Exp $ */
+/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.35.2.21 2009/06/16 21:54:12 pajoye Exp $ */
#include <sys/types.h>
#include <sys/stat.h>
@@ -35,6 +35,9 @@
#ifdef TSRM_WIN32
#include <io.h>
#include "tsrm_win32.h"
+# ifndef IO_REPARSE_TAG_SYMLINK
+# define IO_REPARSE_TAG_SYMLINK 0xA000000C
+# endif
#endif
#ifdef NETWARE
@@ -137,6 +140,42 @@ static int php_check_dots(const char *element, int n)
#ifdef TSRM_WIN32
+#ifdef CTL_CODE
+#undef CTL_CODE
+#endif
+#define CTL_CODE(DeviceType,Function,Method,Access) (((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method))
+#define FILE_DEVICE_FILE_SYSTEM 0x00000009
+#define METHOD_BUFFERED 0
+#define FILE_ANY_ACCESS 0
+#define FSCTL_GET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define MAXIMUM_REPARSE_DATA_BUFFER_SIZE ( 16 * 1024 )
+
+typedef struct {
+ unsigned long ReparseTag;
+ unsigned short ReparseDataLength;
+ unsigned short Reserved;
+ union {
+ struct {
+ unsigned short SubstituteNameOffset;
+ unsigned short SubstituteNameLength;
+ unsigned short PrintNameOffset;
+ unsigned short PrintNameLength;
+ unsigned long Flags;
+ wchar_t ReparseTarget[1];
+ } SymbolicLinkReparseBuffer;
+ struct {
+ unsigned short SubstituteNameOffset;
+ unsigned short SubstituteNameLength;
+ unsigned short PrintNameOffset;
+ unsigned short PrintNameLength;
+ wchar_t ReparseTarget[1];
+ } MountPointReparseBuffer;
+ struct {
+ unsigned char ReparseTarget[1];
+ } GenericReparseBuffer;
+ };
+} REPARSE_DATA_BUFFER;
+
#define SECS_BETWEEN_EPOCHS (__int64)11644473600
#define SECS_TO_100NS (__int64)10000000
static inline time_t FileTimeToUnixTime(const FILETIME FileTime)
@@ -471,6 +510,12 @@ static inline void realpath_cache_add(const char *path, int path_len, const char
}
bucket->realpath_len = realpath_len;
bucket->is_dir = is_dir;
+#ifdef PHP_WIN32
+ bucket->is_rvalid = 0;
+ bucket->is_readable = 0;
+ bucket->is_wvalid = 0;
+ bucket->is_writable = 0;
+#endif
bucket->expires = t + CWDG(realpath_cache_ttl);
n = bucket->key % (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
bucket->next = CWDG(realpath_cache)[n];
@@ -503,6 +548,12 @@ static inline realpath_cache_bucket* realpath_cache_find(const char *path, int p
}
/* }}} */
+CWD_API realpath_cache_bucket* realpath_cache_lookup(const char *path, int path_len, time_t t TSRMLS_DC) /* {{{ */
+{
+ return realpath_cache_find(path, path_len, t TSRMLS_CC);
+}
+/* }}} */
+
#undef LINK_MAX
#define LINK_MAX 32
@@ -518,7 +569,8 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
#endif
realpath_cache_bucket *bucket;
char *tmp;
- TSRM_ALLOCA_FLAG(use_heap);
+ TSRM_ALLOCA_FLAG(use_heap)
+ TSRM_ALLOCA_FLAG(use_heap_large)
while (1) {
if (len <= start) {
@@ -594,7 +646,7 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
memcpy(path, bucket->realpath, bucket->realpath_len + 1);
return bucket->realpath_len;
}
- }
+ }
}
#ifdef TSRM_WIN32
@@ -606,16 +658,103 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
/* continue resolution anyway but don't save result in the cache */
save = 0;
}
+
if (save) {
- directory = (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
- if (is_dir && !directory) {
- /* not a directory */
- FindClose(hFind);
- return -1;
- }
+ FindClose(hFind);
}
+
tmp = tsrm_do_alloca(len+1, use_heap);
memcpy(tmp, path, len+1);
+
+ if(save && (data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
+ /* File is a reparse point. Get the target */
+ HANDLE hLink = NULL;
+ REPARSE_DATA_BUFFER * pbuffer;
+ unsigned int retlength = 0, rname_off = 0;
+ int bufindex = 0, rname_len = 0, isabsolute = 0;
+ wchar_t * reparsetarget;
+
+ if(++(*ll) > LINK_MAX) {
+ return -1;
+ }
+
+ hLink = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_FLAG_OPEN_REPARSE_POINT|FILE_FLAG_BACKUP_SEMANTICS, NULL);
+ if(hLink == INVALID_HANDLE_VALUE) {
+ return -1;
+ }
+
+ pbuffer = (REPARSE_DATA_BUFFER *)tsrm_do_alloca(MAXIMUM_REPARSE_DATA_BUFFER_SIZE, use_heap_large);
+ if(!DeviceIoControl(hLink, FSCTL_GET_REPARSE_POINT, NULL, 0, pbuffer, MAXIMUM_REPARSE_DATA_BUFFER_SIZE, &retlength, NULL)) {
+ tsrm_free_alloca(pbuffer, use_heap_large);
+ CloseHandle(hLink);
+ return -1;
+ }
+
+ CloseHandle(hLink);
+
+ if(pbuffer->ReparseTag == IO_REPARSE_TAG_SYMLINK) {
+ rname_len = pbuffer->SymbolicLinkReparseBuffer.PrintNameLength/2;
+ rname_off = pbuffer->SymbolicLinkReparseBuffer.PrintNameOffset/2;
+ reparsetarget = pbuffer->SymbolicLinkReparseBuffer.ReparseTarget;
+ isabsolute = (pbuffer->SymbolicLinkReparseBuffer.Flags == 0) ? 1 : 0;
+ }
+ else if(pbuffer->ReparseTag == IO_REPARSE_TAG_MOUNT_POINT) {
+ rname_len = pbuffer->MountPointReparseBuffer.PrintNameLength/2;
+ rname_off = pbuffer->MountPointReparseBuffer.PrintNameOffset/2;
+ reparsetarget = pbuffer->MountPointReparseBuffer.ReparseTarget;
+ isabsolute = 1;
+ }
+ else {
+ tsrm_free_alloca(pbuffer, use_heap_large);
+ return -1;
+ }
+
+ /* Convert wide string to narrow string */
+ for(bufindex = 0; bufindex < rname_len; bufindex++) {
+ *(path + bufindex) = (char)(reparsetarget[rname_off + bufindex]);
+ }
+
+ *(path + bufindex) = 0;
+ tsrm_free_alloca(pbuffer, use_heap_large);
+ j = bufindex;
+
+ if(isabsolute == 1) {
+ /* use_realpath is 0 in the call below coz path is absolute*/
+ j = tsrm_realpath_r(path, 0, j, ll, t, 0, is_dir, &directory TSRMLS_CC);
+ if(j < 0) {
+ tsrm_free_alloca(tmp, use_heap);
+ return -1;
+ }
+ }
+ else {
+ if(i + j >= MAXPATHLEN - 1) {
+ tsrm_free_alloca(tmp, use_heap);
+ return -1;
+ }
+
+ memmove(path+i, path, j+1);
+ memcpy(path, tmp, i-1);
+ path[i-1] = DEFAULT_SLASH;
+ j = tsrm_realpath_r(path, start, i + j, ll, t, use_realpath, is_dir, &directory TSRMLS_CC);
+ if(j < 0) {
+ tsrm_free_alloca(tmp, use_heap);
+ return -1;
+ }
+ }
+
+ if(link_is_dir) {
+ *link_is_dir = directory;
+ }
+ }
+ else {
+ if (save) {
+ directory = (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
+ if (is_dir && !directory) {
+ /* not a directory */
+ return -1;
+ }
+ }
+
#elif defined(NETWARE)
save = 0;
tmp = tsrm_do_alloca(len+1, use_heap);
@@ -687,19 +826,18 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
#ifdef TSRM_WIN32
if (j < 0 || j + len - i >= MAXPATHLEN-1) {
tsrm_free_alloca(tmp, use_heap);
- if (save) FindClose(hFind);
return -1;
}
if (save) {
i = strlen(data.cFileName);
memcpy(path+j, data.cFileName, i+1);
j += i;
- FindClose(hFind);
} else {
/* use the original file or directory name as it wasn't found */
memcpy(path+j, tmp+i, len-i+1);
j += (len-i);
}
+ }
#else
if (j < 0 || j + len - i >= MAXPATHLEN-1) {
tsrm_free_alloca(tmp, use_heap);
@@ -1060,7 +1198,6 @@ static void UnixTimeToFileTime(time_t t, LPFILETIME pft) /* {{{ */
static int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
{
FILETIME mtime, atime;
- BOOL f;
HANDLE hFile;
hFile = CreateFile(filename, GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, NULL,
diff --git a/TSRM/tsrm_virtual_cwd.h b/TSRM/tsrm_virtual_cwd.h
index de65e87..65225f3 100644
--- a/TSRM/tsrm_virtual_cwd.h
+++ b/TSRM/tsrm_virtual_cwd.h
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tsrm_virtual_cwd.h,v 1.48.2.5.2.8.2.6 2008/12/31 11:15:31 sebastian Exp $ */
+/* $Id: tsrm_virtual_cwd.h,v 1.48.2.5.2.8.2.7 2009/06/16 00:07:04 pajoye Exp $ */
#ifndef VIRTUAL_CWD_H
#define VIRTUAL_CWD_H
@@ -210,6 +210,12 @@ typedef struct _realpath_cache_bucket {
int realpath_len;
int is_dir;
time_t expires;
+#ifdef PHP_WIN32
+ unsigned char is_rvalid;
+ unsigned char is_readable;
+ unsigned char is_wvalid;
+ unsigned char is_writable;
+#endif
struct _realpath_cache_bucket *next;
} realpath_cache_bucket;
@@ -231,6 +237,7 @@ extern virtual_cwd_globals cwd_globals;
CWD_API void realpath_cache_clean(TSRMLS_D);
CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC);
+CWD_API realpath_cache_bucket* realpath_cache_lookup(const char *path, int path_len, time_t t TSRMLS_DC);
/* The actual macros to be used in programs using TSRM
* If the program defines VIRTUAL_DIR it will use the
diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
index 9a52992..7c47fa3 100644
--- a/TSRM/tsrm_win32.c
+++ b/TSRM/tsrm_win32.c
@@ -16,21 +16,23 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tsrm_win32.c,v 1.27.2.1.2.7.2.3 2008/12/31 11:15:31 sebastian Exp $ */
+/* $Id: tsrm_win32.c,v 1.27.2.1.2.7.2.11 2009/06/16 00:07:04 pajoye Exp $ */
#include <stdio.h>
#include <fcntl.h>
#include <io.h>
#include <process.h>
#include <time.h>
+#include <errno.h>
#define TSRM_INCLUDE_FULL_WINDOWS_HEADERS
-
+#include "SAPI.h"
#include "TSRM.h"
#ifdef TSRM_WIN32
#include "tsrm_win32.h"
+#include "tsrm_virtual_cwd.h"
#ifdef ZTS
static ts_rsrc_id win32_globals_id;
@@ -40,11 +42,25 @@ static tsrm_win32_globals win32_globals;
static void tsrm_win32_ctor(tsrm_win32_globals *globals TSRMLS_DC)
{
+ HANDLE process_token = NULL;
+
globals->process = NULL;
globals->shm = NULL;
globals->process_size = 0;
globals->shm_size = 0;
globals->comspec = _strdup((GetVersion()<0x80000000)?"cmd.exe":"command.com");
+ globals->impersonation_token = NULL;
+
+ /* Access check requires impersonation token. Create a duplicate token. */
+ if(OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE | TOKEN_QUERY, &process_token)) {
+ DuplicateToken(process_token, SecurityImpersonation, &globals->impersonation_token);
+ }
+
+ /* impersonation_token will be closed when the process dies */
+ if(process_token != NULL) {
+ CloseHandle(process_token);
+ process_token = NULL;
+ }
}
static void tsrm_win32_dtor(tsrm_win32_globals *globals TSRMLS_DC)
@@ -66,6 +82,10 @@ static void tsrm_win32_dtor(tsrm_win32_globals *globals TSRMLS_DC)
}
free(globals->comspec);
+
+ if(globals->impersonation_token) {
+ CloseHandle(globals->impersonation_token);
+ }
}
TSRM_API void tsrm_win32_startup(void)
@@ -86,21 +106,127 @@ TSRM_API void tsrm_win32_shutdown(void)
TSRM_API int tsrm_win32_access(const char *pathname, int mode)
{
+ SECURITY_INFORMATION sec_info = OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION;
+ GENERIC_MAPPING gen_map = { FILE_GENERIC_READ, FILE_GENERIC_WRITE, FILE_GENERIC_EXECUTE, FILE_ALL_ACCESS };
+ DWORD priv_set_length = sizeof(PRIVILEGE_SET);
+
+ PRIVILEGE_SET privilege_set = {0};
+ DWORD sec_desc_length = 0, desired_access = 0, granted_access = 0;
+ BYTE * psec_desc = NULL;
+ BOOL fAccess = FALSE;
+ HANDLE process_token = NULL;
+
+ realpath_cache_bucket * bucket = NULL;
+ char * real_path = NULL;
+ time_t t;
+
+ TSRMLS_FETCH();
+
if (mode == 1 /*X_OK*/) {
-#if 1
- /* This code is not supported by Windows 98,
- * but we don't support it anymore */
DWORD type;
+ return GetBinaryType(pathname, &type) ? 0 : -1;
+ } else {
+ if(access(pathname, mode)) {
+ return errno;
+ }
- return GetBinaryType(pathname, &type)?0:-1;
-#else
- SHFILEINFO sfi;
+ if(!IS_ABSOLUTE_PATH(pathname, strlen(pathname)+1)) {
+ real_path = (char *)malloc(MAX_PATH);
+ if(tsrm_realpath(pathname, real_path TSRMLS_CC) == NULL) {
+ goto Finished;
+ }
+ pathname = real_path;
+ }
+
+ if (CWDG(realpath_cache_size_limit)) {
+ t = time(0);
+ bucket = realpath_cache_lookup(pathname, strlen(pathname), t TSRMLS_CC);
+ if(bucket == NULL && real_path == NULL) {
+ /* We used the pathname directly. Call tsrm_realpath */
+ /* so that entry is created in realpath cache */
+ real_path = (char *)malloc(MAX_PATH);
+ if(tsrm_realpath(pathname, real_path TSRMLS_CC) != NULL) {
+ pathname = real_path;
+ bucket = realpath_cache_lookup(pathname, strlen(pathname), t TSRMLS_CC);
+ }
+ }
+ }
+
+ /* Do a full access check because access() will only check read-only attribute */
+ if(mode == 0 || mode > 6) {
+ if(bucket != NULL && bucket->is_rvalid) {
+ fAccess = bucket->is_readable;
+ goto Finished;
+ }
+ desired_access = FILE_GENERIC_READ;
+ } else if(mode <= 2) {
+ if(bucket != NULL && bucket->is_wvalid) {
+ fAccess = bucket->is_writable;
+ goto Finished;
+ }
+ desired_access = FILE_GENERIC_WRITE;
+ } else if(mode <= 4) {
+ if(bucket != NULL && bucket->is_rvalid) {
+ fAccess = bucket->is_readable;
+ goto Finished;
+ }
+ desired_access = FILE_GENERIC_READ;
+ } else { // if(mode <= 6)
+ if(bucket != NULL && bucket->is_rvalid && bucket->is_wvalid) {
+ fAccess = bucket->is_readable & bucket->is_writable;
+ goto Finished;
+ }
+ desired_access = FILE_GENERIC_READ | FILE_GENERIC_WRITE;
+ }
- return access(pathname, 0) == 0 &&
- SHGetFileInfo(pathname, 0, &sfi, sizeof(SHFILEINFO), SHGFI_EXETYPE) != 0 ? 0 : -1;
-#endif
- } else {
- return access(pathname, mode);
+ if(TWG(impersonation_token) == NULL) {
+ goto Finished;
+ }
+
+ /* Get size of security buffer. Call is expected to fail */
+ if(GetFileSecurity(pathname, sec_info, NULL, 0, &sec_desc_length)) {
+ goto Finished;
+ }
+
+ psec_desc = (BYTE *)malloc(sec_desc_length);
+ if(psec_desc == NULL ||
+ !GetFileSecurity(pathname, sec_info, (PSECURITY_DESCRIPTOR)psec_desc, sec_desc_length, &sec_desc_length)) {
+ goto Finished;
+ }
+
+ if(!AccessCheck((PSECURITY_DESCRIPTOR)psec_desc, TWG(impersonation_token), desired_access, &gen_map, &privilege_set, &priv_set_length, &granted_access, &fAccess)) {
+ goto Finished;
+ }
+
+ /* Keep the result in realpath_cache */
+ if(bucket != NULL) {
+ if(desired_access == FILE_GENERIC_READ) {
+ bucket->is_rvalid = 1;
+ bucket->is_readable = fAccess;
+ }
+ else if(desired_access == FILE_GENERIC_WRITE) {
+ bucket->is_wvalid = 1;
+ bucket->is_writable = fAccess;
+ }
+ }
+
+Finished:
+ if(psec_desc != NULL) {
+ free(psec_desc);
+ psec_desc = NULL;
+ }
+
+ if(real_path != NULL) {
+ free(real_path);
+ real_path = NULL;
+ }
+
+ if(fAccess == FALSE) {
+ errno = EACCES;
+ return errno;
+ } else {
+ return 0;
+ }
}
}
@@ -184,6 +310,7 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
PROCESS_INFORMATION process;
SECURITY_ATTRIBUTES security;
HANDLE in, out;
+ DWORD dwCreateFlags = 0;
char *cmd;
process_pair *proc;
TSRMLS_FETCH();
@@ -206,7 +333,6 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
read = (type[0] == 'r') ? TRUE : FALSE;
mode = ((str_len == 2) && (type[1] == 'b')) ? O_BINARY : O_TEXT;
-
if (read) {
in = dupHandle(in, FALSE);
startup.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
@@ -217,9 +343,14 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
startup.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
}
+ dwCreateFlags = NORMAL_PRIORITY_CLASS;
+ if (strcmp(sapi_module.name, "cli") != 0) {
+ dwCreateFlags |= CREATE_NO_WINDOW;
+ }
+
cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c ")+2);
sprintf(cmd, "%s /c \"%s\"", TWG(comspec), command);
- if (!CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, NORMAL_PRIORITY_CLASS|CREATE_NO_WINDOW, env, cwd, &startup, &process)) {
+ if (!CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process)) {
return NULL;
}
free(cmd);
@@ -252,7 +383,7 @@ TSRM_API int pclose(FILE *stream)
}
fflush(process->stream);
- fclose(process->stream);
+ fclose(process->stream);
WaitForSingleObject(process->prochnd, INFINITE);
GetExitCodeProcess(process->prochnd, &termstat);
diff --git a/TSRM/tsrm_win32.h b/TSRM/tsrm_win32.h
index 8b3857c..912fac6 100644
--- a/TSRM/tsrm_win32.h
+++ b/TSRM/tsrm_win32.h
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tsrm_win32.h,v 1.19.2.1.2.1.2.2 2008/12/31 11:15:31 sebastian Exp $ */
+/* $Id: tsrm_win32.h,v 1.19.2.1.2.1.2.3 2009/05/17 19:42:53 pajoye Exp $ */
#ifndef TSRM_WIN32_H
#define TSRM_WIN32_H
@@ -63,6 +63,7 @@ typedef struct {
int process_size;
int shm_size;
char *comspec;
+ HANDLE impersonation_token;
} tsrm_win32_globals;
#ifdef ZTS
diff --git a/UPGRADING b/UPGRADING
index f093b32..26ca7f4 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -1,4 +1,4 @@
-$Id: UPGRADING,v 1.1.2.3.2.1.2.1 2009/01/28 17:23:28 sfox Exp $
+$Id: UPGRADING,v 1.1.2.3.2.1.2.10 2009/06/14 19:15:57 philip Exp $
UPGRADE NOTES - PHP 5.3
@@ -50,6 +50,8 @@ UPGRADE NOTES - PHP 5.3
- clearstatcache() no longer clears the realpath cache by default.
+- call_user_func() now propagates $this even if the callee is the parent class.
+
- The filesystem functions opendir(), scandir() and dir() now use the default
context if no context is passed as an argument to them.
@@ -76,12 +78,18 @@ UPGRADE NOTES - PHP 5.3
copy(): context.
fgetcsv(): escape.
ini_get_all(): details.
+ json_encode(): options.
nl2br(): is_xhtml.
parse_ini_file(): scanner_mode.
round(): mode.
stream_context_create(): params.
strstr(), stristr(): before_needle.
+- The new mysqlnd library necessitates using MySQL's newer 41 byte password format.
+ Continued use of the old 16 byte passwords will cause mysql_connect() to produce
+ the following error message: "mysqlnd cannot connect to MySQL 4.1+ using old
+ authentication"
+
===================================
3. Changes made to existing methods
===================================
@@ -115,12 +123,21 @@ UPGRADE NOTES - PHP 5.3
5. Deprecated
=============
-- Ticks: declare(ticks=N) and register_tick_function() both now trigger an
- E_DEPRECATED notice.
-
- define_syslog_variables() is deprecated.
-- All ereg functions are deprecated. Use PCRE (preg_*()) instead.
+- All ereg functions are deprecated and emit E_DEPRECATED errors.
+ Use PCRE (preg_*()) instead.
+
+- The following ini directives will now emit an E_DEPRECATED warning
+ upon startup if they are activated:
+
+ - define_syslog_variables
+ - register_globals
+ - register_long_arrays
+ - safe_mode
+ - magic_quotes_gpc
+ - magic_quotes_runtime
+ - magic_quotes_sybase
===============
6. Undeprecated
@@ -186,7 +203,11 @@ UPGRADE NOTES - PHP 5.3
9. Changes in INI directives
============================
-- zend.ze1_compatibility_mode has been removed.
+- zend_extension_debug and zend_extension_ts have been removed.
+ Instead use the zend_extension directive to load all Zend Extensions.
+
+- zend.ze1_compatibility_mode has been removed. If this ini directive is set
+ to on, then an E_ERROR is emitted at startup.
- A new user initialization mechanism and config variables have been added:
user_ini.filename and user_ini.cache_ttl
@@ -227,17 +248,42 @@ UPGRADE NOTES - PHP 5.3
var_dump(0 ?: 'Hello!');
+- Namespaces were added:
+
+ namespace my\name;
+ $obj = new \my\name\MyClass;
+
===================
11. Windows support
===================
-- The minimum Windows version is now Windows 2000. (Windows 98 and NT4 are no
- longer supported).
+- The minimum Windows version is now Windows 2000. (Windows 98, ME and NT4 are
+ no longer supported).
- PHP Windows binaries target i586 or later. i386 and i486 are not supported.
- Windows support has been added for the following functions: getopt(),
- imagecolorclosesthwb(), mcrypt_create_iv(), inet_ntop() and inet_pton().
+ imagecolorclosesthwb(), mcrypt_create_iv(), inet_ntop(), inet_pton(),
+ getmxrr(), checkdnsrr(), dns_get_record(), linkinfo(), readlink(),
+ symlink(), link(), fnmatch(), stream_socket_pair(), time_nanosleep(),
+ time_sleep_until() and socket_create_pair().
+
+- Improved portability of stat(), touch(), filemtime(), filesize() and related
+ functions (100% portable for the available data)
+
+- The PDO_OCI php_pdo_oci8.dll library (for use with Oracle version 8 client
+ libraries) is no longer being built. Instead, use php_pdo_oci.dll (note no '8')
+ with Oracle 10 or 11 client libraries. Connection to other database versions
+ is supported.
+
+- For the OCI8 extension, a new library php_oci8_11g.dll is available in addition to
+ php_oci8.dll. Only one can be enabled at any time. Use php_oci8.dll with Oracle 10.2
+ client libraries. Use php_oci8_11g.dll with Oracle 11 client libraries. Connection
+ to other database versions is supported.
+
+- It's now possible to use hardlinks on Windows using the link() function,
+ and symbolic links via the symlink() function. Hardlinks are available
+ as of Windows 2000 and symbolic links as of Windows Vista.
===================
12. New in PHP 5.3:
@@ -282,6 +328,7 @@ UPGRADE NOTES - PHP 5.3
date_parse_from_format()
date_create_from_format()
date_get_last_errors()
+ timezone_version_get()
- INI: parse_ini_string()
- GMP: gmp_testbit()
- Hash: hash_copy()
@@ -290,6 +337,8 @@ UPGRADE NOTES - PHP 5.3
mysqli_get_connection_stats()
mysqli_poll()
mysqli_reap_async_query()
+ - Network: gethostname()
+ header_remove()
- OpenSSL: openssl_random_pseudo_bytes()
- PCNTL: pcntl_signal_dispatch()
pcntl_sigprocmask()
@@ -394,6 +443,12 @@ UPGRADE NOTES - PHP 5.3
DateTime::getLastErrors()
- PDO_Firebird: PDO::setAttribute()
- Reflection: ReflectionProperty::setAccessible()
+ ReflectionFunction::inNamespace()
+ ReflectionFunction::getNamespaceName()
+ ReflectionFunction::getShortName()
+ ReflectionClass::inNamespace()
+ ReflectionClass::getNamespaceName()
+ ReflectionClass::getShortName()
- XSL: XSLTProcessor::setProfiling()
h. New class constants
diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index e623679..f633204 100644
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -1,5 +1,5 @@
dnl
-dnl $Id: Zend.m4,v 1.58.4.4.2.5 2008/12/02 16:19:09 cseiler Exp $
+dnl $Id: Zend.m4,v 1.58.4.4.2.6 2009/06/04 18:20:42 mattwil Exp $
dnl
dnl This file contains Zend specific autoconf functions.
dnl
@@ -117,6 +117,38 @@ AC_CHECK_FUNCS(finite isfinite isinf isnan)
ZEND_FP_EXCEPT
ZEND_CHECK_FLOAT_PRECISION
+
+dnl test whether double cast to long preserves least significant bits
+AC_MSG_CHECKING(whether double cast to long preserves least significant bits)
+
+AC_TRY_RUN([
+#include <limits.h>
+
+int main()
+{
+ if (sizeof(long) == 4) {
+ double d = (double) LONG_MIN * LONG_MIN + 2e9;
+
+ if ((long) d == 2e9 && (long) -d == -2e9) {
+ exit(0);
+ }
+ } else if (sizeof(long) == 8) {
+ double correct = 18e18 - ((double) LONG_MIN * -2); /* Subtract ULONG_MAX + 1 */
+
+ if ((long) 18e18 == correct) { /* On 64-bit, only check between LONG_MAX and ULONG_MAX */
+ exit(0);
+ }
+ }
+ exit(1);
+}
+], [
+ AC_DEFINE([ZEND_DVAL_TO_LVAL_CAST_OK], 1, [Define if double cast to long preserves least significant bits])
+ AC_MSG_RESULT(yes)
+], [
+ AC_MSG_RESULT(no)
+], [
+ AC_MSG_RESULT(no)
+])
])
diff --git a/Zend/tests/017.phpt b/Zend/tests/017.phpt
index 09ad123..03c1e73 100644
--- a/Zend/tests/017.phpt
+++ b/Zend/tests/017.phpt
@@ -60,7 +60,7 @@ int(%d)
Warning: get_loaded_extensions() expects at most 1 parameter, 2 given in %s on line %d
NULL
-Warning: Wrong parameter count for get_defined_constants() in %s on line %d
+Warning: get_defined_constants() expects at most 1 parameter, 2 given in %s on line %d
NULL
string(5) "array"
string(5) "array"
diff --git a/Zend/tests/029.phpt b/Zend/tests/029.phpt
index 469dd08..8ef56fa 100644
--- a/Zend/tests/029.phpt
+++ b/Zend/tests/029.phpt
@@ -49,37 +49,3 @@ array(1) {
}
}
}
---UEXPECT--
-array(1) {
- [0]=>
- object(stdClass)#1 (1) {
- [u"a"]=>
- object(stdClass)#2 (0) {
- }
- }
-}
-array(1) {
- [0]=>
- object(stdClass)#1 (2) {
- [u"a"]=>
- object(stdClass)#2 (0) {
- }
- [u"b"]=>
- object(stdClass)#3 (0) {
- }
- }
-}
-array(1) {
- [0]=>
- object(stdClass)#1 (3) {
- [u"a"]=>
- object(stdClass)#2 (0) {
- }
- [u"b"]=>
- object(stdClass)#3 (0) {
- }
- [u"c"]=>
- object(stdClass)#2 (0) {
- }
- }
-}
diff --git a/Zend/tests/bug39018.phpt b/Zend/tests/bug39018.phpt
index 1bc23d3..6de9092 100644
--- a/Zend/tests/bug39018.phpt
+++ b/Zend/tests/bug39018.phpt
@@ -65,7 +65,7 @@ print "\nDone\n";
Notice: Uninitialized string offset: 0 in %s on line 12
-Notice: Uninitialized string offset: -%d in %s on line 16
+Notice: Uninitialized string offset: %i in %s on line 16
Notice: Uninitialized string offset: 4 in %s on line 28
diff --git a/Zend/tests/bug42143.phpt b/Zend/tests/bug42143.phpt
new file mode 100644
index 0000000..8a73d41
--- /dev/null
+++ b/Zend/tests/bug42143.phpt
@@ -0,0 +1,38 @@
+--TEST--
+bug #42143 (The constant NAN is reported as 0 on Windows build)
+--CREDITS--
+Venkat Raman Don
+--FILE--
+<?php
+echo "Testing NAN:\n";
+echo "NAN= ";
+var_dump(NAN);
+var_dump(tan(-1) == 123);
+var_dump(cos(-100) == "PHP String");
+var_dump(deg2rad(-5.6) == null);
+var_dump(sqrt(-0.1) == false);
+var_dump(sqrt(cos(M_PI)) == 0.1);
+var_dump(NAN);
+var_dump(is_nan(sqrt(-1.005)) == false);
+var_dump(is_nan(floor(1)) == true);
+var_dump(log10(-1) == log(-1));
+var_dump(log10(-1) != log10(-1));
+var_dump(is_finite(log10(-1)) == false);
+var_dump(NAN == NAN);
+?>
+--EXPECT--
+Testing NAN:
+NAN= float(NAN)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+float(NAN)
+bool(false)
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+bool(false)
+
diff --git a/Zend/tests/bug43027.phpt b/Zend/tests/bug43027.phpt
index 32f68d0..adecf3e 100755
--- a/Zend/tests/bug43027.phpt
+++ b/Zend/tests/bug43027.phpt
@@ -7,5 +7,4 @@ namespace test;
echo "ok\n";
?>
--EXPECTF--
-Deprecated: Ticks is deprecated and will be removed in PHP 6 in %s on line %d
ok
diff --git a/Zend/tests/bug47516.phpt b/Zend/tests/bug47516.phpt
new file mode 100644
index 0000000..66304fe
--- /dev/null
+++ b/Zend/tests/bug47516.phpt
@@ -0,0 +1,36 @@
+--TEST--
+Bug #47516 (nowdoc can not be embed in heredoc but can be embed in double quote)
+--FILE--
+<?php
+$s='substr';
+
+$htm=<<<DOC
+{$s(<<<'ppp'
+abcdefg
+ppp
+,0,3)}
+DOC;
+
+echo "$htm\n";
+
+$htm=<<<DOC
+{$s(<<<ppp
+abcdefg
+ppp
+,0,3)}
+DOC;
+
+echo "$htm\n";
+
+$htm="{$s(<<<'ppp'
+abcdefg
+ppp
+,0,3)}
+";
+
+echo "$htm\n";
+?>
+--EXPECT---
+abc
+abc
+abc
diff --git a/Zend/tests/bug47596.phpt b/Zend/tests/bug47596.phpt
new file mode 100644
index 0000000..1fcba21
--- /dev/null
+++ b/Zend/tests/bug47596.phpt
@@ -0,0 +1,63 @@
+--TEST--
+Bug #47596 (Bus error on parsing file, when file size is equal to page size)
+--FILE--
+<?php
+echo "ok\n";
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comment comment comment comment comment comment comment
+// comment comment comm
+?>
+--EXPECT--
+ok
diff --git a/Zend/tests/bug47699.phpt b/Zend/tests/bug47699.phpt
new file mode 100644
index 0000000..23ea5a4
--- /dev/null
+++ b/Zend/tests/bug47699.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Bug #47699 (autoload and late static binding)
+--FILE--
+<?php
+class A {
+ static function test($v='') {
+ print_r(get_called_class());
+ }
+}
+class B extends A {
+}
+B::test();
+spl_autoload_register('B::test');
+new X();
+?>
+--EXPECTF--
+BB
+Fatal error: Class 'X' not found in %sbug47699.php on line %d
diff --git a/Zend/tests/bug47714.phpt b/Zend/tests/bug47714.phpt
new file mode 100644
index 0000000..e8ef8c3
--- /dev/null
+++ b/Zend/tests/bug47714.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Testing lambda function in set_exception_handler()
+--FILE--
+<?php
+function au($class) {
+ eval('class handler {
+ function handle($e) {
+ echo $e->getMessage()."\n";
+ }
+ }');
+}
+
+function __autoload($class) {
+ au($class);
+}
+
+//spl_autoload_register('au');
+
+set_exception_handler(function($exception) {
+ $h = new handler();
+ $h->handle($exception);
+});
+
+throw new Exception('exception');
+?>
+--EXPECT--
+exception
diff --git a/Zend/tests/bug47771.phpt b/Zend/tests/bug47771.phpt
new file mode 100644
index 0000000..a17fcf3
--- /dev/null
+++ b/Zend/tests/bug47771.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Bug #47771 (Exception during object construction from arg call calls object's destructor)
+--FILE--
+<?php
+function throw_exc() {
+ throw new Exception('TEST_EXCEPTION');
+}
+
+class Test {
+
+ public function __construct() {
+ echo 'Constr' ."\n";
+ }
+
+ public function __destruct() {
+ echo 'Destr' ."\n";
+ }
+
+}
+
+try {
+
+ $T =new Test(throw_exc());
+
+} catch( Exception $e) {
+ echo 'Exception: ' . $e->getMessage() . "\n";
+}
+?>
+--EXPECT--
+Exception: TEST_EXCEPTION
diff --git a/Zend/tests/bug47801.phpt b/Zend/tests/bug47801.phpt
new file mode 100644
index 0000000..3230819
--- /dev/null
+++ b/Zend/tests/bug47801.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Bug #47801 (__call() accessed via parent:: operator is provided incorrect method name)
+--FILE--
+<?php
+
+class A
+{
+ function __call($name, $args)
+ {
+ echo("magic method called: $name\n");
+ }
+}
+
+class B extends A
+{
+ function getFoo()
+ {
+ parent::getFoo();
+ }
+}
+
+$a = new A();
+$a->getFoo();
+
+$b = new B();
+$b->getFoo();
+
+?>
+--EXPECT--
+magic method called: getFoo
+magic method called: getFoo
diff --git a/Zend/tests/bug47836.phpt b/Zend/tests/bug47836.phpt
new file mode 100644
index 0000000..5a93a44
--- /dev/null
+++ b/Zend/tests/bug47836.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Bug #47836 (array operator [] inconsistency when the array has PHP_INT_MAX index value)
+--FILE--
+<?php
+
+$arr[PHP_INT_MAX] = 1;
+$arr[] = 2;
+
+var_dump($arr);
+?>
+--EXPECTF--
+Warning: Cannot add element to the array as the next element is already occupied in %s on line 4
+array(1) {
+ [%d]=>
+ int(1)
+}
diff --git a/Zend/tests/bug47880.phpt b/Zend/tests/bug47880.phpt
new file mode 100644
index 0000000..bf2022c
--- /dev/null
+++ b/Zend/tests/bug47880.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #47880 (crashes in call_user_func_array())
+--FILE--
+<?php
+class bomb {
+ static function go($n) {
+ $backtrace = debug_backtrace(false);
+ $backtrace[1]['args'][1] = 'bomb';
+ }
+}
+call_user_func_array(array('bomb', 'go'), array(0));
+echo "ok\n";
+?>
+--EXPECT--
+ok
diff --git a/Zend/tests/bug47981.phpt b/Zend/tests/bug47981.phpt
new file mode 100644
index 0000000..2d68d37
--- /dev/null
+++ b/Zend/tests/bug47981.phpt
@@ -0,0 +1,19 @@
+--TEST--
+Bug #47981 (error handler not called regardless)
+--INI--
+error_reporting=0
+--FILE--
+<?php
+function errh($errno, $errstr) {
+ var_dump($errstr);
+}
+set_error_handler("errh");
+
+interface a{}
+class b implements a { function f($a=1) {}}
+class c extends b {function f() {}}
+?>
+--EXPECTF--
+string(62) "Declaration of c::f() should be compatible with that of b::f()"
+
+
diff --git a/Zend/tests/bug48004.phpt b/Zend/tests/bug48004.phpt
new file mode 100644
index 0000000..5968876
--- /dev/null
+++ b/Zend/tests/bug48004.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Bug #48004 (Error handler prevents creation of default object)
+--FILE--
+<?php
+function error_handler($errno, $errstr, $errfile, $errline, $errcontext) {
+ return true;
+}
+
+function test() {
+ $data->id = 1;
+ print_r($data);
+}
+
+set_error_handler("error_handler");
+test();
+?>
+--EXPECT--
+stdClass Object
+(
+ [id] => 1
+)
diff --git a/Zend/tests/bug48215.phpt b/Zend/tests/bug48215.phpt
new file mode 100644
index 0000000..99c4dd2
--- /dev/null
+++ b/Zend/tests/bug48215.phpt
@@ -0,0 +1,38 @@
+--TEST--
+Bug #48215 - parent::method() calls __construct
+--FILE--
+<?php
+class A
+{
+ public function __construct() {
+ echo __METHOD__ . "\n";
+ }
+ protected function A()
+ {
+ echo __METHOD__ . "\n";
+ }
+}
+class B extends A
+{
+ public function __construct() {
+ echo __METHOD__ . "\n";
+ parent::__construct();
+ }
+ public function A()
+ {
+ echo __METHOD__ . "\n";
+ parent::A();
+ }
+}
+$b = new B();
+$b->A();
+?>
+===DONE===
+--EXPECTF--
+
+Strict Standards: Redefining already defined constructor for class A in %s on line %d
+B::__construct
+A::__construct
+B::A
+A::A
+===DONE===
diff --git a/Zend/tests/bug48228.phpt b/Zend/tests/bug48228.phpt
new file mode 100644
index 0000000..ae8ba61
--- /dev/null
+++ b/Zend/tests/bug48228.phpt
@@ -0,0 +1,32 @@
+--TEST--
+Bug #48228 (crash when exception is thrown while passing function arguments)
+--FILE--
+<?php
+
+function do_throw() {
+ throw new Exception();
+}
+
+class aa
+{
+ function check()
+ {
+ }
+
+ function dosome()
+ {
+ $this->check(do_throw());
+ }
+}
+$l_aa=new aa();
+
+$l_aa->dosome();
+?>
+--EXPECTF--
+
+Fatal error: Uncaught exception 'Exception' in %s
+Stack trace:
+#0 %s(%d): do_throw()
+#1 %s(%d): aa->dosome()
+#2 {main}
+ thrown in %s
diff --git a/Zend/tests/bug48248.phpt b/Zend/tests/bug48248.phpt
new file mode 100644
index 0000000..9cdb7c1
--- /dev/null
+++ b/Zend/tests/bug48248.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Bug #48248 (SIGSEGV when access to private property via &__get)
+--FILE--
+<?php
+
+class A
+{
+ public function & __get($name)
+ {
+ return $this->test;
+ }
+}
+
+class B extends A
+{
+ private $test;
+}
+
+$b = new B;
+var_dump($b->test);
+
+?>
+--EXPECTF--
+Notice: Undefined property: B::$test in %s on line %d
+
+Notice: Only variable references should be returned by reference in %s on line %d
+NULL
diff --git a/Zend/tests/bug48408.phpt b/Zend/tests/bug48408.phpt
new file mode 100644
index 0000000..20a0198
--- /dev/null
+++ b/Zend/tests/bug48408.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Bug #48408 (crash when exception is thrown while passing function arguments)
+--FILE--
+<?php
+class B{
+ public function process($x){
+ return $x;
+ }
+}
+class C{
+ public function generate($x){
+ throw new Exception;
+ }
+}
+$b = new B;
+$c = new C;
+try{
+ $b->process($c->generate(0));
+}
+catch(Exception $e){
+ $c->generate(0);
+}
+?>
+--EXPECTF--
+
+Fatal error: Uncaught exception 'Exception' in %s
+Stack trace:
+#0 %s(%d): C->generate(0)
+#1 {main}
+ thrown in %s
diff --git a/Zend/tests/bug48409.phpt b/Zend/tests/bug48409.phpt
new file mode 100644
index 0000000..238b52e
--- /dev/null
+++ b/Zend/tests/bug48409.phpt
@@ -0,0 +1,67 @@
+--TEST--
+Bug #48409 (crash when exception is thrown while passing function arguments)
+--FILE--
+<?php
+
+class ABCException extends Exception {}
+
+class BBB
+{
+ public function xyz($d, $x)
+ {
+ if ($x == 34) {
+ throw new ABCException;
+ }
+ return array('foo' => 'xyz');
+ }
+}
+
+class CCC
+{
+ public function process($p)
+ {
+ return $p;
+ }
+}
+
+class AAA
+{
+ public function func()
+ {
+ $b = new BBB;
+ $c = new CCC;
+ $i = 34;
+ $item = array('foo' => 'bar');
+ try {
+ $c->process($b->xyz($item['foo'], $i));
+ }
+ catch(ABCException $e) {
+ $b->xyz($item['foo'], $i);
+ }
+ } // end func();
+}
+
+class Runner
+{
+ public function run($x)
+ {
+ try {
+ $x->func();
+ }
+ catch(ABCException $e) {
+ throw new Exception;
+ }
+ }
+}
+
+try {
+ $runner = new Runner;
+ $runner->run(new AAA);
+}
+catch(Exception $e) {
+ die('Exception thrown');
+}
+
+?>
+--EXPECT--
+Exception thrown
diff --git a/Zend/tests/bug48428.phpt b/Zend/tests/bug48428.phpt
new file mode 100644
index 0000000..ae9ac93
--- /dev/null
+++ b/Zend/tests/bug48428.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Bug #48428 (crash when exception is thrown while passing function arguments)
+--FILE--
+<?php
+try {
+ function x() { throw new Exception("ERROR"); }
+ x(x());
+} catch(Exception $e) {
+ echo($e -> getMessage());
+}
+?>
+--EXPECT--
+ERROR
diff --git a/Zend/tests/bug48533.phpt b/Zend/tests/bug48533.phpt
new file mode 100644
index 0000000..274013c
--- /dev/null
+++ b/Zend/tests/bug48533.phpt
@@ -0,0 +1,41 @@
+--TEST--
+Bug #48533 (__callStatic is not invoked for private/protected methods)
+--FILE--
+<?php
+
+class foo {
+ private function a() {
+ var_dump(1);
+ }
+ public function b() {
+ var_dump(2);
+ }
+ protected function c() {
+ var_dump(3);
+ }
+ static function __callstatic($a, $b) {
+ var_dump('__callStatic::'. $a);
+ }
+ public function __call($a, $b) {
+ var_dump('__call::'. $a);
+ }
+}
+
+$x = new foo;
+$x->a();
+$x->b();
+$x->c();
+$x::a();
+$x::b();
+$x::c();
+
+?>
+--EXPECTF--
+%unicode|string%(9) "__call::a"
+int(2)
+%unicode|string%(9) "__call::c"
+%unicode|string%(15) "__callStatic::a"
+
+Strict Standards: Non-static method foo::b() should not be called statically in %s on line %d
+int(2)
+%unicode|string%(15) "__callStatic::c"
diff --git a/Zend/tests/call_static_006.phpt b/Zend/tests/call_static_006.phpt
index 6d6b3ca..e172f4e 100644
--- a/Zend/tests/call_static_006.phpt
+++ b/Zend/tests/call_static_006.phpt
@@ -27,4 +27,4 @@ ok
Strict Standards: Non-static method foo::aa() should not be called statically in %s on line %d
ok
-Fatal error: Can not call constructor in %s on line %d
+Fatal error: Cannot call constructor in %s on line %d
diff --git a/Zend/tests/exception_010.phpt b/Zend/tests/exception_010.phpt
new file mode 100644
index 0000000..6bff8c6
--- /dev/null
+++ b/Zend/tests/exception_010.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Testing Exception's methods
+--FILE--
+<?php
+
+$x = new Exception;
+$x->gettraceasstring(1);
+$x->gettraceasstring();
+$x->__tostring(1);
+$x->gettrace(1);
+$x->getline(1);
+$x->getfile(1);
+$x->getmessage(1);
+$x->getcode(1);
+
+?>
+--EXPECTF--
+Warning: Exception::getTraceAsString() expects exactly 0 parameters, 1 given in %s on line %d
+
+Warning: Exception::__toString() expects exactly 0 parameters, 1 given in %s on line %d
+
+Warning: Exception::getTrace() expects exactly 0 parameters, 1 given in %s on line %d
+
+Warning: Exception::getLine() expects exactly 0 parameters, 1 given in %s on line %d
+
+Warning: Exception::getFile() expects exactly 0 parameters, 1 given in %s on line %d
+
+Warning: Exception::getMessage() expects exactly 0 parameters, 1 given in %s on line %d
+
+Warning: Exception::getCode() expects exactly 0 parameters, 1 given in %s on line %d
diff --git a/Zend/tests/function_exists_basic.phpt b/Zend/tests/function_exists_basic.phpt
new file mode 100644
index 0000000..469e3d8
--- /dev/null
+++ b/Zend/tests/function_exists_basic.phpt
@@ -0,0 +1,39 @@
+--TEST--
+function_exists function : basic functionality
+--FILE--
+<?php
+/*
+ * proto bool function_exists(string function_name)
+ * Function is implemented in Zend/zend_builtin_functions.c
+*/
+
+echo "*** Testing function_exists() : basic functionality ***\n";
+
+echo "Internal function: ";
+var_dump(function_exists('function_exists'));
+
+echo "User defined function: ";
+function f() {}
+var_dump(function_exists('f'));
+
+echo "Case sensitivity: ";
+var_dump(function_exists('F'));
+
+echo "Non existent function: ";
+var_dump(function_exists('g'));
+
+echo "Method: ";
+Class C {
+ static function f() {}
+}
+var_dump(function_exists('C::f'));
+?>
+===Done===
+--EXPECT--
+*** Testing function_exists() : basic functionality ***
+Internal function: bool(true)
+User defined function: bool(true)
+Case sensitivity: bool(true)
+Non existent function: bool(false)
+Method: bool(false)
+===Done===
diff --git a/Zend/tests/function_exists_error.phpt b/Zend/tests/function_exists_error.phpt
new file mode 100644
index 0000000..c95dc07
--- /dev/null
+++ b/Zend/tests/function_exists_error.phpt
@@ -0,0 +1,37 @@
+--TEST--
+Test function_exists() function : error conditions
+--INI--
+--FILE--
+<?php
+/*
+ * proto bool function_exists(string function_name)
+ * Function is implemented in Zend/zend_builtin_functions.c
+*/
+
+echo "*** Testing function_exists() : error conditions ***\n";
+
+$arg_0 = "ABC";
+$extra_arg = 1;
+
+echo "\nToo many arguments\n";
+var_dump(function_exists($arg_0, $extra_arg));
+
+echo "\nToo few arguments\n";
+var_dump(function_exists());
+
+?>
+===Done===
+--EXPECTF--
+*** Testing function_exists() : error conditions ***
+
+Too many arguments
+
+Warning: function_exists() expects exactly 1 parameter, 2 given in %s on line %d
+NULL
+
+Too few arguments
+
+Warning: function_exists() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+===Done===
+
diff --git a/Zend/tests/function_exists_variation1.phpt b/Zend/tests/function_exists_variation1.phpt
new file mode 100644
index 0000000..16b05fc
--- /dev/null
+++ b/Zend/tests/function_exists_variation1.phpt
@@ -0,0 +1,138 @@
+--TEST--
+Test function_exists() function : usage variations - test values for $str argument
+--FILE--
+<?php
+
+/*
+ * proto bool function_exists(string function_name)
+ * Function is implemented in Zend/zend_builtin_functions.c
+*/
+
+echo "*** Testing function_exists() function: with unexpected inputs for 'str' argument ***\n";
+
+//get an unset variable
+$unset_var = 'string_val';
+unset($unset_var);
+
+//defining a class
+class sample {
+ public function __toString() {
+ return "sample object";
+ }
+}
+
+//getting the resource
+$file_handle = fopen(__FILE__, "r");
+
+// array with different values for $str
+$inputs = array (
+
+ // integer values
+ 0,
+ 1,
+ 255,
+ 256,
+ PHP_INT_MAX,
+ -PHP_INT_MAX,
+
+ // float values
+ 10.5,
+ -20.5,
+ 10.1234567e10,
+
+ // array values
+ array(),
+ array(0),
+ array(1, 2),
+
+ // boolean values
+ true,
+ false,
+ TRUE,
+ FALSE,
+
+ // null values
+ NULL,
+ null,
+
+ // objects
+ new sample(),
+
+ // resource
+ $file_handle,
+
+ // undefined variable
+ @$undefined_var,
+
+ // unset variable
+ @$unset_var
+);
+
+// loop through with each element of the $inputs array to test function_exists() function
+$count = 1;
+foreach($inputs as $input) {
+ echo "-- Iteration $count --\n";
+ var_dump( function_exists($input) );
+ $count ++;
+}
+
+fclose($file_handle); //closing the file handle
+
+?>
+===Done===
+--EXPECTF--
+*** Testing function_exists() function: with unexpected inputs for 'str' argument ***
+-- Iteration 1 --
+bool(false)
+-- Iteration 2 --
+bool(false)
+-- Iteration 3 --
+bool(false)
+-- Iteration 4 --
+bool(false)
+-- Iteration 5 --
+bool(false)
+-- Iteration 6 --
+bool(false)
+-- Iteration 7 --
+bool(false)
+-- Iteration 8 --
+bool(false)
+-- Iteration 9 --
+bool(false)
+-- Iteration 10 --
+
+Warning: function_exists() expects parameter 1 to be string, array given in %s on line %d
+NULL
+-- Iteration 11 --
+
+Warning: function_exists() expects parameter 1 to be string, array given in %s on line %d
+NULL
+-- Iteration 12 --
+
+Warning: function_exists() expects parameter 1 to be string, array given in %s on line %d
+NULL
+-- Iteration 13 --
+bool(false)
+-- Iteration 14 --
+bool(false)
+-- Iteration 15 --
+bool(false)
+-- Iteration 16 --
+bool(false)
+-- Iteration 17 --
+bool(false)
+-- Iteration 18 --
+bool(false)
+-- Iteration 19 --
+bool(false)
+-- Iteration 20 --
+
+Warning: function_exists() expects parameter 1 to be string, resource given in %s on line %d
+NULL
+-- Iteration 21 --
+bool(false)
+-- Iteration 22 --
+bool(false)
+===Done===
+
\ No newline at end of file
diff --git a/Zend/tests/get_class_vars_003.phpt b/Zend/tests/get_class_vars_003.phpt
index f9dab77..d2c82bb 100644
--- a/Zend/tests/get_class_vars_003.phpt
+++ b/Zend/tests/get_class_vars_003.phpt
@@ -33,7 +33,7 @@ new C;
?>
--EXPECT--
-array(5) {
+array(6) {
["aaa"]=>
int(7)
["ccc"]=>
@@ -42,6 +42,8 @@ array(5) {
int(1)
["aa"]=>
int(4)
+ ["bb"]=>
+ int(5)
["cc"]=>
int(6)
}
diff --git a/Zend/tests/get_class_vars_006.phpt b/Zend/tests/get_class_vars_006.phpt
index 73de66b..d1c2844 100644
--- a/Zend/tests/get_class_vars_006.phpt
+++ b/Zend/tests/get_class_vars_006.phpt
@@ -44,5 +44,7 @@ array(1) {
["a"]=>
int(1)
}
-array(0) {
+array(1) {
+ ["a"]=>
+ int(1)
}
diff --git a/Zend/tests/get_defined_functions_basic.phpt b/Zend/tests/get_defined_functions_basic.phpt
new file mode 100644
index 0000000..a849e32
--- /dev/null
+++ b/Zend/tests/get_defined_functions_basic.phpt
@@ -0,0 +1,59 @@
+--TEST--
+get_defined_functions() function : basic functionality
+--FILE--
+<?php
+
+/* Prototype : array get_defined_functions ( void )
+ * Description: Gets an array of all defined functions.
+ * Source code: Zend/zend_builtin_functions.c
+*/
+
+echo "*** Testing get_defined_functions() : basic functionality ***\n";
+
+function foo() {}
+
+// mixed case function
+function HelloWorld() {}
+
+Class C {
+ function f1() {}
+ static function f2() {}
+}
+
+$func = get_defined_functions();
+
+if (!is_array($func)) {
+ echo "TEST FAILED: return type not an array\n";
+}
+
+
+if (!is_array($func["internal"])) {
+ echo "TEST FAILED: no element in result array with key 'internal'\n";
+}
+
+$internal = $func["internal"];
+
+//check for a few core functions
+if (!in_array("cos", $internal) || !in_array("strlen", $internal)) {
+ echo "TEST FAILED: missing elements from 'internal' array\n";
+ var_dump($internal);
+}
+
+if (!is_array($func["user"])) {
+ echo "TEST FAILED: no element in result array with key 'user'\n";
+}
+
+$user = $func["user"];
+if (count($user) == 2 && in_array("foo", $user) && in_array("helloworld", $user)) {
+ echo "TEST PASSED\n";
+} else {
+ echo "TEST FAILED: missing elements from 'user' array\n";
+ var_dump($user);
+}
+
+?>
+===Done===
+--EXPECT--
+*** Testing get_defined_functions() : basic functionality ***
+TEST PASSED
+===Done===
diff --git a/Zend/tests/get_defined_functions_error.phpt b/Zend/tests/get_defined_functions_error.phpt
new file mode 100644
index 0000000..fcb01e0
--- /dev/null
+++ b/Zend/tests/get_defined_functions_error.phpt
@@ -0,0 +1,29 @@
+--TEST--
+Test get_defined_functions() function : error conditions
+--FILE--
+<?php
+
+/* Prototype : array get_defined_functions ( void )
+ * Description: Gets an array of all defined functions.
+ * Source code: Zend/zend_builtin_functions.c
+*/
+
+
+echo "*** Testing get_defined_functions() : error conditions ***\n";
+
+
+echo "\n-- Testing get_defined_functions() function with more than expected no. of arguments --\n";
+$extra_arg = 10;
+var_dump( get_defined_functions($extra_arg) );
+
+?>
+===Done===
+--EXPECTF--
+*** Testing get_defined_functions() : error conditions ***
+
+-- Testing get_defined_functions() function with more than expected no. of arguments --
+
+Warning: get_defined_functions() expects exactly 0 parameters, 1 given in %s on line %d
+NULL
+
+===Done===
diff --git a/Zend/tests/int_overflow_64bit.phpt b/Zend/tests/int_overflow_64bit.phpt
index 769b179..7c54125 100644
--- a/Zend/tests/int_overflow_64bit.phpt
+++ b/Zend/tests/int_overflow_64bit.phpt
@@ -22,12 +22,12 @@ foreach ($doubles as $d) {
echo "Done\n";
?>
---EXPECTF--
-int(9223372036854775807)
-int(9223372036854775807)
-int(9223372036854775807)
+--EXPECT--
int(9223372036854775807)
int(-9223372036854775808)
int(-9223372036854775808)
+int(0)
+int(-9223372036854775808)
+int(-9223372036854775808)
int(-9223372036854775808)
Done
diff --git a/Zend/tests/int_underflow_32bit.phpt b/Zend/tests/int_underflow_32bit.phpt
index 901e7cf..79a949a 100644
--- a/Zend/tests/int_underflow_32bit.phpt
+++ b/Zend/tests/int_underflow_32bit.phpt
@@ -20,10 +20,10 @@ foreach ($doubles as $d) {
echo "Done\n";
?>
---EXPECTF--
-int(-2147483648)
-int(-2147483648)
-int(-2147483648)
-int(-2147483648)
+--EXPECT--
int(-2147483648)
+int(2147483647)
+int(2147483638)
+int(2147483548)
+int(2147482648)
Done
diff --git a/Zend/tests/jump12.phpt b/Zend/tests/jump12.phpt
index a7fa590..10bebc2 100644
--- a/Zend/tests/jump12.phpt
+++ b/Zend/tests/jump12.phpt
@@ -14,7 +14,6 @@ c:
goto b;
?>
--EXPECTF--
-Deprecated: Ticks is deprecated and will be removed in PHP 6 in %s on line %d
ok!
ok!
ok!
diff --git a/Zend/tests/magic_methods_002.phpt b/Zend/tests/magic_methods_002.phpt
index 1e8305e..fe0a4dc 100644
--- a/Zend/tests/magic_methods_002.phpt
+++ b/Zend/tests/magic_methods_002.phpt
@@ -11,4 +11,4 @@ class foo {
?>
--EXPECTF--
-Warning: The magic method __unset() must have public visibility and can not be static in %s on line %d
+Warning: The magic method __unset() must have public visibility and cannot be static in %s on line %d
diff --git a/Zend/tests/magic_methods_003.phpt b/Zend/tests/magic_methods_003.phpt
index 1118a23..be354ec 100644
--- a/Zend/tests/magic_methods_003.phpt
+++ b/Zend/tests/magic_methods_003.phpt
@@ -11,4 +11,4 @@ class foo {
?>
--EXPECTF--
-Warning: The magic method __unset() must have public visibility and can not be static in %s on line %d
+Warning: The magic method __unset() must have public visibility and cannot be static in %s on line %d
diff --git a/Zend/tests/magic_methods_004.phpt b/Zend/tests/magic_methods_004.phpt
index 0ac332c..33a0a60 100644
--- a/Zend/tests/magic_methods_004.phpt
+++ b/Zend/tests/magic_methods_004.phpt
@@ -11,4 +11,4 @@ class foo {
?>
--EXPECTF--
-Warning: The magic method __unset() must have public visibility and can not be static in %s on line %d
+Warning: The magic method __unset() must have public visibility and cannot be static in %s on line %d
diff --git a/Zend/tests/magic_methods_005.phpt b/Zend/tests/magic_methods_005.phpt
index 8e8bb4e..76ab300 100644
--- a/Zend/tests/magic_methods_005.phpt
+++ b/Zend/tests/magic_methods_005.phpt
@@ -9,4 +9,4 @@ interface a {
?>
--EXPECTF--
-Warning: The magic method __call() must have public visibility and can not be static in %s on line %d
+Warning: The magic method __call() must have public visibility and cannot be static in %s on line %d
diff --git a/Zend/tests/magic_methods_007.phpt b/Zend/tests/magic_methods_007.phpt
index d949c95..0630c63 100644
--- a/Zend/tests/magic_methods_007.phpt
+++ b/Zend/tests/magic_methods_007.phpt
@@ -9,6 +9,6 @@ abstract class b {
?>
--EXPECTF--
-Warning: The magic method __set() must have public visibility and can not be static in %s on line %d
+Warning: The magic method __set() must have public visibility and cannot be static in %s on line %d
Fatal error: Method b::__set() must take exactly 2 arguments in %s on line %d
diff --git a/Zend/tests/magic_methods_008.phpt b/Zend/tests/magic_methods_008.phpt
index 3d9b697..61c4fa0 100644
--- a/Zend/tests/magic_methods_008.phpt
+++ b/Zend/tests/magic_methods_008.phpt
@@ -14,6 +14,6 @@ class a extends b {
?>
--EXPECTF--
-Warning: The magic method __set() must have public visibility and can not be static in %s on line %d
+Warning: The magic method __set() must have public visibility and cannot be static in %s on line %d
Fatal error: Access level to a::__set() must be public (as in class b) in %s on line %d
diff --git a/Zend/tests/magic_methods_010.phpt b/Zend/tests/magic_methods_010.phpt
index d50b357..06d46db 100644
--- a/Zend/tests/magic_methods_010.phpt
+++ b/Zend/tests/magic_methods_010.phpt
@@ -10,6 +10,6 @@ class a {
?>
--EXPECTF--
-Warning: The magic method __toString() must have public visibility and can not be static in %s on line %d
+Warning: The magic method __toString() must have public visibility and cannot be static in %s on line %d
Fatal error: Method a::__tostring() cannot take arguments in %s on line %d
diff --git a/Zend/tests/unset_cv05.phpt b/Zend/tests/unset_cv05.phpt
index bc023c4..24f9c00 100644
--- a/Zend/tests/unset_cv05.phpt
+++ b/Zend/tests/unset_cv05.phpt
@@ -19,6 +19,7 @@ echo $HTTP_SESSION_VARS;
echo "\nok\n";
?>
--EXPECTF--
+PHP Warning: Directive 'register_long_arrays' is deprecated in PHP %d.%d and greater in Unknown on line 0
ok
Warning: session_start(): Cannot send session cookie - headers already sent by (output started at %sunset_cv05.php on line %d
diff --git a/Zend/tests/unset_cv06.phpt b/Zend/tests/unset_cv06.phpt
index 3a70ad7..b682594 100644
--- a/Zend/tests/unset_cv06.phpt
+++ b/Zend/tests/unset_cv06.phpt
@@ -19,6 +19,7 @@ echo $x;
echo "ok\n";
?>
--EXPECTF--
+PHP Warning: Directive 'register_globals' is deprecated in PHP %d.%d and greater in Unknown on line 0
1
Deprecated: Function session_register() is deprecated in %s on line %d
diff --git a/Zend/zend.c b/Zend/zend.c
index a27eb3d..a5f5a58 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.c,v 1.308.2.12.2.35.2.30 2009/03/18 10:18:09 dmitry Exp $ */
+/* $Id: zend.c,v 1.308.2.12.2.35.2.33 2009/06/16 16:10:15 rasmus Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -863,7 +863,7 @@ void zend_deactivate_modules(TSRMLS_D) /* {{{ */
EG(opline_ptr) = NULL; /* we're no longer executing anything */
zend_try {
- zend_hash_apply(&module_registry, (apply_func_t) module_registry_cleanup TSRMLS_CC);
+ zend_hash_reverse_apply(&module_registry, (apply_func_t) module_registry_cleanup TSRMLS_CC);
} zend_end_try();
}
/* }}} */
@@ -1133,7 +1133,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
}
/* }}} */
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)
+#if defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)
void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((alias("zend_error"),noreturn));
#endif
@@ -1192,20 +1192,20 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_co
zval *orig_user_exception_handler;
zval **params[1], *retval2, *old_exception;
old_exception = EG(exception);
- zend_exception_save(TSRMLS_C);
+ EG(exception) = NULL;
params[0] = &old_exception;
orig_user_exception_handler = EG(user_exception_handler);
if (call_user_function_ex(CG(function_table), NULL, orig_user_exception_handler, &retval2, 1, params, 1, NULL TSRMLS_CC) == SUCCESS) {
if (retval2 != NULL) {
zval_ptr_dtor(&retval2);
}
- zend_exception_restore(TSRMLS_C);
if (EG(exception)) {
zval_ptr_dtor(&EG(exception));
EG(exception) = NULL;
}
+ zval_ptr_dtor(&old_exception);
} else {
- zend_exception_restore(TSRMLS_C);
+ EG(exception) = old_exception;
zend_exception_error(EG(exception), E_ERROR TSRMLS_CC);
}
} else {
diff --git a/Zend/zend.h b/Zend/zend.h
index b36195a..27af9bf 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.h,v 1.293.2.11.2.9.2.33 2009/03/18 01:08:12 mattwil Exp $ */
+/* $Id: zend.h,v 1.293.2.11.2.9.2.37 2009/06/17 08:55:23 rasmus Exp $ */
#ifndef ZEND_H
#define ZEND_H
@@ -34,8 +34,6 @@
#define END_EXTERN_C()
#endif
-#include <stdio.h>
-
/*
* general definitions
*/
@@ -67,6 +65,8 @@
/* all HAVE_XXX test have to be after the include of zend_config above */
+#include <stdio.h>
+
#ifdef HAVE_UNIX_H
# include <unix.h>
#endif
@@ -192,6 +192,12 @@ char *alloca ();
# define ZEND_FASTCALL
#endif
+#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3400
+#else
+# define __restrict__
+#endif
+#define restrict __restrict__
+
#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN)
# define ZEND_ALLOCA_MAX_SIZE (32 * 1024)
# define ALLOCA_FLAG(name) \
@@ -286,7 +292,7 @@ static const char long_min_digits[] = "9223372036854775808";
#define INTERNAL_FUNCTION_PARAMETERS int ht, zval *return_value, zval **return_value_ptr, zval *this_ptr, int return_value_used TSRMLS_DC
#define INTERNAL_FUNCTION_PARAM_PASSTHRU ht, return_value, return_value_ptr, this_ptr, return_value_used TSRMLS_CC
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)
+#if defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)
void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((noreturn));
#else
# define zend_error_noreturn zend_error
@@ -361,7 +367,12 @@ struct _zval_struct {
#define Z_SET_ISREF_TO(z, isref) Z_SET_ISREF_TO_P(&(z), isref)
#if defined(__GNUC__)
+#if __GNUC__ >= 3
#define zend_always_inline inline __attribute__((always_inline))
+#else
+#define zend_always_inline inline
+#endif
+
#elif defined(_MSC_VER)
#define zend_always_inline __forceinline
#else
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 3890769..5788229 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.c,v 1.296.2.27.2.34.2.60 2009/01/14 11:56:08 dmitry Exp $ */
+/* $Id: zend_API.c,v 1.296.2.27.2.34.2.64 2009/06/04 18:20:42 mattwil Exp $ */
#include "zend.h"
#include "zend_execute.h"
@@ -313,6 +313,7 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, char **sp
switch (c) {
case 'l':
+ case 'L':
{
long *p = va_arg(*va, long *);
switch (Z_TYPE_PP(arg)) {
@@ -324,14 +325,33 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, char **sp
if ((type = is_numeric_string(Z_STRVAL_PP(arg), Z_STRLEN_PP(arg), p, &d, -1)) == 0) {
return "long";
} else if (type == IS_DOUBLE) {
- *p = (long) d;
+ if (c == 'L') {
+ if (d > LONG_MAX) {
+ *p = LONG_MAX;
+ break;
+ } else if (d < LONG_MIN) {
+ *p = LONG_MIN;
+ break;
+ }
+ }
+
+ *p = zend_dval_to_lval(d);
}
}
break;
+ case IS_DOUBLE:
+ if (c == 'L') {
+ if (Z_DVAL_PP(arg) > LONG_MAX) {
+ *p = LONG_MAX;
+ break;
+ } else if (Z_DVAL_PP(arg) < LONG_MIN) {
+ *p = LONG_MIN;
+ break;
+ }
+ }
case IS_NULL:
case IS_LONG:
- case IS_DOUBLE:
case IS_BOOL:
convert_to_long_ex(arg);
*p = Z_LVAL_PP(arg);
@@ -1929,7 +1949,6 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
fname_len = strlen(ptr->fname);
lowercase_name = zend_str_tolower_dup(ptr->fname, fname_len);
if (zend_hash_exists(target_function_table, lowercase_name, fname_len+1)) {
- efree(lowercase_name);
zend_error(error_type, "Function registration failed - duplicate name - %s%s%s", scope ? scope->name : "", scope ? "::" : "", ptr->fname);
}
efree(lowercase_name);
@@ -2541,12 +2560,18 @@ get_function_via_handler:
fcc->object_ptr = EG(This);
if (error) {
zend_spprintf(error, 0, "non-static method %s::%s() %s be called statically, assuming $this from compatible context %s", fcc->calling_scope->name, fcc->function_handler->common.function_name, verb, Z_OBJCE_P(EG(This))->name);
+ if (severity == E_ERROR) {
+ retval = 0;
+ }
} else if (retval) {
zend_error(severity, "Non-static method %s::%s() %s be called statically, assuming $this from compatible context %s", fcc->calling_scope->name, fcc->function_handler->common.function_name, verb, Z_OBJCE_P(EG(This))->name);
}
} else {
if (error) {
zend_spprintf(error, 0, "non-static method %s::%s() %s be called statically", fcc->calling_scope->name, fcc->function_handler->common.function_name, verb);
+ if (severity == E_ERROR) {
+ retval = 0;
+ }
} else if (retval) {
zend_error(severity, "Non-static method %s::%s() %s be called statically", fcc->calling_scope->name, fcc->function_handler->common.function_name, verb);
}
@@ -2851,9 +2876,6 @@ ZEND_API int zend_fcall_info_init(zval *callable, uint check_flags, zend_fcall_i
ZEND_API void zend_fcall_info_args_clear(zend_fcall_info *fci, int free_mem) /* {{{ */
{
if (fci->params) {
- while (fci->param_count) {
- zval_ptr_dtor(fci->params[--fci->param_count]);
- }
if (free_mem) {
efree(fci->params);
fci->params = NULL;
@@ -2901,7 +2923,6 @@ ZEND_API int zend_fcall_info_args(zend_fcall_info *fci, zval *args TSRMLS_DC) /*
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(args), &pos);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(args), (void *) &arg, &pos) == SUCCESS) {
*params++ = arg;
- Z_ADDREF_P(*arg);
zend_hash_move_forward_ex(Z_ARRVAL_P(args), &pos);
}
@@ -2924,7 +2945,6 @@ ZEND_API int zend_fcall_info_argp(zend_fcall_info *fci TSRMLS_DC, int argc, zval
fci->params = (zval ***) erealloc(fci->params, fci->param_count * sizeof(zval **));
for (i = 0; i < argc; ++i) {
- Z_ADDREF_P(*(argv[i]));
fci->params[i] = argv[i];
}
}
@@ -2950,7 +2970,6 @@ ZEND_API int zend_fcall_info_argv(zend_fcall_info *fci TSRMLS_DC, int argc, va_l
for (i = 0; i < argc; ++i) {
arg = va_arg(*argv, zval **);
- Z_ADDREF_P(*arg);
fci->params[i] = arg;
}
}
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 8701712..9eafda4 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_alloc.c,v 1.144.2.3.2.43.2.22 2009/03/20 11:23:00 dmitry Exp $ */
+/* $Id: zend_alloc.c,v 1.144.2.3.2.43.2.24 2009/05/30 16:42:13 lbarnaud Exp $ */
#include "zend.h"
#include "zend_alloc.h"
@@ -150,7 +150,12 @@ static zend_mm_segment* zend_mm_mem_mmap_realloc(zend_mm_storage *storage, zend_
{
zend_mm_segment *ret;
#ifdef HAVE_MREMAP
+#if defined(__NetBSD__)
+ /* NetBSD 5 supports mremap but takes an extra newp argument */
+ ret = (zend_mm_segment*)mremap(segment, segment->size, segment, size, MREMAP_MAYMOVE);
+#else
ret = (zend_mm_segment*)mremap(segment, segment->size, size, MREMAP_MAYMOVE);
+#endif
if (ret == MAP_FAILED) {
#endif
ret = storage->handlers->_alloc(storage, size);
@@ -2491,7 +2496,11 @@ ZEND_API size_t zend_memory_usage(int real_usage TSRMLS_DC)
if (real_usage) {
return AG(mm_heap)->real_size;
} else {
- return AG(mm_heap)->size;
+ size_t usage = AG(mm_heap)->size;
+#if ZEND_MM_CACHE
+ usage -= AG(mm_heap)->cached;
+#endif
+ return usage;
}
}
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index a33b66c..e965c5d 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.47 2009/03/16 09:51:31 dmitry Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.52 2009/06/08 21:27:05 pajoye Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -629,6 +629,7 @@ ZEND_FUNCTION(define)
zend_bool non_cs = 0;
int case_sensitive = CONST_CS;
zend_constant c;
+ char *p;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|b", &name, &name_len, &val, &non_cs) == FAILURE) {
return;
@@ -638,6 +639,34 @@ ZEND_FUNCTION(define)
case_sensitive = 0;
}
+ /* class constant, check if there is name and make sure class is valid & exists */
+ if ((p = zend_memnstr(name, "::", sizeof("::") - 1, name + name_len))) {
+ char *class_name;
+ int found;
+ zend_class_entry **ce;
+ ALLOCA_FLAG(use_heap)
+
+ if (p == (name + name_len - sizeof("::") + 1)) {
+ zend_error(E_WARNING, "Class constant must have a name");
+ RETURN_FALSE;
+ } else if (p == name) {
+ zend_error(E_WARNING, "Missing class name");
+ RETURN_FALSE;
+ }
+
+ class_name = do_alloca((p - name + 1), use_heap);
+ zend_str_tolower_copy(class_name, name, (p - name));
+
+ found = zend_hash_find(EG(class_table), class_name, p - name + 1, (void **) &ce);
+
+ if (found != SUCCESS) {
+ zend_error(E_WARNING, "Class '%s' does not exist", class_name);
+ free_alloca(class_name, use_heap);
+ RETURN_FALSE;
+ }
+ free_alloca(class_name, use_heap);
+ }
+
repeat:
switch (Z_TYPE_P(val)) {
case IS_LONG:
@@ -890,27 +919,22 @@ static void add_class_vars(zend_class_entry *ce, HashTable *properties, zval *re
while (zend_hash_get_current_data_ex(properties, (void **) &prop, &pos) == SUCCESS) {
char *key, *class_name, *prop_name;
uint key_len;
- ulong num_index, h;
+ ulong num_index;
int prop_name_len = 0;
zval *prop_copy;
zend_property_info *property_info;
+ zval zprop_name;
zend_hash_get_current_key_ex(properties, &key, &key_len, &num_index, 0, &pos);
zend_hash_move_forward_ex(properties, &pos);
zend_unmangle_property_name(key, key_len-1, &class_name, &prop_name);
prop_name_len = strlen(prop_name);
-
- h = zend_get_hash_value(prop_name, prop_name_len+1);
- if (zend_hash_quick_find(&ce->properties_info, prop_name, prop_name_len+1, h, (void **) &property_info) == FAILURE) {
- continue;
- }
-
- if (property_info->flags & ZEND_ACC_SHADOW) {
- continue;
- } else if ((property_info->flags & ZEND_ACC_PRIVATE) && EG(scope) != ce) {
- continue;
- } else if ((property_info->flags & ZEND_ACC_PROTECTED) && zend_check_protected(ce, EG(scope)) == 0) {
+
+ ZVAL_STRINGL(&zprop_name, prop_name, prop_name_len, 0);
+ property_info = zend_get_property_info(ce, &zprop_name, 1 TSRMLS_CC);
+
+ if (!property_info || property_info == &EG(std_property_info)) {
continue;
}
@@ -1678,7 +1702,7 @@ ZEND_FUNCTION(get_defined_vars)
ZEND_FUNCTION(create_function)
{
char *eval_code, *function_name, *function_args, *function_code;
- int function_name_length, function_args_len, function_code_len;
+ int eval_code_length, function_name_length, function_args_len, function_code_len;
int retval;
char *eval_name;
@@ -1686,10 +1710,29 @@ ZEND_FUNCTION(create_function)
return;
}
- zend_spprintf(&eval_code, 0, "function " LAMBDA_TEMP_FUNCNAME "(%s){%s}", function_args, function_code);
+ eval_code = (char *) emalloc(sizeof("function " LAMBDA_TEMP_FUNCNAME)
+ +function_args_len
+ +2 /* for the args parentheses */
+ +2 /* for the curly braces */
+ +function_code_len);
+
+ eval_code_length = sizeof("function " LAMBDA_TEMP_FUNCNAME "(") - 1;
+ memcpy(eval_code, "function " LAMBDA_TEMP_FUNCNAME "(", eval_code_length);
+
+ memcpy(eval_code + eval_code_length, function_args, function_args_len);
+ eval_code_length += function_args_len;
+
+ eval_code[eval_code_length++] = ')';
+ eval_code[eval_code_length++] = '{';
+
+ memcpy(eval_code + eval_code_length, function_code, function_code_len);
+ eval_code_length += function_code_len;
+
+ eval_code[eval_code_length++] = '}';
+ eval_code[eval_code_length] = '\0';
eval_name = zend_make_compiled_string_description("runtime-created function" TSRMLS_CC);
- retval = zend_eval_string(eval_code, NULL, eval_name TSRMLS_CC);
+ retval = zend_eval_stringl(eval_code, eval_code_length, NULL, eval_name TSRMLS_CC);
efree(eval_code);
efree(eval_name);
@@ -1704,10 +1747,10 @@ ZEND_FUNCTION(create_function)
function_add_ref(&new_function);
function_name = (char *) emalloc(sizeof("0lambda_")+MAX_LENGTH_OF_LONG);
+ function_name[0] = '\0';
do {
- sprintf(function_name, "%clambda_%d", 0, ++EG(lambda_count));
- function_name_length = strlen(function_name+1)+1;
+ function_name_length = 1 + sprintf(function_name + 1, "lambda_%d", ++EG(lambda_count));
} while (zend_hash_add(EG(function_table), function_name, function_name_length+1, &new_function, sizeof(zend_function), NULL)==FAILURE);
zend_hash_del(EG(function_table), LAMBDA_TEMP_FUNCNAME, sizeof(LAMBDA_TEMP_FUNCNAME));
RETURN_STRINGL(function_name, function_name_length, 0);
@@ -1805,19 +1848,19 @@ ZEND_FUNCTION(get_loaded_extensions)
/* }}} */
-/* {{{ proto array get_defined_constants([mixed categorize])
+/* {{{ proto array get_defined_constants([bool categorize])
Return an array containing the names and values of all defined constants */
ZEND_FUNCTION(get_defined_constants)
{
- int argc = ZEND_NUM_ARGS();
-
- if (argc != 0 && argc != 1) {
- ZEND_WRONG_PARAM_COUNT();
+ zend_bool categorize = 0;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &categorize) == FAILURE) {
+ return;
}
array_init(return_value);
- if (argc) {
+ if (categorize) {
HashPosition pos;
zend_constant *val;
int module_number;
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index ae14878..06608ab 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.103 2009/03/10 10:01:44 dmitry Exp $ */
+/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.109 2009/06/07 15:46:51 mattwil Exp $ */
#include <zend_language_parser.h>
#include "zend.h"
@@ -1197,16 +1197,7 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
if (is_method) {
if (zend_hash_add(&CG(active_class_entry)->function_table, lcname, name_len+1, &op_array, sizeof(zend_op_array), (void **) &CG(active_op_array)) == FAILURE) {
- zend_op_array *child_op_array, *parent_op_array;
- if (CG(active_class_entry)->parent
- && (zend_hash_find(&CG(active_class_entry)->function_table, name, name_len+1, (void **) &child_op_array) == SUCCESS)
- && (zend_hash_find(&CG(active_class_entry)->parent->function_table, name, name_len+1, (void **) &parent_op_array) == SUCCESS)
- && (child_op_array == parent_op_array)) {
- zend_hash_update(&CG(active_class_entry)->function_table, name, name_len+1, &op_array, sizeof(zend_op_array), (void **) &CG(active_op_array));
- } else {
- efree(lcname);
- zend_error(E_COMPILE_ERROR, "Cannot redeclare %s::%s()", CG(active_class_entry)->name, name);
- }
+ zend_error(E_COMPILE_ERROR, "Cannot redeclare %s::%s()", CG(active_class_entry)->name, name);
}
if (fn_flags & ZEND_ACC_ABSTRACT) {
@@ -1220,7 +1211,7 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
if (CG(active_class_entry)->ce_flags & ZEND_ACC_INTERFACE) {
if ((name_len == sizeof(ZEND_CALL_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
- zend_error(E_WARNING, "The magic method __call() must have public visibility and can not be static");
+ zend_error(E_WARNING, "The magic method __call() must have public visibility and cannot be static");
}
} else if ((name_len == sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CALLSTATIC_FUNC_NAME, sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1))) {
if ((fn_flags & (ZEND_ACC_PPP_MASK ^ ZEND_ACC_PUBLIC)) || (fn_flags & ZEND_ACC_STATIC) == 0) {
@@ -1228,23 +1219,23 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
}
} else if ((name_len == sizeof(ZEND_GET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
- zend_error(E_WARNING, "The magic method __get() must have public visibility and can not be static");
+ zend_error(E_WARNING, "The magic method __get() must have public visibility and cannot be static");
}
} else if ((name_len == sizeof(ZEND_SET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
- zend_error(E_WARNING, "The magic method __set() must have public visibility and can not be static");
+ zend_error(E_WARNING, "The magic method __set() must have public visibility and cannot be static");
}
} else if ((name_len == sizeof(ZEND_UNSET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_UNSET_FUNC_NAME, sizeof(ZEND_UNSET_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
- zend_error(E_WARNING, "The magic method __unset() must have public visibility and can not be static");
+ zend_error(E_WARNING, "The magic method __unset() must have public visibility and cannot be static");
}
} else if ((name_len == sizeof(ZEND_ISSET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_ISSET_FUNC_NAME, sizeof(ZEND_ISSET_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
- zend_error(E_WARNING, "The magic method __isset() must have public visibility and can not be static");
+ zend_error(E_WARNING, "The magic method __isset() must have public visibility and cannot be static");
}
} else if ((name_len == sizeof(ZEND_TOSTRING_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_TOSTRING_FUNC_NAME, sizeof(ZEND_TOSTRING_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
- zend_error(E_WARNING, "The magic method __toString() must have public visibility and can not be static");
+ zend_error(E_WARNING, "The magic method __toString() must have public visibility and cannot be static");
}
}
} else {
@@ -1280,7 +1271,7 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
CG(active_class_entry)->clone = (zend_function *) CG(active_op_array);
} else if ((name_len == sizeof(ZEND_CALL_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
- zend_error(E_WARNING, "The magic method __call() must have public visibility and can not be static");
+ zend_error(E_WARNING, "The magic method __call() must have public visibility and cannot be static");
}
CG(active_class_entry)->__call = (zend_function *) CG(active_op_array);
} else if ((name_len == sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CALLSTATIC_FUNC_NAME, sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1))) {
@@ -1290,27 +1281,27 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
CG(active_class_entry)->__callstatic = (zend_function *) CG(active_op_array);
} else if ((name_len == sizeof(ZEND_GET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
- zend_error(E_WARNING, "The magic method __get() must have public visibility and can not be static");
+ zend_error(E_WARNING, "The magic method __get() must have public visibility and cannot be static");
}
CG(active_class_entry)->__get = (zend_function *) CG(active_op_array);
} else if ((name_len == sizeof(ZEND_SET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
- zend_error(E_WARNING, "The magic method __set() must have public visibility and can not be static");
+ zend_error(E_WARNING, "The magic method __set() must have public visibility and cannot be static");
}
CG(active_class_entry)->__set = (zend_function *) CG(active_op_array);
} else if ((name_len == sizeof(ZEND_UNSET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_UNSET_FUNC_NAME, sizeof(ZEND_UNSET_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
- zend_error(E_WARNING, "The magic method __unset() must have public visibility and can not be static");
+ zend_error(E_WARNING, "The magic method __unset() must have public visibility and cannot be static");
}
CG(active_class_entry)->__unset = (zend_function *) CG(active_op_array);
} else if ((name_len == sizeof(ZEND_ISSET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_ISSET_FUNC_NAME, sizeof(ZEND_ISSET_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
- zend_error(E_WARNING, "The magic method __isset() must have public visibility and can not be static");
+ zend_error(E_WARNING, "The magic method __isset() must have public visibility and cannot be static");
}
CG(active_class_entry)->__isset = (zend_function *) CG(active_op_array);
} else if ((name_len == sizeof(ZEND_TOSTRING_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_TOSTRING_FUNC_NAME, sizeof(ZEND_TOSTRING_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
- zend_error(E_WARNING, "The magic method __toString() must have public visibility and can not be static");
+ zend_error(E_WARNING, "The magic method __toString() must have public visibility and cannot be static");
}
CG(active_class_entry)->__tostring = (zend_function *) CG(active_op_array);
} else if (!(fn_flags & ZEND_ACC_STATIC)) {
@@ -2640,7 +2631,7 @@ static zend_bool do_inherit_method_check(HashTable *child_function_table, zend_f
if (!zend_do_perform_implementation_check(child, child->common.prototype)) {
zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() must be compatible with that of %s::%s()", ZEND_FN_SCOPE_NAME(child), child->common.function_name, ZEND_FN_SCOPE_NAME(child->common.prototype), child->common.prototype->common.function_name);
}
- } else if (EG(error_reporting) & E_STRICT) { /* Check E_STRICT before the check so that we save some time */
+ } else if (EG(error_reporting) & E_STRICT || EG(user_error_handler)) { /* Check E_STRICT (or custom error handler) before the check so that we save some time */
if (!zend_do_perform_implementation_check(child, parent)) {
zend_error(E_STRICT, "Declaration of %s::%s() should be compatible with that of %s::%s()", ZEND_FN_SCOPE_NAME(child), child->common.function_name, ZEND_FN_SCOPE_NAME(parent), parent->common.function_name);
}
@@ -2891,24 +2882,20 @@ ZEND_API int do_bind_function(zend_op *opline, HashTable *function_table, zend_b
{
zend_function *function;
- if (opline->opcode != ZEND_DECLARE_FUNCTION) {
- zend_error(E_COMPILE_ERROR, "Internal compiler error. Please report!");
- }
-
zend_hash_find(function_table, opline->op1.u.constant.value.str.val, opline->op1.u.constant.value.str.len, (void *) &function);
if (zend_hash_add(function_table, opline->op2.u.constant.value.str.val, opline->op2.u.constant.value.str.len+1, function, sizeof(zend_function), NULL)==FAILURE) {
int error_level = compile_time ? E_COMPILE_ERROR : E_ERROR;
- zend_function *function;
+ zend_function *old_function;
- if (zend_hash_find(function_table, opline->op2.u.constant.value.str.val, opline->op2.u.constant.value.str.len+1, (void *) &function)==SUCCESS
- && function->type==ZEND_USER_FUNCTION
- && ((zend_op_array *) function)->last>0) {
+ if (zend_hash_find(function_table, opline->op2.u.constant.value.str.val, opline->op2.u.constant.value.str.len+1, (void *) &old_function)==SUCCESS
+ && old_function->type == ZEND_USER_FUNCTION
+ && old_function->op_array.last > 0) {
zend_error(error_level, "Cannot redeclare %s() (previously declared in %s:%d)",
- opline->op2.u.constant.value.str.val,
- ((zend_op_array *) function)->filename,
- ((zend_op_array *) function)->opcodes[0].lineno);
+ function->common.function_name,
+ old_function->op_array.filename,
+ old_function->op_array.opcodes[0].lineno);
} else {
- zend_error(error_level, "Cannot redeclare %s()", opline->op2.u.constant.value.str.val);
+ zend_error(error_level, "Cannot redeclare %s()", function->common.function_name);
}
return FAILURE;
} else {
@@ -2982,13 +2969,6 @@ ZEND_API zend_class_entry *do_bind_inherited_class(const zend_op *opline, HashTa
/* Register the derived class */
if (zend_hash_add(class_table, opline->op2.u.constant.value.str.val, opline->op2.u.constant.value.str.len+1, pce, sizeof(zend_class_entry *), NULL)==FAILURE) {
zend_error(E_COMPILE_ERROR, "Cannot redeclare class %s", ce->name);
- ce->refcount--;
- zend_hash_destroy(&ce->function_table);
- zend_hash_destroy(&ce->default_properties);
- zend_hash_destroy(&ce->properties_info);
- zend_hash_destroy(&ce->default_static_members);
- zend_hash_destroy(&ce->constants_table);
- return NULL;
}
return ce;
}
@@ -3456,8 +3436,6 @@ void zend_do_end_class_declaration(const znode *class_token, const znode *parent
{
zend_class_entry *ce = CG(active_class_entry);
- do_inherit_parent_constructor(ce);
-
if (ce->constructor) {
ce->constructor->common.fn_flags |= ZEND_ACC_CTOR;
if (ce->constructor->common.fn_flags & ZEND_ACC_STATIC) {
@@ -3482,7 +3460,7 @@ void zend_do_end_class_declaration(const znode *class_token, const znode *parent
if (!(ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS))
&& ((parent_token->op_type != IS_UNUSED) || (ce->num_interfaces > 0))) {
zend_verify_abstract_class(ce TSRMLS_CC);
- if (ce->parent || ce->num_interfaces) {
+ if (ce->num_interfaces) {
do_verify_abstract_class(TSRMLS_C);
}
}
@@ -4041,7 +4019,7 @@ void zend_do_add_static_array_element(znode *result, znode *offset, const znode
zend_hash_index_update(Z_ARRVAL(result->u.constant), Z_LVAL(offset->u.constant), &element, sizeof(zval *), NULL);
break;
case IS_DOUBLE:
- zend_hash_index_update(Z_ARRVAL(result->u.constant), (long)Z_DVAL(offset->u.constant), &element, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL(result->u.constant), zend_dval_to_lval(Z_DVAL(offset->u.constant)), &element, sizeof(zval *), NULL);
break;
case IS_CONSTANT_ARRAY:
zend_error(E_ERROR, "Illegal offset type");
@@ -4594,8 +4572,6 @@ void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC)
if (!zend_binary_strcasecmp(var->u.constant.value.str.val, var->u.constant.value.str.len, "ticks", sizeof("ticks")-1)) {
convert_to_long(&val->u.constant);
CG(declarables).ticks = val->u.constant;
-
- zend_error(E_DEPRECATED, "Ticks is deprecated and will be removed in PHP 6");
#ifdef ZEND_MULTIBYTE
} else if (!zend_binary_strcasecmp(var->u.constant.value.str.val, var->u.constant.value.str.len, "encoding", sizeof("encoding")-1)) {
zend_encoding *new_encoding, *old_encoding;
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 0227c55..1771b53 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_compile.h,v 1.316.2.8.2.12.2.39 2009/01/26 22:54:20 cseiler Exp $ */
+/* $Id: zend_compile.h,v 1.316.2.8.2.12.2.40 2009/06/05 23:20:59 shire Exp $ */
#ifndef ZEND_COMPILE_H
#define ZEND_COMPILE_H
@@ -582,7 +582,7 @@ void init_op(zend_op *op TSRMLS_DC);
int get_next_op_number(zend_op_array *op_array);
int print_class(zend_class_entry *class_entry TSRMLS_DC);
void print_op_array(zend_op_array *op_array, int optimizations);
-int pass_two(zend_op_array *op_array TSRMLS_DC);
+ZEND_API int pass_two(zend_op_array *op_array TSRMLS_DC);
zend_brk_cont_element *get_next_brk_cont_element(zend_op_array *op_array);
void zend_do_first_catch(znode *open_parentheses TSRMLS_DC);
void zend_initialize_try_catch_element(const znode *try_token TSRMLS_DC);
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 769b912..fc9a744 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_exceptions.c,v 1.79.2.6.2.9.2.20 2009/01/02 13:14:49 helly Exp $ */
+/* $Id: zend_exceptions.c,v 1.79.2.6.2.9.2.22 2009/05/11 15:03:46 felipe Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -487,9 +487,14 @@ static int _build_trace_string(zval **frame TSRMLS_DC, int num_args, va_list arg
ZEND_METHOD(exception, getTraceAsString)
{
zval *trace;
- char *res = estrdup(""), **str = &res, *s_tmp;
+ char *res, **str, *s_tmp;
int res_len = 0, *len = &res_len, num = 0;
+ DEFAULT_0_PARAMS;
+
+ res = estrdup("");
+ str = &res;
+
trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC);
zend_hash_apply_with_arguments(Z_ARRVAL_P(trace) TSRMLS_CC, (apply_func_args_t)_build_trace_string, 3, str, len, &num);
@@ -508,6 +513,9 @@ ZEND_METHOD(exception, getTraceAsString)
ZEND_METHOD(exception, getPrevious)
{
zval *previous;
+
+ DEFAULT_0_PARAMS;
+
previous = zend_read_property(default_exception_ce, getThis(), "previous", sizeof("previous")-1, 1 TSRMLS_CC);
RETURN_ZVAL(previous, 1, 0);
}
@@ -529,10 +537,14 @@ int zend_spprintf(char **message, int max_len, char *format, ...) /* {{{ */
ZEND_METHOD(exception, __toString)
{
zval message, file, line, *trace, *exception;
- char *str = estrndup("", 0), *prev_str;
+ char *str, *prev_str;
int len = 0;
zend_fcall_info fci;
zval fname;
+
+ DEFAULT_0_PARAMS;
+
+ str = estrndup("", 0);
exception = getThis();
ZVAL_STRINGL(&fname, "gettraceasstring", sizeof("gettraceasstring")-1, 1);
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index e6096df..bc0000b 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute.c,v 1.716.2.12.2.24.2.41 2009/03/18 14:15:28 dmitry Exp $ */
+/* $Id: zend_execute.c,v 1.716.2.12.2.24.2.44 2009/06/04 18:20:42 mattwil Exp $ */
#define ZEND_INTENSIVE_DEBUGGING 0
@@ -518,13 +518,13 @@ static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zva
static inline void zend_assign_to_object(znode *result, zval **object_ptr, zval *property_name, znode *value_op, const temp_variable *Ts, int opcode TSRMLS_DC)
{
- zval *object;
+ zval *object = *object_ptr;
zend_free_op free_value;
zval *value = get_zval_ptr(value_op, Ts, &free_value, BP_VAR_R);
zval **retval = &T(result->u.var).var.ptr;
- if (Z_TYPE_P(*object_ptr) != IS_OBJECT) {
- if (*object_ptr == EG(error_zval_ptr)) {
+ if (Z_TYPE_P(object) != IS_OBJECT) {
+ if (object == EG(error_zval_ptr)) {
if (!RETURN_VALUE_UNUSED(result)) {
*retval = EG(uninitialized_zval_ptr);
PZVAL_LOCK(*retval);
@@ -532,13 +532,14 @@ static inline void zend_assign_to_object(znode *result, zval **object_ptr, zval
FREE_OP(free_value);
return;
}
- if (Z_TYPE_PP(object_ptr) == IS_NULL ||
- (Z_TYPE_PP(object_ptr) == IS_BOOL && Z_LVAL_PP(object_ptr) == 0) ||
- (Z_TYPE_PP(object_ptr) == IS_STRING && Z_STRLEN_PP(object_ptr) == 0)) {
- zend_error(E_STRICT, "Creating default object from empty value");
+ if (Z_TYPE_P(object) == IS_NULL ||
+ (Z_TYPE_P(object) == IS_BOOL && Z_LVAL_P(object) == 0) ||
+ (Z_TYPE_P(object) == IS_STRING && Z_STRLEN_P(object) == 0)) {
SEPARATE_ZVAL_IF_NOT_REF(object_ptr);
zval_dtor(*object_ptr);
object_init(*object_ptr);
+ object = *object_ptr;
+ zend_error(E_STRICT, "Creating default object from empty value");
} else {
zend_error(E_WARNING, "Attempt to assign property of non-object");
if (!RETURN_VALUE_UNUSED(result)) {
@@ -550,9 +551,6 @@ static inline void zend_assign_to_object(znode *result, zval **object_ptr, zval
}
}
- /* here we are sure we are dealing with an object */
- object = *object_ptr;
-
/* separate our value if necessary */
if (value_op->op_type == IS_TMP_VAR) {
zval *orig_value = value;
@@ -825,10 +823,9 @@ fetch_string_dim:
}
}
break;
- case IS_DOUBLE: {
- DVAL_TO_LVAL(Z_DVAL_P(dim), index);
+ case IS_DOUBLE:
+ index = zend_dval_to_lval(Z_DVAL_P(dim));
goto num_index;
- }
case IS_RESOURCE:
zend_error(E_STRICT, "Resource ID#%ld used as offset, casting to integer (%ld)", Z_LVAL_P(dim), Z_LVAL_P(dim));
/* Fall Through */
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 47c5fbd..9f9e5d4 100644
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute.h,v 1.84.2.4.2.8.2.12 2008/12/31 11:15:32 sebastian Exp $ */
+/* $Id: zend_execute.h,v 1.84.2.4.2.8.2.15 2009/06/09 09:26:02 pajoye Exp $ */
#ifndef ZEND_EXECUTE_H
#define ZEND_EXECUTE_H
@@ -73,7 +73,9 @@ static inline void safe_free_zval_ptr_rel(zval *p ZEND_FILE_LINE_DC ZEND_FILE_LI
ZEND_API int zend_lookup_class(const char *name, int name_length, zend_class_entry ***ce TSRMLS_DC);
ZEND_API int zend_lookup_class_ex(const char *name, int name_length, int use_autoload, zend_class_entry ***ce TSRMLS_DC);
ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC);
+ZEND_API int zend_eval_stringl(char *str, int str_len, zval *retval_ptr, char *string_name TSRMLS_DC);
ZEND_API int zend_eval_string_ex(char *str, zval *retval_ptr, char *string_name, int handle_exceptions TSRMLS_DC);
+ZEND_API int zend_eval_stringl_ex(char *str, int str_len, zval *retval_ptr, char *string_name, int handle_exceptions TSRMLS_DC);
static inline int i_zend_is_true(zval *op)
{
@@ -290,6 +292,27 @@ static inline zval** zend_vm_stack_get_arg(int requested_arg TSRMLS_DC)
return (zval**)p - arg_count + requested_arg - 1;
}
+static inline void zend_arg_types_stack_2_pop(zend_ptr_stack *stack, zval **object, zend_function **fbc)
+{
+ void *a, *b;
+
+ zend_ptr_stack_2_pop(stack, &a, &b);
+
+ *object = (zval *) a;
+ *fbc = (zend_function *) b;
+}
+
+static inline void zend_arg_types_stack_3_pop(zend_ptr_stack *stack, zend_class_entry **called_scope, zval **object, zend_function **fbc)
+{
+ void *a, *b, *c;
+
+ zend_ptr_stack_3_pop(stack, &a, &b, &c);
+
+ *called_scope = (zend_class_entry *) a;
+ *object = (zval *) b;
+ *fbc = (zend_function *) c;
+}
+
void execute_new_code(TSRMLS_D);
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index b0e7a9e..42f5f50 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.75 2009/03/19 18:34:16 mattwil Exp $ */
+/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.78 2009/06/05 18:50:32 mattwil Exp $ */
#include <stdio.h>
#include <signal.h>
@@ -662,7 +662,7 @@ ZEND_API int zval_update_constant_ex(zval **pp, void *arg, zend_class_entry *sco
ret = zend_hash_update_current_key_ex(Z_ARRVAL_P(p), HASH_KEY_IS_LONG, NULL, 0, Z_LVAL(const_value), HASH_UPDATE_KEY_IF_BEFORE, NULL);
break;
case IS_DOUBLE:
- ret = zend_hash_update_current_key_ex(Z_ARRVAL_P(p), HASH_KEY_IS_LONG, NULL, 0, (long)Z_DVAL(const_value), HASH_UPDATE_KEY_IF_BEFORE, NULL);
+ ret = zend_hash_update_current_key_ex(Z_ARRVAL_P(p), HASH_KEY_IS_LONG, NULL, 0, zend_dval_to_lval(Z_DVAL(const_value)), HASH_UPDATE_KEY_IF_BEFORE, NULL);
break;
case IS_NULL:
ret = zend_hash_update_current_key_ex(Z_ARRVAL_P(p), HASH_KEY_IS_STRING, "", 1, 0, HASH_UPDATE_KEY_IF_BEFORE, NULL);
@@ -1020,6 +1020,7 @@ ZEND_API int zend_lookup_class_ex(const char *name, int name_length, int use_aut
zend_fcall_info fcall_info;
zend_fcall_info_cache fcall_cache;
char dummy = 1;
+ ulong hash;
ALLOCA_FLAG(use_heap)
if (name == NULL || !name_length) {
@@ -1035,7 +1036,9 @@ ZEND_API int zend_lookup_class_ex(const char *name, int name_length, int use_aut
lc_length -= 1;
}
- if (zend_hash_find(EG(class_table), lc_name, lc_length, (void **) ce) == SUCCESS) {
+ hash = zend_inline_hash_func(lc_name, lc_length);
+
+ if (zend_hash_quick_find(EG(class_table), lc_name, lc_length, hash, (void **) ce) == SUCCESS) {
free_alloca(lc_free, use_heap);
return SUCCESS;
}
@@ -1053,7 +1056,7 @@ ZEND_API int zend_lookup_class_ex(const char *name, int name_length, int use_aut
zend_hash_init(EG(in_autoload), 0, NULL, NULL, 0);
}
- if (zend_hash_add(EG(in_autoload), lc_name, lc_length, (void**)&dummy, sizeof(char), NULL) == FAILURE) {
+ if (zend_hash_quick_add(EG(in_autoload), lc_name, lc_length, hash, (void**)&dummy, sizeof(char), NULL) == FAILURE) {
free_alloca(lc_free, use_heap);
return FAILURE;
}
@@ -1090,7 +1093,7 @@ ZEND_API int zend_lookup_class_ex(const char *name, int name_length, int use_aut
zval_ptr_dtor(&class_name_ptr);
- zend_hash_del(EG(in_autoload), lc_name, lc_length);
+ zend_hash_quick_del(EG(in_autoload), lc_name, lc_length, hash);
if (retval_ptr) {
zval_ptr_dtor(&retval_ptr);
@@ -1101,7 +1104,7 @@ ZEND_API int zend_lookup_class_ex(const char *name, int name_length, int use_aut
return FAILURE;
}
- retval = zend_hash_find(EG(class_table), lc_name, lc_length, (void **) ce);
+ retval = zend_hash_quick_find(EG(class_table), lc_name, lc_length, hash, (void **) ce);
free_alloca(lc_free, use_heap);
return retval;
}
@@ -1113,7 +1116,7 @@ ZEND_API int zend_lookup_class(const char *name, int name_length, zend_class_ent
}
/* }}} */
-ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC) /* {{{ */
+ZEND_API int zend_eval_stringl(char *str, int str_len, zval *retval_ptr, char *string_name TSRMLS_DC) /* {{{ */
{
zval pv;
zend_op_array *new_op_array;
@@ -1122,15 +1125,14 @@ ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSR
int retval;
if (retval_ptr) {
- int l = strlen(str);
- Z_STRLEN(pv) = l + sizeof("return ;") - 1;
+ Z_STRLEN(pv) = str_len + sizeof("return ;") - 1;
Z_STRVAL(pv) = emalloc(Z_STRLEN(pv) + 1);
memcpy(Z_STRVAL(pv), "return ", sizeof("return ") - 1);
- memcpy(Z_STRVAL(pv) + sizeof("return ") - 1, str, l);
+ memcpy(Z_STRVAL(pv) + sizeof("return ") - 1, str, str_len);
Z_STRVAL(pv)[Z_STRLEN(pv) - 1] = ';';
Z_STRVAL(pv)[Z_STRLEN(pv)] = '\0';
} else {
- Z_STRLEN(pv) = strlen(str);
+ Z_STRLEN(pv) = str_len;
Z_STRVAL(pv) = str;
}
Z_TYPE(pv) = IS_STRING;
@@ -1185,11 +1187,17 @@ ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSR
}
/* }}} */
-ZEND_API int zend_eval_string_ex(char *str, zval *retval_ptr, char *string_name, int handle_exceptions TSRMLS_DC) /* {{{ */
+ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC) /* {{{ */
+{
+ return zend_eval_stringl(str, strlen(str), retval_ptr, string_name TSRMLS_CC);
+}
+/* }}} */
+
+ZEND_API int zend_eval_stringl_ex(char *str, int str_len, zval *retval_ptr, char *string_name, int handle_exceptions TSRMLS_DC) /* {{{ */
{
int result;
- result = zend_eval_string(str, retval_ptr, string_name TSRMLS_CC);
+ result = zend_eval_stringl(str, str_len, retval_ptr, string_name TSRMLS_CC);
if (handle_exceptions && EG(exception)) {
zend_exception_error(EG(exception), E_ERROR TSRMLS_CC);
result = FAILURE;
@@ -1198,6 +1206,12 @@ ZEND_API int zend_eval_string_ex(char *str, zval *retval_ptr, char *string_name,
}
/* }}} */
+ZEND_API int zend_eval_string_ex(char *str, zval *retval_ptr, char *string_name, int handle_exceptions TSRMLS_DC) /* {{{ */
+{
+ return zend_eval_stringl_ex(str, strlen(str), retval_ptr, string_name, handle_exceptions TSRMLS_CC);
+}
+/* }}} */
+
void execute_new_code(TSRMLS_D) /* {{{ */
{
zend_op *opline, *end;
diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c
index 04e4c4f..a1a6fcd 100644
--- a/Zend/zend_extensions.c
+++ b/Zend/zend_extensions.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_extensions.c,v 1.48.2.1.2.3.2.4 2009/01/17 02:05:13 stas Exp $ */
+/* $Id: zend_extensions.c,v 1.48.2.1.2.3.2.6 2009/04/08 13:26:35 mattwil Exp $ */
#include "zend_extensions.h"
@@ -79,8 +79,9 @@ int zend_load_extension(const char *path)
DL_UNLOAD(handle);
return FAILURE;
}
- } else if (strcmp(ZEND_EXTENSION_BUILD_ID, extension_version_info->build_id)) {
- fprintf(stderr, "Cannot load %s - it was build with configuration %s, whereas running engine is %s\n",
+ } else if (strcmp(ZEND_EXTENSION_BUILD_ID, extension_version_info->build_id) &&
+ (!new_extension->build_id_check || new_extension->build_id_check(ZEND_EXTENSION_BUILD_ID) != SUCCESS)) {
+ fprintf(stderr, "Cannot load %s - it was built with configuration %s, whereas running engine is %s\n",
new_extension->name, extension_version_info->build_id, ZEND_EXTENSION_BUILD_ID);
DL_UNLOAD(handle);
return FAILURE;
diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h
index e550e14..2fd1e63 100644
--- a/Zend/zend_extensions.h
+++ b/Zend/zend_extensions.h
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_extensions.h,v 1.67.2.3.2.3.2.6 2009/01/17 16:14:59 johannes Exp $ */
+/* $Id: zend_extensions.h,v 1.67.2.3.2.3.2.8 2009/04/08 23:06:16 stas Exp $ */
#ifndef ZEND_EXTENSIONS_H
#define ZEND_EXTENSIONS_H
@@ -80,7 +80,7 @@ struct _zend_extension {
op_array_dtor_func_t op_array_dtor;
int (*api_no_check)(int api_no);
- void *reserved2;
+ int (*build_id_check)(const char* build_id);
void *reserved3;
void *reserved4;
void *reserved5;
@@ -103,8 +103,9 @@ END_EXTERN_C()
#define ZEND_EXTENSION() \
ZEND_EXT_API zend_extension_version_info extension_version_info = { ZEND_EXTENSION_API_NO, ZEND_EXTENSION_BUILD_ID }
-#define STANDARD_ZEND_EXTENSION_PROPERTIES NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1
-#define COMPAT_ZEND_EXTENSION_PROPERTIES NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1
+#define STANDARD_ZEND_EXTENSION_PROPERTIES NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1
+#define COMPAT_ZEND_EXTENSION_PROPERTIES NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1
+#define BUILD_COMPAT_ZEND_EXTENSION_PROPERTIES NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1
ZEND_API extern zend_llist zend_extensions;
diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c
index 64ffaf1..52e37dd 100644
--- a/Zend/zend_gc.c
+++ b/Zend/zend_gc.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_gc.c,v 1.1.2.21 2009/02/18 12:02:53 dmitry Exp $ */
+/* $Id: zend_gc.c,v 1.1.2.22 2009/04/03 18:52:21 dmitry Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -30,12 +30,6 @@ ZEND_API int gc_globals_id;
ZEND_API zend_gc_globals gc_globals;
#endif
-/* Forward declarations */
-static int children_scan_black(zval **pz TSRMLS_DC);
-static int children_mark_grey(zval **pz TSRMLS_DC);
-static int children_collect_white(zval **pz TSRMLS_DC);
-static int children_scan(zval **pz TSRMLS_DC);
-
static void root_buffer_dtor(zend_gc_globals *gc_globals TSRMLS_DC)
{
if (gc_globals->buf) {
@@ -272,18 +266,12 @@ ZEND_API void gc_remove_zval_from_buffer(zval *zv TSRMLS_DC)
((zval_gc_info*)zv)->u.buffered = NULL;
}
-static void zobj_scan_black(struct _store_object *obj, zval *pz TSRMLS_DC)
-{
- GC_SET_BLACK(obj->buffered);
-
- if (EXPECTED(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].valid &&
- Z_OBJ_HANDLER_P(pz, get_properties) != NULL)) {
- zend_hash_apply(Z_OBJPROP_P(pz), (apply_func_t) children_scan_black TSRMLS_CC);
- }
-}
-
static void zval_scan_black(zval *pz TSRMLS_DC)
{
+ Bucket *p;
+
+tail_call:
+ p = NULL;
GC_ZVAL_SET_BLACK(pz);
if (Z_TYPE_P(pz) == IS_OBJECT && EG(objects_store).object_buckets) {
@@ -291,43 +279,61 @@ static void zval_scan_black(zval *pz TSRMLS_DC)
obj->refcount++;
if (GC_GET_COLOR(obj->buffered) != GC_BLACK) {
- zobj_scan_black(obj, pz TSRMLS_CC);
+ GC_SET_BLACK(obj->buffered);
+ if (EXPECTED(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].valid &&
+ Z_OBJ_HANDLER_P(pz, get_properties) != NULL)) {
+ p = Z_OBJPROP_P(pz)->pListHead;
+ }
}
} else if (Z_TYPE_P(pz) == IS_ARRAY) {
if (Z_ARRVAL_P(pz) != &EG(symbol_table)) {
- zend_hash_apply(Z_ARRVAL_P(pz), (apply_func_t) children_scan_black TSRMLS_CC);
+ p = Z_ARRVAL_P(pz)->pListHead;
}
}
-}
-
-static int children_scan_black(zval **pz TSRMLS_DC)
-{
- if (Z_TYPE_PP(pz) != IS_ARRAY || Z_ARRVAL_PP(pz) != &EG(symbol_table)) {
- (*pz)->refcount__gc++;
- }
-
- if (GC_ZVAL_GET_COLOR(*pz) != GC_BLACK) {
- zval_scan_black(*pz TSRMLS_CC);
+ while (p != NULL) {
+ pz = *(zval**)p->pData;
+ if (Z_TYPE_P(pz) != IS_ARRAY || Z_ARRVAL_P(pz) != &EG(symbol_table)) {
+ pz->refcount__gc++;
+ }
+ if (GC_ZVAL_GET_COLOR(pz) != GC_BLACK) {
+ if (p->pListNext == NULL) {
+ goto tail_call;
+ } else {
+ zval_scan_black(pz TSRMLS_CC);
+ }
+ }
+ p = p->pListNext;
}
-
- return 0;
}
-static void zobj_mark_grey(struct _store_object *obj, zval *pz TSRMLS_DC)
+static void zobj_scan_black(struct _store_object *obj, zval *pz TSRMLS_DC)
{
- if (GC_GET_COLOR(obj->buffered) != GC_GREY) {
- GC_BENCH_INC(zobj_marked_grey);
- GC_SET_COLOR(obj->buffered, GC_GREY);
- if (EXPECTED(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].valid &&
- Z_OBJ_HANDLER_P(pz, get_properties) != NULL)) {
- zend_hash_apply(Z_OBJPROP_P(pz), (apply_func_t) children_mark_grey TSRMLS_CC);
+ Bucket *p;
+
+ GC_SET_BLACK(obj->buffered);
+ if (EXPECTED(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].valid &&
+ Z_OBJ_HANDLER_P(pz, get_properties) != NULL)) {
+ p = Z_OBJPROP_P(pz)->pListHead;
+ while (p != NULL) {
+ pz = *(zval**)p->pData;
+ if (Z_TYPE_P(pz) != IS_ARRAY || Z_ARRVAL_P(pz) != &EG(symbol_table)) {
+ pz->refcount__gc++;
+ }
+ if (GC_ZVAL_GET_COLOR(pz) != GC_BLACK) {
+ zval_scan_black(pz TSRMLS_CC);
+ }
+ p = p->pListNext;
}
}
}
static void zval_mark_grey(zval *pz TSRMLS_DC)
{
+ Bucket *p;
+
+tail_call:
if (GC_ZVAL_GET_COLOR(pz) != GC_GREY) {
+ p = NULL;
GC_BENCH_INC(zval_marked_grey);
GC_ZVAL_SET_COLOR(pz, GC_GREY);
@@ -335,24 +341,56 @@ static void zval_mark_grey(zval *pz TSRMLS_DC)
struct _store_object *obj = &EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].bucket.obj;
obj->refcount--;
- zobj_mark_grey(obj, pz TSRMLS_CC);
+ if (GC_GET_COLOR(obj->buffered) != GC_GREY) {
+ GC_BENCH_INC(zobj_marked_grey);
+ GC_SET_COLOR(obj->buffered, GC_GREY);
+ if (EXPECTED(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].valid &&
+ Z_OBJ_HANDLER_P(pz, get_properties) != NULL)) {
+ p = Z_OBJPROP_P(pz)->pListHead;
+ }
+ }
} else if (Z_TYPE_P(pz) == IS_ARRAY) {
if (Z_ARRVAL_P(pz) == &EG(symbol_table)) {
GC_ZVAL_SET_BLACK(pz);
} else {
- zend_hash_apply(Z_ARRVAL_P(pz), (apply_func_t) children_mark_grey TSRMLS_CC);
+ p = Z_ARRVAL_P(pz)->pListHead;
+ }
+ }
+ while (p != NULL) {
+ pz = *(zval**)p->pData;
+ if (Z_TYPE_P(pz) != IS_ARRAY || Z_ARRVAL_P(pz) != &EG(symbol_table)) {
+ pz->refcount__gc--;
+ }
+ if (p->pListNext == NULL) {
+ goto tail_call;
+ } else {
+ zval_mark_grey(pz TSRMLS_CC);
}
+ p = p->pListNext;
}
}
}
-static int children_mark_grey(zval **pz TSRMLS_DC)
+static void zobj_mark_grey(struct _store_object *obj, zval *pz TSRMLS_DC)
{
- if (Z_TYPE_PP(pz) != IS_ARRAY || Z_ARRVAL_PP(pz) != &EG(symbol_table)) {
- (*pz)->refcount__gc--;
+ Bucket *p;
+
+ if (GC_GET_COLOR(obj->buffered) != GC_GREY) {
+ GC_BENCH_INC(zobj_marked_grey);
+ GC_SET_COLOR(obj->buffered, GC_GREY);
+ if (EXPECTED(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].valid &&
+ Z_OBJ_HANDLER_P(pz, get_properties) != NULL)) {
+ p = Z_OBJPROP_P(pz)->pListHead;
+ while (p != NULL) {
+ pz = *(zval**)p->pData;
+ if (Z_TYPE_P(pz) != IS_ARRAY || Z_ARRVAL_P(pz) != &EG(symbol_table)) {
+ pz->refcount__gc--;
+ }
+ zval_mark_grey(pz TSRMLS_CC);
+ p = p->pListNext;
+ }
+ }
}
- zval_mark_grey(*pz TSRMLS_CC);
- return 0;
}
static void gc_mark_roots(TSRMLS_D)
@@ -386,50 +424,75 @@ static void gc_mark_roots(TSRMLS_D)
}
}
-static void zobj_scan(zval *pz TSRMLS_DC)
-{
- if (EG(objects_store).object_buckets) {
- struct _store_object *obj = &EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].bucket.obj;
-
- if (GC_GET_COLOR(obj->buffered) == GC_GREY) {
- if (obj->refcount > 0) {
- zobj_scan_black(obj, pz TSRMLS_CC);
- } else {
- GC_SET_COLOR(obj->buffered, GC_WHITE);
- if (EXPECTED(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].valid &&
- Z_OBJ_HANDLER_P(pz, get_properties) != NULL)) {
- zend_hash_apply(Z_OBJPROP_P(pz), (apply_func_t) children_scan TSRMLS_CC);
- }
- }
- }
- }
-}
-
static int zval_scan(zval *pz TSRMLS_DC)
{
+ Bucket *p;
+
+tail_call:
if (GC_ZVAL_GET_COLOR(pz) == GC_GREY) {
+ p = NULL;
if (pz->refcount__gc > 0) {
zval_scan_black(pz TSRMLS_CC);
} else {
GC_ZVAL_SET_COLOR(pz, GC_WHITE);
- if (Z_TYPE_P(pz) == IS_OBJECT) {
- zobj_scan(pz TSRMLS_CC);
+ if (Z_TYPE_P(pz) == IS_OBJECT && EG(objects_store).object_buckets) {
+ struct _store_object *obj = &EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].bucket.obj;
+
+ if (GC_GET_COLOR(obj->buffered) == GC_GREY) {
+ if (obj->refcount > 0) {
+ zobj_scan_black(obj, pz TSRMLS_CC);
+ } else {
+ GC_SET_COLOR(obj->buffered, GC_WHITE);
+ if (EXPECTED(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].valid &&
+ Z_OBJ_HANDLER_P(pz, get_properties) != NULL)) {
+ p = Z_OBJPROP_P(pz)->pListHead;
+ }
+ }
+ }
} else if (Z_TYPE_P(pz) == IS_ARRAY) {
if (Z_ARRVAL_P(pz) == &EG(symbol_table)) {
GC_ZVAL_SET_BLACK(pz);
} else {
- zend_hash_apply(Z_ARRVAL_P(pz), (apply_func_t) children_scan TSRMLS_CC);
+ p = Z_ARRVAL_P(pz)->pListHead;
}
}
}
+ while (p != NULL) {
+ if (p->pListNext == NULL) {
+ pz = *(zval**)p->pData;
+ goto tail_call;
+ } else {
+ zval_scan(*(zval**)p->pData TSRMLS_CC);
+ }
+ p = p->pListNext;
+ }
}
return 0;
}
-static int children_scan(zval **pz TSRMLS_DC)
+static void zobj_scan(zval *pz TSRMLS_DC)
{
- zval_scan(*pz TSRMLS_CC);
- return 0;
+ Bucket *p;
+
+ if (EG(objects_store).object_buckets) {
+ struct _store_object *obj = &EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].bucket.obj;
+
+ if (GC_GET_COLOR(obj->buffered) == GC_GREY) {
+ if (obj->refcount > 0) {
+ zobj_scan_black(obj, pz TSRMLS_CC);
+ } else {
+ GC_SET_COLOR(obj->buffered, GC_WHITE);
+ if (EXPECTED(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].valid &&
+ Z_OBJ_HANDLER_P(pz, get_properties) != NULL)) {
+ p = Z_OBJPROP_P(pz)->pListHead;
+ while (p != NULL) {
+ zval_scan(*(zval**)p->pData TSRMLS_CC);
+ p = p->pListNext;
+ }
+ }
+ }
+ }
+ }
}
static void gc_scan_roots(TSRMLS_D)
@@ -451,33 +514,29 @@ static void gc_scan_roots(TSRMLS_D)
}
}
-static void zobj_collect_white(zval *pz TSRMLS_DC)
-{
- if (EG(objects_store).object_buckets) {
- zend_object_handle handle = Z_OBJ_HANDLE_P(pz);
- struct _store_object *obj = &EG(objects_store).object_buckets[handle].bucket.obj;
-
- if (obj->buffered == (gc_root_buffer*)GC_WHITE) {
- GC_SET_BLACK(obj->buffered);
-
- if (EXPECTED(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].valid &&
- Z_OBJ_HANDLER_P(pz, get_properties) != NULL)) {
- zend_hash_apply(Z_OBJPROP_P(pz), (apply_func_t) children_collect_white TSRMLS_CC);
- }
- }
- }
-}
-
static void zval_collect_white(zval *pz TSRMLS_DC)
{
+ Bucket *p;
+
+tail_call:
if (((zval_gc_info*)(pz))->u.buffered == (gc_root_buffer*)GC_WHITE) {
+ p = NULL;
GC_ZVAL_SET_BLACK(pz);
- if (Z_TYPE_P(pz) == IS_OBJECT) {
- zobj_collect_white(pz TSRMLS_CC);
+ if (Z_TYPE_P(pz) == IS_OBJECT && EG(objects_store).object_buckets) {
+ struct _store_object *obj = &EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].bucket.obj;
+
+ if (obj->buffered == (gc_root_buffer*)GC_WHITE) {
+ GC_SET_BLACK(obj->buffered);
+
+ if (EXPECTED(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].valid &&
+ Z_OBJ_HANDLER_P(pz, get_properties) != NULL)) {
+ p = Z_OBJPROP_P(pz)->pListHead;
+ }
+ }
} else {
if (Z_TYPE_P(pz) == IS_ARRAY) {
- zend_hash_apply(Z_ARRVAL_P(pz), (apply_func_t) children_collect_white TSRMLS_CC);
+ p = Z_ARRVAL_P(pz)->pListHead;
}
}
@@ -485,16 +544,46 @@ static void zval_collect_white(zval *pz TSRMLS_DC)
pz->refcount__gc++;
((zval_gc_info*)pz)->u.next = GC_G(zval_to_free);
GC_G(zval_to_free) = (zval_gc_info*)pz;
+
+ while (p != NULL) {
+ pz = *(zval**)p->pData;
+ if (Z_TYPE_P(pz) != IS_ARRAY || Z_ARRVAL_P(pz) != &EG(symbol_table)) {
+ pz->refcount__gc++;
+ }
+ if (p->pListNext == NULL) {
+ goto tail_call;
+ } else {
+ zval_collect_white(pz TSRMLS_CC);
+ }
+ p = p->pListNext;
+ }
}
}
-static int children_collect_white(zval **pz TSRMLS_DC)
+static void zobj_collect_white(zval *pz TSRMLS_DC)
{
- if (Z_TYPE_PP(pz) != IS_ARRAY || Z_ARRVAL_PP(pz) != &EG(symbol_table)) {
- (*pz)->refcount__gc++;
+ Bucket *p;
+
+ if (EG(objects_store).object_buckets) {
+ struct _store_object *obj = &EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].bucket.obj;
+
+ if (obj->buffered == (gc_root_buffer*)GC_WHITE) {
+ GC_SET_BLACK(obj->buffered);
+
+ if (EXPECTED(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].valid &&
+ Z_OBJ_HANDLER_P(pz, get_properties) != NULL)) {
+ p = Z_OBJPROP_P(pz)->pListHead;
+ while (p != NULL) {
+ pz = *(zval**)p->pData;
+ if (Z_TYPE_P(pz) != IS_ARRAY || Z_ARRVAL_P(pz) != &EG(symbol_table)) {
+ pz->refcount__gc++;
+ }
+ zval_collect_white(pz TSRMLS_CC);
+ p = p->pListNext;
+ }
+ }
+ }
}
- zval_collect_white(*pz TSRMLS_CC);
- return 0;
}
static void gc_collect_roots(TSRMLS_D)
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index 2fa423a..efda001 100644
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_globals.h,v 1.141.2.3.2.7.2.23 2009/03/18 10:18:09 dmitry Exp $ */
+/* $Id: zend_globals.h,v 1.141.2.3.2.7.2.24 2009/03/25 15:23:17 dmitry Exp $ */
#ifndef ZEND_GLOBALS_H
#define ZEND_GLOBALS_H
@@ -292,8 +292,6 @@ struct _zend_php_scanner_globals {
int yy_state;
zend_stack state_stack;
- zend_llist used_state_stacks;
-
#ifdef ZEND_MULTIBYTE
/* original (unfiltered) script */
unsigned char *script_org;
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 5a7a389..ba2b831 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_hash.c,v 1.121.2.4.2.8.2.8 2008/12/31 11:15:32 sebastian Exp $ */
+/* $Id: zend_hash.c,v 1.121.2.4.2.8.2.9 2009/06/07 19:28:15 mattwil Exp $ */
#include "zend.h"
@@ -376,7 +376,7 @@ ZEND_API int _zend_hash_index_update_or_next_insert(HashTable *ht, ulong h, void
UPDATE_DATA(ht, p, pData, nDataSize);
HANDLE_UNBLOCK_INTERRUPTIONS();
if ((long)h >= (long)ht->nNextFreeElement) {
- ht->nNextFreeElement = h + 1;
+ ht->nNextFreeElement = h < LONG_MAX ? h + 1 : LONG_MAX;
}
if (pDest) {
*pDest = p->pData;
@@ -404,7 +404,7 @@ ZEND_API int _zend_hash_index_update_or_next_insert(HashTable *ht, ulong h, void
HANDLE_UNBLOCK_INTERRUPTIONS();
if ((long)h >= (long)ht->nNextFreeElement) {
- ht->nNextFreeElement = h + 1;
+ ht->nNextFreeElement = h < LONG_MAX ? h + 1 : LONG_MAX;
}
ht->nNumOfElements++;
ZEND_HASH_IF_FULL_DO_RESIZE(ht);
diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
index 90b4535..8575f6b 100644
--- a/Zend/zend_hash.h
+++ b/Zend/zend_hash.h
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_hash.h,v 1.78.2.2.2.2.2.11 2009/03/19 15:16:10 dmitry Exp $ */
+/* $Id: zend_hash.h,v 1.78.2.2.2.2.2.13 2009/05/25 01:18:00 pollita Exp $ */
#ifndef ZEND_HASH_H
#define ZEND_HASH_H
@@ -314,47 +314,29 @@ END_EXTERN_C()
const char *end = key + length - 1; \
long idx; \
\
- if (*end != '\0') { /* not a null terminated string */ \
+ if ((*end != '\0') /* not a null terminated string */ \
+ || (*tmp == '0' && length > 2) /* numbers with leading zeros */ \
+ || (end - tmp > MAX_LENGTH_OF_LONG - 1) /* number too long */ \
+ || (SIZEOF_LONG == 4 && \
+ end - tmp == MAX_LENGTH_OF_LONG - 1 && \
+ *tmp > '2')) { /* overflow */ \
break; \
- } else if (*tmp == '0') { \
- if (end - tmp != 1) { \
- /* don't accept numbers with leading zeros */ \
- break; \
- } \
- idx = 0; \
- } else if (end - tmp > MAX_LENGTH_OF_LONG - 1) { \
- /* don't accept too long strings */ \
- break; \
- } else { \
- if (end - tmp == MAX_LENGTH_OF_LONG - 1) { \
- end--; /* check overflow in last digit later */ \
- } \
- idx = (*tmp++ - '0'); \
- while (tmp != end && *tmp >= '0' && *tmp <= '9') { \
- idx = (idx * 10) + (*tmp++ - '0'); \
- } \
- if (tmp != end) { \
- break; \
- } \
- if (end != key + length - 1) { \
- /* last digit can cause overflow */ \
- if (*tmp < '0' || *tmp > '9' || idx > LONG_MAX / 10) { \
- break; \
- } \
- idx = (idx * 10) + (*tmp - '0'); \
- if (*key == '-') { \
- idx = -idx; \
- if (idx > 0) { /* overflow */ \
- break; \
- } \
- } else if (idx < 0) { /* overflow */ \
+ } \
+ idx = (*tmp - '0'); \
+ while (++tmp != end && *tmp >= '0' && *tmp <= '9') { \
+ idx = (idx * 10) + (*tmp - '0'); \
+ } \
+ if (tmp == end) { \
+ if (*key == '-') { \
+ idx = -idx; \
+ if (idx > 0) { /* overflow */ \
break; \
} \
- } else if (*key == '-') { \
- idx = -idx; \
+ } else if (idx < 0) { /* overflow */ \
+ break; \
} \
+ return func; \
} \
- return func; \
} \
} while (0)
@@ -385,11 +367,14 @@ static inline int zend_symtable_exists(HashTable *ht, const char *arKey, uint nK
return zend_hash_exists(ht, arKey, nKeyLength);
}
-static inline int zend_symtable_update_current_key(HashTable *ht, const char *arKey, uint nKeyLength, int mode)
+static inline int zend_symtable_update_current_key_ex(HashTable *ht, const char *arKey, uint nKeyLength, int mode, HashPosition *pos)
{
- ZEND_HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_update_current_key_ex(ht, HASH_KEY_IS_LONG, NULL, 0, idx, mode, NULL));
- return zend_hash_update_current_key_ex(ht, HASH_KEY_IS_STRING, arKey, nKeyLength, 0, mode, NULL);
+ ZEND_HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_update_current_key_ex(ht, HASH_KEY_IS_LONG, NULL, 0, idx, mode, pos));
+ return zend_hash_update_current_key_ex(ht, HASH_KEY_IS_STRING, arKey, nKeyLength, 0, mode, pos);
}
+#define zend_symtable_update_current_key(ht,arKey,nKeyLength,mode) \
+ zend_symtable_update_current_key_ex(ht, arKey, nKeyLength, mode, NULL)
+
#endif /* ZEND_HASH_H */
diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c
index 83b2d13..b2f2c2a 100644
--- a/Zend/zend_highlight.c
+++ b/Zend/zend_highlight.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_highlight.c,v 1.49.2.3.2.2.2.6 2008/12/31 11:15:32 sebastian Exp $ */
+/* $Id: zend_highlight.c,v 1.49.2.3.2.2.2.7 2009/05/05 01:35:44 mattwil Exp $ */
#include "zend.h"
#include <zend_language_parser.h>
@@ -142,14 +142,8 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
zend_printf("<span style=\"color: %s\">", last_color);
}
}
- switch (token_type) {
- case T_END_HEREDOC:
- zend_html_puts(token.value.str.val, token.value.str.len TSRMLS_CC);
- break;
- default:
- zend_html_puts(LANG_SCNG(yy_text), LANG_SCNG(yy_leng) TSRMLS_CC);
- break;
- }
+
+ zend_html_puts(LANG_SCNG(yy_text), LANG_SCNG(yy_leng) TSRMLS_CC);
if (token.type == IS_STRING) {
switch (token_type) {
@@ -170,19 +164,6 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
token.type = 0;
}
- /* handler for trailing comments, see bug #42767 */
- if (LANG_SCNG(yy_leng) && LANG_SCNG(yy_text) < LANG_SCNG(yy_limit)) {
- if (last_color != syntax_highlighter_ini->highlight_comment) {
- if (last_color != syntax_highlighter_ini->highlight_html) {
- zend_printf("</span>");
- }
- if (syntax_highlighter_ini->highlight_comment != syntax_highlighter_ini->highlight_html) {
- zend_printf("<span style=\"color: %s\">", syntax_highlighter_ini->highlight_comment);
- }
- }
- zend_html_puts(LANG_SCNG(yy_text), (LANG_SCNG(yy_limit) - LANG_SCNG(yy_text)) TSRMLS_CC);
- }
-
if (last_color != syntax_highlighter_ini->highlight_html) {
zend_printf("</span>\n");
}
diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c
index 9f0a3b4..f5cd731 100644
--- a/Zend/zend_ini_scanner.c
+++ b/Zend/zend_ini_scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.6.dev on Mon Feb 2 19:23:18 2009 */
+/* Generated by re2c 0.13.5 on Tue May 19 08:53:54 2009 */
#line 1 "Zend/zend_ini_scanner.l"
/*
+----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_ini_scanner.c,v 1.1.2.17 2009/02/14 21:20:14 rasmus Exp $ */
+/* $Id: zend_ini_scanner.c,v 1.1.2.18 2009/05/19 15:59:36 shire Exp $ */
#include <errno.h>
#include "zend.h"
@@ -339,21 +339,21 @@ yyc_INITIAL:
{
static const unsigned char yybm[] = {
128, 128, 128, 128, 128, 128, 128, 128,
- 128, 192, 0, 128, 128, 0, 128, 128,
+ 128, 160, 0, 128, 128, 0, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
- 192, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 160, 128, 128, 160, 160, 128,
- 160, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 128, 128, 128, 128, 128, 128,
- 128, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 160, 128, 128, 128, 128, 160,
- 128, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 160, 128, 128, 128, 128, 128,
+ 160, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 192, 128, 128, 192, 192, 128,
+ 192, 192, 192, 192, 192, 192, 192, 192,
+ 192, 192, 128, 128, 128, 128, 128, 128,
+ 128, 192, 192, 192, 192, 192, 192, 192,
+ 192, 192, 192, 192, 192, 192, 192, 192,
+ 192, 192, 192, 192, 192, 192, 192, 192,
+ 192, 192, 192, 128, 128, 128, 128, 192,
+ 128, 192, 192, 192, 192, 192, 192, 192,
+ 192, 192, 192, 192, 192, 192, 192, 192,
+ 192, 192, 192, 192, 192, 192, 192, 192,
+ 192, 192, 192, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
@@ -371,7 +371,8 @@ yyc_INITIAL:
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
};
- YYDEBUG(1, *YYCURSOR);
+
+ YYDEBUG(0, *YYCURSOR);
YYFILL(6);
yych = *YYCURSOR;
YYDEBUG(-1, yych);
@@ -388,11 +389,8 @@ yyc_INITIAL:
case '\'':
case '(':
case ')':
- case '*':
case '+':
case ',':
- case '-':
- case '.':
case '/':
case ':':
case '<':
@@ -406,6 +404,9 @@ yyc_INITIAL:
case '}':
case '~': goto yy10;
case '#': goto yy12;
+ case '*':
+ case '-':
+ case '.': goto yy13;
case '0':
case '1':
case '2':
@@ -458,7 +459,7 @@ yyc_INITIAL:
case 'v':
case 'w':
case 'x':
- case 'z': goto yy13;
+ case 'z': goto yy14;
case ';': goto yy15;
case '=': goto yy16;
case 'F':
@@ -474,6 +475,14 @@ yyc_INITIAL:
case '[': goto yy23;
default: goto yy3;
}
+yy2:
+ YYDEBUG(2, *YYCURSOR);
+ yyleng = YYCURSOR - SCNG(yy_text);
+#line 389 "Zend/zend_ini_scanner.l"
+ { /* Get option name */
+ RETURN_TOKEN(TC_LABEL, yytext, yyleng);
+}
+#line 486 "Zend/zend_ini_scanner.c"
yy3:
YYDEBUG(3, *YYCURSOR);
++YYCURSOR;
@@ -483,7 +492,7 @@ yy3:
{
return 0;
}
-#line 487 "Zend/zend_ini_scanner.c"
+#line 496 "Zend/zend_ini_scanner.c"
yy5:
YYDEBUG(5, *YYCURSOR);
yyaccept = 0;
@@ -497,7 +506,7 @@ yy6:
/* eat whitespace */
goto restart;
}
-#line 501 "Zend/zend_ini_scanner.c"
+#line 510 "Zend/zend_ini_scanner.c"
yy7:
YYDEBUG(7, *YYCURSOR);
++YYCURSOR;
@@ -509,7 +518,7 @@ yy8:
SCNG(lineno)++;
return END_OF_LINE;
}
-#line 513 "Zend/zend_ini_scanner.c"
+#line 522 "Zend/zend_ini_scanner.c"
yy9:
YYDEBUG(9, *YYCURSOR);
yych = *++YYCURSOR;
@@ -524,7 +533,7 @@ yy10:
{ /* Disallow these chars outside option values */
return yytext[0];
}
-#line 528 "Zend/zend_ini_scanner.c"
+#line 537 "Zend/zend_ini_scanner.c"
yy12:
YYDEBUG(12, *YYCURSOR);
yyaccept = 1;
@@ -532,17 +541,12 @@ yy12:
goto yy57;
yy13:
YYDEBUG(13, *YYCURSOR);
- ++YYCURSOR;
- yych = *YYCURSOR;
- goto yy26;
+ yych = *++YYCURSOR;
+ goto yy29;
yy14:
YYDEBUG(14, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
-#line 389 "Zend/zend_ini_scanner.l"
- { /* Get option name */
- RETURN_TOKEN(TC_LABEL, yytext, yyleng);
-}
-#line 546 "Zend/zend_ini_scanner.c"
+ yych = *++YYCURSOR;
+ goto yy29;
yy15:
YYDEBUG(15, *YYCURSOR);
yyaccept = 1;
@@ -565,27 +569,27 @@ yy17:
}
return '=';
}
-#line 569 "Zend/zend_ini_scanner.c"
+#line 573 "Zend/zend_ini_scanner.c"
yy18:
YYDEBUG(18, *YYCURSOR);
yych = *++YYCURSOR;
if (yych == 'A') goto yy46;
if (yych == 'a') goto yy46;
- goto yy26;
+ goto yy29;
yy19:
YYDEBUG(19, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'U') {
if (yych == 'O') goto yy42;
- if (yych <= 'T') goto yy26;
+ if (yych <= 'T') goto yy29;
goto yy43;
} else {
if (yych <= 'o') {
- if (yych <= 'n') goto yy26;
+ if (yych <= 'n') goto yy29;
goto yy42;
} else {
if (yych == 'u') goto yy43;
- goto yy26;
+ goto yy29;
}
}
yy20:
@@ -593,15 +597,15 @@ yy20:
yych = *++YYCURSOR;
if (yych <= 'N') {
if (yych == 'F') goto yy37;
- if (yych <= 'M') goto yy26;
+ if (yych <= 'M') goto yy29;
goto yy31;
} else {
if (yych <= 'f') {
- if (yych <= 'e') goto yy26;
+ if (yych <= 'e') goto yy29;
goto yy37;
} else {
if (yych == 'n') goto yy31;
- goto yy26;
+ goto yy29;
}
}
yy21:
@@ -609,16 +613,19 @@ yy21:
yych = *++YYCURSOR;
if (yych == 'R') goto yy35;
if (yych == 'r') goto yy35;
- goto yy26;
+ goto yy29;
yy22:
YYDEBUG(22, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy27;
- if (yych == 'e') goto yy27;
- goto yy26;
+ if (yych == 'E') goto yy30;
+ if (yych == 'e') goto yy30;
+ goto yy29;
yy23:
YYDEBUG(23, *YYCURSOR);
++YYCURSOR;
+ if (yybm[0+(yych = *YYCURSOR)] & 32) {
+ goto yy25;
+ }
YYDEBUG(24, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
#line 327 "Zend/zend_ini_scanner.l"
@@ -631,35 +638,17 @@ yy23:
}
return TC_SECTION;
}
-#line 635 "Zend/zend_ini_scanner.c"
+#line 642 "Zend/zend_ini_scanner.c"
yy25:
YYDEBUG(25, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
-yy26:
YYDEBUG(26, *YYCURSOR);
if (yybm[0+yych] & 32) {
goto yy25;
}
- if (yych == '[') goto yy28;
- goto yy14;
-yy27:
YYDEBUG(27, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych == 'S') goto yy31;
- if (yych == 's') goto yy31;
- goto yy26;
-yy28:
- YYDEBUG(28, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(29, *YYCURSOR);
- if (yybm[0+yych] & 64) {
- goto yy28;
- }
- YYDEBUG(30, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
#line 352 "Zend/zend_ini_scanner.l"
{ /* Start of option with offset */
@@ -671,14 +660,31 @@ yy28:
RETURN_TOKEN(TC_OFFSET, yytext, yyleng);
}
-#line 675 "Zend/zend_ini_scanner.c"
+#line 664 "Zend/zend_ini_scanner.c"
+yy28:
+ YYDEBUG(28, *YYCURSOR);
+ ++YYCURSOR;
+ YYFILL(1);
+ yych = *YYCURSOR;
+yy29:
+ YYDEBUG(29, *YYCURSOR);
+ if (yybm[0+yych] & 64) {
+ goto yy28;
+ }
+ if (yych == '[') goto yy25;
+ goto yy2;
+yy30:
+ YYDEBUG(30, *YYCURSOR);
+ yych = *++YYCURSOR;
+ if (yych == 'S') goto yy31;
+ if (yych != 's') goto yy29;
yy31:
YYDEBUG(31, *YYCURSOR);
++YYCURSOR;
- if (yybm[0+(yych = *YYCURSOR)] & 32) {
- goto yy25;
+ if (yybm[0+(yych = *YYCURSOR)] & 64) {
+ goto yy28;
}
- if (yych == '[') goto yy28;
+ if (yych == '[') goto yy25;
goto yy34;
yy32:
YYDEBUG(32, *YYCURSOR);
@@ -687,7 +693,7 @@ yy32:
{ /* TRUE value (when used outside option value/offset this causes parse error!) */
RETURN_TOKEN(BOOL_TRUE, "1", 1);
}
-#line 691 "Zend/zend_ini_scanner.c"
+#line 697 "Zend/zend_ini_scanner.c"
yy33:
YYDEBUG(33, *YYCURSOR);
++YYCURSOR;
@@ -702,25 +708,25 @@ yy35:
YYDEBUG(35, *YYCURSOR);
yych = *++YYCURSOR;
if (yych == 'U') goto yy36;
- if (yych != 'u') goto yy26;
+ if (yych != 'u') goto yy29;
yy36:
YYDEBUG(36, *YYCURSOR);
yych = *++YYCURSOR;
if (yych == 'E') goto yy31;
if (yych == 'e') goto yy31;
- goto yy26;
+ goto yy29;
yy37:
YYDEBUG(37, *YYCURSOR);
yych = *++YYCURSOR;
if (yych == 'F') goto yy38;
- if (yych != 'f') goto yy26;
+ if (yych != 'f') goto yy29;
yy38:
YYDEBUG(38, *YYCURSOR);
++YYCURSOR;
- if (yybm[0+(yych = *YYCURSOR)] & 32) {
- goto yy25;
+ if (yybm[0+(yych = *YYCURSOR)] & 64) {
+ goto yy28;
}
- if (yych == '[') goto yy28;
+ if (yych == '[') goto yy25;
goto yy41;
yy39:
YYDEBUG(39, *YYCURSOR);
@@ -729,7 +735,7 @@ yy39:
{ /* FALSE value (when used outside option value/offset this causes parse error!)*/
RETURN_TOKEN(BOOL_FALSE, "", 0);
}
-#line 733 "Zend/zend_ini_scanner.c"
+#line 739 "Zend/zend_ini_scanner.c"
yy40:
YYDEBUG(40, *YYCURSOR);
++YYCURSOR;
@@ -745,32 +751,32 @@ yy42:
yych = *++YYCURSOR;
if (yych <= 'N') {
if (yych <= '.') {
- if (yych == '*') goto yy25;
+ if (yych == '*') goto yy28;
if (yych <= ',') goto yy41;
- goto yy25;
+ goto yy28;
} else {
if (yych <= '9') {
if (yych <= '/') goto yy41;
- goto yy25;
+ goto yy28;
} else {
if (yych <= '@') goto yy41;
- if (yych <= 'M') goto yy25;
+ if (yych <= 'M') goto yy28;
goto yy45;
}
}
} else {
if (yych <= '_') {
- if (yych <= 'Z') goto yy25;
- if (yych <= '[') goto yy28;
+ if (yych <= 'Z') goto yy28;
+ if (yych <= '[') goto yy25;
if (yych <= '^') goto yy41;
- goto yy25;
+ goto yy28;
} else {
if (yych <= 'm') {
if (yych <= '`') goto yy41;
- goto yy25;
+ goto yy28;
} else {
if (yych <= 'n') goto yy45;
- if (yych <= 'z') goto yy25;
+ if (yych <= 'z') goto yy28;
goto yy41;
}
}
@@ -779,35 +785,35 @@ yy43:
YYDEBUG(43, *YYCURSOR);
yych = *++YYCURSOR;
if (yych == 'L') goto yy44;
- if (yych != 'l') goto yy26;
+ if (yych != 'l') goto yy29;
yy44:
YYDEBUG(44, *YYCURSOR);
yych = *++YYCURSOR;
if (yych == 'L') goto yy38;
if (yych == 'l') goto yy38;
- goto yy26;
+ goto yy29;
yy45:
YYDEBUG(45, *YYCURSOR);
yych = *++YYCURSOR;
if (yych == 'E') goto yy38;
if (yych == 'e') goto yy38;
- goto yy26;
+ goto yy29;
yy46:
YYDEBUG(46, *YYCURSOR);
yych = *++YYCURSOR;
if (yych == 'L') goto yy47;
- if (yych != 'l') goto yy26;
+ if (yych != 'l') goto yy29;
yy47:
YYDEBUG(47, *YYCURSOR);
yych = *++YYCURSOR;
if (yych == 'S') goto yy48;
- if (yych != 's') goto yy26;
+ if (yych != 's') goto yy29;
yy48:
YYDEBUG(48, *YYCURSOR);
yych = *++YYCURSOR;
if (yych == 'E') goto yy38;
if (yych == 'e') goto yy38;
- goto yy26;
+ goto yy29;
yy49:
YYDEBUG(49, *YYCURSOR);
++YYCURSOR;
@@ -841,7 +847,7 @@ yy54:
SCNG(lineno)++;
return END_OF_LINE;
}
-#line 845 "Zend/zend_ini_scanner.c"
+#line 851 "Zend/zend_ini_scanner.c"
yy55:
YYDEBUG(55, *YYCURSOR);
yych = *++YYCURSOR;
@@ -870,7 +876,7 @@ yy59:
SCNG(lineno)++;
return END_OF_LINE;
}
-#line 874 "Zend/zend_ini_scanner.c"
+#line 880 "Zend/zend_ini_scanner.c"
yy60:
YYDEBUG(60, *YYCURSOR);
yych = *++YYCURSOR;
@@ -976,7 +982,7 @@ yy68:
zend_ini_escape_string(ini_lval, yytext, yyleng, '"' TSRMLS_CC);
return TC_QUOTED_STRING;
}
-#line 980 "Zend/zend_ini_scanner.c"
+#line 986 "Zend/zend_ini_scanner.c"
yy69:
YYDEBUG(69, *YYCURSOR);
++YYCURSOR;
@@ -990,7 +996,7 @@ yy70:
yy_pop_state(TSRMLS_C);
return '"';
}
-#line 994 "Zend/zend_ini_scanner.c"
+#line 1000 "Zend/zend_ini_scanner.c"
yy71:
YYDEBUG(71, *YYCURSOR);
++YYCURSOR;
@@ -1009,7 +1015,7 @@ yy72:
{
return 0;
}
-#line 1013 "Zend/zend_ini_scanner.c"
+#line 1019 "Zend/zend_ini_scanner.c"
yy73:
YYDEBUG(73, *YYCURSOR);
yyaccept = 1;
@@ -1022,7 +1028,7 @@ yy73:
yy75:
YYDEBUG(75, *YYCURSOR);
YYCURSOR = YYMARKER;
- if (yyaccept == 0) {
+ if (yyaccept <= 0) {
goto yy68;
} else {
goto yy72;
@@ -1130,7 +1136,7 @@ yy88:
yy_push_state(ST_VARNAME TSRMLS_CC);
return TC_DOLLAR_CURLY;
}
-#line 1134 "Zend/zend_ini_scanner.c"
+#line 1140 "Zend/zend_ini_scanner.c"
yy90:
YYDEBUG(90, *YYCURSOR);
++YYCURSOR;
@@ -1233,7 +1239,7 @@ yy95:
{ /* Get rest as section/offset value */
RETURN_TOKEN(TC_STRING, yytext, yyleng);
}
-#line 1237 "Zend/zend_ini_scanner.c"
+#line 1243 "Zend/zend_ini_scanner.c"
yy96:
YYDEBUG(96, *YYCURSOR);
yyaccept = 0;
@@ -1254,7 +1260,7 @@ yy98:
{
return 0;
}
-#line 1258 "Zend/zend_ini_scanner.c"
+#line 1264 "Zend/zend_ini_scanner.c"
yy99:
YYDEBUG(99, *YYCURSOR);
++YYCURSOR;
@@ -1266,7 +1272,7 @@ yy100:
yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
return '"';
}
-#line 1270 "Zend/zend_ini_scanner.c"
+#line 1276 "Zend/zend_ini_scanner.c"
yy101:
YYDEBUG(101, *YYCURSOR);
yych = *++YYCURSOR;
@@ -1332,7 +1338,7 @@ yy106:
{ /* Get number option value as string */
RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
}
-#line 1336 "Zend/zend_ini_scanner.c"
+#line 1342 "Zend/zend_ini_scanner.c"
yy107:
YYDEBUG(107, *YYCURSOR);
yyaccept = 3;
@@ -1362,7 +1368,7 @@ yy108:
{ /* Get constant option value */
RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
}
-#line 1366 "Zend/zend_ini_scanner.c"
+#line 1372 "Zend/zend_ini_scanner.c"
yy109:
YYDEBUG(109, *YYCURSOR);
yych = *++YYCURSOR;
@@ -1378,7 +1384,7 @@ yy111:
BEGIN(INITIAL);
return ']';
}
-#line 1382 "Zend/zend_ini_scanner.c"
+#line 1388 "Zend/zend_ini_scanner.c"
yy112:
YYDEBUG(112, *YYCURSOR);
yyaccept = 0;
@@ -1414,13 +1420,13 @@ yy116:
YYDEBUG(116, *YYCURSOR);
YYCURSOR = YYMARKER;
if (yyaccept <= 1) {
- if (yyaccept == 0) {
+ if (yyaccept <= 0) {
goto yy95;
} else {
goto yy98;
}
} else {
- if (yyaccept == 2) {
+ if (yyaccept <= 2) {
goto yy106;
} else {
goto yy108;
@@ -1677,7 +1683,7 @@ yy133:
}
RETURN_TOKEN(TC_RAW, yytext, yyleng);
}
-#line 1681 "Zend/zend_ini_scanner.c"
+#line 1687 "Zend/zend_ini_scanner.c"
yy137:
YYDEBUG(137, *YYCURSOR);
++YYCURSOR;
@@ -1688,7 +1694,7 @@ yy137:
yy_push_state(ST_VARNAME TSRMLS_CC);
return TC_DOLLAR_CURLY;
}
-#line 1692 "Zend/zend_ini_scanner.c"
+#line 1698 "Zend/zend_ini_scanner.c"
yy139:
YYDEBUG(139, *YYCURSOR);
yyaccept = 0;
@@ -1804,7 +1810,7 @@ yy146:
}
RETURN_TOKEN(TC_RAW, yytext, yyleng);
}
-#line 1808 "Zend/zend_ini_scanner.c"
+#line 1814 "Zend/zend_ini_scanner.c"
yy147:
YYDEBUG(147, *YYCURSOR);
yyaccept = 0;
@@ -1832,7 +1838,7 @@ yy149:
SCNG(lineno)++;
return END_OF_LINE;
}
-#line 1836 "Zend/zend_ini_scanner.c"
+#line 1842 "Zend/zend_ini_scanner.c"
yy150:
YYDEBUG(150, *YYCURSOR);
yych = *++YYCURSOR;
@@ -1851,7 +1857,7 @@ yy152:
BEGIN(INITIAL);
return END_OF_LINE;
}
-#line 1855 "Zend/zend_ini_scanner.c"
+#line 1861 "Zend/zend_ini_scanner.c"
yy153:
YYDEBUG(153, *YYCURSOR);
yych = *++YYCURSOR;
@@ -1879,7 +1885,7 @@ yy157:
SCNG(lineno)++;
return END_OF_LINE;
}
-#line 1883 "Zend/zend_ini_scanner.c"
+#line 1889 "Zend/zend_ini_scanner.c"
yy158:
YYDEBUG(158, *YYCURSOR);
yych = *++YYCURSOR;
@@ -1985,7 +1991,7 @@ yy168:
{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
RETURN_TOKEN(TC_RAW, yytext, yyleng);
}
-#line 1989 "Zend/zend_ini_scanner.c"
+#line 1995 "Zend/zend_ini_scanner.c"
yy169:
YYDEBUG(169, *YYCURSOR);
++YYCURSOR;
@@ -1995,7 +2001,7 @@ yy169:
{
return 0;
}
-#line 1999 "Zend/zend_ini_scanner.c"
+#line 2005 "Zend/zend_ini_scanner.c"
yy171:
YYDEBUG(171, *YYCURSOR);
++YYCURSOR;
@@ -2010,7 +2016,7 @@ yy172:
SCNG(lineno)++;
return ']';
}
-#line 2014 "Zend/zend_ini_scanner.c"
+#line 2020 "Zend/zend_ini_scanner.c"
yy173:
YYDEBUG(173, *YYCURSOR);
++YYCURSOR;
@@ -2135,7 +2141,7 @@ yy182:
{ /* Get rest as section/offset value */
RETURN_TOKEN(TC_STRING, yytext, yyleng);
}
-#line 2139 "Zend/zend_ini_scanner.c"
+#line 2145 "Zend/zend_ini_scanner.c"
yy183:
YYDEBUG(183, *YYCURSOR);
yyaccept = 0;
@@ -2158,7 +2164,7 @@ yy185:
{
return 0;
}
-#line 2162 "Zend/zend_ini_scanner.c"
+#line 2168 "Zend/zend_ini_scanner.c"
yy186:
YYDEBUG(186, *YYCURSOR);
++YYCURSOR;
@@ -2170,7 +2176,7 @@ yy187:
yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
return '"';
}
-#line 2174 "Zend/zend_ini_scanner.c"
+#line 2180 "Zend/zend_ini_scanner.c"
yy188:
YYDEBUG(188, *YYCURSOR);
yych = *++YYCURSOR;
@@ -2236,7 +2242,7 @@ yy193:
{ /* Get number option value as string */
RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
}
-#line 2240 "Zend/zend_ini_scanner.c"
+#line 2246 "Zend/zend_ini_scanner.c"
yy194:
YYDEBUG(194, *YYCURSOR);
yyaccept = 3;
@@ -2266,7 +2272,7 @@ yy195:
{ /* Get constant option value */
RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
}
-#line 2270 "Zend/zend_ini_scanner.c"
+#line 2276 "Zend/zend_ini_scanner.c"
yy196:
YYDEBUG(196, *YYCURSOR);
yych = *++YYCURSOR;
@@ -2285,7 +2291,7 @@ yy198:
SCNG(lineno)++;
return ']';
}
-#line 2289 "Zend/zend_ini_scanner.c"
+#line 2295 "Zend/zend_ini_scanner.c"
yy199:
YYDEBUG(199, *YYCURSOR);
++YYCURSOR;
@@ -2343,13 +2349,13 @@ yy207:
YYDEBUG(207, *YYCURSOR);
YYCURSOR = YYMARKER;
if (yyaccept <= 1) {
- if (yyaccept == 0) {
+ if (yyaccept <= 0) {
goto yy182;
} else {
goto yy185;
}
} else {
- if (yyaccept == 2) {
+ if (yyaccept <= 2) {
goto yy193;
} else {
goto yy195;
@@ -2606,7 +2612,7 @@ yy224:
}
RETURN_TOKEN(TC_RAW, yytext, yyleng);
}
-#line 2610 "Zend/zend_ini_scanner.c"
+#line 2616 "Zend/zend_ini_scanner.c"
yy228:
YYDEBUG(228, *YYCURSOR);
++YYCURSOR;
@@ -2617,7 +2623,7 @@ yy228:
yy_push_state(ST_VARNAME TSRMLS_CC);
return TC_DOLLAR_CURLY;
}
-#line 2621 "Zend/zend_ini_scanner.c"
+#line 2627 "Zend/zend_ini_scanner.c"
yy230:
YYDEBUG(230, *YYCURSOR);
yyaccept = 0;
@@ -2801,7 +2807,7 @@ yy236:
BEGIN(INITIAL);
return END_OF_LINE;
}
-#line 2805 "Zend/zend_ini_scanner.c"
+#line 2811 "Zend/zend_ini_scanner.c"
yy237:
YYDEBUG(237, *YYCURSOR);
yyaccept = 0;
@@ -2814,7 +2820,7 @@ yy238:
{ /* Get everything else as option/offset value */
RETURN_TOKEN(TC_STRING, yytext, yyleng);
}
-#line 2818 "Zend/zend_ini_scanner.c"
+#line 2824 "Zend/zend_ini_scanner.c"
yy239:
YYDEBUG(239, *YYCURSOR);
yyaccept = 1;
@@ -2827,7 +2833,7 @@ yy240:
{
RETURN_TOKEN(TC_WHITESPACE, yytext, yyleng);
}
-#line 2831 "Zend/zend_ini_scanner.c"
+#line 2837 "Zend/zend_ini_scanner.c"
yy241:
YYDEBUG(241, *YYCURSOR);
++YYCURSOR;
@@ -2840,7 +2846,7 @@ yy242:
SCNG(lineno)++;
return END_OF_LINE;
}
-#line 2844 "Zend/zend_ini_scanner.c"
+#line 2850 "Zend/zend_ini_scanner.c"
yy243:
YYDEBUG(243, *YYCURSOR);
yych = *++YYCURSOR;
@@ -2858,7 +2864,7 @@ yy245:
{ /* Boolean operators */
return yytext[0];
}
-#line 2862 "Zend/zend_ini_scanner.c"
+#line 2868 "Zend/zend_ini_scanner.c"
yy246:
YYDEBUG(246, *YYCURSOR);
++YYCURSOR;
@@ -2870,7 +2876,7 @@ yy247:
yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
return '"';
}
-#line 2874 "Zend/zend_ini_scanner.c"
+#line 2880 "Zend/zend_ini_scanner.c"
yy248:
YYDEBUG(248, *YYCURSOR);
yych = *++YYCURSOR;
@@ -2950,7 +2956,7 @@ yy253:
{ /* Get number option value as string */
RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
}
-#line 2954 "Zend/zend_ini_scanner.c"
+#line 2960 "Zend/zend_ini_scanner.c"
yy254:
YYDEBUG(254, *YYCURSOR);
yyaccept = 2;
@@ -2967,7 +2973,7 @@ yy255:
BEGIN(INITIAL);
return END_OF_LINE;
}
-#line 2971 "Zend/zend_ini_scanner.c"
+#line 2977 "Zend/zend_ini_scanner.c"
yy257:
YYDEBUG(257, *YYCURSOR);
yyaccept = 4;
@@ -3007,7 +3013,7 @@ yy258:
{ /* Get constant option value */
RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
}
-#line 3011 "Zend/zend_ini_scanner.c"
+#line 3017 "Zend/zend_ini_scanner.c"
yy259:
YYDEBUG(259, *YYCURSOR);
yyaccept = 4;
@@ -3407,13 +3413,13 @@ yy270:
YYCURSOR = YYMARKER;
if (yyaccept <= 3) {
if (yyaccept <= 1) {
- if (yyaccept == 0) {
+ if (yyaccept <= 0) {
goto yy238;
} else {
goto yy240;
}
} else {
- if (yyaccept == 2) {
+ if (yyaccept <= 2) {
goto yy236;
} else {
goto yy253;
@@ -3421,7 +3427,7 @@ yy270:
}
} else {
if (yyaccept <= 5) {
- if (yyaccept == 4) {
+ if (yyaccept <= 4) {
goto yy258;
} else {
goto yy275;
@@ -3503,7 +3509,7 @@ yy275:
{ /* TRUE value (when used outside option value/offset this causes parse error!) */
RETURN_TOKEN(BOOL_TRUE, "1", 1);
}
-#line 3507 "Zend/zend_ini_scanner.c"
+#line 3513 "Zend/zend_ini_scanner.c"
yy276:
YYDEBUG(276, *YYCURSOR);
++YYCURSOR;
@@ -3707,7 +3713,7 @@ yy282:
{ /* FALSE value (when used outside option value/offset this causes parse error!)*/
RETURN_TOKEN(BOOL_FALSE, "", 0);
}
-#line 3711 "Zend/zend_ini_scanner.c"
+#line 3717 "Zend/zend_ini_scanner.c"
yy283:
YYDEBUG(283, *YYCURSOR);
++YYCURSOR;
@@ -4089,7 +4095,7 @@ yy295:
SCNG(lineno)++;
return END_OF_LINE;
}
-#line 4093 "Zend/zend_ini_scanner.c"
+#line 4099 "Zend/zend_ini_scanner.c"
yy296:
YYDEBUG(296, *YYCURSOR);
yych = *++YYCURSOR;
@@ -4310,7 +4316,7 @@ yy305:
}
RETURN_TOKEN(TC_RAW, yytext, yyleng);
}
-#line 4314 "Zend/zend_ini_scanner.c"
+#line 4320 "Zend/zend_ini_scanner.c"
yy309:
YYDEBUG(309, *YYCURSOR);
++YYCURSOR;
@@ -4321,7 +4327,7 @@ yy309:
yy_push_state(ST_VARNAME TSRMLS_CC);
return TC_DOLLAR_CURLY;
}
-#line 4325 "Zend/zend_ini_scanner.c"
+#line 4331 "Zend/zend_ini_scanner.c"
yy311:
YYDEBUG(311, *YYCURSOR);
++YYCURSOR;
@@ -4411,43 +4417,48 @@ yyc_ST_VARNAME:
YYDEBUG(318, *YYCURSOR);
YYFILL(2);
yych = *YYCURSOR;
- if (yych <= '^') {
- if (yych <= '9') {
- if (yych >= '0') goto yy322;
+ if (yych <= '@') {
+ if (yych <= ',') {
+ if (yych == '*') goto yy323;
+ goto yy321;
} else {
- if (yych <= '@') goto yy320;
- if (yych <= 'Z') goto yy322;
+ if (yych == '/') goto yy321;
+ if (yych <= '9') goto yy323;
+ goto yy321;
}
} else {
- if (yych <= 'z') {
- if (yych != '`') goto yy322;
+ if (yych <= '`') {
+ if (yych <= 'Z') goto yy323;
+ if (yych == '_') goto yy323;
+ goto yy321;
} else {
+ if (yych <= 'z') goto yy323;
if (yych == '}') goto yy324;
+ goto yy321;
}
}
yy320:
YYDEBUG(320, *YYCURSOR);
- ++YYCURSOR;
+ yyleng = YYCURSOR - SCNG(yy_text);
+#line 372 "Zend/zend_ini_scanner.l"
+ { /* Variable name */
+ RETURN_TOKEN(TC_VARNAME, yytext, yyleng);
+}
+#line 4448 "Zend/zend_ini_scanner.c"
+yy321:
YYDEBUG(321, *YYCURSOR);
+ ++YYCURSOR;
+ YYDEBUG(322, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
#line 502 "Zend/zend_ini_scanner.l"
{
return 0;
}
-#line 4438 "Zend/zend_ini_scanner.c"
-yy322:
- YYDEBUG(322, *YYCURSOR);
- ++YYCURSOR;
- yych = *YYCURSOR;
- goto yy327;
+#line 4458 "Zend/zend_ini_scanner.c"
yy323:
YYDEBUG(323, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
-#line 372 "Zend/zend_ini_scanner.l"
- { /* Variable name */
- RETURN_TOKEN(TC_VARNAME, yytext, yyleng);
-}
-#line 4451 "Zend/zend_ini_scanner.c"
+ yych = *++YYCURSOR;
+ goto yy327;
yy324:
YYDEBUG(324, *YYCURSOR);
++YYCURSOR;
@@ -4458,7 +4469,7 @@ yy324:
yy_pop_state(TSRMLS_C);
return '}';
}
-#line 4462 "Zend/zend_ini_scanner.c"
+#line 4473 "Zend/zend_ini_scanner.c"
yy326:
YYDEBUG(326, *YYCURSOR);
++YYCURSOR;
@@ -4469,7 +4480,7 @@ yy327:
if (yybm[0+yych] & 128) {
goto yy326;
}
- goto yy323;
+ goto yy320;
}
}
#line 506 "Zend/zend_ini_scanner.l"
diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index 4485bec..f283acd 100644
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_ini_scanner.l,v 1.41.2.2.2.2.2.16 2009/02/02 19:23:13 nlopess Exp $ */
+/* $Id: zend_ini_scanner.l,v 1.41.2.2.2.2.2.17 2009/05/19 15:59:36 shire Exp $ */
#include <errno.h>
#include "zend.h"
@@ -308,7 +308,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
TABS_AND_SPACES [ \t]
WHITESPACE [ \t]+
CONSTANT [a-zA-Z][a-zA-Z0-9_]*
-LABEL [a-zA-Z0-9_][a-zA-Z0-9*._-]*
+LABEL [a-zA-Z0-9*._-]*
TOKENS [:,.\[\]"'()|^&+-/*=%$!~<>?@{}]
OPERATORS [&|~()!]
DOLLAR_CURLY "${"
diff --git a/Zend/zend_ini_scanner_defs.h b/Zend/zend_ini_scanner_defs.h
index 46676e8..7c5dc4a 100644
--- a/Zend/zend_ini_scanner_defs.h
+++ b/Zend/zend_ini_scanner_defs.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.6.dev on Mon Feb 2 19:23:18 2009 */
+/* Generated by re2c 0.13.5 on Tue May 19 08:53:54 2009 */
#line 3 "Zend/zend_ini_scanner_defs.h"
enum YYCONDTYPE {
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
index 212dc2a..d14ac52 100755
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_interfaces.c,v 1.33.2.4.2.6.2.12 2008/12/31 11:15:32 sebastian Exp $ */
+/* $Id: zend_interfaces.c,v 1.33.2.4.2.6.2.13 2009/03/25 10:39:26 dmitry Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -84,7 +84,15 @@ ZEND_API zval* zend_call_method(zval **object_pp, zend_class_entry *obj_ce, zend
fcic.function_handler = *fn_proxy;
}
fcic.calling_scope = obj_ce;
- fcic.called_scope = object_pp ? obj_ce : EG(called_scope);
+ if (object_pp) {
+ fcic.called_scope = Z_OBJCE_PP(object_pp);
+ } else if (obj_ce &&
+ !(EG(called_scope) &&
+ instanceof_function(EG(called_scope), obj_ce TSRMLS_CC))) {
+ fcic.called_scope = obj_ce;
+ } else {
+ fcic.called_scope = EG(called_scope);
+ }
fcic.object_ptr = object_pp ? *object_pp : NULL;
result = zend_call_function(&fci, &fcic TSRMLS_CC);
}
diff --git a/Zend/zend_language_parser.c b/Zend/zend_language_parser.c
index d95a760..e875a5e 100644
--- a/Zend/zend_language_parser.c
+++ b/Zend/zend_language_parser.c
@@ -349,7 +349,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_parser.y,v 1.160.2.4.2.8.2.34 2009/01/26 22:54:20 cseiler Exp $ */
+/* $Id: zend_language_parser.y,v 1.160.2.4.2.8.2.35 2009/03/26 12:37:17 dmitry Exp $ */
/*
* LALR shift/reduce conflicts and how they are resolved:
@@ -4889,12 +4889,12 @@ yyreduce:
case 353:
- { (yyval) = (yyvsp[(2) - (3)]); }
+ { (yyval) = (yyvsp[(2) - (3)]); CG(heredoc) = Z_STRVAL((yyvsp[(1) - (3)]).u.constant); CG(heredoc_len) = Z_STRLEN((yyvsp[(1) - (3)]).u.constant); }
break;
case 354:
- { ZVAL_EMPTY_STRING(&(yyval).u.constant); INIT_PZVAL(&(yyval).u.constant); (yyval).op_type = IS_CONST; }
+ { ZVAL_EMPTY_STRING(&(yyval).u.constant); INIT_PZVAL(&(yyval).u.constant); (yyval).op_type = IS_CONST; CG(heredoc) = Z_STRVAL((yyvsp[(1) - (2)]).u.constant); CG(heredoc_len) = Z_STRLEN((yyvsp[(1) - (2)]).u.constant); }
break;
case 355:
@@ -4979,7 +4979,7 @@ yyreduce:
case 371:
- { (yyval) = (yyvsp[(2) - (3)]); }
+ { (yyval) = (yyvsp[(2) - (3)]); CG(heredoc) = Z_STRVAL((yyvsp[(1) - (3)]).u.constant); CG(heredoc_len) = Z_STRLEN((yyvsp[(1) - (3)]).u.constant); }
break;
case 372:
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 619264f..ab3c29a 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_parser.y,v 1.160.2.4.2.8.2.34 2009/01/26 22:54:20 cseiler Exp $ */
+/* $Id: zend_language_parser.y,v 1.160.2.4.2.8.2.35 2009/03/26 12:37:17 dmitry Exp $ */
/*
* LALR shift/reduce conflicts and how they are resolved:
@@ -763,8 +763,8 @@ common_scalar:
| T_METHOD_C { $$ = $1; }
| T_FUNC_C { $$ = $1; }
| T_NS_C { $$ = $1; }
- | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$ = $2; }
- | T_START_HEREDOC T_END_HEREDOC { ZVAL_EMPTY_STRING(&$$.u.constant); INIT_PZVAL(&$$.u.constant); $$.op_type = IS_CONST; }
+ | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$ = $2; CG(heredoc) = Z_STRVAL($1.u.constant); CG(heredoc_len) = Z_STRLEN($1.u.constant); }
+ | T_START_HEREDOC T_END_HEREDOC { ZVAL_EMPTY_STRING(&$$.u.constant); INIT_PZVAL(&$$.u.constant); $$.op_type = IS_CONST; CG(heredoc) = Z_STRVAL($1.u.constant); CG(heredoc_len) = Z_STRLEN($1.u.constant); }
;
@@ -791,7 +791,7 @@ scalar:
| T_NS_SEPARATOR namespace_name { char *tmp = estrndup(Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); memcpy(&(tmp[1]), Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); tmp[0] = '\\'; efree(Z_STRVAL($2.u.constant)); Z_STRVAL($2.u.constant) = tmp; ++Z_STRLEN($2.u.constant); zend_do_fetch_constant(&$$, NULL, &$2, ZEND_RT, 0 TSRMLS_CC); }
| common_scalar { $$ = $1; }
| '"' encaps_list '"' { $$ = $2; }
- | T_START_HEREDOC encaps_list T_END_HEREDOC { $$ = $2; }
+ | T_START_HEREDOC encaps_list T_END_HEREDOC { $$ = $2; CG(heredoc) = Z_STRVAL($1.u.constant); CG(heredoc_len) = Z_STRLEN($1.u.constant); }
;
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 56fc21b..607a9df 100644
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -1,4 +1,5 @@
-/* Generated by re2c 0.13.5 on Mon Mar 23 21:40:47 2009 */
+/* Generated by re2c 0.13.5 on Mon May 04 19:38:30 2009 */
+#line 1 "Zend/zend_language_scanner.l"
/*
+----------------------------------------------------------------------+
| Zend Engine |
@@ -22,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_scanner.l,v 1.131.2.11.2.13.2.37 2009/03/16 01:40:13 shire Exp $ */
+/* $Id: zend_language_scanner.c,v 1.1.2.38 2009/05/05 01:44:50 mattwil Exp $ */
#if 0
# define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c)
@@ -110,6 +111,12 @@ do { \
} \
}
+/* To save initial string length after scanning to first variable, CG(doc_comment_len) can be reused */
+#define SET_DOUBLE_QUOTES_SCANNED_LENGTH(len) CG(doc_comment_len) = (len)
+#define GET_DOUBLE_QUOTES_SCANNED_LENGTH() CG(doc_comment_len)
+
+#define IS_LABEL_START(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z') || (c) == '_' || (c) >= 0x7F)
+
#define ZEND_IS_OCT(c) ((c)>='0' && (c)<='7')
#define ZEND_IS_HEX(c) (((c)>='0' && (c)<='9') || ((c)>='a' && (c)<='f') || ((c)>='A' && (c)<='F'))
@@ -144,9 +151,7 @@ void startup_scanner(TSRMLS_D)
CG(heredoc_len) = 0;
CG(doc_comment) = NULL;
CG(doc_comment_len) = 0;
- zend_llist_init(&SCNG(used_state_stacks), sizeof(zend_stack), (llist_dtor_func_t) zend_stack_destroy, 0);
zend_stack_init(&SCNG(state_stack));
- zend_llist_add_element(&SCNG(used_state_stacks), &SCNG(state_stack));
}
void shutdown_scanner(TSRMLS_D)
@@ -155,15 +160,10 @@ void shutdown_scanner(TSRMLS_D)
efree(CG(heredoc));
CG(heredoc_len)=0;
}
- zend_llist_destroy(&SCNG(used_state_stacks));
+ zend_stack_destroy(&SCNG(state_stack));
RESET_DOC_COMMENT();
}
-static int compare_stacks(zend_stack *stack1, zend_stack *stack2)
-{
- return (stack1 == stack2);
-}
-
ZEND_API void zend_save_lexical_state(zend_lex_state *lex_state TSRMLS_DC)
{
lex_state->yy_leng = SCNG(yy_leng);
@@ -175,7 +175,6 @@ ZEND_API void zend_save_lexical_state(zend_lex_state *lex_state TSRMLS_DC)
lex_state->state_stack = SCNG(state_stack);
zend_stack_init(&SCNG(state_stack));
- zend_llist_add_element(&SCNG(used_state_stacks), &SCNG(state_stack));
lex_state->in = SCNG(yy_in);
lex_state->yy_state = YYSTATE;
@@ -203,7 +202,7 @@ ZEND_API void zend_restore_lexical_state(zend_lex_state *lex_state TSRMLS_DC)
SCNG(yy_marker) = lex_state->yy_marker;
SCNG(yy_limit) = lex_state->yy_limit;
- zend_llist_del_element(&SCNG(used_state_stacks), &SCNG(state_stack), (int (*)(void *, void *)) compare_stacks);
+ zend_stack_destroy(&SCNG(state_stack));
SCNG(state_stack) = lex_state->state_stack;
SCNG(yy_in) = lex_state->in;
@@ -362,9 +361,7 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR
retval = NULL;
}
}
- if (compilation_successful) {
- zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
- }
+ zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
return retval;
}
@@ -527,8 +524,8 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC)
zend_release_labels(TSRMLS_C);
retval = op_array;
}
- zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
}
+ zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
zval_dtor(&tmp);
CG(in_compilation) = original_in_compilation;
return retval;
@@ -548,6 +545,7 @@ int highlight_file(char *filename, zend_syntax_highlighter_ini *syntax_highlight
zend_save_lexical_state(&original_lex_state TSRMLS_CC);
if (open_file_for_scanning(&file_handle TSRMLS_CC)==FAILURE) {
zend_message_dispatcher(ZMSG_FAILED_HIGHLIGHT_FOPEN, filename TSRMLS_CC);
+ zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
return FAILURE;
}
zend_highlight(syntax_highlighter_ini TSRMLS_CC);
@@ -575,6 +573,7 @@ int highlight_string(zval *str, zend_syntax_highlighter_ini *syntax_highlighter_
zval_copy_ctor(str);
zend_save_lexical_state(&original_lex_state TSRMLS_CC);
if (zend_prepare_string_for_scanning(str, str_name TSRMLS_CC)==FAILURE) {
+ zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
return FAILURE;
}
BEGIN(INITIAL);
@@ -835,51 +834,40 @@ restart:
yymore_restart:
+#line 838 "Zend/zend_language_scanner.c"
{
YYCTYPE yych;
unsigned int yyaccept = 0;
- if (YYGETCONDITION() < 6) {
- if (YYGETCONDITION() < 3) {
+ if (YYGETCONDITION() < 5) {
+ if (YYGETCONDITION() < 2) {
if (YYGETCONDITION() < 1) {
goto yyc_ST_IN_SCRIPTING;
} else {
- if (YYGETCONDITION() < 2) {
- goto yyc_ST_LOOKING_FOR_PROPERTY;
- } else {
- goto yyc_ST_BACKQUOTE;
- }
+ goto yyc_ST_LOOKING_FOR_PROPERTY;
}
} else {
- if (YYGETCONDITION() < 4) {
- goto yyc_ST_DOUBLE_QUOTES;
+ if (YYGETCONDITION() < 3) {
+ goto yyc_ST_BACKQUOTE;
} else {
- if (YYGETCONDITION() < 5) {
- goto yyc_ST_HEREDOC;
+ if (YYGETCONDITION() < 4) {
+ goto yyc_ST_DOUBLE_QUOTES;
} else {
- goto yyc_ST_LOOKING_FOR_VARNAME;
+ goto yyc_ST_HEREDOC;
}
}
}
} else {
- if (YYGETCONDITION() < 9) {
- if (YYGETCONDITION() < 7) {
- goto yyc_ST_VAR_OFFSET;
+ if (YYGETCONDITION() < 7) {
+ if (YYGETCONDITION() < 6) {
+ goto yyc_ST_LOOKING_FOR_VARNAME;
} else {
- if (YYGETCONDITION() < 8) {
- goto yyc_INITIAL;
- } else {
- goto yyc_ST_ONE_LINE_COMMENT;
- }
+ goto yyc_ST_VAR_OFFSET;
}
} else {
- if (YYGETCONDITION() < 11) {
- if (YYGETCONDITION() < 10) {
- goto yyc_ST_COMMENT;
- } else {
- goto yyc_ST_DOC_COMMENT;
- }
+ if (YYGETCONDITION() < 8) {
+ goto yyc_INITIAL;
} else {
- if (YYGETCONDITION() < 12) {
+ if (YYGETCONDITION() < 9) {
goto yyc_ST_END_HEREDOC;
} else {
goto yyc_ST_NOWDOC;
@@ -928,56 +916,67 @@ yyc_INITIAL:
YYDEBUG(0, *YYCURSOR);
YYFILL(8);
yych = *YYCURSOR;
- if (yych <= 0x00) goto yy2;
- if (yych == '<') goto yy4;
- goto yy6;
-yy2:
+ if (yych != '<') goto yy4;
YYDEBUG(2, *YYCURSOR);
- ++YYCURSOR;
- YYDEBUG(3, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- { return 0; }
-yy4:
- YYDEBUG(4, *YYCURSOR);
yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
if (yych <= '?') {
- if (yych == '%') goto yy9;
- if (yych >= '?') goto yy7;
+ if (yych == '%') goto yy7;
+ if (yych >= '?') goto yy5;
} else {
if (yych <= 'S') {
- if (yych >= 'S') goto yy11;
+ if (yych >= 'S') goto yy9;
} else {
- if (yych == 's') goto yy11;
+ if (yych == 's') goto yy9;
}
}
-yy5:
- YYDEBUG(5, *YYCURSOR);
+yy3:
+ YYDEBUG(3, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1562 "Zend/zend_language_scanner.l"
{
+ if (YYCURSOR > YYLIMIT) {
+ return 0;
+ }
inline_char_handler:
while (1) {
YYCTYPE *ptr = memchr(YYCURSOR, '<', YYLIMIT - YYCURSOR);
- if (ptr == NULL) {
- YYCURSOR = YYLIMIT;
- yyleng = YYCURSOR - SCNG(yy_text);
- break;
-
- } else {
- YYCURSOR = ptr + 1;
+ YYCURSOR = ptr ? ptr + 1 : YYLIMIT;
- /* stop if it may be an opening tag (<?, <%, <script>). this condition is not optimal though */
- if (YYCURSOR < YYLIMIT && (*YYCURSOR == '?' || *YYCURSOR == '%' || *YYCURSOR == 's')) {
- --YYCURSOR;
- yyleng = YYCURSOR - SCNG(yy_text);
- break;
+ if (YYCURSOR < YYLIMIT) {
+ switch (*YYCURSOR) {
+ case '?':
+ if (CG(short_tags) || !strncasecmp(YYCURSOR + 1, "php", 3)) { /* Assume [ \t\n\r] follows "php" */
+ break;
+ }
+ continue;
+ case '%':
+ if (CG(asp_tags)) {
+ break;
+ }
+ continue;
+ case 's':
+ case 'S':
+ /* Probably NOT an opening PHP <script> tag, so don't end the HTML chunk yet
+ * If it is, the PHP <script> tag rule checks for any HTML scanned before it */
+ YYCURSOR--;
+ yymore();
+ default:
+ continue;
}
+
+ YYCURSOR--;
}
+
+ break;
}
+inline_html:
+ yyleng = YYCURSOR - SCNG(yy_text);
+
#ifdef ZEND_MULTIBYTE
if (SCNG(output_filter)) {
int readsize;
@@ -999,23 +998,25 @@ inline_char_handler:
HANDLE_NEWLINES(yytext, yyleng);
return T_INLINE_HTML;
}
-yy6:
- YYDEBUG(6, *YYCURSOR);
+#line 1002 "Zend/zend_language_scanner.c"
+yy4:
+ YYDEBUG(4, *YYCURSOR);
yych = *++YYCURSOR;
- goto yy5;
-yy7:
- YYDEBUG(7, *YYCURSOR);
+ goto yy3;
+yy5:
+ YYDEBUG(5, *YYCURSOR);
yyaccept = 1;
yych = *(YYMARKER = ++YYCURSOR);
if (yych <= 'O') {
- if (yych == '=') goto yy47;
+ if (yych == '=') goto yy45;
} else {
- if (yych <= 'P') goto yy49;
- if (yych == 'p') goto yy49;
+ if (yych <= 'P') goto yy47;
+ if (yych == 'p') goto yy47;
}
-yy8:
- YYDEBUG(8, *YYCURSOR);
+yy6:
+ YYDEBUG(6, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1550 "Zend/zend_language_scanner.l"
{
if (CG(short_tags)) {
zendlval->value.str.val = yytext; /* no copying - intentional */
@@ -1027,12 +1028,14 @@ yy8:
goto inline_char_handler;
}
}
-yy9:
- YYDEBUG(9, *YYCURSOR);
+#line 1032 "Zend/zend_language_scanner.c"
+yy7:
+ YYDEBUG(7, *YYCURSOR);
++YYCURSOR;
- if ((yych = *YYCURSOR) == '=') goto yy45;
- YYDEBUG(10, *YYCURSOR);
+ if ((yych = *YYCURSOR) == '=') goto yy43;
+ YYDEBUG(8, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1527 "Zend/zend_language_scanner.l"
{
if (CG(asp_tags)) {
zendlval->value.str.val = yytext; /* no copying - intentional */
@@ -1044,192 +1047,202 @@ yy9:
goto inline_char_handler;
}
}
-yy11:
- YYDEBUG(11, *YYCURSOR);
+#line 1051 "Zend/zend_language_scanner.c"
+yy9:
+ YYDEBUG(9, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy13;
- if (yych == 'c') goto yy13;
-yy12:
- YYDEBUG(12, *YYCURSOR);
+ if (yych == 'C') goto yy11;
+ if (yych == 'c') goto yy11;
+yy10:
+ YYDEBUG(10, *YYCURSOR);
YYCURSOR = YYMARKER;
if (yyaccept <= 0) {
- goto yy5;
+ goto yy3;
} else {
- goto yy8;
+ goto yy6;
}
+yy11:
+ YYDEBUG(11, *YYCURSOR);
+ yych = *++YYCURSOR;
+ if (yych == 'R') goto yy12;
+ if (yych != 'r') goto yy10;
+yy12:
+ YYDEBUG(12, *YYCURSOR);
+ yych = *++YYCURSOR;
+ if (yych == 'I') goto yy13;
+ if (yych != 'i') goto yy10;
yy13:
YYDEBUG(13, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy14;
- if (yych != 'r') goto yy12;
+ if (yych == 'P') goto yy14;
+ if (yych != 'p') goto yy10;
yy14:
YYDEBUG(14, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'I') goto yy15;
- if (yych != 'i') goto yy12;
+ if (yych == 'T') goto yy15;
+ if (yych != 't') goto yy10;
yy15:
YYDEBUG(15, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'P') goto yy16;
- if (yych != 'p') goto yy12;
+ if (yych == 'L') goto yy10;
+ if (yych == 'l') goto yy10;
+ goto yy17;
yy16:
YYDEBUG(16, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych == 'T') goto yy17;
- if (yych != 't') goto yy12;
+ ++YYCURSOR;
+ YYFILL(8);
+ yych = *YYCURSOR;
yy17:
YYDEBUG(17, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych == 'L') goto yy12;
- if (yych == 'l') goto yy12;
- goto yy19;
+ if (yybm[0+yych] & 128) {
+ goto yy16;
+ }
+ if (yych == 'L') goto yy18;
+ if (yych != 'l') goto yy10;
yy18:
YYDEBUG(18, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(8);
- yych = *YYCURSOR;
+ yych = *++YYCURSOR;
+ if (yych == 'A') goto yy19;
+ if (yych != 'a') goto yy10;
yy19:
YYDEBUG(19, *YYCURSOR);
- if (yybm[0+yych] & 128) {
- goto yy18;
- }
- if (yych == 'L') goto yy20;
- if (yych != 'l') goto yy12;
+ yych = *++YYCURSOR;
+ if (yych == 'N') goto yy20;
+ if (yych != 'n') goto yy10;
yy20:
YYDEBUG(20, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy21;
- if (yych != 'a') goto yy12;
+ if (yych == 'G') goto yy21;
+ if (yych != 'g') goto yy10;
yy21:
YYDEBUG(21, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy22;
- if (yych != 'n') goto yy12;
+ if (yych == 'U') goto yy22;
+ if (yych != 'u') goto yy10;
yy22:
YYDEBUG(22, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'G') goto yy23;
- if (yych != 'g') goto yy12;
+ if (yych == 'A') goto yy23;
+ if (yych != 'a') goto yy10;
yy23:
YYDEBUG(23, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'U') goto yy24;
- if (yych != 'u') goto yy12;
+ if (yych == 'G') goto yy24;
+ if (yych != 'g') goto yy10;
yy24:
YYDEBUG(24, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy25;
- if (yych != 'a') goto yy12;
+ if (yych == 'E') goto yy25;
+ if (yych != 'e') goto yy10;
yy25:
YYDEBUG(25, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych == 'G') goto yy26;
- if (yych != 'g') goto yy12;
-yy26:
- YYDEBUG(26, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych == 'E') goto yy27;
- if (yych != 'e') goto yy12;
-yy27:
- YYDEBUG(27, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
- YYDEBUG(28, *YYCURSOR);
+ YYDEBUG(26, *YYCURSOR);
if (yych <= '\r') {
- if (yych <= 0x08) goto yy12;
- if (yych <= '\n') goto yy27;
- if (yych <= '\f') goto yy12;
- goto yy27;
+ if (yych <= 0x08) goto yy10;
+ if (yych <= '\n') goto yy25;
+ if (yych <= '\f') goto yy10;
+ goto yy25;
} else {
if (yych <= ' ') {
- if (yych <= 0x1F) goto yy12;
- goto yy27;
+ if (yych <= 0x1F) goto yy10;
+ goto yy25;
} else {
- if (yych != '=') goto yy12;
+ if (yych != '=') goto yy10;
}
}
-yy29:
- YYDEBUG(29, *YYCURSOR);
+yy27:
+ YYDEBUG(27, *YYCURSOR);
++YYCURSOR;
YYFILL(5);
yych = *YYCURSOR;
- YYDEBUG(30, *YYCURSOR);
+ YYDEBUG(28, *YYCURSOR);
if (yych <= '!') {
if (yych <= '\f') {
- if (yych <= 0x08) goto yy12;
- if (yych <= '\n') goto yy29;
- goto yy12;
+ if (yych <= 0x08) goto yy10;
+ if (yych <= '\n') goto yy27;
+ goto yy10;
} else {
- if (yych <= '\r') goto yy29;
- if (yych == ' ') goto yy29;
- goto yy12;
+ if (yych <= '\r') goto yy27;
+ if (yych == ' ') goto yy27;
+ goto yy10;
}
} else {
if (yych <= 'O') {
- if (yych <= '"') goto yy32;
- if (yych == '\'') goto yy33;
- goto yy12;
+ if (yych <= '"') goto yy30;
+ if (yych == '\'') goto yy31;
+ goto yy10;
} else {
- if (yych <= 'P') goto yy31;
- if (yych != 'p') goto yy12;
+ if (yych <= 'P') goto yy29;
+ if (yych != 'p') goto yy10;
}
}
+yy29:
+ YYDEBUG(29, *YYCURSOR);
+ yych = *++YYCURSOR;
+ if (yych == 'H') goto yy42;
+ if (yych == 'h') goto yy42;
+ goto yy10;
+yy30:
+ YYDEBUG(30, *YYCURSOR);
+ yych = *++YYCURSOR;
+ if (yych == 'P') goto yy39;
+ if (yych == 'p') goto yy39;
+ goto yy10;
yy31:
YYDEBUG(31, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'H') goto yy44;
- if (yych == 'h') goto yy44;
- goto yy12;
+ if (yych == 'P') goto yy32;
+ if (yych != 'p') goto yy10;
yy32:
YYDEBUG(32, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'P') goto yy41;
- if (yych == 'p') goto yy41;
- goto yy12;
+ if (yych == 'H') goto yy33;
+ if (yych != 'h') goto yy10;
yy33:
YYDEBUG(33, *YYCURSOR);
yych = *++YYCURSOR;
if (yych == 'P') goto yy34;
- if (yych != 'p') goto yy12;
+ if (yych != 'p') goto yy10;
yy34:
YYDEBUG(34, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'H') goto yy35;
- if (yych != 'h') goto yy12;
+ if (yych != '\'') goto yy10;
yy35:
YYDEBUG(35, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych == 'P') goto yy36;
- if (yych != 'p') goto yy12;
-yy36:
- YYDEBUG(36, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych != '\'') goto yy12;
-yy37:
- YYDEBUG(37, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
- YYDEBUG(38, *YYCURSOR);
+ YYDEBUG(36, *YYCURSOR);
if (yych <= '\r') {
- if (yych <= 0x08) goto yy12;
- if (yych <= '\n') goto yy37;
- if (yych <= '\f') goto yy12;
- goto yy37;
+ if (yych <= 0x08) goto yy10;
+ if (yych <= '\n') goto yy35;
+ if (yych <= '\f') goto yy10;
+ goto yy35;
} else {
if (yych <= ' ') {
- if (yych <= 0x1F) goto yy12;
- goto yy37;
+ if (yych <= 0x1F) goto yy10;
+ goto yy35;
} else {
- if (yych != '>') goto yy12;
+ if (yych != '>') goto yy10;
}
}
- YYDEBUG(39, *YYCURSOR);
+ YYDEBUG(37, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(40, *YYCURSOR);
+ YYDEBUG(38, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1483 "Zend/zend_language_scanner.l"
{
+ YYCTYPE *bracket = zend_memrchr(yytext, '<', yyleng - (sizeof("script language=php>") - 1));
+
+ if (bracket != SCNG(yy_text)) {
+ /* Handle previously scanned HTML, as possible <script> tags found are assumed to not be PHP's */
+ YYCURSOR = bracket;
+ goto inline_html;
+ }
+
HANDLE_NEWLINES(yytext, yyleng);
zendlval->value.str.val = yytext; /* no copying - intentional */
zendlval->value.str.len = yyleng;
@@ -1237,32 +1250,34 @@ yy37:
BEGIN(ST_IN_SCRIPTING);
return T_OPEN_TAG;
}
+#line 1254 "Zend/zend_language_scanner.c"
+yy39:
+ YYDEBUG(39, *YYCURSOR);
+ yych = *++YYCURSOR;
+ if (yych == 'H') goto yy40;
+ if (yych != 'h') goto yy10;
+yy40:
+ YYDEBUG(40, *YYCURSOR);
+ yych = *++YYCURSOR;
+ if (yych == 'P') goto yy41;
+ if (yych != 'p') goto yy10;
yy41:
YYDEBUG(41, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'H') goto yy42;
- if (yych != 'h') goto yy12;
+ if (yych == '"') goto yy35;
+ goto yy10;
yy42:
YYDEBUG(42, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'P') goto yy43;
- if (yych != 'p') goto yy12;
+ if (yych == 'P') goto yy35;
+ if (yych == 'p') goto yy35;
+ goto yy10;
yy43:
YYDEBUG(43, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych == '"') goto yy37;
- goto yy12;
-yy44:
- YYDEBUG(44, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych == 'P') goto yy37;
- if (yych == 'p') goto yy37;
- goto yy12;
-yy45:
- YYDEBUG(45, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(46, *YYCURSOR);
+ YYDEBUG(44, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1501 "Zend/zend_language_scanner.l"
{
if (CG(asp_tags)) {
zendlval->value.str.val = yytext; /* no copying - intentional */
@@ -1274,11 +1289,13 @@ yy45:
goto inline_char_handler;
}
}
-yy47:
- YYDEBUG(47, *YYCURSOR);
+#line 1293 "Zend/zend_language_scanner.c"
+yy45:
+ YYDEBUG(45, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(48, *YYCURSOR);
+ YYDEBUG(46, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1514 "Zend/zend_language_scanner.l"
{
if (CG(short_tags)) {
zendlval->value.str.val = yytext; /* no copying - intentional */
@@ -1290,32 +1307,34 @@ yy47:
goto inline_char_handler;
}
}
-yy49:
- YYDEBUG(49, *YYCURSOR);
+#line 1311 "Zend/zend_language_scanner.c"
+yy47:
+ YYDEBUG(47, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'H') goto yy50;
- if (yych != 'h') goto yy12;
-yy50:
- YYDEBUG(50, *YYCURSOR);
+ if (yych == 'H') goto yy48;
+ if (yych != 'h') goto yy10;
+yy48:
+ YYDEBUG(48, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'P') goto yy51;
- if (yych != 'p') goto yy12;
-yy51:
- YYDEBUG(51, *YYCURSOR);
+ if (yych == 'P') goto yy49;
+ if (yych != 'p') goto yy10;
+yy49:
+ YYDEBUG(49, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= '\f') {
- if (yych <= 0x08) goto yy12;
- if (yych >= '\v') goto yy12;
+ if (yych <= 0x08) goto yy10;
+ if (yych >= '\v') goto yy10;
} else {
- if (yych <= '\r') goto yy54;
- if (yych != ' ') goto yy12;
+ if (yych <= '\r') goto yy52;
+ if (yych != ' ') goto yy10;
}
-yy52:
- YYDEBUG(52, *YYCURSOR);
+yy50:
+ YYDEBUG(50, *YYCURSOR);
++YYCURSOR;
-yy53:
- YYDEBUG(53, *YYCURSOR);
+yy51:
+ YYDEBUG(51, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1540 "Zend/zend_language_scanner.l"
{
zendlval->value.str.val = yytext; /* no copying - intentional */
zendlval->value.str.len = yyleng;
@@ -1324,302 +1343,199 @@ yy53:
BEGIN(ST_IN_SCRIPTING);
return T_OPEN_TAG;
}
-yy54:
- YYDEBUG(54, *YYCURSOR);
+#line 1347 "Zend/zend_language_scanner.c"
+yy52:
+ YYDEBUG(52, *YYCURSOR);
++YYCURSOR;
- if ((yych = *YYCURSOR) == '\n') goto yy52;
- goto yy53;
+ if ((yych = *YYCURSOR) == '\n') goto yy50;
+ goto yy51;
}
/* *********************************** */
yyc_ST_BACKQUOTE:
{
static const unsigned char yybm[] = {
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 32, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 16, 16, 16, 16, 16, 16,
- 16, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 16, 0, 16, 16, 144,
- 0, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 64, 16, 16, 16, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 0, 0, 0, 0, 0, 0,
+ 0, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 0, 0, 0, 0, 128,
+ 0, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 0, 0, 0, 0, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
};
- YYDEBUG(55, *YYCURSOR);
+ YYDEBUG(53, *YYCURSOR);
YYFILL(2);
yych = *YYCURSOR;
- if (yych <= '\\') {
- if (yych <= '#') {
- if (yych >= 0x01) goto yy62;
- } else {
- if (yych <= '$') goto yy59;
- if (yych <= '[') goto yy62;
- goto yy64;
- }
+ if (yych <= '_') {
+ if (yych != '$') goto yy60;
} else {
- if (yych <= '`') {
- if (yych <= '_') goto yy62;
- goto yy66;
+ if (yych <= '`') goto yy58;
+ if (yych == '{') goto yy57;
+ goto yy60;
+ }
+ YYDEBUG(55, *YYCURSOR);
+ ++YYCURSOR;
+ if ((yych = *YYCURSOR) <= '_') {
+ if (yych <= '@') goto yy56;
+ if (yych <= 'Z') goto yy63;
+ if (yych >= '_') goto yy63;
+ } else {
+ if (yych <= 'z') {
+ if (yych >= 'a') goto yy63;
} else {
- if (yych == '{') goto yy60;
- goto yy62;
+ if (yych <= '{') goto yy66;
+ if (yych >= 0x7F) goto yy63;
}
}
- YYDEBUG(57, *YYCURSOR);
- yyaccept = 0;
- yych = *(YYMARKER = ++YYCURSOR);
- goto yy63;
-yy58:
- YYDEBUG(58, *YYCURSOR);
+yy56:
+ YYDEBUG(56, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 2020 "Zend/zend_language_scanner.l"
{
+ if (YYCURSOR > YYLIMIT) {
+ return 0;
+ }
+ if (yytext[0] == '\\' && YYCURSOR < YYLIMIT) {
+ YYCURSOR++;
+ }
+
+ while (YYCURSOR < YYLIMIT) {
+ switch (*YYCURSOR++) {
+ case '`':
+ break;
+ case '$':
+ if (IS_LABEL_START(*YYCURSOR) || *YYCURSOR == '{') {
+ break;
+ }
+ continue;
+ case '{':
+ if (*YYCURSOR == '$') {
+ break;
+ }
+ continue;
+ case '\\':
+ if (YYCURSOR < YYLIMIT) {
+ YYCURSOR++;
+ }
+ /* fall through */
+ default:
+ continue;
+ }
+
+ YYCURSOR--;
+ break;
+ }
+
+ yyleng = YYCURSOR - SCNG(yy_text);
+
zend_scan_escape_string(zendlval, yytext, yyleng, '`' TSRMLS_CC);
return T_ENCAPSED_AND_WHITESPACE;
}
-yy59:
- YYDEBUG(59, *YYCURSOR);
+#line 1459 "Zend/zend_language_scanner.c"
+yy57:
+ YYDEBUG(57, *YYCURSOR);
yych = *++YYCURSOR;
- if (yybm[0+yych] & 32) {
- goto yy71;
- }
- if (yych <= '^') {
- if (yych <= 'Z') {
- if (yych <= '@') goto yy62;
- goto yy77;
- } else {
- if (yych == '\\') goto yy70;
- goto yy62;
- }
- } else {
- if (yych <= 'z') {
- if (yych == '`') goto yy74;
- goto yy77;
- } else {
- if (yych <= '{') goto yy80;
- if (yych <= '~') goto yy62;
- goto yy77;
- }
- }
+ if (yych == '$') goto yy61;
+ goto yy56;
+yy58:
+ YYDEBUG(58, *YYCURSOR);
+ ++YYCURSOR;
+ YYDEBUG(59, *YYCURSOR);
+ yyleng = YYCURSOR - SCNG(yy_text);
+#line 1964 "Zend/zend_language_scanner.l"
+ {
+ BEGIN(ST_IN_SCRIPTING);
+ return '`';
+}
+#line 1475 "Zend/zend_language_scanner.c"
yy60:
YYDEBUG(60, *YYCURSOR);
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 64) {
- goto yy75;
- }
- if (yych == '$') goto yy61;
- if (yych == '`') goto yy74;
- goto yy63;
+ yych = *++YYCURSOR;
+ goto yy56;
yy61:
YYDEBUG(61, *YYCURSOR);
+ ++YYCURSOR;
+ YYDEBUG(62, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1951 "Zend/zend_language_scanner.l"
{
zendlval->value.lval = (long) '{';
yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
+ yyless(1);
return T_CURLY_OPEN;
}
-yy62:
- YYDEBUG(62, *YYCURSOR);
- yyaccept = 0;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
+#line 1492 "Zend/zend_language_scanner.c"
yy63:
YYDEBUG(63, *YYCURSOR);
- if (yybm[0+yych] & 16) {
- goto yy62;
- }
- if (yych <= '[') goto yy69;
- if (yych <= '\\') goto yy64;
- if (yych <= 'z') goto yy58;
- goto yy68;
-yy64:
- YYDEBUG(64, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yych >= 0x01) goto yy62;
-yy65:
- YYDEBUG(65, *YYCURSOR);
- YYCURSOR = YYMARKER;
- if (yyaccept <= 1) {
- if (yyaccept <= 0) {
- goto yy58;
- } else {
- goto yy61;
- }
- } else {
- if (yyaccept <= 2) {
- goto yy73;
- } else {
- goto yy79;
- }
- }
-yy66:
- YYDEBUG(66, *YYCURSOR);
- ++YYCURSOR;
- YYDEBUG(67, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- BEGIN(ST_IN_SCRIPTING);
- return '`';
-}
-yy68:
- YYDEBUG(68, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 16) {
- goto yy62;
- }
- if (yych <= '[') goto yy65;
- if (yych <= '\\') goto yy64;
- if (yych <= 'z') goto yy74;
- goto yy75;
-yy69:
- YYDEBUG(69, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 32) {
- goto yy71;
- }
- if (yych <= '^') {
- if (yych <= 'Z') {
- if (yych <= '@') goto yy62;
- goto yy65;
- } else {
- if (yych != '\\') goto yy62;
- }
- } else {
- if (yych <= '`') {
- if (yych <= '_') goto yy65;
- goto yy74;
- } else {
- if (yych <= '{') goto yy65;
- if (yych <= '~') goto yy62;
- goto yy65;
- }
- }
-yy70:
- YYDEBUG(70, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= 0x00) goto yy65;
- goto yy62;
-yy71:
- YYDEBUG(71, *YYCURSOR);
- yyaccept = 2;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(72, *YYCURSOR);
- if (yybm[0+yych] & 32) {
- goto yy71;
- }
- if (yych <= '^') {
- if (yych <= 'Z') {
- if (yych <= '@') goto yy62;
- } else {
- if (yych == '\\') goto yy70;
- goto yy62;
- }
- } else {
- if (yych <= '`') {
- if (yych >= '`') goto yy74;
- } else {
- if (yych <= '{') goto yy73;
- if (yych <= '~') goto yy62;
- }
- }
-yy73:
- YYDEBUG(73, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- yyless(yyleng - 1);
- zend_scan_escape_string(zendlval, yytext, yyleng, '`' TSRMLS_CC);
- return T_ENCAPSED_AND_WHITESPACE;
-}
-yy74:
- YYDEBUG(74, *YYCURSOR);
- yych = *++YYCURSOR;
- goto yy73;
-yy75:
- YYDEBUG(75, *YYCURSOR);
- yyaccept = 2;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(76, *YYCURSOR);
- if (yybm[0+yych] & 16) {
- goto yy62;
- }
- if (yych <= '[') goto yy73;
- if (yych <= '\\') goto yy64;
- if (yych <= 'z') goto yy74;
- goto yy75;
-yy77:
- YYDEBUG(77, *YYCURSOR);
- yyaccept = 3;
+ yyaccept = 0;
YYMARKER = ++YYCURSOR;
YYFILL(3);
yych = *YYCURSOR;
- YYDEBUG(78, *YYCURSOR);
+ YYDEBUG(64, *YYCURSOR);
if (yybm[0+yych] & 128) {
- goto yy77;
+ goto yy63;
}
- if (yych == '-') goto yy82;
- if (yych == '[') goto yy83;
-yy79:
- YYDEBUG(79, *YYCURSOR);
+ if (yych == '-') goto yy68;
+ if (yych == '[') goto yy70;
+yy65:
+ YYDEBUG(65, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1649 "Zend/zend_language_scanner.l"
{
zend_copy_value(zendlval, (yytext+1), (yyleng-1));
zendlval->type = IS_STRING;
return T_VARIABLE;
}
-yy80:
- YYDEBUG(80, *YYCURSOR);
+#line 1514 "Zend/zend_language_scanner.c"
+yy66:
+ YYDEBUG(66, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(81, *YYCURSOR);
+ YYDEBUG(67, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1276 "Zend/zend_language_scanner.l"
{
yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC);
return T_DOLLAR_OPEN_CURLY_BRACES;
}
-yy82:
- YYDEBUG(82, *YYCURSOR);
+#line 1525 "Zend/zend_language_scanner.c"
+yy68:
+ YYDEBUG(68, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '>') goto yy85;
+ if (yych == '>') goto yy72;
+yy69:
+ YYDEBUG(69, *YYCURSOR);
+ YYCURSOR = YYMARKER;
goto yy65;
-yy83:
- YYDEBUG(83, *YYCURSOR);
+yy70:
+ YYDEBUG(70, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(84, *YYCURSOR);
+ YYDEBUG(71, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1641 "Zend/zend_language_scanner.l"
{
yyless(yyleng - 1);
yy_push_state(ST_VAR_OFFSET TSRMLS_CC);
@@ -1627,23 +1543,25 @@ yy83:
zendlval->type = IS_STRING;
return T_VARIABLE;
}
-yy85:
- YYDEBUG(85, *YYCURSOR);
+#line 1547 "Zend/zend_language_scanner.c"
+yy72:
+ YYDEBUG(72, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= '_') {
- if (yych <= '@') goto yy65;
- if (yych <= 'Z') goto yy86;
- if (yych <= '^') goto yy65;
+ if (yych <= '@') goto yy69;
+ if (yych <= 'Z') goto yy73;
+ if (yych <= '^') goto yy69;
} else {
- if (yych <= '`') goto yy65;
- if (yych <= 'z') goto yy86;
- if (yych <= '~') goto yy65;
+ if (yych <= '`') goto yy69;
+ if (yych <= 'z') goto yy73;
+ if (yych <= '~') goto yy69;
}
-yy86:
- YYDEBUG(86, *YYCURSOR);
+yy73:
+ YYDEBUG(73, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(87, *YYCURSOR);
+ YYDEBUG(74, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1631 "Zend/zend_language_scanner.l"
{
yyless(yyleng - 3);
yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
@@ -1651,116 +1569,28 @@ yy86:
zendlval->type = IS_STRING;
return T_VARIABLE;
}
+#line 1573 "Zend/zend_language_scanner.c"
}
/* *********************************** */
-yyc_ST_COMMENT:
- {
- static const unsigned char yybm[] = {
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 0, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- };
- YYDEBUG(88, *YYCURSOR);
- YYFILL(2);
- yych = *YYCURSOR;
- if (yych <= 0x00) goto yy90;
- if (yych == '*') goto yy95;
- goto yy92;
-yy90:
- YYDEBUG(90, *YYCURSOR);
- ++YYCURSOR;
- if (yybm[0+(yych = *YYCURSOR)] & 128) {
- goto yy92;
- }
- YYDEBUG(91, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- zend_error(E_COMPILE_WARNING, "Unterminated comment starting line %d", CG(zend_lineno));
- return 0;
-}
-yy92:
- YYDEBUG(92, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(93, *YYCURSOR);
- if (yybm[0+yych] & 128) {
- goto yy92;
- }
- YYDEBUG(94, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- yymore();
-}
-yy95:
- YYDEBUG(95, *YYCURSOR);
- ++YYCURSOR;
- if ((yych = *YYCURSOR) == '/') goto yy97;
- YYDEBUG(96, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- yymore();
-}
-yy97:
- YYDEBUG(97, *YYCURSOR);
- ++YYCURSOR;
- YYDEBUG(98, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- HANDLE_NEWLINES(yytext, yyleng);
- BEGIN(ST_IN_SCRIPTING);
- return T_COMMENT;
-}
- }
-/* *********************************** */
-yyc_ST_DOC_COMMENT:
+yyc_ST_DOUBLE_QUOTES:
{
static const unsigned char yybm[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 0, 0, 0, 0, 0, 0,
+ 0, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 0, 0, 0, 0, 128,
+ 0, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 0, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 0, 0, 0, 0, 128,
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
@@ -1778,353 +1608,165 @@ yyc_ST_DOC_COMMENT:
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
};
- YYDEBUG(99, *YYCURSOR);
+ YYDEBUG(75, *YYCURSOR);
YYFILL(2);
yych = *YYCURSOR;
- if (yych <= 0x00) goto yy101;
- if (yych == '*') goto yy106;
- goto yy103;
-yy101:
- YYDEBUG(101, *YYCURSOR);
- ++YYCURSOR;
- if (yybm[0+(yych = *YYCURSOR)] & 128) {
- goto yy103;
- }
- YYDEBUG(102, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- zend_error(E_COMPILE_WARNING, "Unterminated comment starting line %d", CG(zend_lineno));
- return 0;
-}
-yy103:
- YYDEBUG(103, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(104, *YYCURSOR);
- if (yybm[0+yych] & 128) {
- goto yy103;
+ if (yych <= '#') {
+ if (yych == '"') goto yy80;
+ goto yy82;
+ } else {
+ if (yych <= '$') goto yy77;
+ if (yych == '{') goto yy79;
+ goto yy82;
}
- YYDEBUG(105, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- yymore();
-}
-yy106:
- YYDEBUG(106, *YYCURSOR);
- ++YYCURSOR;
- if ((yych = *YYCURSOR) == '/') goto yy108;
- YYDEBUG(107, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- yymore();
-}
-yy108:
- YYDEBUG(108, *YYCURSOR);
+yy77:
+ YYDEBUG(77, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(109, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- CG(doc_comment) = estrndup(yytext, yyleng);
- CG(doc_comment_len) = yyleng;
- HANDLE_NEWLINES(yytext, yyleng);
- BEGIN(ST_IN_SCRIPTING);
- return T_DOC_COMMENT;
-}
- }
-/* *********************************** */
-yyc_ST_DOUBLE_QUOTES:
- {
- static const unsigned char yybm[] = {
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 0, 16, 32, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 16, 16, 16, 16, 16, 16,
- 16, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 16, 0, 16, 16, 144,
- 16, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 64, 16, 16, 16, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- };
- YYDEBUG(110, *YYCURSOR);
- YYFILL(2);
- yych = *YYCURSOR;
- if (yych <= '$') {
- if (yych <= '!') {
- if (yych >= 0x01) goto yy117;
- } else {
- if (yych <= '"') goto yy121;
- if (yych <= '#') goto yy117;
- goto yy114;
- }
+ if ((yych = *YYCURSOR) <= '_') {
+ if (yych <= '@') goto yy78;
+ if (yych <= 'Z') goto yy85;
+ if (yych >= '_') goto yy85;
} else {
- if (yych <= '\\') {
- if (yych <= '[') goto yy117;
- goto yy119;
+ if (yych <= 'z') {
+ if (yych >= 'a') goto yy85;
} else {
- if (yych == '{') goto yy115;
- goto yy117;
+ if (yych <= '{') goto yy88;
+ if (yych >= 0x7F) goto yy85;
}
}
- YYDEBUG(112, *YYCURSOR);
- yyaccept = 0;
- yych = *(YYMARKER = ++YYCURSOR);
- goto yy118;
-yy113:
- YYDEBUG(113, *YYCURSOR);
+yy78:
+ YYDEBUG(78, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1970 "Zend/zend_language_scanner.l"
{
+ if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) {
+ YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1;
+ SET_DOUBLE_QUOTES_SCANNED_LENGTH(0);
+
+ goto double_quotes_scan_done;
+ }
+
+ if (YYCURSOR > YYLIMIT) {
+ return 0;
+ }
+ if (yytext[0] == '\\' && YYCURSOR < YYLIMIT) {
+ YYCURSOR++;
+ }
+
+ while (YYCURSOR < YYLIMIT) {
+ switch (*YYCURSOR++) {
+ case '"':
+ break;
+ case '$':
+ if (IS_LABEL_START(*YYCURSOR) || *YYCURSOR == '{') {
+ break;
+ }
+ continue;
+ case '{':
+ if (*YYCURSOR == '$') {
+ break;
+ }
+ continue;
+ case '\\':
+ if (YYCURSOR < YYLIMIT) {
+ YYCURSOR++;
+ }
+ /* fall through */
+ default:
+ continue;
+ }
+
+ YYCURSOR--;
+ break;
+ }
+
+double_quotes_scan_done:
+ yyleng = YYCURSOR - SCNG(yy_text);
+
zend_scan_escape_string(zendlval, yytext, yyleng, '"' TSRMLS_CC);
return T_ENCAPSED_AND_WHITESPACE;
}
-yy114:
- YYDEBUG(114, *YYCURSOR);
+#line 1690 "Zend/zend_language_scanner.c"
+yy79:
+ YYDEBUG(79, *YYCURSOR);
yych = *++YYCURSOR;
- if (yybm[0+yych] & 32) {
- goto yy126;
- }
- if (yych <= '\\') {
- if (yych <= '@') {
- if (yych == '"') goto yy129;
- goto yy117;
- } else {
- if (yych <= 'Z') goto yy132;
- if (yych <= '[') goto yy117;
- goto yy125;
- }
- } else {
- if (yych <= '`') {
- if (yych == '_') goto yy132;
- goto yy117;
- } else {
- if (yych <= 'z') goto yy132;
- if (yych <= '{') goto yy135;
- if (yych <= '~') goto yy117;
- goto yy132;
- }
- }
-yy115:
- YYDEBUG(115, *YYCURSOR);
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 64) {
- goto yy130;
- }
- if (yych == '"') goto yy129;
- if (yych != '$') goto yy118;
-yy116:
- YYDEBUG(116, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- zendlval->value.lval = (long) '{';
- yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
- return T_CURLY_OPEN;
-}
-yy117:
- YYDEBUG(117, *YYCURSOR);
- yyaccept = 0;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
-yy118:
- YYDEBUG(118, *YYCURSOR);
- if (yybm[0+yych] & 16) {
- goto yy117;
- }
- if (yych <= '#') goto yy113;
- if (yych <= '$') goto yy124;
- if (yych >= '{') goto yy123;
-yy119:
- YYDEBUG(119, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yych >= 0x01) goto yy117;
-yy120:
- YYDEBUG(120, *YYCURSOR);
- YYCURSOR = YYMARKER;
- if (yyaccept <= 1) {
- if (yyaccept <= 0) {
- goto yy113;
- } else {
- goto yy116;
- }
- } else {
- if (yyaccept <= 2) {
- goto yy128;
- } else {
- goto yy134;
- }
- }
-yy121:
- YYDEBUG(121, *YYCURSOR);
+ if (yych == '$') goto yy83;
+ goto yy78;
+yy80:
+ YYDEBUG(80, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(122, *YYCURSOR);
+ YYDEBUG(81, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1959 "Zend/zend_language_scanner.l"
{
BEGIN(ST_IN_SCRIPTING);
return '"';
}
-yy123:
- YYDEBUG(123, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 16) {
- goto yy117;
- }
- if (yych <= '#') goto yy129;
- if (yych <= '$') goto yy120;
- if (yych <= 'z') goto yy119;
- goto yy130;
-yy124:
- YYDEBUG(124, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 32) {
- goto yy126;
- }
- if (yych <= '\\') {
- if (yych <= '@') {
- if (yych == '"') goto yy129;
- goto yy117;
- } else {
- if (yych <= 'Z') goto yy120;
- if (yych <= '[') goto yy117;
- }
- } else {
- if (yych <= '`') {
- if (yych == '_') goto yy120;
- goto yy117;
- } else {
- if (yych <= '{') goto yy120;
- if (yych <= '~') goto yy117;
- goto yy120;
- }
- }
-yy125:
- YYDEBUG(125, *YYCURSOR);
+#line 1706 "Zend/zend_language_scanner.c"
+yy82:
+ YYDEBUG(82, *YYCURSOR);
+ yych = *++YYCURSOR;
+ goto yy78;
+yy83:
+ YYDEBUG(83, *YYCURSOR);
++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= 0x00) goto yy120;
- goto yy117;
-yy126:
- YYDEBUG(126, *YYCURSOR);
- yyaccept = 2;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(127, *YYCURSOR);
- if (yybm[0+yych] & 32) {
- goto yy126;
- }
- if (yych <= '\\') {
- if (yych <= '@') {
- if (yych == '"') goto yy129;
- goto yy117;
- } else {
- if (yych <= 'Z') goto yy128;
- if (yych <= '[') goto yy117;
- goto yy125;
- }
- } else {
- if (yych <= '`') {
- if (yych != '_') goto yy117;
- } else {
- if (yych <= '{') goto yy128;
- if (yych <= '~') goto yy117;
- }
- }
-yy128:
- YYDEBUG(128, *YYCURSOR);
+ YYDEBUG(84, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1951 "Zend/zend_language_scanner.l"
{
- yyless(yyleng - 1);
- zend_scan_escape_string(zendlval, yytext, yyleng, '"' TSRMLS_CC);
- return T_ENCAPSED_AND_WHITESPACE;
+ zendlval->value.lval = (long) '{';
+ yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
+ yyless(1);
+ return T_CURLY_OPEN;
}
-yy129:
- YYDEBUG(129, *YYCURSOR);
- yych = *++YYCURSOR;
- goto yy128;
-yy130:
- YYDEBUG(130, *YYCURSOR);
- yyaccept = 2;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(131, *YYCURSOR);
- if (yybm[0+yych] & 16) {
- goto yy117;
- }
- if (yych <= '#') goto yy129;
- if (yych <= '$') goto yy128;
- if (yych <= 'z') goto yy119;
- goto yy130;
-yy132:
- YYDEBUG(132, *YYCURSOR);
- yyaccept = 3;
+#line 1723 "Zend/zend_language_scanner.c"
+yy85:
+ YYDEBUG(85, *YYCURSOR);
+ yyaccept = 0;
YYMARKER = ++YYCURSOR;
YYFILL(3);
yych = *YYCURSOR;
- YYDEBUG(133, *YYCURSOR);
+ YYDEBUG(86, *YYCURSOR);
if (yybm[0+yych] & 128) {
- goto yy132;
+ goto yy85;
}
- if (yych == '-') goto yy137;
- if (yych == '[') goto yy138;
-yy134:
- YYDEBUG(134, *YYCURSOR);
+ if (yych == '-') goto yy90;
+ if (yych == '[') goto yy92;
+yy87:
+ YYDEBUG(87, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1649 "Zend/zend_language_scanner.l"
{
zend_copy_value(zendlval, (yytext+1), (yyleng-1));
zendlval->type = IS_STRING;
return T_VARIABLE;
}
-yy135:
- YYDEBUG(135, *YYCURSOR);
+#line 1745 "Zend/zend_language_scanner.c"
+yy88:
+ YYDEBUG(88, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(136, *YYCURSOR);
+ YYDEBUG(89, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1276 "Zend/zend_language_scanner.l"
{
yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC);
return T_DOLLAR_OPEN_CURLY_BRACES;
}
-yy137:
- YYDEBUG(137, *YYCURSOR);
+#line 1756 "Zend/zend_language_scanner.c"
+yy90:
+ YYDEBUG(90, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '>') goto yy140;
- goto yy120;
-yy138:
- YYDEBUG(138, *YYCURSOR);
+ if (yych == '>') goto yy94;
+yy91:
+ YYDEBUG(91, *YYCURSOR);
+ YYCURSOR = YYMARKER;
+ goto yy87;
+yy92:
+ YYDEBUG(92, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(139, *YYCURSOR);
+ YYDEBUG(93, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1641 "Zend/zend_language_scanner.l"
{
yyless(yyleng - 1);
yy_push_state(ST_VAR_OFFSET TSRMLS_CC);
@@ -2132,23 +1774,25 @@ yy138:
zendlval->type = IS_STRING;
return T_VARIABLE;
}
-yy140:
- YYDEBUG(140, *YYCURSOR);
+#line 1778 "Zend/zend_language_scanner.c"
+yy94:
+ YYDEBUG(94, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= '_') {
- if (yych <= '@') goto yy120;
- if (yych <= 'Z') goto yy141;
- if (yych <= '^') goto yy120;
+ if (yych <= '@') goto yy91;
+ if (yych <= 'Z') goto yy95;
+ if (yych <= '^') goto yy91;
} else {
- if (yych <= '`') goto yy120;
- if (yych <= 'z') goto yy141;
- if (yych <= '~') goto yy120;
+ if (yych <= '`') goto yy91;
+ if (yych <= 'z') goto yy95;
+ if (yych <= '~') goto yy91;
}
-yy141:
- YYDEBUG(141, *YYCURSOR);
+yy95:
+ YYDEBUG(95, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(142, *YYCURSOR);
+ YYDEBUG(96, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1631 "Zend/zend_language_scanner.l"
{
yyless(yyleng - 3);
yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
@@ -2156,23 +1800,18 @@ yy141:
zendlval->type = IS_STRING;
return T_VARIABLE;
}
+#line 1804 "Zend/zend_language_scanner.c"
}
/* *********************************** */
yyc_ST_END_HEREDOC:
- YYDEBUG(143, *YYCURSOR);
+ YYDEBUG(97, *YYCURSOR);
YYFILL(1);
yych = *YYCURSOR;
- if (yych >= 0x01) goto yy147;
- YYDEBUG(145, *YYCURSOR);
+ YYDEBUG(99, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(146, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- { return 0; }
-yy147:
- YYDEBUG(147, *YYCURSOR);
- ++YYCURSOR;
- YYDEBUG(148, *YYCURSOR);
+ YYDEBUG(100, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1938 "Zend/zend_language_scanner.l"
{
YYCURSOR += CG(heredoc_len) - 1;
yyleng = CG(heredoc_len);
@@ -2184,806 +1823,209 @@ yy147:
BEGIN(ST_IN_SCRIPTING);
return T_END_HEREDOC;
}
+#line 1827 "Zend/zend_language_scanner.c"
/* *********************************** */
yyc_ST_HEREDOC:
{
static const unsigned char yybm[] = {
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 16, 4, 4, 32, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 64, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 4, 4, 4, 4, 4, 4,
- 4, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 4, 0, 4, 4, 8,
- 4, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 128, 4, 4, 4, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 0, 0, 0, 0, 0, 0,
+ 0, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 0, 0, 0, 0, 128,
+ 0, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 0, 0, 0, 0, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
};
- YYDEBUG(149, *YYCURSOR);
+ YYDEBUG(101, *YYCURSOR);
YYFILL(2);
- yych = *(YYMARKER = YYCURSOR);
- if (yybm[0+yych] & 16) {
- goto yy161;
- }
- if (yych <= '[') {
- if (yych <= '#') {
- if (yych <= 0x00) goto yy152;
- if (yych == '\r') goto yy163;
- goto yy156;
- } else {
- if (yych <= '$') goto yy153;
- if (yych <= '@') goto yy156;
- if (yych <= 'Z') goto yy158;
- goto yy156;
- }
- } else {
- if (yych <= '`') {
- if (yych <= '\\') goto yy160;
- if (yych == '_') goto yy158;
- goto yy156;
- } else {
- if (yych <= 'z') goto yy158;
- if (yych <= '{') goto yy154;
- if (yych <= '~') goto yy156;
- goto yy158;
- }
- }
-yy151:
- YYDEBUG(151, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- zend_scan_escape_string(zendlval, yytext, yyleng, 0 TSRMLS_CC);
- return T_ENCAPSED_AND_WHITESPACE;
-}
-yy152:
- YYDEBUG(152, *YYCURSOR);
- yyaccept = 0;
- yych = *(YYMARKER = ++YYCURSOR);
- goto yy157;
-yy153:
- YYDEBUG(153, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych <= '\\') {
- if (yych <= '@') {
- if (yych == '$') goto yy198;
- goto yy157;
- } else {
- if (yych <= 'Z') goto yy202;
- if (yych <= '[') goto yy157;
- goto yy191;
- }
- } else {
- if (yych <= '`') {
- if (yych == '_') goto yy202;
- goto yy157;
- } else {
- if (yych <= 'z') goto yy202;
- if (yych <= '{') goto yy205;
- if (yych <= '~') goto yy157;
- goto yy202;
- }
- }
-yy154:
- YYDEBUG(154, *YYCURSOR);
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 16) {
- goto yy161;
- }
- if (yych <= '$') {
- if (yych == '\r') goto yy163;
- if (yych <= '#') goto yy156;
+ yych = *YYCURSOR;
+ if (yych == '$') goto yy103;
+ if (yych == '{') goto yy105;
+ goto yy106;
+yy103:
+ YYDEBUG(103, *YYCURSOR);
+ ++YYCURSOR;
+ if ((yych = *YYCURSOR) <= '_') {
+ if (yych <= '@') goto yy104;
+ if (yych <= 'Z') goto yy109;
+ if (yych >= '_') goto yy109;
} else {
- if (yych <= '\\') {
- if (yych <= '[') goto yy156;
- goto yy160;
+ if (yych <= 'z') {
+ if (yych >= 'a') goto yy109;
} else {
- if (yych == '{') goto yy200;
- goto yy156;
+ if (yych <= '{') goto yy112;
+ if (yych >= 0x7F) goto yy109;
}
}
-yy155:
- YYDEBUG(155, *YYCURSOR);
+yy104:
+ YYDEBUG(104, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 2062 "Zend/zend_language_scanner.l"
{
- zendlval->value.lval = (long) '{';
- yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
- return T_CURLY_OPEN;
-}
-yy156:
- YYDEBUG(156, *YYCURSOR);
- yyaccept = 0;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
-yy157:
- YYDEBUG(157, *YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy156;
- }
- if (yych <= '[') {
- if (yych <= '\f') goto yy161;
- if (yych <= '\r') goto yy163;
- if (yych <= '@') goto yy197;
- } else {
- if (yych <= '\\') goto yy160;
- if (yych == '{') goto yy196;
- }
-yy158:
- YYDEBUG(158, *YYCURSOR);
- yyaccept = 0;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(159, *YYCURSOR);
- if (yybm[0+yych] & 16) {
- goto yy161;
- }
- if (yych <= '@') {
- if (yych <= '$') {
- if (yych == '\r') goto yy163;
- if (yych <= '#') goto yy156;
- goto yy190;
- } else {
- if (yych <= '9') {
- if (yych <= '/') goto yy156;
- goto yy158;
- } else {
- if (yych == ';') goto yy188;
- goto yy156;
- }
- }
- } else {
- if (yych <= '_') {
- if (yych <= '[') {
- if (yych <= 'Z') goto yy158;
- goto yy156;
- } else {
- if (yych <= '\\') goto yy160;
- if (yych <= '^') goto yy156;
- goto yy158;
- }
- } else {
- if (yych <= 'z') {
- if (yych <= '`') goto yy156;
- goto yy158;
- } else {
- if (yych <= '{') goto yy189;
- if (yych <= '~') goto yy156;
- goto yy158;
+ int newline = 0;
+
+ if (YYCURSOR > YYLIMIT) {
+ return 0;
+ }
+
+ YYCURSOR--;
+
+ while (YYCURSOR < YYLIMIT) {
+ switch (*YYCURSOR++) {
+ case '\r':
+ if (*YYCURSOR == '\n') {
+ YYCURSOR++;
}
- }
- }
-yy160:
- YYDEBUG(160, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 16) {
- goto yy161;
- }
- if (yych == '\r') goto yy163;
- goto yy156;
-yy161:
- YYDEBUG(161, *YYCURSOR);
- yyaccept = 0;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(162, *YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy156;
- }
- if (yych <= '[') {
- if (yych <= '\f') goto yy161;
- if (yych <= '\r') goto yy163;
- if (yych <= '@') goto yy169;
- goto yy165;
- } else {
- if (yych <= '\\') goto yy170;
- if (yych == '{') goto yy167;
- goto yy165;
- }
-yy163:
- YYDEBUG(163, *YYCURSOR);
- yyaccept = 0;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(164, *YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy156;
- }
- if (yych <= '[') {
- if (yych <= '\f') goto yy161;
- if (yych <= '\r') goto yy163;
- if (yych <= '@') goto yy169;
- } else {
- if (yych <= '\\') goto yy170;
- if (yych == '{') goto yy167;
- }
-yy165:
- YYDEBUG(165, *YYCURSOR);
- yyaccept = 0;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(166, *YYCURSOR);
- if (yych <= ';') {
- if (yych <= '#') {
- if (yych <= '\n') {
- if (yych <= '\t') goto yy156;
- goto yy181;
- } else {
- if (yych == '\r') goto yy181;
- goto yy156;
+ /* fall through */
+ case '\n':
+ /* Check for ending label on the next line */
+ if (IS_LABEL_START(*YYCURSOR) && CG(heredoc_len) < YYLIMIT - YYCURSOR && !memcmp(YYCURSOR, CG(heredoc), CG(heredoc_len))) {
+ YYCTYPE *end = YYCURSOR + CG(heredoc_len);
+
+ if (*end == ';') {
+ end++;
+ }
+
+ if (*end == '\n' || *end == '\r') {
+ /* newline before label will be subtracted from returned text, but
+ * yyleng/yytext will include it, for zend_highlight/strip, tokenizer, etc. */
+ if (YYCURSOR[-2] == '\r' && YYCURSOR[-1] == '\n') {
+ newline = 2; /* Windows newline */
+ } else {
+ newline = 1;
+ }
+
+ CG(increment_lineno) = 1; /* For newline before label */
+ BEGIN(ST_END_HEREDOC);
+
+ goto heredoc_scan_done;
+ }
}
- } else {
- if (yych <= '/') {
- if (yych <= '$') goto yy180;
- goto yy156;
- } else {
- if (yych <= '9') goto yy165;
- if (yych <= ':') goto yy156;
- goto yy177;
+ continue;
+ case '$':
+ if (IS_LABEL_START(*YYCURSOR) || *YYCURSOR == '{') {
+ break;
}
- }
- } else {
- if (yych <= '^') {
- if (yych <= 'Z') {
- if (yych <= '@') goto yy156;
- goto yy165;
- } else {
- if (yych == '\\') goto yy178;
- goto yy156;
+ continue;
+ case '{':
+ if (*YYCURSOR == '$') {
+ break;
}
- } else {
- if (yych <= 'z') {
- if (yych == '`') goto yy156;
- goto yy165;
- } else {
- if (yych <= '{') goto yy179;
- if (yych <= '~') goto yy156;
- goto yy165;
+ continue;
+ case '\\':
+ if (YYCURSOR < YYLIMIT && *YYCURSOR != '\n' && *YYCURSOR != '\r') {
+ YYCURSOR++;
}
- }
- }
-yy167:
- YYDEBUG(167, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 16) {
- goto yy161;
- }
- if (yych <= '$') {
- if (yych == '\r') goto yy163;
- if (yych <= '#') goto yy156;
- } else {
- if (yych <= '\\') {
- if (yych <= '[') goto yy156;
- goto yy170;
- } else {
- if (yych == '{') goto yy175;
- goto yy156;
- }
+ /* fall through */
+ default:
+ continue;
}
-yy168:
- YYDEBUG(168, *YYCURSOR);
- YYCURSOR = YYMARKER;
- if (yyaccept <= 1) {
- if (yyaccept <= 0) {
- goto yy151;
- } else {
- goto yy155;
- }
- } else {
- if (yyaccept <= 2) {
- goto yy174;
- } else {
- goto yy204;
- }
- }
-yy169:
- YYDEBUG(169, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 4) {
- goto yy156;
- }
- if (yych <= '@') {
- if (yych <= '\f') goto yy161;
- if (yych <= '\r') goto yy163;
- goto yy172;
- } else {
- if (yych == '\\') goto yy171;
- goto yy168;
- }
-yy170:
- YYDEBUG(170, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 16) {
- goto yy161;
- }
- if (yych == '\r') goto yy163;
- goto yy156;
-yy171:
- YYDEBUG(171, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 16) {
- goto yy161;
- }
- if (yych == '\r') goto yy163;
- goto yy156;
-yy172:
- YYDEBUG(172, *YYCURSOR);
- yyaccept = 2;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(173, *YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy156;
- }
- if (yych <= '@') {
- if (yych <= '\f') goto yy161;
- if (yych <= '\r') goto yy163;
- goto yy172;
- } else {
- if (yych == '\\') goto yy171;
- }
-yy174:
- YYDEBUG(174, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- yyless(yyleng - 1);
- zend_scan_escape_string(zendlval, yytext, yyleng, 0 TSRMLS_CC);
- return T_ENCAPSED_AND_WHITESPACE;
-}
-yy175:
- YYDEBUG(175, *YYCURSOR);
- yyaccept = 2;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(176, *YYCURSOR);
- if (yybm[0+yych] & 16) {
- goto yy161;
- }
- if (yych <= '$') {
- if (yych == '\r') goto yy163;
- if (yych <= '#') goto yy156;
- goto yy174;
- } else {
- if (yych <= '\\') {
- if (yych <= '[') goto yy156;
- goto yy170;
- } else {
- if (yych == '{') goto yy175;
- goto yy156;
- }
- }
-yy177:
- YYDEBUG(177, *YYCURSOR);
- yyaccept = 0;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '#') {
- if (yych <= '\n') {
- if (yych <= '\t') goto yy156;
- goto yy181;
- } else {
- if (yych == '\r') goto yy181;
- goto yy156;
- }
- } else {
- if (yych <= '\\') {
- if (yych <= '$') goto yy180;
- if (yych <= '[') goto yy156;
- } else {
- if (yych == '{') goto yy179;
- goto yy156;
- }
- }
-yy178:
- YYDEBUG(178, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 16) {
- goto yy161;
- }
- if (yych == '\r') goto yy163;
- goto yy156;
-yy179:
- YYDEBUG(179, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 16) {
- goto yy161;
- }
- if (yych <= '$') {
- if (yych == '\r') goto yy163;
- if (yych <= '#') goto yy156;
- goto yy168;
- } else {
- if (yych <= '\\') {
- if (yych <= '[') goto yy156;
- goto yy178;
- } else {
- if (yych == '{') goto yy186;
- goto yy156;
- }
- }
-yy180:
- YYDEBUG(180, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 4) {
- goto yy156;
- }
- if (yych <= '@') {
- if (yych <= '\f') goto yy161;
- if (yych <= '\r') goto yy163;
- goto yy183;
- } else {
- if (yych == '\\') goto yy185;
- goto yy168;
- }
-yy181:
- YYDEBUG(181, *YYCURSOR);
- ++YYCURSOR;
- YYDEBUG(182, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- char *end = yytext + yyleng - 1;
- if (end[-1] == ';') {
- end--;
- yyleng--;
+ YYCURSOR--;
+ break;
}
- if (yyleng > CG(heredoc_len) && !memcmp(end - CG(heredoc_len), CG(heredoc), CG(heredoc_len))) {
- int len = yyleng - CG(heredoc_len) - 2; /* 2 for newline before and after label */
-
- /* May have matched fooLABEL; make sure there's a newline before it */
- if (yytext[len] != '\n') {
- if (yytext[len] != '\r') {
- yyless(yyleng - 1);
- yymore();
- }
- } else if (len > 0 && yytext[len - 1] == '\r') {
- len--; /* Windows newline */
- }
-
- /* Go back before label, to match in ST_END_HEREDOC state. yytext will include
- * newline before label, for zend_highlight/strip, tokenizer, etc. */
- yyless(yyleng - CG(heredoc_len) - 1); /* 1 for newline after label */
+heredoc_scan_done:
+ yyleng = YYCURSOR - SCNG(yy_text);
- CG(increment_lineno) = 1; /* For newline before label */
- BEGIN(ST_END_HEREDOC);
- zend_scan_escape_string(zendlval, yytext, len, 0 TSRMLS_CC);
- return T_ENCAPSED_AND_WHITESPACE;
- } else {
- /* Go back to end of label, so the next match works correctly in case of
- * a variable or another label at the beginning of the next line */
- yyless(yyleng - 1);
- yymore();
- }
+ zend_scan_escape_string(zendlval, yytext, yyleng - newline, 0 TSRMLS_CC);
+ return T_ENCAPSED_AND_WHITESPACE;
}
-yy183:
- YYDEBUG(183, *YYCURSOR);
- yyaccept = 2;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(184, *YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy156;
- }
- if (yych <= '@') {
- if (yych <= '\f') goto yy161;
- if (yych <= '\r') goto yy163;
- goto yy183;
- } else {
- if (yych != '\\') goto yy174;
- }
-yy185:
- YYDEBUG(185, *YYCURSOR);
+#line 1960 "Zend/zend_language_scanner.c"
+yy105:
+ YYDEBUG(105, *YYCURSOR);
+ yych = *++YYCURSOR;
+ if (yych == '$') goto yy107;
+ goto yy104;
+yy106:
+ YYDEBUG(106, *YYCURSOR);
+ yych = *++YYCURSOR;
+ goto yy104;
+yy107:
+ YYDEBUG(107, *YYCURSOR);
++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 16) {
- goto yy161;
- }
- if (yych == '\r') goto yy163;
- goto yy156;
-yy186:
- YYDEBUG(186, *YYCURSOR);
- yyaccept = 2;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(187, *YYCURSOR);
- if (yybm[0+yych] & 16) {
- goto yy161;
- }
- if (yych <= '$') {
- if (yych == '\r') goto yy163;
- if (yych <= '#') goto yy156;
- goto yy174;
- } else {
- if (yych <= '\\') {
- if (yych <= '[') goto yy156;
- goto yy178;
- } else {
- if (yych == '{') goto yy186;
- goto yy156;
- }
- }
-yy188:
- YYDEBUG(188, *YYCURSOR);
+ YYDEBUG(108, *YYCURSOR);
+ yyleng = YYCURSOR - SCNG(yy_text);
+#line 1951 "Zend/zend_language_scanner.l"
+ {
+ zendlval->value.lval = (long) '{';
+ yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
+ yyless(1);
+ return T_CURLY_OPEN;
+}
+#line 1982 "Zend/zend_language_scanner.c"
+yy109:
+ YYDEBUG(109, *YYCURSOR);
yyaccept = 0;
YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 4) {
- goto yy156;
- }
- if (yych <= '[') {
- if (yych <= '\f') goto yy161;
- if (yych <= '\r') goto yy163;
- if (yych <= '@') goto yy190;
- goto yy158;
- } else {
- if (yych <= '\\') goto yy160;
- if (yych != '{') goto yy158;
- }
-yy189:
- YYDEBUG(189, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 16) {
- goto yy161;
- }
- if (yych <= '$') {
- if (yych == '\r') goto yy163;
- if (yych <= '#') goto yy156;
- goto yy168;
- } else {
- if (yych <= '\\') {
- if (yych <= '[') goto yy156;
- goto yy160;
- } else {
- if (yych == '{') goto yy194;
- goto yy156;
- }
- }
-yy190:
- YYDEBUG(190, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 4) {
- goto yy156;
- }
- if (yych <= '@') {
- if (yych <= '\f') goto yy161;
- if (yych <= '\r') goto yy163;
- goto yy192;
- } else {
- if (yych != '\\') goto yy168;
- }
-yy191:
- YYDEBUG(191, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 16) {
- goto yy161;
- }
- if (yych == '\r') goto yy163;
- goto yy156;
-yy192:
- YYDEBUG(192, *YYCURSOR);
- yyaccept = 2;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(193, *YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy156;
- }
- if (yych <= '@') {
- if (yych <= '\f') goto yy161;
- if (yych <= '\r') goto yy163;
- goto yy192;
- } else {
- if (yych == '\\') goto yy191;
- goto yy174;
- }
-yy194:
- YYDEBUG(194, *YYCURSOR);
- yyaccept = 2;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(195, *YYCURSOR);
- if (yybm[0+yych] & 16) {
- goto yy161;
- }
- if (yych <= '$') {
- if (yych == '\r') goto yy163;
- if (yych <= '#') goto yy156;
- goto yy174;
- } else {
- if (yych <= '\\') {
- if (yych <= '[') goto yy156;
- goto yy160;
- } else {
- if (yych == '{') goto yy194;
- goto yy156;
- }
- }
-yy196:
- YYDEBUG(196, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 16) {
- goto yy161;
- }
- if (yych <= '$') {
- if (yych == '\r') goto yy163;
- if (yych <= '#') goto yy156;
- goto yy168;
- } else {
- if (yych <= '\\') {
- if (yych <= '[') goto yy156;
- goto yy160;
- } else {
- if (yych == '{') goto yy200;
- goto yy156;
- }
- }
-yy197:
- YYDEBUG(197, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 4) {
- goto yy156;
- }
- if (yych <= '@') {
- if (yych <= '\f') goto yy161;
- if (yych <= '\r') goto yy163;
- } else {
- if (yych == '\\') goto yy191;
- goto yy168;
- }
-yy198:
- YYDEBUG(198, *YYCURSOR);
- yyaccept = 2;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(199, *YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy156;
- }
- if (yych <= '@') {
- if (yych <= '\f') goto yy161;
- if (yych <= '\r') goto yy163;
- goto yy198;
- } else {
- if (yych == '\\') goto yy191;
- goto yy174;
- }
-yy200:
- YYDEBUG(200, *YYCURSOR);
- yyaccept = 2;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(201, *YYCURSOR);
- if (yybm[0+yych] & 16) {
- goto yy161;
- }
- if (yych <= '$') {
- if (yych == '\r') goto yy163;
- if (yych <= '#') goto yy156;
- goto yy174;
- } else {
- if (yych <= '\\') {
- if (yych <= '[') goto yy156;
- goto yy160;
- } else {
- if (yych == '{') goto yy200;
- goto yy156;
- }
- }
-yy202:
- YYDEBUG(202, *YYCURSOR);
- yyaccept = 3;
- YYMARKER = ++YYCURSOR;
YYFILL(3);
yych = *YYCURSOR;
- YYDEBUG(203, *YYCURSOR);
- if (yych <= 'Z') {
- if (yych <= '/') {
- if (yych == '-') goto yy207;
- } else {
- if (yych <= '9') goto yy202;
- if (yych >= 'A') goto yy202;
- }
- } else {
- if (yych <= '_') {
- if (yych <= '[') goto yy208;
- if (yych >= '_') goto yy202;
- } else {
- if (yych <= '`') goto yy204;
- if (yych <= 'z') goto yy202;
- if (yych >= 0x7F) goto yy202;
- }
+ YYDEBUG(110, *YYCURSOR);
+ if (yybm[0+yych] & 128) {
+ goto yy109;
}
-yy204:
- YYDEBUG(204, *YYCURSOR);
+ if (yych == '-') goto yy114;
+ if (yych == '[') goto yy116;
+yy111:
+ YYDEBUG(111, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1649 "Zend/zend_language_scanner.l"
{
zend_copy_value(zendlval, (yytext+1), (yyleng-1));
zendlval->type = IS_STRING;
return T_VARIABLE;
}
-yy205:
- YYDEBUG(205, *YYCURSOR);
+#line 2004 "Zend/zend_language_scanner.c"
+yy112:
+ YYDEBUG(112, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(206, *YYCURSOR);
+ YYDEBUG(113, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1276 "Zend/zend_language_scanner.l"
{
yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC);
return T_DOLLAR_OPEN_CURLY_BRACES;
}
-yy207:
- YYDEBUG(207, *YYCURSOR);
+#line 2015 "Zend/zend_language_scanner.c"
+yy114:
+ YYDEBUG(114, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '>') goto yy210;
- goto yy168;
-yy208:
- YYDEBUG(208, *YYCURSOR);
+ if (yych == '>') goto yy118;
+yy115:
+ YYDEBUG(115, *YYCURSOR);
+ YYCURSOR = YYMARKER;
+ goto yy111;
+yy116:
+ YYDEBUG(116, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(209, *YYCURSOR);
+ YYDEBUG(117, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1641 "Zend/zend_language_scanner.l"
{
yyless(yyleng - 1);
yy_push_state(ST_VAR_OFFSET TSRMLS_CC);
@@ -2991,23 +2033,25 @@ yy208:
zendlval->type = IS_STRING;
return T_VARIABLE;
}
-yy210:
- YYDEBUG(210, *YYCURSOR);
+#line 2037 "Zend/zend_language_scanner.c"
+yy118:
+ YYDEBUG(118, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= '_') {
- if (yych <= '@') goto yy168;
- if (yych <= 'Z') goto yy211;
- if (yych <= '^') goto yy168;
+ if (yych <= '@') goto yy115;
+ if (yych <= 'Z') goto yy119;
+ if (yych <= '^') goto yy115;
} else {
- if (yych <= '`') goto yy168;
- if (yych <= 'z') goto yy211;
- if (yych <= '~') goto yy168;
+ if (yych <= '`') goto yy115;
+ if (yych <= 'z') goto yy119;
+ if (yych <= '~') goto yy115;
}
-yy211:
- YYDEBUG(211, *YYCURSOR);
+yy119:
+ YYDEBUG(119, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(212, *YYCURSOR);
+ YYDEBUG(120, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1631 "Zend/zend_language_scanner.l"
{
yyless(yyleng - 3);
yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
@@ -3015,84 +2059,51 @@ yy211:
zendlval->type = IS_STRING;
return T_VARIABLE;
}
+#line 2063 "Zend/zend_language_scanner.c"
}
/* *********************************** */
yyc_ST_IN_SCRIPTING:
{
static const unsigned char yybm[] = {
- /* table 1 .. 8: 0 */
- 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 194, 66, 2, 2, 66, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2,
- 194, 2, 0, 2, 4, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 2, 2, 2, 2, 2, 2,
- 2, 42, 42, 42, 42, 42, 42, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 2, 0, 2, 2, 10,
- 2, 42, 42, 42, 42, 42, 42, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 1, 2, 2, 2, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- /* table 9 .. 9: 256 */
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 0,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 0, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 192, 64, 0, 0, 64, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 192, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 0, 0, 0, 0, 0, 0,
+ 0, 40, 40, 40, 40, 40, 40, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 0, 0, 0, 0, 8,
+ 0, 40, 40, 40, 40, 40, 40, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 0, 0, 0, 0, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
};
- YYDEBUG(213, *YYCURSOR);
+ YYDEBUG(121, *YYCURSOR);
YYFILL(16);
yych = *YYCURSOR;
YYDEBUG(-1, yych);
switch (yych) {
- case 0x00: goto yy215;
+ case 0x00:
case 0x01:
case 0x02:
case 0x03:
@@ -3120,32 +2131,32 @@ yyc_ST_IN_SCRIPTING:
case 0x1C:
case 0x1D:
case 0x1E:
- case 0x1F: goto yy277;
+ case 0x1F: goto yy183;
case '\t':
case '\n':
case '\r':
- case ' ': goto yy233;
- case '!': goto yy246;
- case '"': goto yy271;
- case '#': goto yy269;
- case '$': goto yy258;
- case '%': goto yy252;
- case '&': goto yy253;
- case '\'': goto yy273;
- case '(': goto yy240;
+ case ' ': goto yy139;
+ case '!': goto yy152;
+ case '"': goto yy179;
+ case '#': goto yy175;
+ case '$': goto yy164;
+ case '%': goto yy158;
+ case '&': goto yy159;
+ case '\'': goto yy177;
+ case '(': goto yy146;
case ')':
case ',':
case ';':
case '@':
case '[':
case ']':
- case '~': goto yy259;
- case '*': goto yy249;
- case '+': goto yy245;
- case '-': goto yy231;
- case '.': goto yy251;
- case '/': goto yy250;
- case '0': goto yy265;
+ case '~': goto yy165;
+ case '*': goto yy155;
+ case '+': goto yy151;
+ case '-': goto yy137;
+ case '.': goto yy157;
+ case '/': goto yy156;
+ case '0': goto yy171;
case '1':
case '2':
case '3':
@@ -3154,349 +2165,327 @@ yyc_ST_IN_SCRIPTING:
case '6':
case '7':
case '8':
- case '9': goto yy267;
- case ':': goto yy235;
- case '<': goto yy247;
- case '=': goto yy243;
- case '>': goto yy248;
- case '?': goto yy260;
+ case '9': goto yy173;
+ case ':': goto yy141;
+ case '<': goto yy153;
+ case '=': goto yy149;
+ case '>': goto yy154;
+ case '?': goto yy166;
case 'A':
- case 'a': goto yy226;
+ case 'a': goto yy132;
case 'B':
- case 'b': goto yy228;
+ case 'b': goto yy134;
case 'C':
- case 'c': goto yy221;
+ case 'c': goto yy127;
case 'D':
- case 'd': goto yy219;
+ case 'd': goto yy125;
case 'E':
- case 'e': goto yy217;
+ case 'e': goto yy123;
case 'F':
- case 'f': goto yy220;
+ case 'f': goto yy126;
case 'G':
- case 'g': goto yy229;
+ case 'g': goto yy135;
case 'I':
- case 'i': goto yy224;
+ case 'i': goto yy130;
case 'L':
- case 'l': goto yy244;
+ case 'l': goto yy150;
case 'N':
- case 'n': goto yy238;
+ case 'n': goto yy144;
case 'O':
- case 'o': goto yy256;
+ case 'o': goto yy162;
case 'P':
- case 'p': goto yy230;
+ case 'p': goto yy136;
case 'R':
- case 'r': goto yy222;
+ case 'r': goto yy128;
case 'S':
- case 's': goto yy227;
+ case 's': goto yy133;
case 'T':
- case 't': goto yy223;
+ case 't': goto yy129;
case 'U':
- case 'u': goto yy241;
+ case 'u': goto yy147;
case 'V':
- case 'v': goto yy239;
+ case 'v': goto yy145;
case 'W':
- case 'w': goto yy225;
+ case 'w': goto yy131;
case 'X':
- case 'x': goto yy257;
- case '\\': goto yy236;
- case '^': goto yy255;
- case '_': goto yy242;
- case '`': goto yy275;
- case '{': goto yy261;
- case '|': goto yy254;
- case '}': goto yy263;
- default: goto yy268;
+ case 'x': goto yy163;
+ case '\\': goto yy142;
+ case '^': goto yy161;
+ case '_': goto yy148;
+ case '`': goto yy181;
+ case '{': goto yy167;
+ case '|': goto yy160;
+ case '}': goto yy169;
+ default: goto yy174;
}
-yy215:
- YYDEBUG(215, *YYCURSOR);
- ++YYCURSOR;
- YYDEBUG(216, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- { return 0; }
-yy217:
- YYDEBUG(217, *YYCURSOR);
+yy123:
+ YYDEBUG(123, *YYCURSOR);
++YYCURSOR;
YYDEBUG(-1, yych);
switch ((yych = *YYCURSOR)) {
case 'C':
- case 'c': goto yy809;
+ case 'c': goto yy701;
case 'L':
- case 'l': goto yy810;
+ case 'l': goto yy702;
case 'M':
- case 'm': goto yy811;
+ case 'm': goto yy703;
case 'N':
- case 'n': goto yy812;
+ case 'n': goto yy704;
case 'V':
- case 'v': goto yy813;
+ case 'v': goto yy705;
case 'X':
- case 'x': goto yy814;
- default: goto yy295;
+ case 'x': goto yy706;
+ default: goto yy186;
}
-yy218:
- YYDEBUG(218, *YYCURSOR);
+yy124:
+ YYDEBUG(124, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1672 "Zend/zend_language_scanner.l"
{
zend_copy_value(zendlval, yytext, yyleng);
zendlval->type = IS_STRING;
return T_STRING;
}
-yy219:
- YYDEBUG(219, *YYCURSOR);
+#line 2250 "Zend/zend_language_scanner.c"
+yy125:
+ YYDEBUG(125, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'O') {
if (yych <= 'H') {
- if (yych == 'E') goto yy791;
- goto yy295;
+ if (yych == 'E') goto yy683;
+ goto yy186;
} else {
- if (yych <= 'I') goto yy792;
- if (yych <= 'N') goto yy295;
- goto yy793;
+ if (yych <= 'I') goto yy684;
+ if (yych <= 'N') goto yy186;
+ goto yy685;
}
} else {
if (yych <= 'h') {
- if (yych == 'e') goto yy791;
- goto yy295;
+ if (yych == 'e') goto yy683;
+ goto yy186;
} else {
- if (yych <= 'i') goto yy792;
- if (yych == 'o') goto yy793;
- goto yy295;
+ if (yych <= 'i') goto yy684;
+ if (yych == 'o') goto yy685;
+ goto yy186;
}
}
-yy220:
- YYDEBUG(220, *YYCURSOR);
+yy126:
+ YYDEBUG(126, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'U') {
if (yych <= 'N') {
- if (yych == 'I') goto yy770;
- goto yy295;
+ if (yych == 'I') goto yy662;
+ goto yy186;
} else {
- if (yych <= 'O') goto yy771;
- if (yych <= 'T') goto yy295;
- goto yy772;
+ if (yych <= 'O') goto yy663;
+ if (yych <= 'T') goto yy186;
+ goto yy664;
}
} else {
if (yych <= 'n') {
- if (yych == 'i') goto yy770;
- goto yy295;
+ if (yych == 'i') goto yy662;
+ goto yy186;
} else {
- if (yych <= 'o') goto yy771;
- if (yych == 'u') goto yy772;
- goto yy295;
+ if (yych <= 'o') goto yy663;
+ if (yych == 'u') goto yy664;
+ goto yy186;
}
}
-yy221:
- YYDEBUG(221, *YYCURSOR);
+yy127:
+ YYDEBUG(127, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'O') {
if (yych <= 'K') {
- if (yych == 'A') goto yy742;
- goto yy295;
+ if (yych == 'A') goto yy634;
+ goto yy186;
} else {
- if (yych <= 'L') goto yy743;
- if (yych <= 'N') goto yy295;
- goto yy744;
+ if (yych <= 'L') goto yy635;
+ if (yych <= 'N') goto yy186;
+ goto yy636;
}
} else {
if (yych <= 'k') {
- if (yych == 'a') goto yy742;
- goto yy295;
+ if (yych == 'a') goto yy634;
+ goto yy186;
} else {
- if (yych <= 'l') goto yy743;
- if (yych == 'o') goto yy744;
- goto yy295;
+ if (yych <= 'l') goto yy635;
+ if (yych == 'o') goto yy636;
+ goto yy186;
}
}
-yy222:
- YYDEBUG(222, *YYCURSOR);
+yy128:
+ YYDEBUG(128, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy724;
- if (yych == 'e') goto yy724;
- goto yy295;
-yy223:
- YYDEBUG(223, *YYCURSOR);
+ if (yych == 'E') goto yy616;
+ if (yych == 'e') goto yy616;
+ goto yy186;
+yy129:
+ YYDEBUG(129, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'R') {
- if (yych == 'H') goto yy716;
- if (yych <= 'Q') goto yy295;
- goto yy717;
+ if (yych == 'H') goto yy608;
+ if (yych <= 'Q') goto yy186;
+ goto yy609;
} else {
if (yych <= 'h') {
- if (yych <= 'g') goto yy295;
- goto yy716;
+ if (yych <= 'g') goto yy186;
+ goto yy608;
} else {
- if (yych == 'r') goto yy717;
- goto yy295;
+ if (yych == 'r') goto yy609;
+ goto yy186;
}
}
-yy224:
- YYDEBUG(224, *YYCURSOR);
+yy130:
+ YYDEBUG(130, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'S') {
if (yych <= 'L') {
- if (yych == 'F') goto yy669;
- goto yy295;
+ if (yych == 'F') goto yy561;
+ goto yy186;
} else {
- if (yych <= 'M') goto yy671;
- if (yych <= 'N') goto yy672;
- if (yych <= 'R') goto yy295;
- goto yy673;
+ if (yych <= 'M') goto yy563;
+ if (yych <= 'N') goto yy564;
+ if (yych <= 'R') goto yy186;
+ goto yy565;
}
} else {
if (yych <= 'm') {
- if (yych == 'f') goto yy669;
- if (yych <= 'l') goto yy295;
- goto yy671;
+ if (yych == 'f') goto yy561;
+ if (yych <= 'l') goto yy186;
+ goto yy563;
} else {
- if (yych <= 'n') goto yy672;
- if (yych == 's') goto yy673;
- goto yy295;
+ if (yych <= 'n') goto yy564;
+ if (yych == 's') goto yy565;
+ goto yy186;
}
}
-yy225:
- YYDEBUG(225, *YYCURSOR);
+yy131:
+ YYDEBUG(131, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'H') goto yy664;
- if (yych == 'h') goto yy664;
- goto yy295;
-yy226:
- YYDEBUG(226, *YYCURSOR);
+ if (yych == 'H') goto yy556;
+ if (yych == 'h') goto yy556;
+ goto yy186;
+yy132:
+ YYDEBUG(132, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'S') {
if (yych <= 'M') {
- if (yych == 'B') goto yy646;
- goto yy295;
+ if (yych == 'B') goto yy538;
+ goto yy186;
} else {
- if (yych <= 'N') goto yy647;
- if (yych <= 'Q') goto yy295;
- if (yych <= 'R') goto yy648;
- goto yy649;
+ if (yych <= 'N') goto yy539;
+ if (yych <= 'Q') goto yy186;
+ if (yych <= 'R') goto yy540;
+ goto yy541;
}
} else {
if (yych <= 'n') {
- if (yych == 'b') goto yy646;
- if (yych <= 'm') goto yy295;
- goto yy647;
+ if (yych == 'b') goto yy538;
+ if (yych <= 'm') goto yy186;
+ goto yy539;
} else {
- if (yych <= 'q') goto yy295;
- if (yych <= 'r') goto yy648;
- if (yych <= 's') goto yy649;
- goto yy295;
+ if (yych <= 'q') goto yy186;
+ if (yych <= 'r') goto yy540;
+ if (yych <= 's') goto yy541;
+ goto yy186;
}
}
-yy227:
- YYDEBUG(227, *YYCURSOR);
+yy133:
+ YYDEBUG(133, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'W') {
- if (yych == 'T') goto yy634;
- if (yych <= 'V') goto yy295;
- goto yy635;
+ if (yych == 'T') goto yy526;
+ if (yych <= 'V') goto yy186;
+ goto yy527;
} else {
if (yych <= 't') {
- if (yych <= 's') goto yy295;
- goto yy634;
+ if (yych <= 's') goto yy186;
+ goto yy526;
} else {
- if (yych == 'w') goto yy635;
- goto yy295;
+ if (yych == 'w') goto yy527;
+ goto yy186;
}
}
-yy228:
- YYDEBUG(228, *YYCURSOR);
+yy134:
+ YYDEBUG(134, *YYCURSOR);
yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= 'Q') {
- if (yych <= '/') {
- if (yych <= '"') {
- if (yych <= '!') goto yy218;
- goto yy627;
- } else {
- if (yych == '\'') goto yy278;
- goto yy218;
- }
+ if (yych <= ';') {
+ if (yych <= '"') {
+ if (yych <= '!') goto yy186;
+ goto yy518;
} else {
- if (yych <= ';') {
- if (yych <= '9') goto yy294;
- goto yy218;
- } else {
- if (yych <= '<') goto yy626;
- if (yych <= '@') goto yy218;
- goto yy294;
- }
+ if (yych == '\'') goto yy519;
+ goto yy186;
}
} else {
- if (yych <= '`') {
- if (yych <= 'Z') {
- if (yych <= 'R') goto yy628;
- goto yy294;
- } else {
- if (yych == '_') goto yy294;
- goto yy218;
- }
+ if (yych <= 'R') {
+ if (yych <= '<') goto yy517;
+ if (yych <= 'Q') goto yy186;
+ goto yy520;
} else {
- if (yych <= 'r') {
- if (yych <= 'q') goto yy294;
- goto yy628;
- } else {
- if (yych <= 'z') goto yy294;
- if (yych <= '~') goto yy218;
- goto yy294;
- }
+ if (yych == 'r') goto yy520;
+ goto yy186;
}
}
-yy229:
- YYDEBUG(229, *YYCURSOR);
+yy135:
+ YYDEBUG(135, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'O') {
- if (yych == 'L') goto yy616;
- if (yych <= 'N') goto yy295;
- goto yy617;
+ if (yych == 'L') goto yy507;
+ if (yych <= 'N') goto yy186;
+ goto yy508;
} else {
if (yych <= 'l') {
- if (yych <= 'k') goto yy295;
- goto yy616;
+ if (yych <= 'k') goto yy186;
+ goto yy507;
} else {
- if (yych == 'o') goto yy617;
- goto yy295;
+ if (yych == 'o') goto yy508;
+ goto yy186;
}
}
-yy230:
- YYDEBUG(230, *YYCURSOR);
+yy136:
+ YYDEBUG(136, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'U') {
- if (yych == 'R') goto yy592;
- if (yych <= 'T') goto yy295;
- goto yy593;
+ if (yych == 'R') goto yy483;
+ if (yych <= 'T') goto yy186;
+ goto yy484;
} else {
if (yych <= 'r') {
- if (yych <= 'q') goto yy295;
- goto yy592;
+ if (yych <= 'q') goto yy186;
+ goto yy483;
} else {
- if (yych == 'u') goto yy593;
- goto yy295;
+ if (yych == 'u') goto yy484;
+ goto yy186;
}
}
-yy231:
- YYDEBUG(231, *YYCURSOR);
+yy137:
+ YYDEBUG(137, *YYCURSOR);
++YYCURSOR;
if ((yych = *YYCURSOR) <= '<') {
- if (yych == '-') goto yy588;
+ if (yych == '-') goto yy479;
} else {
- if (yych <= '=') goto yy586;
- if (yych <= '>') goto yy590;
+ if (yych <= '=') goto yy477;
+ if (yych <= '>') goto yy481;
}
-yy232:
- YYDEBUG(232, *YYCURSOR);
+yy138:
+ YYDEBUG(138, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1265 "Zend/zend_language_scanner.l"
{
return yytext[0];
}
-yy233:
- YYDEBUG(233, *YYCURSOR);
+#line 2480 "Zend/zend_language_scanner.c"
+yy139:
+ YYDEBUG(139, *YYCURSOR);
++YYCURSOR;
yych = *YYCURSOR;
- goto yy585;
-yy234:
- YYDEBUG(234, *YYCURSOR);
+ goto yy476;
+yy140:
+ YYDEBUG(140, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1000 "Zend/zend_language_scanner.l"
{
zendlval->value.str.val = yytext; /* no copying - intentional */
zendlval->value.str.len = yyleng;
@@ -3504,255 +2493,261 @@ yy234:
HANDLE_NEWLINES(yytext, yyleng);
return T_WHITESPACE;
}
-yy235:
- YYDEBUG(235, *YYCURSOR);
+#line 2497 "Zend/zend_language_scanner.c"
+yy141:
+ YYDEBUG(141, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == ':') goto yy582;
- goto yy232;
-yy236:
- YYDEBUG(236, *YYCURSOR);
+ if (yych == ':') goto yy473;
+ goto yy138;
+yy142:
+ YYDEBUG(142, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(237, *YYCURSOR);
+ YYDEBUG(143, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1029 "Zend/zend_language_scanner.l"
{
return T_NS_SEPARATOR;
}
-yy238:
- YYDEBUG(238, *YYCURSOR);
+#line 2512 "Zend/zend_language_scanner.c"
+yy144:
+ YYDEBUG(144, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'E') {
- if (yych == 'A') goto yy570;
- if (yych <= 'D') goto yy295;
- goto yy571;
+ if (yych == 'A') goto yy461;
+ if (yych <= 'D') goto yy186;
+ goto yy462;
} else {
if (yych <= 'a') {
- if (yych <= '`') goto yy295;
- goto yy570;
+ if (yych <= '`') goto yy186;
+ goto yy461;
} else {
- if (yych == 'e') goto yy571;
- goto yy295;
+ if (yych == 'e') goto yy462;
+ goto yy186;
}
}
-yy239:
- YYDEBUG(239, *YYCURSOR);
+yy145:
+ YYDEBUG(145, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy567;
- if (yych == 'a') goto yy567;
- goto yy295;
-yy240:
- YYDEBUG(240, *YYCURSOR);
+ if (yych == 'A') goto yy458;
+ if (yych == 'a') goto yy458;
+ goto yy186;
+yy146:
+ YYDEBUG(146, *YYCURSOR);
yyaccept = 1;
yych = *(YYMARKER = ++YYCURSOR);
if (yych <= 'S') {
if (yych <= 'D') {
if (yych <= ' ') {
- if (yych == '\t') goto yy488;
- if (yych <= 0x1F) goto yy232;
- goto yy488;
+ if (yych == '\t') goto yy379;
+ if (yych <= 0x1F) goto yy138;
+ goto yy379;
} else {
- if (yych <= '@') goto yy232;
- if (yych == 'C') goto yy232;
- goto yy488;
+ if (yych <= '@') goto yy138;
+ if (yych == 'C') goto yy138;
+ goto yy379;
}
} else {
if (yych <= 'I') {
- if (yych == 'F') goto yy488;
- if (yych <= 'H') goto yy232;
- goto yy488;
+ if (yych == 'F') goto yy379;
+ if (yych <= 'H') goto yy138;
+ goto yy379;
} else {
- if (yych == 'O') goto yy488;
- if (yych <= 'Q') goto yy232;
- goto yy488;
+ if (yych == 'O') goto yy379;
+ if (yych <= 'Q') goto yy138;
+ goto yy379;
}
}
} else {
if (yych <= 'f') {
if (yych <= 'b') {
- if (yych == 'U') goto yy488;
- if (yych <= '`') goto yy232;
- goto yy488;
+ if (yych == 'U') goto yy379;
+ if (yych <= '`') goto yy138;
+ goto yy379;
} else {
- if (yych == 'd') goto yy488;
- if (yych <= 'e') goto yy232;
- goto yy488;
+ if (yych == 'd') goto yy379;
+ if (yych <= 'e') goto yy138;
+ goto yy379;
}
} else {
if (yych <= 'o') {
- if (yych == 'i') goto yy488;
- if (yych <= 'n') goto yy232;
- goto yy488;
+ if (yych == 'i') goto yy379;
+ if (yych <= 'n') goto yy138;
+ goto yy379;
} else {
if (yych <= 's') {
- if (yych <= 'q') goto yy232;
- goto yy488;
+ if (yych <= 'q') goto yy138;
+ goto yy379;
} else {
- if (yych == 'u') goto yy488;
- goto yy232;
+ if (yych == 'u') goto yy379;
+ goto yy138;
}
}
}
}
-yy241:
- YYDEBUG(241, *YYCURSOR);
+yy147:
+ YYDEBUG(147, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'S') {
- if (yych == 'N') goto yy479;
- if (yych <= 'R') goto yy295;
- goto yy480;
+ if (yych == 'N') goto yy370;
+ if (yych <= 'R') goto yy186;
+ goto yy371;
} else {
if (yych <= 'n') {
- if (yych <= 'm') goto yy295;
- goto yy479;
+ if (yych <= 'm') goto yy186;
+ goto yy370;
} else {
- if (yych == 's') goto yy480;
- goto yy295;
+ if (yych == 's') goto yy371;
+ goto yy186;
}
}
-yy242:
- YYDEBUG(242, *YYCURSOR);
+yy148:
+ YYDEBUG(148, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '_') goto yy405;
- goto yy295;
-yy243:
- YYDEBUG(243, *YYCURSOR);
+ if (yych == '_') goto yy296;
+ goto yy186;
+yy149:
+ YYDEBUG(149, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych <= '<') goto yy232;
- if (yych <= '=') goto yy399;
- if (yych <= '>') goto yy401;
- goto yy232;
-yy244:
- YYDEBUG(244, *YYCURSOR);
+ if (yych <= '<') goto yy138;
+ if (yych <= '=') goto yy290;
+ if (yych <= '>') goto yy292;
+ goto yy138;
+yy150:
+ YYDEBUG(150, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'I') goto yy395;
- if (yych == 'i') goto yy395;
- goto yy295;
-yy245:
- YYDEBUG(245, *YYCURSOR);
+ if (yych == 'I') goto yy286;
+ if (yych == 'i') goto yy286;
+ goto yy186;
+yy151:
+ YYDEBUG(151, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '+') goto yy393;
- if (yych == '=') goto yy391;
- goto yy232;
-yy246:
- YYDEBUG(246, *YYCURSOR);
+ if (yych == '+') goto yy284;
+ if (yych == '=') goto yy282;
+ goto yy138;
+yy152:
+ YYDEBUG(152, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '=') goto yy388;
- goto yy232;
-yy247:
- YYDEBUG(247, *YYCURSOR);
+ if (yych == '=') goto yy279;
+ goto yy138;
+yy153:
+ YYDEBUG(153, *YYCURSOR);
yyaccept = 1;
yych = *(YYMARKER = ++YYCURSOR);
if (yych <= ';') {
- if (yych == '/') goto yy360;
- goto yy232;
+ if (yych == '/') goto yy251;
+ goto yy138;
} else {
- if (yych <= '<') goto yy358;
- if (yych <= '=') goto yy361;
- if (yych <= '>') goto yy363;
- goto yy232;
+ if (yych <= '<') goto yy249;
+ if (yych <= '=') goto yy252;
+ if (yych <= '>') goto yy254;
+ goto yy138;
}
-yy248:
- YYDEBUG(248, *YYCURSOR);
+yy154:
+ YYDEBUG(154, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych <= '<') goto yy232;
- if (yych <= '=') goto yy354;
- if (yych <= '>') goto yy352;
- goto yy232;
-yy249:
- YYDEBUG(249, *YYCURSOR);
+ if (yych <= '<') goto yy138;
+ if (yych <= '=') goto yy245;
+ if (yych <= '>') goto yy243;
+ goto yy138;
+yy155:
+ YYDEBUG(155, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '=') goto yy350;
- goto yy232;
-yy250:
- YYDEBUG(250, *YYCURSOR);
+ if (yych == '=') goto yy241;
+ goto yy138;
+yy156:
+ YYDEBUG(156, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= '.') {
- if (yych == '*') goto yy341;
- goto yy232;
+ if (yych == '*') goto yy233;
+ goto yy138;
} else {
- if (yych <= '/') goto yy343;
- if (yych == '=') goto yy344;
- goto yy232;
+ if (yych <= '/') goto yy235;
+ if (yych == '=') goto yy236;
+ goto yy138;
}
-yy251:
- YYDEBUG(251, *YYCURSOR);
+yy157:
+ YYDEBUG(157, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych <= '/') goto yy232;
- if (yych <= '9') goto yy337;
- if (yych == '=') goto yy339;
- goto yy232;
-yy252:
- YYDEBUG(252, *YYCURSOR);
+ if (yych <= '/') goto yy138;
+ if (yych <= '9') goto yy229;
+ if (yych == '=') goto yy231;
+ goto yy138;
+yy158:
+ YYDEBUG(158, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych <= '<') goto yy232;
- if (yych <= '=') goto yy333;
- if (yych <= '>') goto yy331;
- goto yy232;
-yy253:
- YYDEBUG(253, *YYCURSOR);
+ if (yych <= '<') goto yy138;
+ if (yych <= '=') goto yy225;
+ if (yych <= '>') goto yy223;
+ goto yy138;
+yy159:
+ YYDEBUG(159, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '&') goto yy327;
- if (yych == '=') goto yy329;
- goto yy232;
-yy254:
- YYDEBUG(254, *YYCURSOR);
+ if (yych == '&') goto yy219;
+ if (yych == '=') goto yy221;
+ goto yy138;
+yy160:
+ YYDEBUG(160, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '=') goto yy325;
- if (yych == '|') goto yy323;
- goto yy232;
-yy255:
- YYDEBUG(255, *YYCURSOR);
+ if (yych == '=') goto yy217;
+ if (yych == '|') goto yy215;
+ goto yy138;
+yy161:
+ YYDEBUG(161, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '=') goto yy321;
- goto yy232;
-yy256:
- YYDEBUG(256, *YYCURSOR);
+ if (yych == '=') goto yy213;
+ goto yy138;
+yy162:
+ YYDEBUG(162, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy319;
- if (yych == 'r') goto yy319;
- goto yy295;
-yy257:
- YYDEBUG(257, *YYCURSOR);
+ if (yych == 'R') goto yy211;
+ if (yych == 'r') goto yy211;
+ goto yy186;
+yy163:
+ YYDEBUG(163, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'O') goto yy316;
- if (yych == 'o') goto yy316;
- goto yy295;
-yy258:
- YYDEBUG(258, *YYCURSOR);
+ if (yych == 'O') goto yy208;
+ if (yych == 'o') goto yy208;
+ goto yy186;
+yy164:
+ YYDEBUG(164, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= '_') {
- if (yych <= '@') goto yy232;
- if (yych <= 'Z') goto yy313;
- if (yych <= '^') goto yy232;
- goto yy313;
+ if (yych <= '@') goto yy138;
+ if (yych <= 'Z') goto yy205;
+ if (yych <= '^') goto yy138;
+ goto yy205;
} else {
- if (yych <= '`') goto yy232;
- if (yych <= 'z') goto yy313;
- if (yych <= '~') goto yy232;
- goto yy313;
+ if (yych <= '`') goto yy138;
+ if (yych <= 'z') goto yy205;
+ if (yych <= '~') goto yy138;
+ goto yy205;
}
-yy259:
- YYDEBUG(259, *YYCURSOR);
+yy165:
+ YYDEBUG(165, *YYCURSOR);
yych = *++YYCURSOR;
- goto yy232;
-yy260:
- YYDEBUG(260, *YYCURSOR);
+ goto yy138;
+yy166:
+ YYDEBUG(166, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '>') goto yy309;
- goto yy232;
-yy261:
- YYDEBUG(261, *YYCURSOR);
+ if (yych == '>') goto yy201;
+ goto yy138;
+yy167:
+ YYDEBUG(167, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(262, *YYCURSOR);
+ YYDEBUG(168, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1270 "Zend/zend_language_scanner.l"
{
yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
return '{';
}
-yy263:
- YYDEBUG(263, *YYCURSOR);
+#line 2745 "Zend/zend_language_scanner.c"
+yy169:
+ YYDEBUG(169, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(264, *YYCURSOR);
+ YYDEBUG(170, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1282 "Zend/zend_language_scanner.l"
{
RESET_DOC_COMMENT();
if (!zend_stack_is_empty(&SCNG(state_stack))) {
@@ -3760,28 +2755,30 @@ yy263:
}
return '}';
}
-yy265:
- YYDEBUG(265, *YYCURSOR);
+#line 2759 "Zend/zend_language_scanner.c"
+yy171:
+ YYDEBUG(171, *YYCURSOR);
yyaccept = 2;
yych = *(YYMARKER = ++YYCURSOR);
if (yych <= 'E') {
if (yych <= '/') {
- if (yych == '.') goto yy296;
+ if (yych == '.') goto yy187;
} else {
- if (yych <= '9') goto yy299;
- if (yych >= 'E') goto yy301;
+ if (yych <= '9') goto yy190;
+ if (yych >= 'E') goto yy192;
}
} else {
if (yych <= 'd') {
- if (yych == 'X') goto yy305;
+ if (yych == 'X') goto yy197;
} else {
- if (yych <= 'e') goto yy301;
- if (yych == 'x') goto yy305;
+ if (yych <= 'e') goto yy192;
+ if (yych == 'x') goto yy197;
}
}
-yy266:
- YYDEBUG(266, *YYCURSOR);
+yy172:
+ YYDEBUG(172, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1308 "Zend/zend_language_scanner.l"
{
if (yyleng < MAX_LENGTH_OF_LONG - 1) { /* Won't overflow */
zendlval->value.lval = strtol(yytext, NULL, 0);
@@ -3802,132 +2799,101 @@ yy266:
zendlval->type = IS_LONG;
return T_LNUMBER;
}
-yy267:
- YYDEBUG(267, *YYCURSOR);
+#line 2803 "Zend/zend_language_scanner.c"
+yy173:
+ YYDEBUG(173, *YYCURSOR);
yyaccept = 2;
yych = *(YYMARKER = ++YYCURSOR);
if (yych <= '9') {
- if (yych == '.') goto yy296;
- if (yych <= '/') goto yy266;
- goto yy299;
+ if (yych == '.') goto yy187;
+ if (yych <= '/') goto yy172;
+ goto yy190;
} else {
if (yych <= 'E') {
- if (yych <= 'D') goto yy266;
- goto yy301;
+ if (yych <= 'D') goto yy172;
+ goto yy192;
} else {
- if (yych == 'e') goto yy301;
- goto yy266;
+ if (yych == 'e') goto yy192;
+ goto yy172;
}
}
-yy268:
- YYDEBUG(268, *YYCURSOR);
+yy174:
+ YYDEBUG(174, *YYCURSOR);
yych = *++YYCURSOR;
- goto yy295;
-yy269:
- YYDEBUG(269, *YYCURSOR);
- ++YYCURSOR;
-yy270:
- YYDEBUG(270, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- BEGIN(ST_ONE_LINE_COMMENT);
- yymore();
-}
-yy271:
- YYDEBUG(271, *YYCURSOR);
- yyaccept = 3;
- yych = *(YYMARKER = ++YYCURSOR);
- goto yy287;
-yy272:
- YYDEBUG(272, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- BEGIN(ST_DOUBLE_QUOTES);
- return '"';
-}
-yy273:
- YYDEBUG(273, *YYCURSOR);
- yyaccept = 4;
- yych = *(YYMARKER = ++YYCURSOR);
- goto yy279;
-yy274:
- YYDEBUG(274, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE);
- goto restart;
-}
-yy275:
- YYDEBUG(275, *YYCURSOR);
+ goto yy186;
+yy175:
+ YYDEBUG(175, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(276, *YYCURSOR);
+yy176:
+ YYDEBUG(176, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1679 "Zend/zend_language_scanner.l"
{
- BEGIN(ST_BACKQUOTE);
- return '`';
-}
-yy277:
- YYDEBUG(277, *YYCURSOR);
- yych = *++YYCURSOR;
- goto yy274;
-yy278:
- YYDEBUG(278, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
-yy279:
- YYDEBUG(279, *YYCURSOR);
- if (yybm[256+yych] & 128) {
- goto yy278;
- }
- if (yych <= '[') goto yy282;
- YYDEBUG(280, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yych >= 0x01) goto yy278;
-yy281:
- YYDEBUG(281, *YYCURSOR);
- YYCURSOR = YYMARKER;
- if (yyaccept <= 3) {
- if (yyaccept <= 1) {
- if (yyaccept <= 0) {
- goto yy218;
- } else {
- goto yy232;
+ while (YYCURSOR < YYLIMIT) {
+ switch (*YYCURSOR++) {
+ case '\r':
+ if (*YYCURSOR == '\n') {
+ YYCURSOR++;
}
- } else {
- if (yyaccept <= 2) {
- goto yy266;
- } else {
- goto yy272;
- }
- }
- } else {
- if (yyaccept <= 5) {
- if (yyaccept <= 4) {
- goto yy274;
- } else {
- goto yy298;
+ /* fall through */
+ case '\n':
+ CG(zend_lineno)++;
+ break;
+ case '%':
+ if (!CG(asp_tags)) {
+ continue;
}
- } else {
- if (yyaccept <= 6) {
- goto yy342;
- } else {
- goto yy359;
+ /* fall through */
+ case '?':
+ if (*YYCURSOR == '>') {
+ YYCURSOR--;
+ break;
}
- }
+ /* fall through */
+ default:
+ continue;
}
-yy282:
- YYDEBUG(282, *YYCURSOR);
+
+ break;
+ }
+
+ yyleng = YYCURSOR - SCNG(yy_text);
+
+ return T_COMMENT;
+}
+#line 2865 "Zend/zend_language_scanner.c"
+yy177:
+ YYDEBUG(177, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(283, *YYCURSOR);
+yy178:
+ YYDEBUG(178, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1770 "Zend/zend_language_scanner.l"
{
register char *s, *t;
char *end;
int bprefix = (yytext[0] != '\'') ? 1 : 0;
+ while (1) {
+ if (YYCURSOR < YYLIMIT) {
+ if (*YYCURSOR == '\'') {
+ YYCURSOR++;
+ yyleng = YYCURSOR - SCNG(yy_text);
+
+ break;
+ } else if (*YYCURSOR++ == '\\' && YYCURSOR < YYLIMIT) {
+ YYCURSOR++;
+ }
+ } else {
+ yyleng = YYLIMIT - SCNG(yy_text);
+
+ /* Unclosed single quotes; treat similar to double quotes, but without a separate token
+ * for ' (unrecognized by parser), instead of old flex fallback to "Unexpected character..."
+ * rule, which continued in ST_IN_SCRIPTING state after the quote */
+ return T_ENCAPSED_AND_WHITESPACE;
+ }
+ }
+
zendlval->value.str.val = estrndup(yytext+bprefix+1, yyleng-bprefix-2);
zendlval->value.str.len = yyleng-bprefix-2;
zendlval->type = IS_STRING;
@@ -3972,176 +2938,199 @@ yy282:
#endif /* ZEND_MULTIBYTE */
return T_CONSTANT_ENCAPSED_STRING;
}
-yy284:
- YYDEBUG(284, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(285, *YYCURSOR);
- if (yybm[0+yych] & 2) {
- goto yy286;
- }
- if (yych <= '#') goto yy291;
- if (yych <= '$') goto yy281;
- if (yych <= 'z') goto yy288;
- goto yy284;
-yy286:
- YYDEBUG(286, *YYCURSOR);
+#line 2942 "Zend/zend_language_scanner.c"
+yy179:
+ YYDEBUG(179, *YYCURSOR);
++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
-yy287:
- YYDEBUG(287, *YYCURSOR);
- if (yybm[0+yych] & 2) {
- goto yy286;
+yy180:
+ YYDEBUG(180, *YYCURSOR);
+ yyleng = YYCURSOR - SCNG(yy_text);
+#line 1841 "Zend/zend_language_scanner.l"
+ {
+ int bprefix = (yytext[0] != '"') ? 1 : 0;
+
+ while (YYCURSOR < YYLIMIT) {
+ switch (*YYCURSOR++) {
+ case '"':
+ yyleng = YYCURSOR - SCNG(yy_text);
+ zend_scan_escape_string(zendlval, yytext+bprefix+1, yyleng-bprefix-2, '"' TSRMLS_CC);
+ return T_CONSTANT_ENCAPSED_STRING;
+ case '$':
+ if (IS_LABEL_START(*YYCURSOR) || *YYCURSOR == '{') {
+ break;
+ }
+ continue;
+ case '{':
+ if (*YYCURSOR == '$') {
+ break;
+ }
+ continue;
+ case '\\':
+ if (YYCURSOR < YYLIMIT) {
+ YYCURSOR++;
+ }
+ /* fall through */
+ default:
+ continue;
}
- if (yych <= '#') goto yy291;
- if (yych <= '$') goto yy289;
- if (yych >= '{') goto yy284;
-yy288:
- YYDEBUG(288, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= 0x00) goto yy281;
- goto yy286;
-yy289:
- YYDEBUG(289, *YYCURSOR);
+
+ YYCURSOR--;
+ break;
+ }
+
+ /* Remember how much was scanned to save rescanning */
+ SET_DOUBLE_QUOTES_SCANNED_LENGTH(YYCURSOR - SCNG(yy_text) - yyleng);
+
+ YYCURSOR = SCNG(yy_text) + yyleng;
+
+ BEGIN(ST_DOUBLE_QUOTES);
+ return '"';
+}
+#line 2990 "Zend/zend_language_scanner.c"
+yy181:
+ YYDEBUG(181, *YYCURSOR);
++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(290, *YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy289;
- }
- if (yych <= '\\') {
- if (yych <= '@') {
- if (yych != '"') goto yy286;
- } else {
- if (yych <= 'Z') goto yy281;
- if (yych <= '[') goto yy286;
- goto yy293;
- }
- } else {
- if (yych <= '`') {
- if (yych == '_') goto yy281;
- goto yy286;
- } else {
- if (yych <= '{') goto yy281;
- if (yych <= '~') goto yy286;
- goto yy281;
- }
- }
-yy291:
- YYDEBUG(291, *YYCURSOR);
+ YYDEBUG(182, *YYCURSOR);
+ yyleng = YYCURSOR - SCNG(yy_text);
+#line 1932 "Zend/zend_language_scanner.l"
+ {
+ BEGIN(ST_BACKQUOTE);
+ return '`';
+}
+#line 3001 "Zend/zend_language_scanner.c"
+yy183:
+ YYDEBUG(183, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(292, *YYCURSOR);
+ YYDEBUG(184, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 2190 "Zend/zend_language_scanner.l"
{
- int bprefix = (yytext[0] != '"') ? 1 : 0;
+ if (YYCURSOR > YYLIMIT) {
+ return 0;
+ }
- zend_scan_escape_string(zendlval, yytext+bprefix+1, yyleng-bprefix-2, '"' TSRMLS_CC);
- return T_CONSTANT_ENCAPSED_STRING;
+ zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE);
+ goto restart;
}
-yy293:
- YYDEBUG(293, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= 0x00) goto yy281;
- goto yy286;
-yy294:
- YYDEBUG(294, *YYCURSOR);
+#line 3016 "Zend/zend_language_scanner.c"
+yy185:
+ YYDEBUG(185, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
-yy295:
- YYDEBUG(295, *YYCURSOR);
+yy186:
+ YYDEBUG(186, *YYCURSOR);
if (yybm[0+yych] & 8) {
- goto yy294;
+ goto yy185;
}
- goto yy218;
-yy296:
- YYDEBUG(296, *YYCURSOR);
- yyaccept = 5;
+ goto yy124;
+yy187:
+ YYDEBUG(187, *YYCURSOR);
+ yyaccept = 3;
YYMARKER = ++YYCURSOR;
YYFILL(3);
yych = *YYCURSOR;
- YYDEBUG(297, *YYCURSOR);
+ YYDEBUG(188, *YYCURSOR);
if (yybm[0+yych] & 16) {
- goto yy296;
+ goto yy187;
}
- if (yych == 'E') goto yy301;
- if (yych == 'e') goto yy301;
-yy298:
- YYDEBUG(298, *YYCURSOR);
+ if (yych == 'E') goto yy192;
+ if (yych == 'e') goto yy192;
+yy189:
+ YYDEBUG(189, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1369 "Zend/zend_language_scanner.l"
{
zendlval->value.dval = zend_strtod(yytext, NULL);
zendlval->type = IS_DOUBLE;
return T_DNUMBER;
}
-yy299:
- YYDEBUG(299, *YYCURSOR);
+#line 3049 "Zend/zend_language_scanner.c"
+yy190:
+ YYDEBUG(190, *YYCURSOR);
yyaccept = 2;
YYMARKER = ++YYCURSOR;
YYFILL(3);
yych = *YYCURSOR;
- YYDEBUG(300, *YYCURSOR);
+ YYDEBUG(191, *YYCURSOR);
if (yych <= '9') {
- if (yych == '.') goto yy296;
- if (yych <= '/') goto yy266;
- goto yy299;
+ if (yych == '.') goto yy187;
+ if (yych <= '/') goto yy172;
+ goto yy190;
} else {
if (yych <= 'E') {
- if (yych <= 'D') goto yy266;
+ if (yych <= 'D') goto yy172;
} else {
- if (yych != 'e') goto yy266;
+ if (yych != 'e') goto yy172;
}
}
-yy301:
- YYDEBUG(301, *YYCURSOR);
+yy192:
+ YYDEBUG(192, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= ',') {
- if (yych != '+') goto yy281;
+ if (yych == '+') goto yy194;
} else {
- if (yych <= '-') goto yy302;
- if (yych <= '/') goto yy281;
- if (yych <= '9') goto yy303;
- goto yy281;
+ if (yych <= '-') goto yy194;
+ if (yych <= '/') goto yy193;
+ if (yych <= '9') goto yy195;
}
-yy302:
- YYDEBUG(302, *YYCURSOR);
+yy193:
+ YYDEBUG(193, *YYCURSOR);
+ YYCURSOR = YYMARKER;
+ if (yyaccept <= 2) {
+ if (yyaccept <= 1) {
+ if (yyaccept <= 0) {
+ goto yy124;
+ } else {
+ goto yy138;
+ }
+ } else {
+ goto yy172;
+ }
+ } else {
+ if (yyaccept <= 4) {
+ if (yyaccept <= 3) {
+ goto yy189;
+ } else {
+ goto yy234;
+ }
+ } else {
+ goto yy250;
+ }
+ }
+yy194:
+ YYDEBUG(194, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych <= '/') goto yy281;
- if (yych >= ':') goto yy281;
-yy303:
- YYDEBUG(303, *YYCURSOR);
+ if (yych <= '/') goto yy193;
+ if (yych >= ':') goto yy193;
+yy195:
+ YYDEBUG(195, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
- YYDEBUG(304, *YYCURSOR);
- if (yych <= '/') goto yy298;
- if (yych <= '9') goto yy303;
- goto yy298;
-yy305:
- YYDEBUG(305, *YYCURSOR);
+ YYDEBUG(196, *YYCURSOR);
+ if (yych <= '/') goto yy189;
+ if (yych <= '9') goto yy195;
+ goto yy189;
+yy197:
+ YYDEBUG(197, *YYCURSOR);
yych = *++YYCURSOR;
if (yybm[0+yych] & 32) {
- goto yy306;
+ goto yy198;
}
- goto yy281;
-yy306:
- YYDEBUG(306, *YYCURSOR);
+ goto yy193;
+yy198:
+ YYDEBUG(198, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
- YYDEBUG(307, *YYCURSOR);
+ YYDEBUG(199, *YYCURSOR);
if (yybm[0+yych] & 32) {
- goto yy306;
+ goto yy198;
}
- YYDEBUG(308, *YYCURSOR);
+ YYDEBUG(200, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1329 "Zend/zend_language_scanner.l"
{
char *hex = yytext + 2; /* Skip "0x" */
int len = yyleng - 2;
@@ -4162,14 +3151,16 @@ yy306:
return T_DNUMBER;
}
}
-yy309:
- YYDEBUG(309, *YYCURSOR);
+#line 3155 "Zend/zend_language_scanner.c"
+yy201:
+ YYDEBUG(201, *YYCURSOR);
++YYCURSOR;
- if ((yych = *YYCURSOR) == '\n') goto yy311;
- if (yych == '\r') goto yy312;
-yy310:
- YYDEBUG(310, *YYCURSOR);
+ if ((yych = *YYCURSOR) == '\n') goto yy203;
+ if (yych == '\r') goto yy204;
+yy202:
+ YYDEBUG(202, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1747 "Zend/zend_language_scanner.l"
{
zendlval->value.str.val = yytext; /* no copying - intentional */
zendlval->value.str.len = yyleng;
@@ -4177,119 +3168,137 @@ yy310:
BEGIN(INITIAL);
return T_CLOSE_TAG; /* implicit ';' at php-end tag */
}
-yy311:
- YYDEBUG(311, *YYCURSOR);
+#line 3172 "Zend/zend_language_scanner.c"
+yy203:
+ YYDEBUG(203, *YYCURSOR);
yych = *++YYCURSOR;
- goto yy310;
-yy312:
- YYDEBUG(312, *YYCURSOR);
+ goto yy202;
+yy204:
+ YYDEBUG(204, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '\n') goto yy311;
- goto yy310;
-yy313:
- YYDEBUG(313, *YYCURSOR);
+ if (yych == '\n') goto yy203;
+ goto yy202;
+yy205:
+ YYDEBUG(205, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
- YYDEBUG(314, *YYCURSOR);
+ YYDEBUG(206, *YYCURSOR);
if (yych <= '^') {
if (yych <= '9') {
- if (yych >= '0') goto yy313;
+ if (yych >= '0') goto yy205;
} else {
- if (yych <= '@') goto yy315;
- if (yych <= 'Z') goto yy313;
+ if (yych <= '@') goto yy207;
+ if (yych <= 'Z') goto yy205;
}
} else {
if (yych <= '`') {
- if (yych <= '_') goto yy313;
+ if (yych <= '_') goto yy205;
} else {
- if (yych <= 'z') goto yy313;
- if (yych >= 0x7F) goto yy313;
+ if (yych <= 'z') goto yy205;
+ if (yych >= 0x7F) goto yy205;
}
}
-yy315:
- YYDEBUG(315, *YYCURSOR);
+yy207:
+ YYDEBUG(207, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1649 "Zend/zend_language_scanner.l"
{
zend_copy_value(zendlval, (yytext+1), (yyleng-1));
zendlval->type = IS_STRING;
return T_VARIABLE;
}
-yy316:
- YYDEBUG(316, *YYCURSOR);
+#line 3212 "Zend/zend_language_scanner.c"
+yy208:
+ YYDEBUG(208, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy317;
- if (yych != 'r') goto yy295;
-yy317:
- YYDEBUG(317, *YYCURSOR);
+ if (yych == 'R') goto yy209;
+ if (yych != 'r') goto yy186;
+yy209:
+ YYDEBUG(209, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(318, *YYCURSOR);
+ YYDEBUG(210, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1253 "Zend/zend_language_scanner.l"
{
return T_LOGICAL_XOR;
}
-yy319:
- YYDEBUG(319, *YYCURSOR);
+#line 3230 "Zend/zend_language_scanner.c"
+yy211:
+ YYDEBUG(211, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(320, *YYCURSOR);
+ YYDEBUG(212, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1245 "Zend/zend_language_scanner.l"
{
return T_LOGICAL_OR;
}
-yy321:
- YYDEBUG(321, *YYCURSOR);
+#line 3243 "Zend/zend_language_scanner.c"
+yy213:
+ YYDEBUG(213, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(322, *YYCURSOR);
+ YYDEBUG(214, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1233 "Zend/zend_language_scanner.l"
{
return T_XOR_EQUAL;
}
-yy323:
- YYDEBUG(323, *YYCURSOR);
+#line 3253 "Zend/zend_language_scanner.c"
+yy215:
+ YYDEBUG(215, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(324, *YYCURSOR);
+ YYDEBUG(216, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1237 "Zend/zend_language_scanner.l"
{
return T_BOOLEAN_OR;
}
-yy325:
- YYDEBUG(325, *YYCURSOR);
+#line 3263 "Zend/zend_language_scanner.c"
+yy217:
+ YYDEBUG(217, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(326, *YYCURSOR);
+ YYDEBUG(218, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1229 "Zend/zend_language_scanner.l"
{
return T_OR_EQUAL;
}
-yy327:
- YYDEBUG(327, *YYCURSOR);
+#line 3273 "Zend/zend_language_scanner.c"
+yy219:
+ YYDEBUG(219, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(328, *YYCURSOR);
+ YYDEBUG(220, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1241 "Zend/zend_language_scanner.l"
{
return T_BOOLEAN_AND;
}
-yy329:
- YYDEBUG(329, *YYCURSOR);
+#line 3283 "Zend/zend_language_scanner.c"
+yy221:
+ YYDEBUG(221, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(330, *YYCURSOR);
+ YYDEBUG(222, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1225 "Zend/zend_language_scanner.l"
{
return T_AND_EQUAL;
}
-yy331:
- YYDEBUG(331, *YYCURSOR);
+#line 3293 "Zend/zend_language_scanner.c"
+yy223:
+ YYDEBUG(223, *YYCURSOR);
++YYCURSOR;
- if ((yych = *YYCURSOR) == '\n') goto yy335;
- if (yych == '\r') goto yy336;
-yy332:
- YYDEBUG(332, *YYCURSOR);
+ if ((yych = *YYCURSOR) == '\n') goto yy227;
+ if (yych == '\r') goto yy228;
+yy224:
+ YYDEBUG(224, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1756 "Zend/zend_language_scanner.l"
{
if (CG(asp_tags)) {
BEGIN(INITIAL);
@@ -4302,324 +3311,377 @@ yy332:
return yytext[0];
}
}
-yy333:
- YYDEBUG(333, *YYCURSOR);
+#line 3315 "Zend/zend_language_scanner.c"
+yy225:
+ YYDEBUG(225, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(334, *YYCURSOR);
+ YYDEBUG(226, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1213 "Zend/zend_language_scanner.l"
{
return T_MOD_EQUAL;
}
-yy335:
- YYDEBUG(335, *YYCURSOR);
+#line 3325 "Zend/zend_language_scanner.c"
+yy227:
+ YYDEBUG(227, *YYCURSOR);
yych = *++YYCURSOR;
- goto yy332;
-yy336:
- YYDEBUG(336, *YYCURSOR);
+ goto yy224;
+yy228:
+ YYDEBUG(228, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '\n') goto yy335;
- goto yy332;
-yy337:
- YYDEBUG(337, *YYCURSOR);
- yyaccept = 5;
+ if (yych == '\n') goto yy227;
+ goto yy224;
+yy229:
+ YYDEBUG(229, *YYCURSOR);
+ yyaccept = 3;
YYMARKER = ++YYCURSOR;
YYFILL(3);
yych = *YYCURSOR;
- YYDEBUG(338, *YYCURSOR);
+ YYDEBUG(230, *YYCURSOR);
if (yych <= 'D') {
- if (yych <= '/') goto yy298;
- if (yych <= '9') goto yy337;
- goto yy298;
+ if (yych <= '/') goto yy189;
+ if (yych <= '9') goto yy229;
+ goto yy189;
} else {
- if (yych <= 'E') goto yy301;
- if (yych == 'e') goto yy301;
- goto yy298;
+ if (yych <= 'E') goto yy192;
+ if (yych == 'e') goto yy192;
+ goto yy189;
}
-yy339:
- YYDEBUG(339, *YYCURSOR);
+yy231:
+ YYDEBUG(231, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(340, *YYCURSOR);
+ YYDEBUG(232, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1209 "Zend/zend_language_scanner.l"
{
return T_CONCAT_EQUAL;
}
-yy341:
- YYDEBUG(341, *YYCURSOR);
- yyaccept = 6;
+#line 3360 "Zend/zend_language_scanner.c"
+yy233:
+ YYDEBUG(233, *YYCURSOR);
+ yyaccept = 4;
yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '*') goto yy346;
-yy342:
- YYDEBUG(342, *YYCURSOR);
+ if (yych == '*') goto yy238;
+yy234:
+ YYDEBUG(234, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1713 "Zend/zend_language_scanner.l"
{
- BEGIN(ST_COMMENT);
- yymore();
+ int doc_com;
+
+ if (yyleng > 2) {
+ doc_com = 1;
+ RESET_DOC_COMMENT();
+ } else {
+ doc_com = 0;
+ }
+
+ while (YYCURSOR < YYLIMIT) {
+ if (*YYCURSOR++ == '*' && *YYCURSOR == '/') {
+ break;
+ }
+ }
+
+ if (YYCURSOR < YYLIMIT) {
+ YYCURSOR++;
+ } else {
+ zend_error(E_COMPILE_WARNING, "Unterminated comment starting line %d", CG(zend_lineno));
+ }
+
+ yyleng = YYCURSOR - SCNG(yy_text);
+ HANDLE_NEWLINES(yytext, yyleng);
+
+ if (doc_com) {
+ CG(doc_comment) = estrndup(yytext, yyleng);
+ CG(doc_comment_len) = yyleng;
+ return T_DOC_COMMENT;
+ }
+
+ return T_COMMENT;
}
-yy343:
- YYDEBUG(343, *YYCURSOR);
+#line 3403 "Zend/zend_language_scanner.c"
+yy235:
+ YYDEBUG(235, *YYCURSOR);
yych = *++YYCURSOR;
- goto yy270;
-yy344:
- YYDEBUG(344, *YYCURSOR);
+ goto yy176;
+yy236:
+ YYDEBUG(236, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(345, *YYCURSOR);
+ YYDEBUG(237, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1205 "Zend/zend_language_scanner.l"
{
return T_DIV_EQUAL;
}
-yy346:
- YYDEBUG(346, *YYCURSOR);
+#line 3417 "Zend/zend_language_scanner.c"
+yy238:
+ YYDEBUG(238, *YYCURSOR);
yych = *++YYCURSOR;
if (yybm[0+yych] & 64) {
- goto yy347;
+ goto yy239;
}
- goto yy281;
-yy347:
- YYDEBUG(347, *YYCURSOR);
+ goto yy193;
+yy239:
+ YYDEBUG(239, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
- YYDEBUG(348, *YYCURSOR);
+ YYDEBUG(240, *YYCURSOR);
if (yybm[0+yych] & 64) {
- goto yy347;
+ goto yy239;
}
- YYDEBUG(349, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- RESET_DOC_COMMENT();
- BEGIN(ST_DOC_COMMENT);
- yymore();
-}
-yy350:
- YYDEBUG(350, *YYCURSOR);
+ goto yy234;
+yy241:
+ YYDEBUG(241, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(351, *YYCURSOR);
+ YYDEBUG(242, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1201 "Zend/zend_language_scanner.l"
{
return T_MUL_EQUAL;
}
-yy352:
- YYDEBUG(352, *YYCURSOR);
+#line 3444 "Zend/zend_language_scanner.c"
+yy243:
+ YYDEBUG(243, *YYCURSOR);
++YYCURSOR;
- if ((yych = *YYCURSOR) == '=') goto yy356;
- YYDEBUG(353, *YYCURSOR);
+ if ((yych = *YYCURSOR) == '=') goto yy247;
+ YYDEBUG(244, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1261 "Zend/zend_language_scanner.l"
{
return T_SR;
}
-yy354:
- YYDEBUG(354, *YYCURSOR);
+#line 3455 "Zend/zend_language_scanner.c"
+yy245:
+ YYDEBUG(245, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(355, *YYCURSOR);
+ YYDEBUG(246, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1189 "Zend/zend_language_scanner.l"
{
return T_IS_GREATER_OR_EQUAL;
}
-yy356:
- YYDEBUG(356, *YYCURSOR);
+#line 3465 "Zend/zend_language_scanner.c"
+yy247:
+ YYDEBUG(247, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(357, *YYCURSOR);
+ YYDEBUG(248, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1221 "Zend/zend_language_scanner.l"
{
return T_SR_EQUAL;
}
-yy358:
- YYDEBUG(358, *YYCURSOR);
- yyaccept = 7;
+#line 3475 "Zend/zend_language_scanner.c"
+yy249:
+ YYDEBUG(249, *YYCURSOR);
+ yyaccept = 5;
yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= ';') goto yy359;
- if (yych <= '<') goto yy374;
- if (yych <= '=') goto yy372;
-yy359:
- YYDEBUG(359, *YYCURSOR);
+ if (yych <= ';') goto yy250;
+ if (yych <= '<') goto yy265;
+ if (yych <= '=') goto yy263;
+yy250:
+ YYDEBUG(250, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1257 "Zend/zend_language_scanner.l"
{
return T_SL;
}
-yy360:
- YYDEBUG(360, *YYCURSOR);
+#line 3490 "Zend/zend_language_scanner.c"
+yy251:
+ YYDEBUG(251, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'S') goto yy365;
- if (yych == 's') goto yy365;
- goto yy281;
-yy361:
- YYDEBUG(361, *YYCURSOR);
+ if (yych == 'S') goto yy256;
+ if (yych == 's') goto yy256;
+ goto yy193;
+yy252:
+ YYDEBUG(252, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(362, *YYCURSOR);
+ YYDEBUG(253, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1185 "Zend/zend_language_scanner.l"
{
return T_IS_SMALLER_OR_EQUAL;
}
-yy363:
- YYDEBUG(363, *YYCURSOR);
+#line 3506 "Zend/zend_language_scanner.c"
+yy254:
+ YYDEBUG(254, *YYCURSOR);
++YYCURSOR;
-yy364:
- YYDEBUG(364, *YYCURSOR);
+yy255:
+ YYDEBUG(255, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1181 "Zend/zend_language_scanner.l"
{
return T_IS_NOT_EQUAL;
}
-yy365:
- YYDEBUG(365, *YYCURSOR);
+#line 3517 "Zend/zend_language_scanner.c"
+yy256:
+ YYDEBUG(256, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy366;
- if (yych != 'c') goto yy281;
-yy366:
- YYDEBUG(366, *YYCURSOR);
+ if (yych == 'C') goto yy257;
+ if (yych != 'c') goto yy193;
+yy257:
+ YYDEBUG(257, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy367;
- if (yych != 'r') goto yy281;
-yy367:
- YYDEBUG(367, *YYCURSOR);
+ if (yych == 'R') goto yy258;
+ if (yych != 'r') goto yy193;
+yy258:
+ YYDEBUG(258, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'I') goto yy368;
- if (yych != 'i') goto yy281;
-yy368:
- YYDEBUG(368, *YYCURSOR);
+ if (yych == 'I') goto yy259;
+ if (yych != 'i') goto yy193;
+yy259:
+ YYDEBUG(259, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'P') goto yy369;
- if (yych != 'p') goto yy281;
-yy369:
- YYDEBUG(369, *YYCURSOR);
+ if (yych == 'P') goto yy260;
+ if (yych != 'p') goto yy193;
+yy260:
+ YYDEBUG(260, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy370;
- if (yych != 't') goto yy281;
-yy370:
- YYDEBUG(370, *YYCURSOR);
+ if (yych == 'T') goto yy261;
+ if (yych != 't') goto yy193;
+yy261:
+ YYDEBUG(261, *YYCURSOR);
++YYCURSOR;
YYFILL(3);
yych = *YYCURSOR;
- YYDEBUG(371, *YYCURSOR);
+ YYDEBUG(262, *YYCURSOR);
if (yych <= '\r') {
- if (yych <= 0x08) goto yy281;
- if (yych <= '\n') goto yy370;
- if (yych <= '\f') goto yy281;
- goto yy370;
+ if (yych <= 0x08) goto yy193;
+ if (yych <= '\n') goto yy261;
+ if (yych <= '\f') goto yy193;
+ goto yy261;
} else {
if (yych <= ' ') {
- if (yych <= 0x1F) goto yy281;
- goto yy370;
+ if (yych <= 0x1F) goto yy193;
+ goto yy261;
} else {
- if (yych == '>') goto yy309;
- goto yy281;
+ if (yych == '>') goto yy201;
+ goto yy193;
}
}
-yy372:
- YYDEBUG(372, *YYCURSOR);
+yy263:
+ YYDEBUG(263, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(373, *YYCURSOR);
+ YYDEBUG(264, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1217 "Zend/zend_language_scanner.l"
{
return T_SL_EQUAL;
}
-yy374:
- YYDEBUG(374, *YYCURSOR);
+#line 3572 "Zend/zend_language_scanner.c"
+yy265:
+ YYDEBUG(265, *YYCURSOR);
++YYCURSOR;
YYFILL(2);
yych = *YYCURSOR;
- YYDEBUG(375, *YYCURSOR);
+ YYDEBUG(266, *YYCURSOR);
if (yybm[0+yych] & 128) {
- goto yy374;
+ goto yy265;
}
if (yych <= 'Z') {
if (yych <= '&') {
- if (yych == '"') goto yy379;
- goto yy281;
+ if (yych == '"') goto yy270;
+ goto yy193;
} else {
- if (yych <= '\'') goto yy378;
- if (yych <= '@') goto yy281;
+ if (yych <= '\'') goto yy269;
+ if (yych <= '@') goto yy193;
}
} else {
if (yych <= '`') {
- if (yych != '_') goto yy281;
+ if (yych != '_') goto yy193;
} else {
- if (yych <= 'z') goto yy376;
- if (yych <= '~') goto yy281;
+ if (yych <= 'z') goto yy267;
+ if (yych <= '~') goto yy193;
}
}
-yy376:
- YYDEBUG(376, *YYCURSOR);
+yy267:
+ YYDEBUG(267, *YYCURSOR);
++YYCURSOR;
YYFILL(2);
yych = *YYCURSOR;
- YYDEBUG(377, *YYCURSOR);
+ YYDEBUG(268, *YYCURSOR);
if (yych <= '@') {
if (yych <= '\f') {
- if (yych == '\n') goto yy383;
- goto yy281;
+ if (yych == '\n') goto yy274;
+ goto yy193;
} else {
- if (yych <= '\r') goto yy385;
- if (yych <= '/') goto yy281;
- if (yych <= '9') goto yy376;
- goto yy281;
+ if (yych <= '\r') goto yy276;
+ if (yych <= '/') goto yy193;
+ if (yych <= '9') goto yy267;
+ goto yy193;
}
} else {
if (yych <= '_') {
- if (yych <= 'Z') goto yy376;
- if (yych <= '^') goto yy281;
- goto yy376;
+ if (yych <= 'Z') goto yy267;
+ if (yych <= '^') goto yy193;
+ goto yy267;
} else {
- if (yych <= '`') goto yy281;
- if (yych <= 'z') goto yy376;
- if (yych <= '~') goto yy281;
- goto yy376;
+ if (yych <= '`') goto yy193;
+ if (yych <= 'z') goto yy267;
+ if (yych <= '~') goto yy193;
+ goto yy267;
}
}
-yy378:
- YYDEBUG(378, *YYCURSOR);
+yy269:
+ YYDEBUG(269, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '\'') goto yy281;
- if (yych <= '/') goto yy387;
- if (yych <= '9') goto yy281;
- goto yy387;
-yy379:
- YYDEBUG(379, *YYCURSOR);
+ if (yych == '\'') goto yy193;
+ if (yych <= '/') goto yy278;
+ if (yych <= '9') goto yy193;
+ goto yy278;
+yy270:
+ YYDEBUG(270, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '"') goto yy281;
- if (yych <= '/') goto yy381;
- if (yych <= '9') goto yy281;
- goto yy381;
-yy380:
- YYDEBUG(380, *YYCURSOR);
+ if (yych == '"') goto yy193;
+ if (yych <= '/') goto yy272;
+ if (yych <= '9') goto yy193;
+ goto yy272;
+yy271:
+ YYDEBUG(271, *YYCURSOR);
++YYCURSOR;
YYFILL(3);
yych = *YYCURSOR;
-yy381:
- YYDEBUG(381, *YYCURSOR);
+yy272:
+ YYDEBUG(272, *YYCURSOR);
if (yych <= 'Z') {
if (yych <= '/') {
- if (yych != '"') goto yy281;
+ if (yych != '"') goto yy193;
} else {
- if (yych <= '9') goto yy380;
- if (yych <= '@') goto yy281;
- goto yy380;
+ if (yych <= '9') goto yy271;
+ if (yych <= '@') goto yy193;
+ goto yy271;
}
} else {
if (yych <= '`') {
- if (yych == '_') goto yy380;
- goto yy281;
+ if (yych == '_') goto yy271;
+ goto yy193;
} else {
- if (yych <= 'z') goto yy380;
- if (yych <= '~') goto yy281;
- goto yy380;
+ if (yych <= 'z') goto yy271;
+ if (yych <= '~') goto yy193;
+ goto yy271;
}
}
-yy382:
- YYDEBUG(382, *YYCURSOR);
+yy273:
+ YYDEBUG(273, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '\n') goto yy383;
- if (yych == '\r') goto yy385;
- goto yy281;
-yy383:
- YYDEBUG(383, *YYCURSOR);
+ if (yych == '\n') goto yy274;
+ if (yych == '\r') goto yy276;
+ goto yy193;
+yy274:
+ YYDEBUG(274, *YYCURSOR);
++YYCURSOR;
-yy384:
- YYDEBUG(384, *YYCURSOR);
+yy275:
+ YYDEBUG(275, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1883 "Zend/zend_language_scanner.l"
{
char *s;
int bprefix = (yytext[0] != '<') ? 1 : 0;
+ /* save old heredoc label */
+ Z_STRVAL_P(zendlval) = CG(heredoc);
+ Z_STRLEN_P(zendlval) = CG(heredoc_len);
+
CG(zend_lineno)++;
CG(heredoc_len) = yyleng-bprefix-3-1-(yytext[yyleng-2]=='\r'?1:0);
s = yytext+bprefix+3;
@@ -4646,7 +3708,7 @@ yy384:
/* Check for ending label on the next line */
if (CG(heredoc_len) < YYLIMIT - YYCURSOR && !memcmp(YYCURSOR, s, CG(heredoc_len))) {
- unsigned char *end = YYCURSOR + CG(heredoc_len);
+ YYCTYPE *end = YYCURSOR + CG(heredoc_len);
if (*end == ';') {
end++;
@@ -4659,231 +3721,247 @@ yy384:
return T_START_HEREDOC;
}
-yy385:
- YYDEBUG(385, *YYCURSOR);
+#line 3725 "Zend/zend_language_scanner.c"
+yy276:
+ YYDEBUG(276, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '\n') goto yy383;
- goto yy384;
-yy386:
- YYDEBUG(386, *YYCURSOR);
+ if (yych == '\n') goto yy274;
+ goto yy275;
+yy277:
+ YYDEBUG(277, *YYCURSOR);
++YYCURSOR;
YYFILL(3);
yych = *YYCURSOR;
-yy387:
- YYDEBUG(387, *YYCURSOR);
+yy278:
+ YYDEBUG(278, *YYCURSOR);
if (yych <= 'Z') {
if (yych <= '/') {
- if (yych == '\'') goto yy382;
- goto yy281;
+ if (yych == '\'') goto yy273;
+ goto yy193;
} else {
- if (yych <= '9') goto yy386;
- if (yych <= '@') goto yy281;
- goto yy386;
+ if (yych <= '9') goto yy277;
+ if (yych <= '@') goto yy193;
+ goto yy277;
}
} else {
if (yych <= '`') {
- if (yych == '_') goto yy386;
- goto yy281;
+ if (yych == '_') goto yy277;
+ goto yy193;
} else {
- if (yych <= 'z') goto yy386;
- if (yych <= '~') goto yy281;
- goto yy386;
+ if (yych <= 'z') goto yy277;
+ if (yych <= '~') goto yy193;
+ goto yy277;
}
}
-yy388:
- YYDEBUG(388, *YYCURSOR);
+yy279:
+ YYDEBUG(279, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych != '=') goto yy364;
- YYDEBUG(389, *YYCURSOR);
+ if (yych != '=') goto yy255;
+ YYDEBUG(280, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(390, *YYCURSOR);
+ YYDEBUG(281, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1173 "Zend/zend_language_scanner.l"
{
return T_IS_NOT_IDENTICAL;
}
-yy391:
- YYDEBUG(391, *YYCURSOR);
+#line 3769 "Zend/zend_language_scanner.c"
+yy282:
+ YYDEBUG(282, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(392, *YYCURSOR);
+ YYDEBUG(283, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1193 "Zend/zend_language_scanner.l"
{
return T_PLUS_EQUAL;
}
-yy393:
- YYDEBUG(393, *YYCURSOR);
+#line 3779 "Zend/zend_language_scanner.c"
+yy284:
+ YYDEBUG(284, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(394, *YYCURSOR);
+ YYDEBUG(285, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1161 "Zend/zend_language_scanner.l"
{
return T_INC;
}
-yy395:
- YYDEBUG(395, *YYCURSOR);
+#line 3789 "Zend/zend_language_scanner.c"
+yy286:
+ YYDEBUG(286, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'S') goto yy396;
- if (yych != 's') goto yy295;
-yy396:
- YYDEBUG(396, *YYCURSOR);
+ if (yych == 'S') goto yy287;
+ if (yych != 's') goto yy186;
+yy287:
+ YYDEBUG(287, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy397;
- if (yych != 't') goto yy295;
-yy397:
- YYDEBUG(397, *YYCURSOR);
+ if (yych == 'T') goto yy288;
+ if (yych != 't') goto yy186;
+yy288:
+ YYDEBUG(288, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(398, *YYCURSOR);
+ YYDEBUG(289, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1153 "Zend/zend_language_scanner.l"
{
return T_LIST;
}
-yy399:
- YYDEBUG(399, *YYCURSOR);
+#line 3812 "Zend/zend_language_scanner.c"
+yy290:
+ YYDEBUG(290, *YYCURSOR);
++YYCURSOR;
- if ((yych = *YYCURSOR) == '=') goto yy403;
- YYDEBUG(400, *YYCURSOR);
+ if ((yych = *YYCURSOR) == '=') goto yy294;
+ YYDEBUG(291, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1177 "Zend/zend_language_scanner.l"
{
return T_IS_EQUAL;
}
-yy401:
- YYDEBUG(401, *YYCURSOR);
+#line 3823 "Zend/zend_language_scanner.c"
+yy292:
+ YYDEBUG(292, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(402, *YYCURSOR);
+ YYDEBUG(293, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1149 "Zend/zend_language_scanner.l"
{
return T_DOUBLE_ARROW;
}
-yy403:
- YYDEBUG(403, *YYCURSOR);
+#line 3833 "Zend/zend_language_scanner.c"
+yy294:
+ YYDEBUG(294, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(404, *YYCURSOR);
+ YYDEBUG(295, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1169 "Zend/zend_language_scanner.l"
{
return T_IS_IDENTICAL;
}
-yy405:
- YYDEBUG(405, *YYCURSOR);
+#line 3843 "Zend/zend_language_scanner.c"
+yy296:
+ YYDEBUG(296, *YYCURSOR);
yych = *++YYCURSOR;
YYDEBUG(-1, yych);
switch (yych) {
case 'C':
- case 'c': goto yy407;
+ case 'c': goto yy298;
case 'D':
- case 'd': goto yy411;
+ case 'd': goto yy302;
case 'F':
- case 'f': goto yy408;
+ case 'f': goto yy299;
case 'H':
- case 'h': goto yy406;
+ case 'h': goto yy297;
case 'L':
- case 'l': goto yy410;
+ case 'l': goto yy301;
case 'M':
- case 'm': goto yy409;
+ case 'm': goto yy300;
case 'N':
- case 'n': goto yy412;
- default: goto yy295;
+ case 'n': goto yy303;
+ default: goto yy186;
}
-yy406:
- YYDEBUG(406, *YYCURSOR);
+yy297:
+ YYDEBUG(297, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy466;
- if (yych == 'a') goto yy466;
- goto yy295;
-yy407:
- YYDEBUG(407, *YYCURSOR);
+ if (yych == 'A') goto yy357;
+ if (yych == 'a') goto yy357;
+ goto yy186;
+yy298:
+ YYDEBUG(298, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'L') goto yy459;
- if (yych == 'l') goto yy459;
- goto yy295;
-yy408:
- YYDEBUG(408, *YYCURSOR);
+ if (yych == 'L') goto yy350;
+ if (yych == 'l') goto yy350;
+ goto yy186;
+yy299:
+ YYDEBUG(299, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'U') {
- if (yych == 'I') goto yy443;
- if (yych <= 'T') goto yy295;
- goto yy444;
+ if (yych == 'I') goto yy334;
+ if (yych <= 'T') goto yy186;
+ goto yy335;
} else {
if (yych <= 'i') {
- if (yych <= 'h') goto yy295;
- goto yy443;
+ if (yych <= 'h') goto yy186;
+ goto yy334;
} else {
- if (yych == 'u') goto yy444;
- goto yy295;
+ if (yych == 'u') goto yy335;
+ goto yy186;
}
}
-yy409:
- YYDEBUG(409, *YYCURSOR);
+yy300:
+ YYDEBUG(300, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy435;
- if (yych == 'e') goto yy435;
- goto yy295;
-yy410:
- YYDEBUG(410, *YYCURSOR);
+ if (yych == 'E') goto yy326;
+ if (yych == 'e') goto yy326;
+ goto yy186;
+yy301:
+ YYDEBUG(301, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'I') goto yy429;
- if (yych == 'i') goto yy429;
- goto yy295;
-yy411:
- YYDEBUG(411, *YYCURSOR);
+ if (yych == 'I') goto yy320;
+ if (yych == 'i') goto yy320;
+ goto yy186;
+yy302:
+ YYDEBUG(302, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'I') goto yy424;
- if (yych == 'i') goto yy424;
- goto yy295;
-yy412:
- YYDEBUG(412, *YYCURSOR);
+ if (yych == 'I') goto yy315;
+ if (yych == 'i') goto yy315;
+ goto yy186;
+yy303:
+ YYDEBUG(303, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy413;
- if (yych != 'a') goto yy295;
-yy413:
- YYDEBUG(413, *YYCURSOR);
+ if (yych == 'A') goto yy304;
+ if (yych != 'a') goto yy186;
+yy304:
+ YYDEBUG(304, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'M') goto yy414;
- if (yych != 'm') goto yy295;
-yy414:
- YYDEBUG(414, *YYCURSOR);
+ if (yych == 'M') goto yy305;
+ if (yych != 'm') goto yy186;
+yy305:
+ YYDEBUG(305, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy415;
- if (yych != 'e') goto yy295;
-yy415:
- YYDEBUG(415, *YYCURSOR);
+ if (yych == 'E') goto yy306;
+ if (yych != 'e') goto yy186;
+yy306:
+ YYDEBUG(306, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'S') goto yy416;
- if (yych != 's') goto yy295;
-yy416:
- YYDEBUG(416, *YYCURSOR);
+ if (yych == 'S') goto yy307;
+ if (yych != 's') goto yy186;
+yy307:
+ YYDEBUG(307, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'P') goto yy417;
- if (yych != 'p') goto yy295;
-yy417:
- YYDEBUG(417, *YYCURSOR);
+ if (yych == 'P') goto yy308;
+ if (yych != 'p') goto yy186;
+yy308:
+ YYDEBUG(308, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy418;
- if (yych != 'a') goto yy295;
-yy418:
- YYDEBUG(418, *YYCURSOR);
+ if (yych == 'A') goto yy309;
+ if (yych != 'a') goto yy186;
+yy309:
+ YYDEBUG(309, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy419;
- if (yych != 'c') goto yy295;
-yy419:
- YYDEBUG(419, *YYCURSOR);
+ if (yych == 'C') goto yy310;
+ if (yych != 'c') goto yy186;
+yy310:
+ YYDEBUG(310, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy420;
- if (yych != 'e') goto yy295;
-yy420:
- YYDEBUG(420, *YYCURSOR);
+ if (yych == 'E') goto yy311;
+ if (yych != 'e') goto yy186;
+yy311:
+ YYDEBUG(311, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych != '_') goto yy295;
- YYDEBUG(421, *YYCURSOR);
+ if (yych != '_') goto yy186;
+ YYDEBUG(312, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych != '_') goto yy295;
- YYDEBUG(422, *YYCURSOR);
+ if (yych != '_') goto yy186;
+ YYDEBUG(313, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(423, *YYCURSOR);
+ YYDEBUG(314, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1473 "Zend/zend_language_scanner.l"
{
if (CG(current_namespace)) {
*zendlval = *CG(current_namespace);
@@ -4893,25 +3971,27 @@ yy420:
}
return T_NS_C;
}
-yy424:
- YYDEBUG(424, *YYCURSOR);
+#line 3975 "Zend/zend_language_scanner.c"
+yy315:
+ YYDEBUG(315, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy425;
- if (yych != 'r') goto yy295;
-yy425:
- YYDEBUG(425, *YYCURSOR);
+ if (yych == 'R') goto yy316;
+ if (yych != 'r') goto yy186;
+yy316:
+ YYDEBUG(316, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych != '_') goto yy295;
- YYDEBUG(426, *YYCURSOR);
+ if (yych != '_') goto yy186;
+ YYDEBUG(317, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych != '_') goto yy295;
- YYDEBUG(427, *YYCURSOR);
+ if (yych != '_') goto yy186;
+ YYDEBUG(318, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(428, *YYCURSOR);
+ YYDEBUG(319, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1446 "Zend/zend_language_scanner.l"
{
char *filename = zend_get_compiled_filename(TSRMLS_C);
const size_t filename_len = strlen(filename);
@@ -4938,69 +4018,73 @@ yy425:
zendlval->type = IS_STRING;
return T_DIR;
}
-yy429:
- YYDEBUG(429, *YYCURSOR);
+#line 4022 "Zend/zend_language_scanner.c"
+yy320:
+ YYDEBUG(320, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy430;
- if (yych != 'n') goto yy295;
-yy430:
- YYDEBUG(430, *YYCURSOR);
+ if (yych == 'N') goto yy321;
+ if (yych != 'n') goto yy186;
+yy321:
+ YYDEBUG(321, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy431;
- if (yych != 'e') goto yy295;
-yy431:
- YYDEBUG(431, *YYCURSOR);
+ if (yych == 'E') goto yy322;
+ if (yych != 'e') goto yy186;
+yy322:
+ YYDEBUG(322, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych != '_') goto yy295;
- YYDEBUG(432, *YYCURSOR);
+ if (yych != '_') goto yy186;
+ YYDEBUG(323, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych != '_') goto yy295;
- YYDEBUG(433, *YYCURSOR);
+ if (yych != '_') goto yy186;
+ YYDEBUG(324, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(434, *YYCURSOR);
+ YYDEBUG(325, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1428 "Zend/zend_language_scanner.l"
{
zendlval->value.lval = CG(zend_lineno);
zendlval->type = IS_LONG;
return T_LINE;
}
-yy435:
- YYDEBUG(435, *YYCURSOR);
+#line 4053 "Zend/zend_language_scanner.c"
+yy326:
+ YYDEBUG(326, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy436;
- if (yych != 't') goto yy295;
-yy436:
- YYDEBUG(436, *YYCURSOR);
+ if (yych == 'T') goto yy327;
+ if (yych != 't') goto yy186;
+yy327:
+ YYDEBUG(327, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'H') goto yy437;
- if (yych != 'h') goto yy295;
-yy437:
- YYDEBUG(437, *YYCURSOR);
+ if (yych == 'H') goto yy328;
+ if (yych != 'h') goto yy186;
+yy328:
+ YYDEBUG(328, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'O') goto yy438;
- if (yych != 'o') goto yy295;
-yy438:
- YYDEBUG(438, *YYCURSOR);
+ if (yych == 'O') goto yy329;
+ if (yych != 'o') goto yy186;
+yy329:
+ YYDEBUG(329, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'D') goto yy439;
- if (yych != 'd') goto yy295;
-yy439:
- YYDEBUG(439, *YYCURSOR);
+ if (yych == 'D') goto yy330;
+ if (yych != 'd') goto yy186;
+yy330:
+ YYDEBUG(330, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych != '_') goto yy295;
- YYDEBUG(440, *YYCURSOR);
+ if (yych != '_') goto yy186;
+ YYDEBUG(331, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych != '_') goto yy295;
- YYDEBUG(441, *YYCURSOR);
+ if (yych != '_') goto yy186;
+ YYDEBUG(332, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(442, *YYCURSOR);
+ YYDEBUG(333, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1407 "Zend/zend_language_scanner.l"
{
char *class_name = CG(active_class_entry) ? CG(active_class_entry)->name : NULL;
char *func_name = CG(active_op_array)? CG(active_op_array)->function_name : NULL;
@@ -5021,56 +4105,58 @@ yy439:
zendlval->type = IS_STRING;
return T_METHOD_C;
}
-yy443:
- YYDEBUG(443, *YYCURSOR);
+#line 4109 "Zend/zend_language_scanner.c"
+yy334:
+ YYDEBUG(334, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'L') goto yy454;
- if (yych == 'l') goto yy454;
- goto yy295;
-yy444:
- YYDEBUG(444, *YYCURSOR);
+ if (yych == 'L') goto yy345;
+ if (yych == 'l') goto yy345;
+ goto yy186;
+yy335:
+ YYDEBUG(335, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy445;
- if (yych != 'n') goto yy295;
-yy445:
- YYDEBUG(445, *YYCURSOR);
+ if (yych == 'N') goto yy336;
+ if (yych != 'n') goto yy186;
+yy336:
+ YYDEBUG(336, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy446;
- if (yych != 'c') goto yy295;
-yy446:
- YYDEBUG(446, *YYCURSOR);
+ if (yych == 'C') goto yy337;
+ if (yych != 'c') goto yy186;
+yy337:
+ YYDEBUG(337, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy447;
- if (yych != 't') goto yy295;
-yy447:
- YYDEBUG(447, *YYCURSOR);
+ if (yych == 'T') goto yy338;
+ if (yych != 't') goto yy186;
+yy338:
+ YYDEBUG(338, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'I') goto yy448;
- if (yych != 'i') goto yy295;
-yy448:
- YYDEBUG(448, *YYCURSOR);
+ if (yych == 'I') goto yy339;
+ if (yych != 'i') goto yy186;
+yy339:
+ YYDEBUG(339, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'O') goto yy449;
- if (yych != 'o') goto yy295;
-yy449:
- YYDEBUG(449, *YYCURSOR);
+ if (yych == 'O') goto yy340;
+ if (yych != 'o') goto yy186;
+yy340:
+ YYDEBUG(340, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy450;
- if (yych != 'n') goto yy295;
-yy450:
- YYDEBUG(450, *YYCURSOR);
+ if (yych == 'N') goto yy341;
+ if (yych != 'n') goto yy186;
+yy341:
+ YYDEBUG(341, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych != '_') goto yy295;
- YYDEBUG(451, *YYCURSOR);
+ if (yych != '_') goto yy186;
+ YYDEBUG(342, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych != '_') goto yy295;
- YYDEBUG(452, *YYCURSOR);
+ if (yych != '_') goto yy186;
+ YYDEBUG(343, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(453, *YYCURSOR);
+ YYDEBUG(344, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1391 "Zend/zend_language_scanner.l"
{
char *func_name = NULL;
@@ -5086,25 +4172,27 @@ yy450:
zendlval->type = IS_STRING;
return T_FUNC_C;
}
-yy454:
- YYDEBUG(454, *YYCURSOR);
+#line 4176 "Zend/zend_language_scanner.c"
+yy345:
+ YYDEBUG(345, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy455;
- if (yych != 'e') goto yy295;
-yy455:
- YYDEBUG(455, *YYCURSOR);
+ if (yych == 'E') goto yy346;
+ if (yych != 'e') goto yy186;
+yy346:
+ YYDEBUG(346, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych != '_') goto yy295;
- YYDEBUG(456, *YYCURSOR);
+ if (yych != '_') goto yy186;
+ YYDEBUG(347, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych != '_') goto yy295;
- YYDEBUG(457, *YYCURSOR);
+ if (yych != '_') goto yy186;
+ YYDEBUG(348, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(458, *YYCURSOR);
+ YYDEBUG(349, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1434 "Zend/zend_language_scanner.l"
{
char *filename = zend_get_compiled_filename(TSRMLS_C);
@@ -5116,35 +4204,37 @@ yy455:
zendlval->type = IS_STRING;
return T_FILE;
}
-yy459:
- YYDEBUG(459, *YYCURSOR);
+#line 4208 "Zend/zend_language_scanner.c"
+yy350:
+ YYDEBUG(350, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy460;
- if (yych != 'a') goto yy295;
-yy460:
- YYDEBUG(460, *YYCURSOR);
+ if (yych == 'A') goto yy351;
+ if (yych != 'a') goto yy186;
+yy351:
+ YYDEBUG(351, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'S') goto yy461;
- if (yych != 's') goto yy295;
-yy461:
- YYDEBUG(461, *YYCURSOR);
+ if (yych == 'S') goto yy352;
+ if (yych != 's') goto yy186;
+yy352:
+ YYDEBUG(352, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'S') goto yy462;
- if (yych != 's') goto yy295;
-yy462:
- YYDEBUG(462, *YYCURSOR);
+ if (yych == 'S') goto yy353;
+ if (yych != 's') goto yy186;
+yy353:
+ YYDEBUG(353, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych != '_') goto yy295;
- YYDEBUG(463, *YYCURSOR);
+ if (yych != '_') goto yy186;
+ YYDEBUG(354, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych != '_') goto yy295;
- YYDEBUG(464, *YYCURSOR);
+ if (yych != '_') goto yy186;
+ YYDEBUG(355, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(465, *YYCURSOR);
+ YYDEBUG(356, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1375 "Zend/zend_language_scanner.l"
{
char *class_name = NULL;
@@ -5160,2400 +4250,2546 @@ yy462:
zendlval->type = IS_STRING;
return T_CLASS_C;
}
-yy466:
- YYDEBUG(466, *YYCURSOR);
+#line 4254 "Zend/zend_language_scanner.c"
+yy357:
+ YYDEBUG(357, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'L') goto yy467;
- if (yych != 'l') goto yy295;
-yy467:
- YYDEBUG(467, *YYCURSOR);
+ if (yych == 'L') goto yy358;
+ if (yych != 'l') goto yy186;
+yy358:
+ YYDEBUG(358, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy468;
- if (yych != 't') goto yy295;
-yy468:
- YYDEBUG(468, *YYCURSOR);
+ if (yych == 'T') goto yy359;
+ if (yych != 't') goto yy186;
+yy359:
+ YYDEBUG(359, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych != '_') goto yy295;
- YYDEBUG(469, *YYCURSOR);
+ if (yych != '_') goto yy186;
+ YYDEBUG(360, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy470;
- if (yych != 'c') goto yy295;
-yy470:
- YYDEBUG(470, *YYCURSOR);
+ if (yych == 'C') goto yy361;
+ if (yych != 'c') goto yy186;
+yy361:
+ YYDEBUG(361, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'O') goto yy471;
- if (yych != 'o') goto yy295;
-yy471:
- YYDEBUG(471, *YYCURSOR);
+ if (yych == 'O') goto yy362;
+ if (yych != 'o') goto yy186;
+yy362:
+ YYDEBUG(362, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'M') goto yy472;
- if (yych != 'm') goto yy295;
-yy472:
- YYDEBUG(472, *YYCURSOR);
+ if (yych == 'M') goto yy363;
+ if (yych != 'm') goto yy186;
+yy363:
+ YYDEBUG(363, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'P') goto yy473;
- if (yych != 'p') goto yy295;
-yy473:
- YYDEBUG(473, *YYCURSOR);
+ if (yych == 'P') goto yy364;
+ if (yych != 'p') goto yy186;
+yy364:
+ YYDEBUG(364, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'I') goto yy474;
- if (yych != 'i') goto yy295;
-yy474:
- YYDEBUG(474, *YYCURSOR);
+ if (yych == 'I') goto yy365;
+ if (yych != 'i') goto yy186;
+yy365:
+ YYDEBUG(365, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'L') goto yy475;
- if (yych != 'l') goto yy295;
-yy475:
- YYDEBUG(475, *YYCURSOR);
+ if (yych == 'L') goto yy366;
+ if (yych != 'l') goto yy186;
+yy366:
+ YYDEBUG(366, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy476;
- if (yych != 'e') goto yy295;
-yy476:
- YYDEBUG(476, *YYCURSOR);
+ if (yych == 'E') goto yy367;
+ if (yych != 'e') goto yy186;
+yy367:
+ YYDEBUG(367, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy477;
- if (yych != 'r') goto yy295;
-yy477:
- YYDEBUG(477, *YYCURSOR);
+ if (yych == 'R') goto yy368;
+ if (yych != 'r') goto yy186;
+yy368:
+ YYDEBUG(368, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(478, *YYCURSOR);
+ YYDEBUG(369, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1117 "Zend/zend_language_scanner.l"
{
return T_HALT_COMPILER;
}
-yy479:
- YYDEBUG(479, *YYCURSOR);
+#line 4320 "Zend/zend_language_scanner.c"
+yy370:
+ YYDEBUG(370, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'S') goto yy483;
- if (yych == 's') goto yy483;
- goto yy295;
-yy480:
- YYDEBUG(480, *YYCURSOR);
+ if (yych == 'S') goto yy374;
+ if (yych == 's') goto yy374;
+ goto yy186;
+yy371:
+ YYDEBUG(371, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy481;
- if (yych != 'e') goto yy295;
-yy481:
- YYDEBUG(481, *YYCURSOR);
+ if (yych == 'E') goto yy372;
+ if (yych != 'e') goto yy186;
+yy372:
+ YYDEBUG(372, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(482, *YYCURSOR);
+ YYDEBUG(373, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1101 "Zend/zend_language_scanner.l"
{
return T_USE;
}
-yy483:
- YYDEBUG(483, *YYCURSOR);
+#line 4344 "Zend/zend_language_scanner.c"
+yy374:
+ YYDEBUG(374, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy484;
- if (yych != 'e') goto yy295;
-yy484:
- YYDEBUG(484, *YYCURSOR);
+ if (yych == 'E') goto yy375;
+ if (yych != 'e') goto yy186;
+yy375:
+ YYDEBUG(375, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy485;
- if (yych != 't') goto yy295;
-yy485:
- YYDEBUG(485, *YYCURSOR);
+ if (yych == 'T') goto yy376;
+ if (yych != 't') goto yy186;
+yy376:
+ YYDEBUG(376, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(486, *YYCURSOR);
+ YYDEBUG(377, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1145 "Zend/zend_language_scanner.l"
{
return T_UNSET;
}
-yy487:
- YYDEBUG(487, *YYCURSOR);
+#line 4367 "Zend/zend_language_scanner.c"
+yy378:
+ YYDEBUG(378, *YYCURSOR);
++YYCURSOR;
YYFILL(7);
yych = *YYCURSOR;
-yy488:
- YYDEBUG(488, *YYCURSOR);
+yy379:
+ YYDEBUG(379, *YYCURSOR);
if (yych <= 'S') {
if (yych <= 'D') {
if (yych <= ' ') {
- if (yych == '\t') goto yy487;
- if (yych <= 0x1F) goto yy281;
- goto yy487;
+ if (yych == '\t') goto yy378;
+ if (yych <= 0x1F) goto yy193;
+ goto yy378;
} else {
if (yych <= 'A') {
- if (yych <= '@') goto yy281;
- goto yy492;
+ if (yych <= '@') goto yy193;
+ goto yy383;
} else {
- if (yych <= 'B') goto yy490;
- if (yych <= 'C') goto yy281;
- goto yy495;
+ if (yych <= 'B') goto yy381;
+ if (yych <= 'C') goto yy193;
+ goto yy386;
}
}
} else {
if (yych <= 'I') {
- if (yych == 'F') goto yy496;
- if (yych <= 'H') goto yy281;
- goto yy497;
+ if (yych == 'F') goto yy387;
+ if (yych <= 'H') goto yy193;
+ goto yy388;
} else {
if (yych <= 'O') {
- if (yych <= 'N') goto yy281;
- goto yy491;
+ if (yych <= 'N') goto yy193;
+ goto yy382;
} else {
- if (yych <= 'Q') goto yy281;
- if (yych <= 'R') goto yy494;
- goto yy493;
+ if (yych <= 'Q') goto yy193;
+ if (yych <= 'R') goto yy385;
+ goto yy384;
}
}
}
} else {
if (yych <= 'f') {
if (yych <= 'a') {
- if (yych == 'U') goto yy489;
- if (yych <= '`') goto yy281;
- goto yy492;
+ if (yych == 'U') goto yy380;
+ if (yych <= '`') goto yy193;
+ goto yy383;
} else {
if (yych <= 'c') {
- if (yych <= 'b') goto yy490;
- goto yy281;
+ if (yych <= 'b') goto yy381;
+ goto yy193;
} else {
- if (yych <= 'd') goto yy495;
- if (yych <= 'e') goto yy281;
- goto yy496;
+ if (yych <= 'd') goto yy386;
+ if (yych <= 'e') goto yy193;
+ goto yy387;
}
}
} else {
if (yych <= 'q') {
if (yych <= 'i') {
- if (yych <= 'h') goto yy281;
- goto yy497;
+ if (yych <= 'h') goto yy193;
+ goto yy388;
} else {
- if (yych == 'o') goto yy491;
- goto yy281;
+ if (yych == 'o') goto yy382;
+ goto yy193;
}
} else {
if (yych <= 's') {
- if (yych <= 'r') goto yy494;
- goto yy493;
+ if (yych <= 'r') goto yy385;
+ goto yy384;
} else {
- if (yych != 'u') goto yy281;
+ if (yych != 'u') goto yy193;
}
}
}
}
-yy489:
- YYDEBUG(489, *YYCURSOR);
+yy380:
+ YYDEBUG(380, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy560;
- if (yych == 'n') goto yy560;
- goto yy281;
-yy490:
- YYDEBUG(490, *YYCURSOR);
+ if (yych == 'N') goto yy451;
+ if (yych == 'n') goto yy451;
+ goto yy193;
+yy381:
+ YYDEBUG(381, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'O') {
- if (yych == 'I') goto yy543;
- if (yych <= 'N') goto yy281;
- goto yy544;
+ if (yych == 'I') goto yy434;
+ if (yych <= 'N') goto yy193;
+ goto yy435;
} else {
if (yych <= 'i') {
- if (yych <= 'h') goto yy281;
- goto yy543;
+ if (yych <= 'h') goto yy193;
+ goto yy434;
} else {
- if (yych == 'o') goto yy544;
- goto yy281;
+ if (yych == 'o') goto yy435;
+ goto yy193;
}
}
-yy491:
- YYDEBUG(491, *YYCURSOR);
+yy382:
+ YYDEBUG(382, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'B') goto yy535;
- if (yych == 'b') goto yy535;
- goto yy281;
-yy492:
- YYDEBUG(492, *YYCURSOR);
+ if (yych == 'B') goto yy426;
+ if (yych == 'b') goto yy426;
+ goto yy193;
+yy383:
+ YYDEBUG(383, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy528;
- if (yych == 'r') goto yy528;
- goto yy281;
-yy493:
- YYDEBUG(493, *YYCURSOR);
+ if (yych == 'R') goto yy419;
+ if (yych == 'r') goto yy419;
+ goto yy193;
+yy384:
+ YYDEBUG(384, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy520;
- if (yych == 't') goto yy520;
- goto yy281;
-yy494:
- YYDEBUG(494, *YYCURSOR);
+ if (yych == 'T') goto yy411;
+ if (yych == 't') goto yy411;
+ goto yy193;
+yy385:
+ YYDEBUG(385, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy518;
- if (yych == 'e') goto yy518;
- goto yy281;
-yy495:
- YYDEBUG(495, *YYCURSOR);
+ if (yych == 'E') goto yy409;
+ if (yych == 'e') goto yy409;
+ goto yy193;
+yy386:
+ YYDEBUG(386, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'O') goto yy514;
- if (yych == 'o') goto yy514;
- goto yy281;
-yy496:
- YYDEBUG(496, *YYCURSOR);
+ if (yych == 'O') goto yy405;
+ if (yych == 'o') goto yy405;
+ goto yy193;
+yy387:
+ YYDEBUG(387, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'L') goto yy507;
- if (yych == 'l') goto yy507;
- goto yy281;
-yy497:
- YYDEBUG(497, *YYCURSOR);
+ if (yych == 'L') goto yy398;
+ if (yych == 'l') goto yy398;
+ goto yy193;
+yy388:
+ YYDEBUG(388, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy498;
- if (yych != 'n') goto yy281;
-yy498:
- YYDEBUG(498, *YYCURSOR);
+ if (yych == 'N') goto yy389;
+ if (yych != 'n') goto yy193;
+yy389:
+ YYDEBUG(389, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy499;
- if (yych != 't') goto yy281;
-yy499:
- YYDEBUG(499, *YYCURSOR);
+ if (yych == 'T') goto yy390;
+ if (yych != 't') goto yy193;
+yy390:
+ YYDEBUG(390, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy500;
- if (yych != 'e') goto yy502;
-yy500:
- YYDEBUG(500, *YYCURSOR);
+ if (yych == 'E') goto yy391;
+ if (yych != 'e') goto yy393;
+yy391:
+ YYDEBUG(391, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'G') goto yy505;
- if (yych == 'g') goto yy505;
- goto yy281;
-yy501:
- YYDEBUG(501, *YYCURSOR);
+ if (yych == 'G') goto yy396;
+ if (yych == 'g') goto yy396;
+ goto yy193;
+yy392:
+ YYDEBUG(392, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
-yy502:
- YYDEBUG(502, *YYCURSOR);
+yy393:
+ YYDEBUG(393, *YYCURSOR);
if (yych <= 0x1F) {
- if (yych == '\t') goto yy501;
- goto yy281;
+ if (yych == '\t') goto yy392;
+ goto yy193;
} else {
- if (yych <= ' ') goto yy501;
- if (yych != ')') goto yy281;
+ if (yych <= ' ') goto yy392;
+ if (yych != ')') goto yy193;
}
- YYDEBUG(503, *YYCURSOR);
+ YYDEBUG(394, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(504, *YYCURSOR);
+ YYDEBUG(395, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1045 "Zend/zend_language_scanner.l"
{
return T_INT_CAST;
}
-yy505:
- YYDEBUG(505, *YYCURSOR);
+#line 4543 "Zend/zend_language_scanner.c"
+yy396:
+ YYDEBUG(396, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy506;
- if (yych != 'e') goto yy281;
-yy506:
- YYDEBUG(506, *YYCURSOR);
+ if (yych == 'E') goto yy397;
+ if (yych != 'e') goto yy193;
+yy397:
+ YYDEBUG(397, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy501;
- if (yych == 'r') goto yy501;
- goto yy281;
-yy507:
- YYDEBUG(507, *YYCURSOR);
+ if (yych == 'R') goto yy392;
+ if (yych == 'r') goto yy392;
+ goto yy193;
+yy398:
+ YYDEBUG(398, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'O') goto yy508;
- if (yych != 'o') goto yy281;
-yy508:
- YYDEBUG(508, *YYCURSOR);
+ if (yych == 'O') goto yy399;
+ if (yych != 'o') goto yy193;
+yy399:
+ YYDEBUG(399, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy509;
- if (yych != 'a') goto yy281;
-yy509:
- YYDEBUG(509, *YYCURSOR);
+ if (yych == 'A') goto yy400;
+ if (yych != 'a') goto yy193;
+yy400:
+ YYDEBUG(400, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy510;
- if (yych != 't') goto yy281;
-yy510:
- YYDEBUG(510, *YYCURSOR);
+ if (yych == 'T') goto yy401;
+ if (yych != 't') goto yy193;
+yy401:
+ YYDEBUG(401, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
- YYDEBUG(511, *YYCURSOR);
+ YYDEBUG(402, *YYCURSOR);
if (yych <= 0x1F) {
- if (yych == '\t') goto yy510;
- goto yy281;
+ if (yych == '\t') goto yy401;
+ goto yy193;
} else {
- if (yych <= ' ') goto yy510;
- if (yych != ')') goto yy281;
+ if (yych <= ' ') goto yy401;
+ if (yych != ')') goto yy193;
}
- YYDEBUG(512, *YYCURSOR);
+ YYDEBUG(403, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(513, *YYCURSOR);
+ YYDEBUG(404, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1049 "Zend/zend_language_scanner.l"
{
return T_DOUBLE_CAST;
}
-yy514:
- YYDEBUG(514, *YYCURSOR);
+#line 4591 "Zend/zend_language_scanner.c"
+yy405:
+ YYDEBUG(405, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'U') goto yy515;
- if (yych != 'u') goto yy281;
-yy515:
- YYDEBUG(515, *YYCURSOR);
+ if (yych == 'U') goto yy406;
+ if (yych != 'u') goto yy193;
+yy406:
+ YYDEBUG(406, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'B') goto yy516;
- if (yych != 'b') goto yy281;
-yy516:
- YYDEBUG(516, *YYCURSOR);
+ if (yych == 'B') goto yy407;
+ if (yych != 'b') goto yy193;
+yy407:
+ YYDEBUG(407, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'L') goto yy517;
- if (yych != 'l') goto yy281;
-yy517:
- YYDEBUG(517, *YYCURSOR);
+ if (yych == 'L') goto yy408;
+ if (yych != 'l') goto yy193;
+yy408:
+ YYDEBUG(408, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy510;
- if (yych == 'e') goto yy510;
- goto yy281;
-yy518:
- YYDEBUG(518, *YYCURSOR);
+ if (yych == 'E') goto yy401;
+ if (yych == 'e') goto yy401;
+ goto yy193;
+yy409:
+ YYDEBUG(409, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy519;
- if (yych != 'a') goto yy281;
-yy519:
- YYDEBUG(519, *YYCURSOR);
+ if (yych == 'A') goto yy410;
+ if (yych != 'a') goto yy193;
+yy410:
+ YYDEBUG(410, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'L') goto yy510;
- if (yych == 'l') goto yy510;
- goto yy281;
-yy520:
- YYDEBUG(520, *YYCURSOR);
+ if (yych == 'L') goto yy401;
+ if (yych == 'l') goto yy401;
+ goto yy193;
+yy411:
+ YYDEBUG(411, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy521;
- if (yych != 'r') goto yy281;
-yy521:
- YYDEBUG(521, *YYCURSOR);
+ if (yych == 'R') goto yy412;
+ if (yych != 'r') goto yy193;
+yy412:
+ YYDEBUG(412, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'I') goto yy522;
- if (yych != 'i') goto yy281;
-yy522:
- YYDEBUG(522, *YYCURSOR);
+ if (yych == 'I') goto yy413;
+ if (yych != 'i') goto yy193;
+yy413:
+ YYDEBUG(413, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy523;
- if (yych != 'n') goto yy281;
-yy523:
- YYDEBUG(523, *YYCURSOR);
+ if (yych == 'N') goto yy414;
+ if (yych != 'n') goto yy193;
+yy414:
+ YYDEBUG(414, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'G') goto yy524;
- if (yych != 'g') goto yy281;
-yy524:
- YYDEBUG(524, *YYCURSOR);
+ if (yych == 'G') goto yy415;
+ if (yych != 'g') goto yy193;
+yy415:
+ YYDEBUG(415, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
- YYDEBUG(525, *YYCURSOR);
+ YYDEBUG(416, *YYCURSOR);
if (yych <= 0x1F) {
- if (yych == '\t') goto yy524;
- goto yy281;
+ if (yych == '\t') goto yy415;
+ goto yy193;
} else {
- if (yych <= ' ') goto yy524;
- if (yych != ')') goto yy281;
+ if (yych <= ' ') goto yy415;
+ if (yych != ')') goto yy193;
}
- YYDEBUG(526, *YYCURSOR);
+ YYDEBUG(417, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(527, *YYCURSOR);
+ YYDEBUG(418, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1053 "Zend/zend_language_scanner.l"
{
return T_STRING_CAST;
}
-yy528:
- YYDEBUG(528, *YYCURSOR);
+#line 4665 "Zend/zend_language_scanner.c"
+yy419:
+ YYDEBUG(419, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy529;
- if (yych != 'r') goto yy281;
-yy529:
- YYDEBUG(529, *YYCURSOR);
+ if (yych == 'R') goto yy420;
+ if (yych != 'r') goto yy193;
+yy420:
+ YYDEBUG(420, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy530;
- if (yych != 'a') goto yy281;
-yy530:
- YYDEBUG(530, *YYCURSOR);
+ if (yych == 'A') goto yy421;
+ if (yych != 'a') goto yy193;
+yy421:
+ YYDEBUG(421, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'Y') goto yy531;
- if (yych != 'y') goto yy281;
-yy531:
- YYDEBUG(531, *YYCURSOR);
+ if (yych == 'Y') goto yy422;
+ if (yych != 'y') goto yy193;
+yy422:
+ YYDEBUG(422, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
- YYDEBUG(532, *YYCURSOR);
+ YYDEBUG(423, *YYCURSOR);
if (yych <= 0x1F) {
- if (yych == '\t') goto yy531;
- goto yy281;
+ if (yych == '\t') goto yy422;
+ goto yy193;
} else {
- if (yych <= ' ') goto yy531;
- if (yych != ')') goto yy281;
+ if (yych <= ' ') goto yy422;
+ if (yych != ')') goto yy193;
}
- YYDEBUG(533, *YYCURSOR);
+ YYDEBUG(424, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(534, *YYCURSOR);
+ YYDEBUG(425, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1061 "Zend/zend_language_scanner.l"
{
return T_ARRAY_CAST;
}
-yy535:
- YYDEBUG(535, *YYCURSOR);
+#line 4702 "Zend/zend_language_scanner.c"
+yy426:
+ YYDEBUG(426, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'J') goto yy536;
- if (yych != 'j') goto yy281;
-yy536:
- YYDEBUG(536, *YYCURSOR);
+ if (yych == 'J') goto yy427;
+ if (yych != 'j') goto yy193;
+yy427:
+ YYDEBUG(427, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy537;
- if (yych != 'e') goto yy281;
-yy537:
- YYDEBUG(537, *YYCURSOR);
+ if (yych == 'E') goto yy428;
+ if (yych != 'e') goto yy193;
+yy428:
+ YYDEBUG(428, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy538;
- if (yych != 'c') goto yy281;
-yy538:
- YYDEBUG(538, *YYCURSOR);
+ if (yych == 'C') goto yy429;
+ if (yych != 'c') goto yy193;
+yy429:
+ YYDEBUG(429, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy539;
- if (yych != 't') goto yy281;
-yy539:
- YYDEBUG(539, *YYCURSOR);
+ if (yych == 'T') goto yy430;
+ if (yych != 't') goto yy193;
+yy430:
+ YYDEBUG(430, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
- YYDEBUG(540, *YYCURSOR);
+ YYDEBUG(431, *YYCURSOR);
if (yych <= 0x1F) {
- if (yych == '\t') goto yy539;
- goto yy281;
+ if (yych == '\t') goto yy430;
+ goto yy193;
} else {
- if (yych <= ' ') goto yy539;
- if (yych != ')') goto yy281;
+ if (yych <= ' ') goto yy430;
+ if (yych != ')') goto yy193;
}
- YYDEBUG(541, *YYCURSOR);
+ YYDEBUG(432, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(542, *YYCURSOR);
+ YYDEBUG(433, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1065 "Zend/zend_language_scanner.l"
{
return T_OBJECT_CAST;
}
-yy543:
- YYDEBUG(543, *YYCURSOR);
+#line 4744 "Zend/zend_language_scanner.c"
+yy434:
+ YYDEBUG(434, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy553;
- if (yych == 'n') goto yy553;
- goto yy281;
-yy544:
- YYDEBUG(544, *YYCURSOR);
+ if (yych == 'N') goto yy444;
+ if (yych == 'n') goto yy444;
+ goto yy193;
+yy435:
+ YYDEBUG(435, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'O') goto yy545;
- if (yych != 'o') goto yy281;
-yy545:
- YYDEBUG(545, *YYCURSOR);
+ if (yych == 'O') goto yy436;
+ if (yych != 'o') goto yy193;
+yy436:
+ YYDEBUG(436, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'L') goto yy546;
- if (yych != 'l') goto yy281;
-yy546:
- YYDEBUG(546, *YYCURSOR);
+ if (yych == 'L') goto yy437;
+ if (yych != 'l') goto yy193;
+yy437:
+ YYDEBUG(437, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy551;
- if (yych == 'e') goto yy551;
- goto yy548;
-yy547:
- YYDEBUG(547, *YYCURSOR);
+ if (yych == 'E') goto yy442;
+ if (yych == 'e') goto yy442;
+ goto yy439;
+yy438:
+ YYDEBUG(438, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
-yy548:
- YYDEBUG(548, *YYCURSOR);
+yy439:
+ YYDEBUG(439, *YYCURSOR);
if (yych <= 0x1F) {
- if (yych == '\t') goto yy547;
- goto yy281;
+ if (yych == '\t') goto yy438;
+ goto yy193;
} else {
- if (yych <= ' ') goto yy547;
- if (yych != ')') goto yy281;
+ if (yych <= ' ') goto yy438;
+ if (yych != ')') goto yy193;
}
- YYDEBUG(549, *YYCURSOR);
+ YYDEBUG(440, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(550, *YYCURSOR);
+ YYDEBUG(441, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1069 "Zend/zend_language_scanner.l"
{
return T_BOOL_CAST;
}
-yy551:
- YYDEBUG(551, *YYCURSOR);
+#line 4789 "Zend/zend_language_scanner.c"
+yy442:
+ YYDEBUG(442, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy552;
- if (yych != 'a') goto yy281;
-yy552:
- YYDEBUG(552, *YYCURSOR);
+ if (yych == 'A') goto yy443;
+ if (yych != 'a') goto yy193;
+yy443:
+ YYDEBUG(443, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy547;
- if (yych == 'n') goto yy547;
- goto yy281;
-yy553:
- YYDEBUG(553, *YYCURSOR);
+ if (yych == 'N') goto yy438;
+ if (yych == 'n') goto yy438;
+ goto yy193;
+yy444:
+ YYDEBUG(444, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy554;
- if (yych != 'a') goto yy281;
-yy554:
- YYDEBUG(554, *YYCURSOR);
+ if (yych == 'A') goto yy445;
+ if (yych != 'a') goto yy193;
+yy445:
+ YYDEBUG(445, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy555;
- if (yych != 'r') goto yy281;
-yy555:
- YYDEBUG(555, *YYCURSOR);
+ if (yych == 'R') goto yy446;
+ if (yych != 'r') goto yy193;
+yy446:
+ YYDEBUG(446, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'Y') goto yy556;
- if (yych != 'y') goto yy281;
-yy556:
- YYDEBUG(556, *YYCURSOR);
+ if (yych == 'Y') goto yy447;
+ if (yych != 'y') goto yy193;
+yy447:
+ YYDEBUG(447, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
- YYDEBUG(557, *YYCURSOR);
+ YYDEBUG(448, *YYCURSOR);
if (yych <= 0x1F) {
- if (yych == '\t') goto yy556;
- goto yy281;
+ if (yych == '\t') goto yy447;
+ goto yy193;
} else {
- if (yych <= ' ') goto yy556;
- if (yych != ')') goto yy281;
+ if (yych <= ' ') goto yy447;
+ if (yych != ')') goto yy193;
}
- YYDEBUG(558, *YYCURSOR);
+ YYDEBUG(449, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(559, *YYCURSOR);
+ YYDEBUG(450, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1057 "Zend/zend_language_scanner.l"
{
return T_STRING_CAST;
}
-yy560:
- YYDEBUG(560, *YYCURSOR);
+#line 4837 "Zend/zend_language_scanner.c"
+yy451:
+ YYDEBUG(451, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'S') goto yy561;
- if (yych != 's') goto yy281;
-yy561:
- YYDEBUG(561, *YYCURSOR);
+ if (yych == 'S') goto yy452;
+ if (yych != 's') goto yy193;
+yy452:
+ YYDEBUG(452, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy562;
- if (yych != 'e') goto yy281;
-yy562:
- YYDEBUG(562, *YYCURSOR);
+ if (yych == 'E') goto yy453;
+ if (yych != 'e') goto yy193;
+yy453:
+ YYDEBUG(453, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy563;
- if (yych != 't') goto yy281;
-yy563:
- YYDEBUG(563, *YYCURSOR);
+ if (yych == 'T') goto yy454;
+ if (yych != 't') goto yy193;
+yy454:
+ YYDEBUG(454, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
- YYDEBUG(564, *YYCURSOR);
+ YYDEBUG(455, *YYCURSOR);
if (yych <= 0x1F) {
- if (yych == '\t') goto yy563;
- goto yy281;
+ if (yych == '\t') goto yy454;
+ goto yy193;
} else {
- if (yych <= ' ') goto yy563;
- if (yych != ')') goto yy281;
+ if (yych <= ' ') goto yy454;
+ if (yych != ')') goto yy193;
}
- YYDEBUG(565, *YYCURSOR);
+ YYDEBUG(456, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(566, *YYCURSOR);
+ YYDEBUG(457, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1073 "Zend/zend_language_scanner.l"
{
return T_UNSET_CAST;
}
-yy567:
- YYDEBUG(567, *YYCURSOR);
+#line 4874 "Zend/zend_language_scanner.c"
+yy458:
+ YYDEBUG(458, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy568;
- if (yych != 'r') goto yy295;
-yy568:
- YYDEBUG(568, *YYCURSOR);
+ if (yych == 'R') goto yy459;
+ if (yych != 'r') goto yy186;
+yy459:
+ YYDEBUG(459, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(569, *YYCURSOR);
+ YYDEBUG(460, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1041 "Zend/zend_language_scanner.l"
{
return T_VAR;
}
-yy570:
- YYDEBUG(570, *YYCURSOR);
+#line 4892 "Zend/zend_language_scanner.c"
+yy461:
+ YYDEBUG(461, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'M') goto yy574;
- if (yych == 'm') goto yy574;
- goto yy295;
-yy571:
- YYDEBUG(571, *YYCURSOR);
+ if (yych == 'M') goto yy465;
+ if (yych == 'm') goto yy465;
+ goto yy186;
+yy462:
+ YYDEBUG(462, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'W') goto yy572;
- if (yych != 'w') goto yy295;
-yy572:
- YYDEBUG(572, *YYCURSOR);
+ if (yych == 'W') goto yy463;
+ if (yych != 'w') goto yy186;
+yy463:
+ YYDEBUG(463, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(573, *YYCURSOR);
+ YYDEBUG(464, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1033 "Zend/zend_language_scanner.l"
{
return T_NEW;
}
-yy574:
- YYDEBUG(574, *YYCURSOR);
+#line 4916 "Zend/zend_language_scanner.c"
+yy465:
+ YYDEBUG(465, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy575;
- if (yych != 'e') goto yy295;
-yy575:
- YYDEBUG(575, *YYCURSOR);
+ if (yych == 'E') goto yy466;
+ if (yych != 'e') goto yy186;
+yy466:
+ YYDEBUG(466, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'S') goto yy576;
- if (yych != 's') goto yy295;
-yy576:
- YYDEBUG(576, *YYCURSOR);
+ if (yych == 'S') goto yy467;
+ if (yych != 's') goto yy186;
+yy467:
+ YYDEBUG(467, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'P') goto yy577;
- if (yych != 'p') goto yy295;
-yy577:
- YYDEBUG(577, *YYCURSOR);
+ if (yych == 'P') goto yy468;
+ if (yych != 'p') goto yy186;
+yy468:
+ YYDEBUG(468, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy578;
- if (yych != 'a') goto yy295;
-yy578:
- YYDEBUG(578, *YYCURSOR);
+ if (yych == 'A') goto yy469;
+ if (yych != 'a') goto yy186;
+yy469:
+ YYDEBUG(469, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy579;
- if (yych != 'c') goto yy295;
-yy579:
- YYDEBUG(579, *YYCURSOR);
+ if (yych == 'C') goto yy470;
+ if (yych != 'c') goto yy186;
+yy470:
+ YYDEBUG(470, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy580;
- if (yych != 'e') goto yy295;
-yy580:
- YYDEBUG(580, *YYCURSOR);
+ if (yych == 'E') goto yy471;
+ if (yych != 'e') goto yy186;
+yy471:
+ YYDEBUG(471, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(581, *YYCURSOR);
+ YYDEBUG(472, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1097 "Zend/zend_language_scanner.l"
{
return T_NAMESPACE;
}
-yy582:
- YYDEBUG(582, *YYCURSOR);
+#line 4959 "Zend/zend_language_scanner.c"
+yy473:
+ YYDEBUG(473, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(583, *YYCURSOR);
+ YYDEBUG(474, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1025 "Zend/zend_language_scanner.l"
{
return T_PAAMAYIM_NEKUDOTAYIM;
}
-yy584:
- YYDEBUG(584, *YYCURSOR);
+#line 4969 "Zend/zend_language_scanner.c"
+yy475:
+ YYDEBUG(475, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
-yy585:
- YYDEBUG(585, *YYCURSOR);
+yy476:
+ YYDEBUG(476, *YYCURSOR);
if (yych <= '\f') {
- if (yych <= 0x08) goto yy234;
- if (yych <= '\n') goto yy584;
- goto yy234;
+ if (yych <= 0x08) goto yy140;
+ if (yych <= '\n') goto yy475;
+ goto yy140;
} else {
- if (yych <= '\r') goto yy584;
- if (yych == ' ') goto yy584;
- goto yy234;
+ if (yych <= '\r') goto yy475;
+ if (yych == ' ') goto yy475;
+ goto yy140;
}
-yy586:
- YYDEBUG(586, *YYCURSOR);
+yy477:
+ YYDEBUG(477, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(587, *YYCURSOR);
+ YYDEBUG(478, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1197 "Zend/zend_language_scanner.l"
{
return T_MINUS_EQUAL;
}
-yy588:
- YYDEBUG(588, *YYCURSOR);
+#line 4995 "Zend/zend_language_scanner.c"
+yy479:
+ YYDEBUG(479, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(589, *YYCURSOR);
+ YYDEBUG(480, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1165 "Zend/zend_language_scanner.l"
{
return T_DEC;
}
-yy590:
- YYDEBUG(590, *YYCURSOR);
+#line 5005 "Zend/zend_language_scanner.c"
+yy481:
+ YYDEBUG(481, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(591, *YYCURSOR);
+ YYDEBUG(482, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 995 "Zend/zend_language_scanner.l"
{
yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
return T_OBJECT_OPERATOR;
}
-yy592:
- YYDEBUG(592, *YYCURSOR);
+#line 5016 "Zend/zend_language_scanner.c"
+yy483:
+ YYDEBUG(483, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'O') {
- if (yych == 'I') goto yy599;
- if (yych <= 'N') goto yy295;
- goto yy600;
+ if (yych == 'I') goto yy490;
+ if (yych <= 'N') goto yy186;
+ goto yy491;
} else {
if (yych <= 'i') {
- if (yych <= 'h') goto yy295;
- goto yy599;
+ if (yych <= 'h') goto yy186;
+ goto yy490;
} else {
- if (yych == 'o') goto yy600;
- goto yy295;
+ if (yych == 'o') goto yy491;
+ goto yy186;
}
}
-yy593:
- YYDEBUG(593, *YYCURSOR);
+yy484:
+ YYDEBUG(484, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'B') goto yy594;
- if (yych != 'b') goto yy295;
-yy594:
- YYDEBUG(594, *YYCURSOR);
+ if (yych == 'B') goto yy485;
+ if (yych != 'b') goto yy186;
+yy485:
+ YYDEBUG(485, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'L') goto yy595;
- if (yych != 'l') goto yy295;
-yy595:
- YYDEBUG(595, *YYCURSOR);
+ if (yych == 'L') goto yy486;
+ if (yych != 'l') goto yy186;
+yy486:
+ YYDEBUG(486, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'I') goto yy596;
- if (yych != 'i') goto yy295;
-yy596:
- YYDEBUG(596, *YYCURSOR);
+ if (yych == 'I') goto yy487;
+ if (yych != 'i') goto yy186;
+yy487:
+ YYDEBUG(487, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy597;
- if (yych != 'c') goto yy295;
-yy597:
- YYDEBUG(597, *YYCURSOR);
+ if (yych == 'C') goto yy488;
+ if (yych != 'c') goto yy186;
+yy488:
+ YYDEBUG(488, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(598, *YYCURSOR);
+ YYDEBUG(489, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1141 "Zend/zend_language_scanner.l"
{
return T_PUBLIC;
}
-yy599:
- YYDEBUG(599, *YYCURSOR);
+#line 5065 "Zend/zend_language_scanner.c"
+yy490:
+ YYDEBUG(490, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'V') {
- if (yych == 'N') goto yy608;
- if (yych <= 'U') goto yy295;
- goto yy609;
+ if (yych == 'N') goto yy499;
+ if (yych <= 'U') goto yy186;
+ goto yy500;
} else {
if (yych <= 'n') {
- if (yych <= 'm') goto yy295;
- goto yy608;
+ if (yych <= 'm') goto yy186;
+ goto yy499;
} else {
- if (yych == 'v') goto yy609;
- goto yy295;
+ if (yych == 'v') goto yy500;
+ goto yy186;
}
}
-yy600:
- YYDEBUG(600, *YYCURSOR);
+yy491:
+ YYDEBUG(491, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy601;
- if (yych != 't') goto yy295;
-yy601:
- YYDEBUG(601, *YYCURSOR);
+ if (yych == 'T') goto yy492;
+ if (yych != 't') goto yy186;
+yy492:
+ YYDEBUG(492, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy602;
- if (yych != 'e') goto yy295;
-yy602:
- YYDEBUG(602, *YYCURSOR);
+ if (yych == 'E') goto yy493;
+ if (yych != 'e') goto yy186;
+yy493:
+ YYDEBUG(493, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy603;
- if (yych != 'c') goto yy295;
-yy603:
- YYDEBUG(603, *YYCURSOR);
+ if (yych == 'C') goto yy494;
+ if (yych != 'c') goto yy186;
+yy494:
+ YYDEBUG(494, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy604;
- if (yych != 't') goto yy295;
-yy604:
- YYDEBUG(604, *YYCURSOR);
+ if (yych == 'T') goto yy495;
+ if (yych != 't') goto yy186;
+yy495:
+ YYDEBUG(495, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy605;
- if (yych != 'e') goto yy295;
-yy605:
- YYDEBUG(605, *YYCURSOR);
+ if (yych == 'E') goto yy496;
+ if (yych != 'e') goto yy186;
+yy496:
+ YYDEBUG(496, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'D') goto yy606;
- if (yych != 'd') goto yy295;
-yy606:
- YYDEBUG(606, *YYCURSOR);
+ if (yych == 'D') goto yy497;
+ if (yych != 'd') goto yy186;
+yy497:
+ YYDEBUG(497, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(607, *YYCURSOR);
+ YYDEBUG(498, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1137 "Zend/zend_language_scanner.l"
{
return T_PROTECTED;
}
-yy608:
- YYDEBUG(608, *YYCURSOR);
+#line 5124 "Zend/zend_language_scanner.c"
+yy499:
+ YYDEBUG(499, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy614;
- if (yych == 't') goto yy614;
- goto yy295;
-yy609:
- YYDEBUG(609, *YYCURSOR);
+ if (yych == 'T') goto yy505;
+ if (yych == 't') goto yy505;
+ goto yy186;
+yy500:
+ YYDEBUG(500, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy610;
- if (yych != 'a') goto yy295;
-yy610:
- YYDEBUG(610, *YYCURSOR);
+ if (yych == 'A') goto yy501;
+ if (yych != 'a') goto yy186;
+yy501:
+ YYDEBUG(501, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy611;
- if (yych != 't') goto yy295;
-yy611:
- YYDEBUG(611, *YYCURSOR);
+ if (yych == 'T') goto yy502;
+ if (yych != 't') goto yy186;
+yy502:
+ YYDEBUG(502, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy612;
- if (yych != 'e') goto yy295;
-yy612:
- YYDEBUG(612, *YYCURSOR);
+ if (yych == 'E') goto yy503;
+ if (yych != 'e') goto yy186;
+yy503:
+ YYDEBUG(503, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(613, *YYCURSOR);
+ YYDEBUG(504, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1133 "Zend/zend_language_scanner.l"
{
return T_PRIVATE;
}
-yy614:
- YYDEBUG(614, *YYCURSOR);
+#line 5158 "Zend/zend_language_scanner.c"
+yy505:
+ YYDEBUG(505, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(615, *YYCURSOR);
+ YYDEBUG(506, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 975 "Zend/zend_language_scanner.l"
{
return T_PRINT;
}
-yy616:
- YYDEBUG(616, *YYCURSOR);
+#line 5171 "Zend/zend_language_scanner.c"
+yy507:
+ YYDEBUG(507, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'O') goto yy621;
- if (yych == 'o') goto yy621;
- goto yy295;
-yy617:
- YYDEBUG(617, *YYCURSOR);
+ if (yych == 'O') goto yy512;
+ if (yych == 'o') goto yy512;
+ goto yy186;
+yy508:
+ YYDEBUG(508, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy618;
- if (yych != 't') goto yy295;
-yy618:
- YYDEBUG(618, *YYCURSOR);
+ if (yych == 'T') goto yy509;
+ if (yych != 't') goto yy186;
+yy509:
+ YYDEBUG(509, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'O') goto yy619;
- if (yych != 'o') goto yy295;
-yy619:
- YYDEBUG(619, *YYCURSOR);
+ if (yych == 'O') goto yy510;
+ if (yych != 'o') goto yy186;
+yy510:
+ YYDEBUG(510, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(620, *YYCURSOR);
+ YYDEBUG(511, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 967 "Zend/zend_language_scanner.l"
{
return T_GOTO;
}
-yy621:
- YYDEBUG(621, *YYCURSOR);
+#line 5200 "Zend/zend_language_scanner.c"
+yy512:
+ YYDEBUG(512, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'B') goto yy622;
- if (yych != 'b') goto yy295;
-yy622:
- YYDEBUG(622, *YYCURSOR);
+ if (yych == 'B') goto yy513;
+ if (yych != 'b') goto yy186;
+yy513:
+ YYDEBUG(513, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy623;
- if (yych != 'a') goto yy295;
-yy623:
- YYDEBUG(623, *YYCURSOR);
+ if (yych == 'A') goto yy514;
+ if (yych != 'a') goto yy186;
+yy514:
+ YYDEBUG(514, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'L') goto yy624;
- if (yych != 'l') goto yy295;
-yy624:
- YYDEBUG(624, *YYCURSOR);
+ if (yych == 'L') goto yy515;
+ if (yych != 'l') goto yy186;
+yy515:
+ YYDEBUG(515, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(625, *YYCURSOR);
+ YYDEBUG(516, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1105 "Zend/zend_language_scanner.l"
{
return T_GLOBAL;
}
-yy626:
- YYDEBUG(626, *YYCURSOR);
+#line 5228 "Zend/zend_language_scanner.c"
+yy517:
+ YYDEBUG(517, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '<') goto yy633;
- goto yy281;
-yy627:
- YYDEBUG(627, *YYCURSOR);
- yyaccept = 3;
- yych = *(YYMARKER = ++YYCURSOR);
- goto yy287;
-yy628:
- YYDEBUG(628, *YYCURSOR);
+ if (yych == '<') goto yy525;
+ goto yy193;
+yy518:
+ YYDEBUG(518, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy629;
- if (yych != 'e') goto yy295;
-yy629:
- YYDEBUG(629, *YYCURSOR);
+ goto yy180;
+yy519:
+ YYDEBUG(519, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy630;
- if (yych != 'a') goto yy295;
-yy630:
- YYDEBUG(630, *YYCURSOR);
+ goto yy178;
+yy520:
+ YYDEBUG(520, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'K') goto yy631;
- if (yych != 'k') goto yy295;
-yy631:
- YYDEBUG(631, *YYCURSOR);
+ if (yych == 'E') goto yy521;
+ if (yych != 'e') goto yy186;
+yy521:
+ YYDEBUG(521, *YYCURSOR);
+ yych = *++YYCURSOR;
+ if (yych == 'A') goto yy522;
+ if (yych != 'a') goto yy186;
+yy522:
+ YYDEBUG(522, *YYCURSOR);
+ yych = *++YYCURSOR;
+ if (yych == 'K') goto yy523;
+ if (yych != 'k') goto yy186;
+yy523:
+ YYDEBUG(523, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(632, *YYCURSOR);
+ YYDEBUG(524, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 959 "Zend/zend_language_scanner.l"
{
return T_BREAK;
}
-yy633:
- YYDEBUG(633, *YYCURSOR);
+#line 5269 "Zend/zend_language_scanner.c"
+yy525:
+ YYDEBUG(525, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == '<') goto yy374;
- goto yy281;
-yy634:
- YYDEBUG(634, *YYCURSOR);
+ if (yych == '<') goto yy265;
+ goto yy193;
+yy526:
+ YYDEBUG(526, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy641;
- if (yych == 'a') goto yy641;
- goto yy295;
-yy635:
- YYDEBUG(635, *YYCURSOR);
+ if (yych == 'A') goto yy533;
+ if (yych == 'a') goto yy533;
+ goto yy186;
+yy527:
+ YYDEBUG(527, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'I') goto yy636;
- if (yych != 'i') goto yy295;
-yy636:
- YYDEBUG(636, *YYCURSOR);
+ if (yych == 'I') goto yy528;
+ if (yych != 'i') goto yy186;
+yy528:
+ YYDEBUG(528, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy637;
- if (yych != 't') goto yy295;
-yy637:
- YYDEBUG(637, *YYCURSOR);
+ if (yych == 'T') goto yy529;
+ if (yych != 't') goto yy186;
+yy529:
+ YYDEBUG(529, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy638;
- if (yych != 'c') goto yy295;
-yy638:
- YYDEBUG(638, *YYCURSOR);
+ if (yych == 'C') goto yy530;
+ if (yych != 'c') goto yy186;
+yy530:
+ YYDEBUG(530, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'H') goto yy639;
- if (yych != 'h') goto yy295;
-yy639:
- YYDEBUG(639, *YYCURSOR);
+ if (yych == 'H') goto yy531;
+ if (yych != 'h') goto yy186;
+yy531:
+ YYDEBUG(531, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(640, *YYCURSOR);
+ YYDEBUG(532, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 943 "Zend/zend_language_scanner.l"
{
return T_SWITCH;
}
-yy641:
- YYDEBUG(641, *YYCURSOR);
+#line 5313 "Zend/zend_language_scanner.c"
+yy533:
+ YYDEBUG(533, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy642;
- if (yych != 't') goto yy295;
-yy642:
- YYDEBUG(642, *YYCURSOR);
+ if (yych == 'T') goto yy534;
+ if (yych != 't') goto yy186;
+yy534:
+ YYDEBUG(534, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'I') goto yy643;
- if (yych != 'i') goto yy295;
-yy643:
- YYDEBUG(643, *YYCURSOR);
+ if (yych == 'I') goto yy535;
+ if (yych != 'i') goto yy186;
+yy535:
+ YYDEBUG(535, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy644;
- if (yych != 'c') goto yy295;
-yy644:
- YYDEBUG(644, *YYCURSOR);
+ if (yych == 'C') goto yy536;
+ if (yych != 'c') goto yy186;
+yy536:
+ YYDEBUG(536, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(645, *YYCURSOR);
+ YYDEBUG(537, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1121 "Zend/zend_language_scanner.l"
{
return T_STATIC;
}
-yy646:
- YYDEBUG(646, *YYCURSOR);
+#line 5341 "Zend/zend_language_scanner.c"
+yy538:
+ YYDEBUG(538, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'S') goto yy657;
- if (yych == 's') goto yy657;
- goto yy295;
-yy647:
- YYDEBUG(647, *YYCURSOR);
+ if (yych == 'S') goto yy549;
+ if (yych == 's') goto yy549;
+ goto yy186;
+yy539:
+ YYDEBUG(539, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'D') goto yy655;
- if (yych == 'd') goto yy655;
- goto yy295;
-yy648:
- YYDEBUG(648, *YYCURSOR);
+ if (yych == 'D') goto yy547;
+ if (yych == 'd') goto yy547;
+ goto yy186;
+yy540:
+ YYDEBUG(540, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy651;
- if (yych == 'r') goto yy651;
- goto yy295;
-yy649:
- YYDEBUG(649, *YYCURSOR);
+ if (yych == 'R') goto yy543;
+ if (yych == 'r') goto yy543;
+ goto yy186;
+yy541:
+ YYDEBUG(541, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(650, *YYCURSOR);
+ YYDEBUG(542, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 939 "Zend/zend_language_scanner.l"
{
return T_AS;
}
-yy651:
- YYDEBUG(651, *YYCURSOR);
+#line 5372 "Zend/zend_language_scanner.c"
+yy543:
+ YYDEBUG(543, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy652;
- if (yych != 'a') goto yy295;
-yy652:
- YYDEBUG(652, *YYCURSOR);
+ if (yych == 'A') goto yy544;
+ if (yych != 'a') goto yy186;
+yy544:
+ YYDEBUG(544, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'Y') goto yy653;
- if (yych != 'y') goto yy295;
-yy653:
- YYDEBUG(653, *YYCURSOR);
+ if (yych == 'Y') goto yy545;
+ if (yych != 'y') goto yy186;
+yy545:
+ YYDEBUG(545, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(654, *YYCURSOR);
+ YYDEBUG(546, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1157 "Zend/zend_language_scanner.l"
{
return T_ARRAY;
}
-yy655:
- YYDEBUG(655, *YYCURSOR);
+#line 5395 "Zend/zend_language_scanner.c"
+yy547:
+ YYDEBUG(547, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(656, *YYCURSOR);
+ YYDEBUG(548, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1249 "Zend/zend_language_scanner.l"
{
return T_LOGICAL_AND;
}
-yy657:
- YYDEBUG(657, *YYCURSOR);
+#line 5408 "Zend/zend_language_scanner.c"
+yy549:
+ YYDEBUG(549, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy658;
- if (yych != 't') goto yy295;
-yy658:
- YYDEBUG(658, *YYCURSOR);
+ if (yych == 'T') goto yy550;
+ if (yych != 't') goto yy186;
+yy550:
+ YYDEBUG(550, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy659;
- if (yych != 'r') goto yy295;
-yy659:
- YYDEBUG(659, *YYCURSOR);
+ if (yych == 'R') goto yy551;
+ if (yych != 'r') goto yy186;
+yy551:
+ YYDEBUG(551, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy660;
- if (yych != 'a') goto yy295;
-yy660:
- YYDEBUG(660, *YYCURSOR);
+ if (yych == 'A') goto yy552;
+ if (yych != 'a') goto yy186;
+yy552:
+ YYDEBUG(552, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy661;
- if (yych != 'c') goto yy295;
-yy661:
- YYDEBUG(661, *YYCURSOR);
+ if (yych == 'C') goto yy553;
+ if (yych != 'c') goto yy186;
+yy553:
+ YYDEBUG(553, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy662;
- if (yych != 't') goto yy295;
-yy662:
- YYDEBUG(662, *YYCURSOR);
+ if (yych == 'T') goto yy554;
+ if (yych != 't') goto yy186;
+yy554:
+ YYDEBUG(554, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(663, *YYCURSOR);
+ YYDEBUG(555, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1125 "Zend/zend_language_scanner.l"
{
return T_ABSTRACT;
}
-yy664:
- YYDEBUG(664, *YYCURSOR);
+#line 5446 "Zend/zend_language_scanner.c"
+yy556:
+ YYDEBUG(556, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'I') goto yy665;
- if (yych != 'i') goto yy295;
-yy665:
- YYDEBUG(665, *YYCURSOR);
+ if (yych == 'I') goto yy557;
+ if (yych != 'i') goto yy186;
+yy557:
+ YYDEBUG(557, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'L') goto yy666;
- if (yych != 'l') goto yy295;
-yy666:
- YYDEBUG(666, *YYCURSOR);
+ if (yych == 'L') goto yy558;
+ if (yych != 'l') goto yy186;
+yy558:
+ YYDEBUG(558, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy667;
- if (yych != 'e') goto yy295;
-yy667:
- YYDEBUG(667, *YYCURSOR);
+ if (yych == 'E') goto yy559;
+ if (yych != 'e') goto yy186;
+yy559:
+ YYDEBUG(559, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(668, *YYCURSOR);
+ YYDEBUG(560, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 899 "Zend/zend_language_scanner.l"
{
return T_WHILE;
}
-yy669:
- YYDEBUG(669, *YYCURSOR);
+#line 5474 "Zend/zend_language_scanner.c"
+yy561:
+ YYDEBUG(561, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(670, *YYCURSOR);
+ YYDEBUG(562, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 883 "Zend/zend_language_scanner.l"
{
return T_IF;
}
-yy671:
- YYDEBUG(671, *YYCURSOR);
+#line 5487 "Zend/zend_language_scanner.c"
+yy563:
+ YYDEBUG(563, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'P') goto yy707;
- if (yych == 'p') goto yy707;
- goto yy295;
-yy672:
- YYDEBUG(672, *YYCURSOR);
+ if (yych == 'P') goto yy599;
+ if (yych == 'p') goto yy599;
+ goto yy186;
+yy564:
+ YYDEBUG(564, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'T') {
if (yych <= 'C') {
- if (yych <= 'B') goto yy295;
- goto yy680;
+ if (yych <= 'B') goto yy186;
+ goto yy572;
} else {
- if (yych <= 'R') goto yy295;
- if (yych <= 'S') goto yy678;
- goto yy679;
+ if (yych <= 'R') goto yy186;
+ if (yych <= 'S') goto yy570;
+ goto yy571;
}
} else {
if (yych <= 'r') {
- if (yych == 'c') goto yy680;
- goto yy295;
+ if (yych == 'c') goto yy572;
+ goto yy186;
} else {
- if (yych <= 's') goto yy678;
- if (yych <= 't') goto yy679;
- goto yy295;
+ if (yych <= 's') goto yy570;
+ if (yych <= 't') goto yy571;
+ goto yy186;
}
}
-yy673:
- YYDEBUG(673, *YYCURSOR);
+yy565:
+ YYDEBUG(565, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'S') goto yy674;
- if (yych != 's') goto yy295;
-yy674:
- YYDEBUG(674, *YYCURSOR);
+ if (yych == 'S') goto yy566;
+ if (yych != 's') goto yy186;
+yy566:
+ YYDEBUG(566, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy675;
- if (yych != 'e') goto yy295;
-yy675:
- YYDEBUG(675, *YYCURSOR);
+ if (yych == 'E') goto yy567;
+ if (yych != 'e') goto yy186;
+yy567:
+ YYDEBUG(567, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy676;
- if (yych != 't') goto yy295;
-yy676:
- YYDEBUG(676, *YYCURSOR);
+ if (yych == 'T') goto yy568;
+ if (yych != 't') goto yy186;
+yy568:
+ YYDEBUG(568, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(677, *YYCURSOR);
+ YYDEBUG(569, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1109 "Zend/zend_language_scanner.l"
{
return T_ISSET;
}
-yy678:
- YYDEBUG(678, *YYCURSOR);
+#line 5543 "Zend/zend_language_scanner.c"
+yy570:
+ YYDEBUG(570, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy699;
- if (yych == 't') goto yy699;
- goto yy295;
-yy679:
- YYDEBUG(679, *YYCURSOR);
+ if (yych == 'T') goto yy591;
+ if (yych == 't') goto yy591;
+ goto yy186;
+yy571:
+ YYDEBUG(571, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy692;
- if (yych == 'e') goto yy692;
- goto yy295;
-yy680:
- YYDEBUG(680, *YYCURSOR);
+ if (yych == 'E') goto yy584;
+ if (yych == 'e') goto yy584;
+ goto yy186;
+yy572:
+ YYDEBUG(572, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'L') goto yy681;
- if (yych != 'l') goto yy295;
-yy681:
- YYDEBUG(681, *YYCURSOR);
+ if (yych == 'L') goto yy573;
+ if (yych != 'l') goto yy186;
+yy573:
+ YYDEBUG(573, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'U') goto yy682;
- if (yych != 'u') goto yy295;
-yy682:
- YYDEBUG(682, *YYCURSOR);
+ if (yych == 'U') goto yy574;
+ if (yych != 'u') goto yy186;
+yy574:
+ YYDEBUG(574, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'D') goto yy683;
- if (yych != 'd') goto yy295;
-yy683:
- YYDEBUG(683, *YYCURSOR);
+ if (yych == 'D') goto yy575;
+ if (yych != 'd') goto yy186;
+yy575:
+ YYDEBUG(575, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy684;
- if (yych != 'e') goto yy295;
-yy684:
- YYDEBUG(684, *YYCURSOR);
+ if (yych == 'E') goto yy576;
+ if (yych != 'e') goto yy186;
+yy576:
+ YYDEBUG(576, *YYCURSOR);
++YYCURSOR;
if ((yych = *YYCURSOR) <= '^') {
if (yych <= '9') {
- if (yych >= '0') goto yy294;
+ if (yych >= '0') goto yy185;
} else {
- if (yych <= '@') goto yy685;
- if (yych <= 'Z') goto yy294;
+ if (yych <= '@') goto yy577;
+ if (yych <= 'Z') goto yy185;
}
} else {
if (yych <= '`') {
- if (yych <= '_') goto yy686;
+ if (yych <= '_') goto yy578;
} else {
- if (yych <= 'z') goto yy294;
- if (yych >= 0x7F) goto yy294;
+ if (yych <= 'z') goto yy185;
+ if (yych >= 0x7F) goto yy185;
}
}
-yy685:
- YYDEBUG(685, *YYCURSOR);
+yy577:
+ YYDEBUG(577, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1081 "Zend/zend_language_scanner.l"
{
return T_INCLUDE;
}
-yy686:
- YYDEBUG(686, *YYCURSOR);
+#line 5601 "Zend/zend_language_scanner.c"
+yy578:
+ YYDEBUG(578, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'O') goto yy687;
- if (yych != 'o') goto yy295;
-yy687:
- YYDEBUG(687, *YYCURSOR);
+ if (yych == 'O') goto yy579;
+ if (yych != 'o') goto yy186;
+yy579:
+ YYDEBUG(579, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy688;
- if (yych != 'n') goto yy295;
-yy688:
- YYDEBUG(688, *YYCURSOR);
+ if (yych == 'N') goto yy580;
+ if (yych != 'n') goto yy186;
+yy580:
+ YYDEBUG(580, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy689;
- if (yych != 'c') goto yy295;
-yy689:
- YYDEBUG(689, *YYCURSOR);
+ if (yych == 'C') goto yy581;
+ if (yych != 'c') goto yy186;
+yy581:
+ YYDEBUG(581, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy690;
- if (yych != 'e') goto yy295;
-yy690:
- YYDEBUG(690, *YYCURSOR);
+ if (yych == 'E') goto yy582;
+ if (yych != 'e') goto yy186;
+yy582:
+ YYDEBUG(582, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(691, *YYCURSOR);
+ YYDEBUG(583, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1085 "Zend/zend_language_scanner.l"
{
return T_INCLUDE_ONCE;
}
-yy692:
- YYDEBUG(692, *YYCURSOR);
+#line 5634 "Zend/zend_language_scanner.c"
+yy584:
+ YYDEBUG(584, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy693;
- if (yych != 'r') goto yy295;
-yy693:
- YYDEBUG(693, *YYCURSOR);
+ if (yych == 'R') goto yy585;
+ if (yych != 'r') goto yy186;
+yy585:
+ YYDEBUG(585, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'F') goto yy694;
- if (yych != 'f') goto yy295;
-yy694:
- YYDEBUG(694, *YYCURSOR);
+ if (yych == 'F') goto yy586;
+ if (yych != 'f') goto yy186;
+yy586:
+ YYDEBUG(586, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy695;
- if (yych != 'a') goto yy295;
-yy695:
- YYDEBUG(695, *YYCURSOR);
+ if (yych == 'A') goto yy587;
+ if (yych != 'a') goto yy186;
+yy587:
+ YYDEBUG(587, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy696;
- if (yych != 'c') goto yy295;
-yy696:
- YYDEBUG(696, *YYCURSOR);
+ if (yych == 'C') goto yy588;
+ if (yych != 'c') goto yy186;
+yy588:
+ YYDEBUG(588, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy697;
- if (yych != 'e') goto yy295;
-yy697:
- YYDEBUG(697, *YYCURSOR);
+ if (yych == 'E') goto yy589;
+ if (yych != 'e') goto yy186;
+yy589:
+ YYDEBUG(589, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(698, *YYCURSOR);
+ YYDEBUG(590, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 983 "Zend/zend_language_scanner.l"
{
return T_INTERFACE;
}
-yy699:
- YYDEBUG(699, *YYCURSOR);
+#line 5672 "Zend/zend_language_scanner.c"
+yy591:
+ YYDEBUG(591, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy700;
- if (yych != 'a') goto yy295;
-yy700:
- YYDEBUG(700, *YYCURSOR);
+ if (yych == 'A') goto yy592;
+ if (yych != 'a') goto yy186;
+yy592:
+ YYDEBUG(592, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy701;
- if (yych != 'n') goto yy295;
-yy701:
- YYDEBUG(701, *YYCURSOR);
+ if (yych == 'N') goto yy593;
+ if (yych != 'n') goto yy186;
+yy593:
+ YYDEBUG(593, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy702;
- if (yych != 'c') goto yy295;
-yy702:
- YYDEBUG(702, *YYCURSOR);
+ if (yych == 'C') goto yy594;
+ if (yych != 'c') goto yy186;
+yy594:
+ YYDEBUG(594, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy703;
- if (yych != 'e') goto yy295;
-yy703:
- YYDEBUG(703, *YYCURSOR);
+ if (yych == 'E') goto yy595;
+ if (yych != 'e') goto yy186;
+yy595:
+ YYDEBUG(595, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'O') goto yy704;
- if (yych != 'o') goto yy295;
-yy704:
- YYDEBUG(704, *YYCURSOR);
+ if (yych == 'O') goto yy596;
+ if (yych != 'o') goto yy186;
+yy596:
+ YYDEBUG(596, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'F') goto yy705;
- if (yych != 'f') goto yy295;
-yy705:
- YYDEBUG(705, *YYCURSOR);
+ if (yych == 'F') goto yy597;
+ if (yych != 'f') goto yy186;
+yy597:
+ YYDEBUG(597, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(706, *YYCURSOR);
+ YYDEBUG(598, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 935 "Zend/zend_language_scanner.l"
{
return T_INSTANCEOF;
}
-yy707:
- YYDEBUG(707, *YYCURSOR);
+#line 5715 "Zend/zend_language_scanner.c"
+yy599:
+ YYDEBUG(599, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'L') goto yy708;
- if (yych != 'l') goto yy295;
-yy708:
- YYDEBUG(708, *YYCURSOR);
+ if (yych == 'L') goto yy600;
+ if (yych != 'l') goto yy186;
+yy600:
+ YYDEBUG(600, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy709;
- if (yych != 'e') goto yy295;
-yy709:
- YYDEBUG(709, *YYCURSOR);
+ if (yych == 'E') goto yy601;
+ if (yych != 'e') goto yy186;
+yy601:
+ YYDEBUG(601, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'M') goto yy710;
- if (yych != 'm') goto yy295;
-yy710:
- YYDEBUG(710, *YYCURSOR);
+ if (yych == 'M') goto yy602;
+ if (yych != 'm') goto yy186;
+yy602:
+ YYDEBUG(602, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy711;
- if (yych != 'e') goto yy295;
-yy711:
- YYDEBUG(711, *YYCURSOR);
+ if (yych == 'E') goto yy603;
+ if (yych != 'e') goto yy186;
+yy603:
+ YYDEBUG(603, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy712;
- if (yych != 'n') goto yy295;
-yy712:
- YYDEBUG(712, *YYCURSOR);
+ if (yych == 'N') goto yy604;
+ if (yych != 'n') goto yy186;
+yy604:
+ YYDEBUG(604, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy713;
- if (yych != 't') goto yy295;
-yy713:
- YYDEBUG(713, *YYCURSOR);
+ if (yych == 'T') goto yy605;
+ if (yych != 't') goto yy186;
+yy605:
+ YYDEBUG(605, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'S') goto yy714;
- if (yych != 's') goto yy295;
-yy714:
- YYDEBUG(714, *YYCURSOR);
+ if (yych == 'S') goto yy606;
+ if (yych != 's') goto yy186;
+yy606:
+ YYDEBUG(606, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(715, *YYCURSOR);
+ YYDEBUG(607, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 991 "Zend/zend_language_scanner.l"
{
return T_IMPLEMENTS;
}
-yy716:
- YYDEBUG(716, *YYCURSOR);
+#line 5763 "Zend/zend_language_scanner.c"
+yy608:
+ YYDEBUG(608, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy720;
- if (yych == 'r') goto yy720;
- goto yy295;
-yy717:
- YYDEBUG(717, *YYCURSOR);
+ if (yych == 'R') goto yy612;
+ if (yych == 'r') goto yy612;
+ goto yy186;
+yy609:
+ YYDEBUG(609, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'Y') goto yy718;
- if (yych != 'y') goto yy295;
-yy718:
- YYDEBUG(718, *YYCURSOR);
+ if (yych == 'Y') goto yy610;
+ if (yych != 'y') goto yy186;
+yy610:
+ YYDEBUG(610, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(719, *YYCURSOR);
+ YYDEBUG(611, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 871 "Zend/zend_language_scanner.l"
{
return T_TRY;
}
-yy720:
- YYDEBUG(720, *YYCURSOR);
+#line 5787 "Zend/zend_language_scanner.c"
+yy612:
+ YYDEBUG(612, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'O') goto yy721;
- if (yych != 'o') goto yy295;
-yy721:
- YYDEBUG(721, *YYCURSOR);
+ if (yych == 'O') goto yy613;
+ if (yych != 'o') goto yy186;
+yy613:
+ YYDEBUG(613, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'W') goto yy722;
- if (yych != 'w') goto yy295;
-yy722:
- YYDEBUG(722, *YYCURSOR);
+ if (yych == 'W') goto yy614;
+ if (yych != 'w') goto yy186;
+yy614:
+ YYDEBUG(614, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(723, *YYCURSOR);
+ YYDEBUG(615, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 879 "Zend/zend_language_scanner.l"
{
return T_THROW;
}
-yy724:
- YYDEBUG(724, *YYCURSOR);
+#line 5810 "Zend/zend_language_scanner.c"
+yy616:
+ YYDEBUG(616, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'T') {
- if (yych == 'Q') goto yy726;
- if (yych <= 'S') goto yy295;
+ if (yych == 'Q') goto yy618;
+ if (yych <= 'S') goto yy186;
} else {
if (yych <= 'q') {
- if (yych <= 'p') goto yy295;
- goto yy726;
+ if (yych <= 'p') goto yy186;
+ goto yy618;
} else {
- if (yych != 't') goto yy295;
+ if (yych != 't') goto yy186;
}
}
- YYDEBUG(725, *YYCURSOR);
+ YYDEBUG(617, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'U') goto yy738;
- if (yych == 'u') goto yy738;
- goto yy295;
-yy726:
- YYDEBUG(726, *YYCURSOR);
+ if (yych == 'U') goto yy630;
+ if (yych == 'u') goto yy630;
+ goto yy186;
+yy618:
+ YYDEBUG(618, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'U') goto yy727;
- if (yych != 'u') goto yy295;
-yy727:
- YYDEBUG(727, *YYCURSOR);
+ if (yych == 'U') goto yy619;
+ if (yych != 'u') goto yy186;
+yy619:
+ YYDEBUG(619, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'I') goto yy728;
- if (yych != 'i') goto yy295;
-yy728:
- YYDEBUG(728, *YYCURSOR);
+ if (yych == 'I') goto yy620;
+ if (yych != 'i') goto yy186;
+yy620:
+ YYDEBUG(620, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy729;
- if (yych != 'r') goto yy295;
-yy729:
- YYDEBUG(729, *YYCURSOR);
+ if (yych == 'R') goto yy621;
+ if (yych != 'r') goto yy186;
+yy621:
+ YYDEBUG(621, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy730;
- if (yych != 'e') goto yy295;
-yy730:
- YYDEBUG(730, *YYCURSOR);
+ if (yych == 'E') goto yy622;
+ if (yych != 'e') goto yy186;
+yy622:
+ YYDEBUG(622, *YYCURSOR);
++YYCURSOR;
if ((yych = *YYCURSOR) <= '^') {
if (yych <= '9') {
- if (yych >= '0') goto yy294;
+ if (yych >= '0') goto yy185;
} else {
- if (yych <= '@') goto yy731;
- if (yych <= 'Z') goto yy294;
+ if (yych <= '@') goto yy623;
+ if (yych <= 'Z') goto yy185;
}
} else {
if (yych <= '`') {
- if (yych <= '_') goto yy732;
+ if (yych <= '_') goto yy624;
} else {
- if (yych <= 'z') goto yy294;
- if (yych >= 0x7F) goto yy294;
+ if (yych <= 'z') goto yy185;
+ if (yych >= 0x7F) goto yy185;
}
}
-yy731:
- YYDEBUG(731, *YYCURSOR);
+yy623:
+ YYDEBUG(623, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1089 "Zend/zend_language_scanner.l"
{
return T_REQUIRE;
}
-yy732:
- YYDEBUG(732, *YYCURSOR);
+#line 5875 "Zend/zend_language_scanner.c"
+yy624:
+ YYDEBUG(624, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'O') goto yy733;
- if (yych != 'o') goto yy295;
-yy733:
- YYDEBUG(733, *YYCURSOR);
+ if (yych == 'O') goto yy625;
+ if (yych != 'o') goto yy186;
+yy625:
+ YYDEBUG(625, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy734;
- if (yych != 'n') goto yy295;
-yy734:
- YYDEBUG(734, *YYCURSOR);
+ if (yych == 'N') goto yy626;
+ if (yych != 'n') goto yy186;
+yy626:
+ YYDEBUG(626, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy735;
- if (yych != 'c') goto yy295;
-yy735:
- YYDEBUG(735, *YYCURSOR);
+ if (yych == 'C') goto yy627;
+ if (yych != 'c') goto yy186;
+yy627:
+ YYDEBUG(627, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy736;
- if (yych != 'e') goto yy295;
-yy736:
- YYDEBUG(736, *YYCURSOR);
+ if (yych == 'E') goto yy628;
+ if (yych != 'e') goto yy186;
+yy628:
+ YYDEBUG(628, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(737, *YYCURSOR);
+ YYDEBUG(629, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1093 "Zend/zend_language_scanner.l"
{
return T_REQUIRE_ONCE;
}
-yy738:
- YYDEBUG(738, *YYCURSOR);
+#line 5908 "Zend/zend_language_scanner.c"
+yy630:
+ YYDEBUG(630, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy739;
- if (yych != 'r') goto yy295;
-yy739:
- YYDEBUG(739, *YYCURSOR);
+ if (yych == 'R') goto yy631;
+ if (yych != 'r') goto yy186;
+yy631:
+ YYDEBUG(631, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy740;
- if (yych != 'n') goto yy295;
-yy740:
- YYDEBUG(740, *YYCURSOR);
+ if (yych == 'N') goto yy632;
+ if (yych != 'n') goto yy186;
+yy632:
+ YYDEBUG(632, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(741, *YYCURSOR);
+ YYDEBUG(633, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 867 "Zend/zend_language_scanner.l"
{
return T_RETURN;
}
-yy742:
- YYDEBUG(742, *YYCURSOR);
+#line 5931 "Zend/zend_language_scanner.c"
+yy634:
+ YYDEBUG(634, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'T') {
- if (yych <= 'R') goto yy295;
- if (yych <= 'S') goto yy764;
- goto yy763;
+ if (yych <= 'R') goto yy186;
+ if (yych <= 'S') goto yy656;
+ goto yy655;
} else {
- if (yych <= 'r') goto yy295;
- if (yych <= 's') goto yy764;
- if (yych <= 't') goto yy763;
- goto yy295;
+ if (yych <= 'r') goto yy186;
+ if (yych <= 's') goto yy656;
+ if (yych <= 't') goto yy655;
+ goto yy186;
}
-yy743:
- YYDEBUG(743, *YYCURSOR);
+yy635:
+ YYDEBUG(635, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'O') {
- if (yych == 'A') goto yy755;
- if (yych <= 'N') goto yy295;
- goto yy756;
+ if (yych == 'A') goto yy647;
+ if (yych <= 'N') goto yy186;
+ goto yy648;
} else {
if (yych <= 'a') {
- if (yych <= '`') goto yy295;
- goto yy755;
+ if (yych <= '`') goto yy186;
+ goto yy647;
} else {
- if (yych == 'o') goto yy756;
- goto yy295;
+ if (yych == 'o') goto yy648;
+ goto yy186;
}
}
-yy744:
- YYDEBUG(744, *YYCURSOR);
+yy636:
+ YYDEBUG(636, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy745;
- if (yych != 'n') goto yy295;
-yy745:
- YYDEBUG(745, *YYCURSOR);
+ if (yych == 'N') goto yy637;
+ if (yych != 'n') goto yy186;
+yy637:
+ YYDEBUG(637, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'T') {
- if (yych <= 'R') goto yy295;
- if (yych >= 'T') goto yy747;
+ if (yych <= 'R') goto yy186;
+ if (yych >= 'T') goto yy639;
} else {
- if (yych <= 'r') goto yy295;
- if (yych <= 's') goto yy746;
- if (yych <= 't') goto yy747;
- goto yy295;
+ if (yych <= 'r') goto yy186;
+ if (yych <= 's') goto yy638;
+ if (yych <= 't') goto yy639;
+ goto yy186;
}
-yy746:
- YYDEBUG(746, *YYCURSOR);
+yy638:
+ YYDEBUG(638, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy753;
- if (yych == 't') goto yy753;
- goto yy295;
-yy747:
- YYDEBUG(747, *YYCURSOR);
+ if (yych == 'T') goto yy645;
+ if (yych == 't') goto yy645;
+ goto yy186;
+yy639:
+ YYDEBUG(639, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'I') goto yy748;
- if (yych != 'i') goto yy295;
-yy748:
- YYDEBUG(748, *YYCURSOR);
+ if (yych == 'I') goto yy640;
+ if (yych != 'i') goto yy186;
+yy640:
+ YYDEBUG(640, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy749;
- if (yych != 'n') goto yy295;
-yy749:
- YYDEBUG(749, *YYCURSOR);
+ if (yych == 'N') goto yy641;
+ if (yych != 'n') goto yy186;
+yy641:
+ YYDEBUG(641, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'U') goto yy750;
- if (yych != 'u') goto yy295;
-yy750:
- YYDEBUG(750, *YYCURSOR);
+ if (yych == 'U') goto yy642;
+ if (yych != 'u') goto yy186;
+yy642:
+ YYDEBUG(642, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy751;
- if (yych != 'e') goto yy295;
-yy751:
- YYDEBUG(751, *YYCURSOR);
+ if (yych == 'E') goto yy643;
+ if (yych != 'e') goto yy186;
+yy643:
+ YYDEBUG(643, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(752, *YYCURSOR);
+ YYDEBUG(644, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 963 "Zend/zend_language_scanner.l"
{
return T_CONTINUE;
}
-yy753:
- YYDEBUG(753, *YYCURSOR);
+#line 6016 "Zend/zend_language_scanner.c"
+yy645:
+ YYDEBUG(645, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(754, *YYCURSOR);
+ YYDEBUG(646, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 863 "Zend/zend_language_scanner.l"
{
return T_CONST;
}
-yy755:
- YYDEBUG(755, *YYCURSOR);
+#line 6029 "Zend/zend_language_scanner.c"
+yy647:
+ YYDEBUG(647, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'S') goto yy760;
- if (yych == 's') goto yy760;
- goto yy295;
-yy756:
- YYDEBUG(756, *YYCURSOR);
+ if (yych == 'S') goto yy652;
+ if (yych == 's') goto yy652;
+ goto yy186;
+yy648:
+ YYDEBUG(648, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy757;
- if (yych != 'n') goto yy295;
-yy757:
- YYDEBUG(757, *YYCURSOR);
+ if (yych == 'N') goto yy649;
+ if (yych != 'n') goto yy186;
+yy649:
+ YYDEBUG(649, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy758;
- if (yych != 'e') goto yy295;
-yy758:
- YYDEBUG(758, *YYCURSOR);
+ if (yych == 'E') goto yy650;
+ if (yych != 'e') goto yy186;
+yy650:
+ YYDEBUG(650, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(759, *YYCURSOR);
+ YYDEBUG(651, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1037 "Zend/zend_language_scanner.l"
{
return T_CLONE;
}
-yy760:
- YYDEBUG(760, *YYCURSOR);
+#line 6058 "Zend/zend_language_scanner.c"
+yy652:
+ YYDEBUG(652, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'S') goto yy761;
- if (yych != 's') goto yy295;
-yy761:
- YYDEBUG(761, *YYCURSOR);
+ if (yych == 'S') goto yy653;
+ if (yych != 's') goto yy186;
+yy653:
+ YYDEBUG(653, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(762, *YYCURSOR);
+ YYDEBUG(654, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 979 "Zend/zend_language_scanner.l"
{
return T_CLASS;
}
-yy763:
- YYDEBUG(763, *YYCURSOR);
+#line 6076 "Zend/zend_language_scanner.c"
+yy655:
+ YYDEBUG(655, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy767;
- if (yych == 'c') goto yy767;
- goto yy295;
-yy764:
- YYDEBUG(764, *YYCURSOR);
+ if (yych == 'C') goto yy659;
+ if (yych == 'c') goto yy659;
+ goto yy186;
+yy656:
+ YYDEBUG(656, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy765;
- if (yych != 'e') goto yy295;
-yy765:
- YYDEBUG(765, *YYCURSOR);
+ if (yych == 'E') goto yy657;
+ if (yych != 'e') goto yy186;
+yy657:
+ YYDEBUG(657, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(766, *YYCURSOR);
+ YYDEBUG(658, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 951 "Zend/zend_language_scanner.l"
{
return T_CASE;
}
-yy767:
- YYDEBUG(767, *YYCURSOR);
+#line 6100 "Zend/zend_language_scanner.c"
+yy659:
+ YYDEBUG(659, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'H') goto yy768;
- if (yych != 'h') goto yy295;
-yy768:
- YYDEBUG(768, *YYCURSOR);
+ if (yych == 'H') goto yy660;
+ if (yych != 'h') goto yy186;
+yy660:
+ YYDEBUG(660, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(769, *YYCURSOR);
+ YYDEBUG(661, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 875 "Zend/zend_language_scanner.l"
{
return T_CATCH;
}
-yy770:
- YYDEBUG(770, *YYCURSOR);
+#line 6118 "Zend/zend_language_scanner.c"
+yy662:
+ YYDEBUG(662, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy787;
- if (yych == 'n') goto yy787;
- goto yy295;
-yy771:
- YYDEBUG(771, *YYCURSOR);
+ if (yych == 'N') goto yy679;
+ if (yych == 'n') goto yy679;
+ goto yy186;
+yy663:
+ YYDEBUG(663, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy780;
- if (yych == 'r') goto yy780;
- goto yy295;
-yy772:
- YYDEBUG(772, *YYCURSOR);
+ if (yych == 'R') goto yy672;
+ if (yych == 'r') goto yy672;
+ goto yy186;
+yy664:
+ YYDEBUG(664, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy773;
- if (yych != 'n') goto yy295;
-yy773:
- YYDEBUG(773, *YYCURSOR);
+ if (yych == 'N') goto yy665;
+ if (yych != 'n') goto yy186;
+yy665:
+ YYDEBUG(665, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy774;
- if (yych != 'c') goto yy295;
-yy774:
- YYDEBUG(774, *YYCURSOR);
+ if (yych == 'C') goto yy666;
+ if (yych != 'c') goto yy186;
+yy666:
+ YYDEBUG(666, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy775;
- if (yych != 't') goto yy295;
-yy775:
- YYDEBUG(775, *YYCURSOR);
+ if (yych == 'T') goto yy667;
+ if (yych != 't') goto yy186;
+yy667:
+ YYDEBUG(667, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'I') goto yy776;
- if (yych != 'i') goto yy295;
-yy776:
- YYDEBUG(776, *YYCURSOR);
+ if (yych == 'I') goto yy668;
+ if (yych != 'i') goto yy186;
+yy668:
+ YYDEBUG(668, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'O') goto yy777;
- if (yych != 'o') goto yy295;
-yy777:
- YYDEBUG(777, *YYCURSOR);
+ if (yych == 'O') goto yy669;
+ if (yych != 'o') goto yy186;
+yy669:
+ YYDEBUG(669, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy778;
- if (yych != 'n') goto yy295;
-yy778:
- YYDEBUG(778, *YYCURSOR);
+ if (yych == 'N') goto yy670;
+ if (yych != 'n') goto yy186;
+yy670:
+ YYDEBUG(670, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(779, *YYCURSOR);
+ YYDEBUG(671, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 859 "Zend/zend_language_scanner.l"
{
return T_FUNCTION;
}
-yy780:
- YYDEBUG(780, *YYCURSOR);
+#line 6173 "Zend/zend_language_scanner.c"
+yy672:
+ YYDEBUG(672, *YYCURSOR);
++YYCURSOR;
if ((yych = *YYCURSOR) <= '^') {
if (yych <= '@') {
- if (yych <= '/') goto yy781;
- if (yych <= '9') goto yy294;
+ if (yych <= '/') goto yy673;
+ if (yych <= '9') goto yy185;
} else {
- if (yych == 'E') goto yy782;
- if (yych <= 'Z') goto yy294;
+ if (yych == 'E') goto yy674;
+ if (yych <= 'Z') goto yy185;
}
} else {
if (yych <= 'd') {
- if (yych != '`') goto yy294;
+ if (yych != '`') goto yy185;
} else {
- if (yych <= 'e') goto yy782;
- if (yych <= 'z') goto yy294;
- if (yych >= 0x7F) goto yy294;
+ if (yych <= 'e') goto yy674;
+ if (yych <= 'z') goto yy185;
+ if (yych >= 0x7F) goto yy185;
}
}
-yy781:
- YYDEBUG(781, *YYCURSOR);
+yy673:
+ YYDEBUG(673, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 911 "Zend/zend_language_scanner.l"
{
return T_FOR;
}
-yy782:
- YYDEBUG(782, *YYCURSOR);
+#line 6201 "Zend/zend_language_scanner.c"
+yy674:
+ YYDEBUG(674, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy783;
- if (yych != 'a') goto yy295;
-yy783:
- YYDEBUG(783, *YYCURSOR);
+ if (yych == 'A') goto yy675;
+ if (yych != 'a') goto yy186;
+yy675:
+ YYDEBUG(675, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy784;
- if (yych != 'c') goto yy295;
-yy784:
- YYDEBUG(784, *YYCURSOR);
+ if (yych == 'C') goto yy676;
+ if (yych != 'c') goto yy186;
+yy676:
+ YYDEBUG(676, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'H') goto yy785;
- if (yych != 'h') goto yy295;
-yy785:
- YYDEBUG(785, *YYCURSOR);
+ if (yych == 'H') goto yy677;
+ if (yych != 'h') goto yy186;
+yy677:
+ YYDEBUG(677, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(786, *YYCURSOR);
+ YYDEBUG(678, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 919 "Zend/zend_language_scanner.l"
{
return T_FOREACH;
}
-yy787:
- YYDEBUG(787, *YYCURSOR);
+#line 6229 "Zend/zend_language_scanner.c"
+yy679:
+ YYDEBUG(679, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy788;
- if (yych != 'a') goto yy295;
-yy788:
- YYDEBUG(788, *YYCURSOR);
+ if (yych == 'A') goto yy680;
+ if (yych != 'a') goto yy186;
+yy680:
+ YYDEBUG(680, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'L') goto yy789;
- if (yych != 'l') goto yy295;
-yy789:
- YYDEBUG(789, *YYCURSOR);
+ if (yych == 'L') goto yy681;
+ if (yych != 'l') goto yy186;
+yy681:
+ YYDEBUG(681, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(790, *YYCURSOR);
+ YYDEBUG(682, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1129 "Zend/zend_language_scanner.l"
{
return T_FINAL;
}
-yy791:
- YYDEBUG(791, *YYCURSOR);
+#line 6252 "Zend/zend_language_scanner.c"
+yy683:
+ YYDEBUG(683, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'F') {
- if (yych == 'C') goto yy797;
- if (yych <= 'E') goto yy295;
- goto yy798;
+ if (yych == 'C') goto yy689;
+ if (yych <= 'E') goto yy186;
+ goto yy690;
} else {
if (yych <= 'c') {
- if (yych <= 'b') goto yy295;
- goto yy797;
+ if (yych <= 'b') goto yy186;
+ goto yy689;
} else {
- if (yych == 'f') goto yy798;
- goto yy295;
+ if (yych == 'f') goto yy690;
+ goto yy186;
}
}
-yy792:
- YYDEBUG(792, *YYCURSOR);
+yy684:
+ YYDEBUG(684, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy795;
- if (yych == 'e') goto yy795;
- goto yy295;
-yy793:
- YYDEBUG(793, *YYCURSOR);
+ if (yych == 'E') goto yy687;
+ if (yych == 'e') goto yy687;
+ goto yy186;
+yy685:
+ YYDEBUG(685, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(794, *YYCURSOR);
+ YYDEBUG(686, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 907 "Zend/zend_language_scanner.l"
{
return T_DO;
}
-yy795:
- YYDEBUG(795, *YYCURSOR);
+#line 6287 "Zend/zend_language_scanner.c"
+yy687:
+ YYDEBUG(687, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(796, *YYCURSOR);
+ YYDEBUG(688, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 855 "Zend/zend_language_scanner.l"
{
return T_EXIT;
}
-yy797:
- YYDEBUG(797, *YYCURSOR);
+#line 6300 "Zend/zend_language_scanner.c"
+yy689:
+ YYDEBUG(689, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'L') goto yy804;
- if (yych == 'l') goto yy804;
- goto yy295;
-yy798:
- YYDEBUG(798, *YYCURSOR);
+ if (yych == 'L') goto yy696;
+ if (yych == 'l') goto yy696;
+ goto yy186;
+yy690:
+ YYDEBUG(690, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy799;
- if (yych != 'a') goto yy295;
-yy799:
- YYDEBUG(799, *YYCURSOR);
+ if (yych == 'A') goto yy691;
+ if (yych != 'a') goto yy186;
+yy691:
+ YYDEBUG(691, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'U') goto yy800;
- if (yych != 'u') goto yy295;
-yy800:
- YYDEBUG(800, *YYCURSOR);
+ if (yych == 'U') goto yy692;
+ if (yych != 'u') goto yy186;
+yy692:
+ YYDEBUG(692, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'L') goto yy801;
- if (yych != 'l') goto yy295;
-yy801:
- YYDEBUG(801, *YYCURSOR);
+ if (yych == 'L') goto yy693;
+ if (yych != 'l') goto yy186;
+yy693:
+ YYDEBUG(693, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy802;
- if (yych != 't') goto yy295;
-yy802:
- YYDEBUG(802, *YYCURSOR);
+ if (yych == 'T') goto yy694;
+ if (yych != 't') goto yy186;
+yy694:
+ YYDEBUG(694, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(803, *YYCURSOR);
+ YYDEBUG(695, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 955 "Zend/zend_language_scanner.l"
{
return T_DEFAULT;
}
-yy804:
- YYDEBUG(804, *YYCURSOR);
+#line 6339 "Zend/zend_language_scanner.c"
+yy696:
+ YYDEBUG(696, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy805;
- if (yych != 'a') goto yy295;
-yy805:
- YYDEBUG(805, *YYCURSOR);
+ if (yych == 'A') goto yy697;
+ if (yych != 'a') goto yy186;
+yy697:
+ YYDEBUG(697, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy806;
- if (yych != 'r') goto yy295;
-yy806:
- YYDEBUG(806, *YYCURSOR);
+ if (yych == 'R') goto yy698;
+ if (yych != 'r') goto yy186;
+yy698:
+ YYDEBUG(698, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy807;
- if (yych != 'e') goto yy295;
-yy807:
- YYDEBUG(807, *YYCURSOR);
+ if (yych == 'E') goto yy699;
+ if (yych != 'e') goto yy186;
+yy699:
+ YYDEBUG(699, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(808, *YYCURSOR);
+ YYDEBUG(700, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 927 "Zend/zend_language_scanner.l"
{
return T_DECLARE;
}
-yy809:
- YYDEBUG(809, *YYCURSOR);
+#line 6367 "Zend/zend_language_scanner.c"
+yy701:
+ YYDEBUG(701, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'H') goto yy871;
- if (yych == 'h') goto yy871;
- goto yy295;
-yy810:
- YYDEBUG(810, *YYCURSOR);
+ if (yych == 'H') goto yy763;
+ if (yych == 'h') goto yy763;
+ goto yy186;
+yy702:
+ YYDEBUG(702, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'S') goto yy865;
- if (yych == 's') goto yy865;
- goto yy295;
-yy811:
- YYDEBUG(811, *YYCURSOR);
+ if (yych == 'S') goto yy757;
+ if (yych == 's') goto yy757;
+ goto yy186;
+yy703:
+ YYDEBUG(703, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'P') goto yy861;
- if (yych == 'p') goto yy861;
- goto yy295;
-yy812:
- YYDEBUG(812, *YYCURSOR);
+ if (yych == 'P') goto yy753;
+ if (yych == 'p') goto yy753;
+ goto yy186;
+yy704:
+ YYDEBUG(704, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'D') goto yy827;
- if (yych == 'd') goto yy827;
- goto yy295;
-yy813:
- YYDEBUG(813, *YYCURSOR);
+ if (yych == 'D') goto yy719;
+ if (yych == 'd') goto yy719;
+ goto yy186;
+yy705:
+ YYDEBUG(705, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy824;
- if (yych == 'a') goto yy824;
- goto yy295;
-yy814:
- YYDEBUG(814, *YYCURSOR);
+ if (yych == 'A') goto yy716;
+ if (yych == 'a') goto yy716;
+ goto yy186;
+yy706:
+ YYDEBUG(706, *YYCURSOR);
yych = *++YYCURSOR;
if (yych <= 'T') {
- if (yych == 'I') goto yy815;
- if (yych <= 'S') goto yy295;
- goto yy816;
+ if (yych == 'I') goto yy707;
+ if (yych <= 'S') goto yy186;
+ goto yy708;
} else {
if (yych <= 'i') {
- if (yych <= 'h') goto yy295;
+ if (yych <= 'h') goto yy186;
} else {
- if (yych == 't') goto yy816;
- goto yy295;
+ if (yych == 't') goto yy708;
+ goto yy186;
}
}
-yy815:
- YYDEBUG(815, *YYCURSOR);
+yy707:
+ YYDEBUG(707, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy822;
- if (yych == 't') goto yy822;
- goto yy295;
-yy816:
- YYDEBUG(816, *YYCURSOR);
+ if (yych == 'T') goto yy714;
+ if (yych == 't') goto yy714;
+ goto yy186;
+yy708:
+ YYDEBUG(708, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy817;
- if (yych != 'e') goto yy295;
-yy817:
- YYDEBUG(817, *YYCURSOR);
+ if (yych == 'E') goto yy709;
+ if (yych != 'e') goto yy186;
+yy709:
+ YYDEBUG(709, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'N') goto yy818;
- if (yych != 'n') goto yy295;
-yy818:
- YYDEBUG(818, *YYCURSOR);
+ if (yych == 'N') goto yy710;
+ if (yych != 'n') goto yy186;
+yy710:
+ YYDEBUG(710, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'D') goto yy819;
- if (yych != 'd') goto yy295;
-yy819:
- YYDEBUG(819, *YYCURSOR);
+ if (yych == 'D') goto yy711;
+ if (yych != 'd') goto yy186;
+yy711:
+ YYDEBUG(711, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'S') goto yy820;
- if (yych != 's') goto yy295;
-yy820:
- YYDEBUG(820, *YYCURSOR);
+ if (yych == 'S') goto yy712;
+ if (yych != 's') goto yy186;
+yy712:
+ YYDEBUG(712, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(821, *YYCURSOR);
+ YYDEBUG(713, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 987 "Zend/zend_language_scanner.l"
{
return T_EXTENDS;
}
-yy822:
- YYDEBUG(822, *YYCURSOR);
+#line 6451 "Zend/zend_language_scanner.c"
+yy714:
+ YYDEBUG(714, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(823, *YYCURSOR);
+ YYDEBUG(715, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 851 "Zend/zend_language_scanner.l"
{
return T_EXIT;
}
-yy824:
- YYDEBUG(824, *YYCURSOR);
+#line 6464 "Zend/zend_language_scanner.c"
+yy716:
+ YYDEBUG(716, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'L') goto yy825;
- if (yych != 'l') goto yy295;
-yy825:
- YYDEBUG(825, *YYCURSOR);
+ if (yych == 'L') goto yy717;
+ if (yych != 'l') goto yy186;
+yy717:
+ YYDEBUG(717, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(826, *YYCURSOR);
+ YYDEBUG(718, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1077 "Zend/zend_language_scanner.l"
{
return T_EVAL;
}
-yy827:
- YYDEBUG(827, *YYCURSOR);
+#line 6482 "Zend/zend_language_scanner.c"
+yy719:
+ YYDEBUG(719, *YYCURSOR);
yych = *++YYCURSOR;
YYDEBUG(-1, yych);
switch (yych) {
case 'D':
- case 'd': goto yy828;
+ case 'd': goto yy720;
case 'F':
- case 'f': goto yy829;
+ case 'f': goto yy721;
case 'I':
- case 'i': goto yy830;
+ case 'i': goto yy722;
case 'S':
- case 's': goto yy831;
+ case 's': goto yy723;
case 'W':
- case 'w': goto yy832;
- default: goto yy295;
- }
-yy828:
- YYDEBUG(828, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych == 'E') goto yy854;
- if (yych == 'e') goto yy854;
- goto yy295;
-yy829:
- YYDEBUG(829, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych == 'O') goto yy846;
- if (yych == 'o') goto yy846;
- goto yy295;
-yy830:
- YYDEBUG(830, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych == 'F') goto yy844;
- if (yych == 'f') goto yy844;
- goto yy295;
-yy831:
- YYDEBUG(831, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych == 'W') goto yy838;
- if (yych == 'w') goto yy838;
- goto yy295;
-yy832:
- YYDEBUG(832, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych == 'H') goto yy833;
- if (yych != 'h') goto yy295;
-yy833:
- YYDEBUG(833, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych == 'I') goto yy834;
- if (yych != 'i') goto yy295;
-yy834:
- YYDEBUG(834, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych == 'L') goto yy835;
- if (yych != 'l') goto yy295;
-yy835:
- YYDEBUG(835, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych == 'E') goto yy836;
- if (yych != 'e') goto yy295;
-yy836:
- YYDEBUG(836, *YYCURSOR);
+ case 'w': goto yy724;
+ default: goto yy186;
+ }
+yy720:
+ YYDEBUG(720, *YYCURSOR);
+ yych = *++YYCURSOR;
+ if (yych == 'E') goto yy746;
+ if (yych == 'e') goto yy746;
+ goto yy186;
+yy721:
+ YYDEBUG(721, *YYCURSOR);
+ yych = *++YYCURSOR;
+ if (yych == 'O') goto yy738;
+ if (yych == 'o') goto yy738;
+ goto yy186;
+yy722:
+ YYDEBUG(722, *YYCURSOR);
+ yych = *++YYCURSOR;
+ if (yych == 'F') goto yy736;
+ if (yych == 'f') goto yy736;
+ goto yy186;
+yy723:
+ YYDEBUG(723, *YYCURSOR);
+ yych = *++YYCURSOR;
+ if (yych == 'W') goto yy730;
+ if (yych == 'w') goto yy730;
+ goto yy186;
+yy724:
+ YYDEBUG(724, *YYCURSOR);
+ yych = *++YYCURSOR;
+ if (yych == 'H') goto yy725;
+ if (yych != 'h') goto yy186;
+yy725:
+ YYDEBUG(725, *YYCURSOR);
+ yych = *++YYCURSOR;
+ if (yych == 'I') goto yy726;
+ if (yych != 'i') goto yy186;
+yy726:
+ YYDEBUG(726, *YYCURSOR);
+ yych = *++YYCURSOR;
+ if (yych == 'L') goto yy727;
+ if (yych != 'l') goto yy186;
+yy727:
+ YYDEBUG(727, *YYCURSOR);
+ yych = *++YYCURSOR;
+ if (yych == 'E') goto yy728;
+ if (yych != 'e') goto yy186;
+yy728:
+ YYDEBUG(728, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(837, *YYCURSOR);
+ YYDEBUG(729, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 903 "Zend/zend_language_scanner.l"
{
return T_ENDWHILE;
}
-yy838:
- YYDEBUG(838, *YYCURSOR);
+#line 6556 "Zend/zend_language_scanner.c"
+yy730:
+ YYDEBUG(730, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'I') goto yy839;
- if (yych != 'i') goto yy295;
-yy839:
- YYDEBUG(839, *YYCURSOR);
+ if (yych == 'I') goto yy731;
+ if (yych != 'i') goto yy186;
+yy731:
+ YYDEBUG(731, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy840;
- if (yych != 't') goto yy295;
-yy840:
- YYDEBUG(840, *YYCURSOR);
+ if (yych == 'T') goto yy732;
+ if (yych != 't') goto yy186;
+yy732:
+ YYDEBUG(732, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy841;
- if (yych != 'c') goto yy295;
-yy841:
- YYDEBUG(841, *YYCURSOR);
+ if (yych == 'C') goto yy733;
+ if (yych != 'c') goto yy186;
+yy733:
+ YYDEBUG(733, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'H') goto yy842;
- if (yych != 'h') goto yy295;
-yy842:
- YYDEBUG(842, *YYCURSOR);
+ if (yych == 'H') goto yy734;
+ if (yych != 'h') goto yy186;
+yy734:
+ YYDEBUG(734, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(843, *YYCURSOR);
+ YYDEBUG(735, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 947 "Zend/zend_language_scanner.l"
{
return T_ENDSWITCH;
}
-yy844:
- YYDEBUG(844, *YYCURSOR);
+#line 6589 "Zend/zend_language_scanner.c"
+yy736:
+ YYDEBUG(736, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(845, *YYCURSOR);
+ YYDEBUG(737, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 891 "Zend/zend_language_scanner.l"
{
return T_ENDIF;
}
-yy846:
- YYDEBUG(846, *YYCURSOR);
+#line 6602 "Zend/zend_language_scanner.c"
+yy738:
+ YYDEBUG(738, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy847;
- if (yych != 'r') goto yy295;
-yy847:
- YYDEBUG(847, *YYCURSOR);
+ if (yych == 'R') goto yy739;
+ if (yych != 'r') goto yy186;
+yy739:
+ YYDEBUG(739, *YYCURSOR);
++YYCURSOR;
if ((yych = *YYCURSOR) <= '^') {
if (yych <= '@') {
- if (yych <= '/') goto yy848;
- if (yych <= '9') goto yy294;
+ if (yych <= '/') goto yy740;
+ if (yych <= '9') goto yy185;
} else {
- if (yych == 'E') goto yy849;
- if (yych <= 'Z') goto yy294;
+ if (yych == 'E') goto yy741;
+ if (yych <= 'Z') goto yy185;
}
} else {
if (yych <= 'd') {
- if (yych != '`') goto yy294;
+ if (yych != '`') goto yy185;
} else {
- if (yych <= 'e') goto yy849;
- if (yych <= 'z') goto yy294;
- if (yych >= 0x7F) goto yy294;
+ if (yych <= 'e') goto yy741;
+ if (yych <= 'z') goto yy185;
+ if (yych >= 0x7F) goto yy185;
}
}
-yy848:
- YYDEBUG(848, *YYCURSOR);
+yy740:
+ YYDEBUG(740, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 915 "Zend/zend_language_scanner.l"
{
return T_ENDFOR;
}
-yy849:
- YYDEBUG(849, *YYCURSOR);
+#line 6635 "Zend/zend_language_scanner.c"
+yy741:
+ YYDEBUG(741, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy850;
- if (yych != 'a') goto yy295;
-yy850:
- YYDEBUG(850, *YYCURSOR);
+ if (yych == 'A') goto yy742;
+ if (yych != 'a') goto yy186;
+yy742:
+ YYDEBUG(742, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy851;
- if (yych != 'c') goto yy295;
-yy851:
- YYDEBUG(851, *YYCURSOR);
+ if (yych == 'C') goto yy743;
+ if (yych != 'c') goto yy186;
+yy743:
+ YYDEBUG(743, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'H') goto yy852;
- if (yych != 'h') goto yy295;
-yy852:
- YYDEBUG(852, *YYCURSOR);
+ if (yych == 'H') goto yy744;
+ if (yych != 'h') goto yy186;
+yy744:
+ YYDEBUG(744, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(853, *YYCURSOR);
+ YYDEBUG(745, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 923 "Zend/zend_language_scanner.l"
{
return T_ENDFOREACH;
}
-yy854:
- YYDEBUG(854, *YYCURSOR);
+#line 6663 "Zend/zend_language_scanner.c"
+yy746:
+ YYDEBUG(746, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'C') goto yy855;
- if (yych != 'c') goto yy295;
-yy855:
- YYDEBUG(855, *YYCURSOR);
+ if (yych == 'C') goto yy747;
+ if (yych != 'c') goto yy186;
+yy747:
+ YYDEBUG(747, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'L') goto yy856;
- if (yych != 'l') goto yy295;
-yy856:
- YYDEBUG(856, *YYCURSOR);
+ if (yych == 'L') goto yy748;
+ if (yych != 'l') goto yy186;
+yy748:
+ YYDEBUG(748, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'A') goto yy857;
- if (yych != 'a') goto yy295;
-yy857:
- YYDEBUG(857, *YYCURSOR);
+ if (yych == 'A') goto yy749;
+ if (yych != 'a') goto yy186;
+yy749:
+ YYDEBUG(749, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'R') goto yy858;
- if (yych != 'r') goto yy295;
-yy858:
- YYDEBUG(858, *YYCURSOR);
+ if (yych == 'R') goto yy750;
+ if (yych != 'r') goto yy186;
+yy750:
+ YYDEBUG(750, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy859;
- if (yych != 'e') goto yy295;
-yy859:
- YYDEBUG(859, *YYCURSOR);
+ if (yych == 'E') goto yy751;
+ if (yych != 'e') goto yy186;
+yy751:
+ YYDEBUG(751, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(860, *YYCURSOR);
+ YYDEBUG(752, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 931 "Zend/zend_language_scanner.l"
{
return T_ENDDECLARE;
}
-yy861:
- YYDEBUG(861, *YYCURSOR);
+#line 6701 "Zend/zend_language_scanner.c"
+yy753:
+ YYDEBUG(753, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'T') goto yy862;
- if (yych != 't') goto yy295;
-yy862:
- YYDEBUG(862, *YYCURSOR);
+ if (yych == 'T') goto yy754;
+ if (yych != 't') goto yy186;
+yy754:
+ YYDEBUG(754, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'Y') goto yy863;
- if (yych != 'y') goto yy295;
-yy863:
- YYDEBUG(863, *YYCURSOR);
+ if (yych == 'Y') goto yy755;
+ if (yych != 'y') goto yy186;
+yy755:
+ YYDEBUG(755, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(864, *YYCURSOR);
+ YYDEBUG(756, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1113 "Zend/zend_language_scanner.l"
{
return T_EMPTY;
}
-yy865:
- YYDEBUG(865, *YYCURSOR);
+#line 6724 "Zend/zend_language_scanner.c"
+yy757:
+ YYDEBUG(757, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'E') goto yy866;
- if (yych != 'e') goto yy295;
-yy866:
- YYDEBUG(866, *YYCURSOR);
+ if (yych == 'E') goto yy758;
+ if (yych != 'e') goto yy186;
+yy758:
+ YYDEBUG(758, *YYCURSOR);
++YYCURSOR;
if ((yych = *YYCURSOR) <= '^') {
if (yych <= '@') {
- if (yych <= '/') goto yy867;
- if (yych <= '9') goto yy294;
+ if (yych <= '/') goto yy759;
+ if (yych <= '9') goto yy185;
} else {
- if (yych == 'I') goto yy868;
- if (yych <= 'Z') goto yy294;
+ if (yych == 'I') goto yy760;
+ if (yych <= 'Z') goto yy185;
}
} else {
if (yych <= 'h') {
- if (yych != '`') goto yy294;
+ if (yych != '`') goto yy185;
} else {
- if (yych <= 'i') goto yy868;
- if (yych <= 'z') goto yy294;
- if (yych >= 0x7F) goto yy294;
+ if (yych <= 'i') goto yy760;
+ if (yych <= 'z') goto yy185;
+ if (yych >= 0x7F) goto yy185;
}
}
-yy867:
- YYDEBUG(867, *YYCURSOR);
+yy759:
+ YYDEBUG(759, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 895 "Zend/zend_language_scanner.l"
{
return T_ELSE;
}
-yy868:
- YYDEBUG(868, *YYCURSOR);
+#line 6757 "Zend/zend_language_scanner.c"
+yy760:
+ YYDEBUG(760, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'F') goto yy869;
- if (yych != 'f') goto yy295;
-yy869:
- YYDEBUG(869, *YYCURSOR);
+ if (yych == 'F') goto yy761;
+ if (yych != 'f') goto yy186;
+yy761:
+ YYDEBUG(761, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(870, *YYCURSOR);
+ YYDEBUG(762, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 887 "Zend/zend_language_scanner.l"
{
return T_ELSEIF;
}
-yy871:
- YYDEBUG(871, *YYCURSOR);
+#line 6775 "Zend/zend_language_scanner.c"
+yy763:
+ YYDEBUG(763, *YYCURSOR);
yych = *++YYCURSOR;
- if (yych == 'O') goto yy872;
- if (yych != 'o') goto yy295;
-yy872:
- YYDEBUG(872, *YYCURSOR);
+ if (yych == 'O') goto yy764;
+ if (yych != 'o') goto yy186;
+yy764:
+ YYDEBUG(764, *YYCURSOR);
++YYCURSOR;
if (yybm[0+(yych = *YYCURSOR)] & 8) {
- goto yy294;
+ goto yy185;
}
- YYDEBUG(873, *YYCURSOR);
+ YYDEBUG(765, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 971 "Zend/zend_language_scanner.l"
{
return T_ECHO;
}
+#line 6793 "Zend/zend_language_scanner.c"
}
/* *********************************** */
yyc_ST_LOOKING_FOR_PROPERTY:
@@ -7592,51 +6828,41 @@ yyc_ST_LOOKING_FOR_PROPERTY:
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
};
- YYDEBUG(874, *YYCURSOR);
+ YYDEBUG(766, *YYCURSOR);
YYFILL(2);
yych = *YYCURSOR;
- if (yych <= ',') {
- if (yych <= '\f') {
- if (yych <= 0x00) goto yy876;
- if (yych <= 0x08) goto yy884;
- if (yych <= '\n') goto yy878;
- goto yy884;
+ if (yych <= '-') {
+ if (yych <= '\r') {
+ if (yych <= 0x08) goto yy774;
+ if (yych <= '\n') goto yy768;
+ if (yych <= '\f') goto yy774;
} else {
- if (yych <= '\r') goto yy878;
- if (yych == ' ') goto yy878;
- goto yy884;
+ if (yych == ' ') goto yy768;
+ if (yych <= ',') goto yy774;
+ goto yy770;
}
} else {
- if (yych <= '^') {
- if (yych <= '-') goto yy880;
- if (yych <= '@') goto yy884;
- if (yych <= 'Z') goto yy882;
- goto yy884;
+ if (yych <= '_') {
+ if (yych <= '@') goto yy774;
+ if (yych <= 'Z') goto yy772;
+ if (yych <= '^') goto yy774;
+ goto yy772;
} else {
- if (yych <= '`') {
- if (yych <= '_') goto yy882;
- goto yy884;
- } else {
- if (yych <= 'z') goto yy882;
- if (yych <= '~') goto yy884;
- goto yy882;
- }
+ if (yych <= '`') goto yy774;
+ if (yych <= 'z') goto yy772;
+ if (yych <= '~') goto yy774;
+ goto yy772;
}
}
-yy876:
- YYDEBUG(876, *YYCURSOR);
- ++YYCURSOR;
- YYDEBUG(877, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- { return 0; }
-yy878:
- YYDEBUG(878, *YYCURSOR);
+yy768:
+ YYDEBUG(768, *YYCURSOR);
++YYCURSOR;
yych = *YYCURSOR;
- goto yy890;
-yy879:
- YYDEBUG(879, *YYCURSOR);
+ goto yy780;
+yy769:
+ YYDEBUG(769, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1000 "Zend/zend_language_scanner.l"
{
zendlval->value.str.val = yytext; /* no copying - intentional */
zendlval->value.str.len = yyleng;
@@ -7644,66 +6870,73 @@ yy879:
HANDLE_NEWLINES(yytext, yyleng);
return T_WHITESPACE;
}
-yy880:
- YYDEBUG(880, *YYCURSOR);
+#line 6874 "Zend/zend_language_scanner.c"
+yy770:
+ YYDEBUG(770, *YYCURSOR);
++YYCURSOR;
- if ((yych = *YYCURSOR) == '>') goto yy887;
-yy881:
- YYDEBUG(881, *YYCURSOR);
+ if ((yych = *YYCURSOR) == '>') goto yy777;
+yy771:
+ YYDEBUG(771, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1019 "Zend/zend_language_scanner.l"
{
yyless(0);
yy_pop_state(TSRMLS_C);
goto restart;
}
-yy882:
- YYDEBUG(882, *YYCURSOR);
+#line 6888 "Zend/zend_language_scanner.c"
+yy772:
+ YYDEBUG(772, *YYCURSOR);
++YYCURSOR;
yych = *YYCURSOR;
- goto yy886;
-yy883:
- YYDEBUG(883, *YYCURSOR);
+ goto yy776;
+yy773:
+ YYDEBUG(773, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1012 "Zend/zend_language_scanner.l"
{
yy_pop_state(TSRMLS_C);
zend_copy_value(zendlval, yytext, yyleng);
zendlval->type = IS_STRING;
return T_STRING;
}
-yy884:
- YYDEBUG(884, *YYCURSOR);
+#line 6904 "Zend/zend_language_scanner.c"
+yy774:
+ YYDEBUG(774, *YYCURSOR);
yych = *++YYCURSOR;
- goto yy881;
-yy885:
- YYDEBUG(885, *YYCURSOR);
+ goto yy771;
+yy775:
+ YYDEBUG(775, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
-yy886:
- YYDEBUG(886, *YYCURSOR);
+yy776:
+ YYDEBUG(776, *YYCURSOR);
if (yybm[0+yych] & 64) {
- goto yy885;
+ goto yy775;
}
- goto yy883;
-yy887:
- YYDEBUG(887, *YYCURSOR);
+ goto yy773;
+yy777:
+ YYDEBUG(777, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(888, *YYCURSOR);
+ YYDEBUG(778, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1008 "Zend/zend_language_scanner.l"
{
return T_OBJECT_OPERATOR;
}
-yy889:
- YYDEBUG(889, *YYCURSOR);
+#line 6929 "Zend/zend_language_scanner.c"
+yy779:
+ YYDEBUG(779, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
-yy890:
- YYDEBUG(890, *YYCURSOR);
+yy780:
+ YYDEBUG(780, *YYCURSOR);
if (yybm[0+yych] & 128) {
- goto yy889;
+ goto yy779;
}
- goto yy879;
+ goto yy769;
}
/* *********************************** */
yyc_ST_LOOKING_FOR_VARNAME:
@@ -7742,38 +6975,27 @@ yyc_ST_LOOKING_FOR_VARNAME:
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
};
- YYDEBUG(891, *YYCURSOR);
+ YYDEBUG(781, *YYCURSOR);
YYFILL(2);
yych = *YYCURSOR;
- if (yych <= '^') {
- if (yych <= 0x00) goto yy893;
- if (yych <= '@') goto yy897;
- if (yych <= 'Z') goto yy895;
- goto yy897;
+ if (yych <= '_') {
+ if (yych <= '@') goto yy785;
+ if (yych <= 'Z') goto yy783;
+ if (yych <= '^') goto yy785;
} else {
- if (yych <= '`') {
- if (yych <= '_') goto yy895;
- goto yy897;
- } else {
- if (yych <= 'z') goto yy895;
- if (yych <= '~') goto yy897;
- goto yy895;
- }
+ if (yych <= '`') goto yy785;
+ if (yych <= 'z') goto yy783;
+ if (yych <= '~') goto yy785;
}
-yy893:
- YYDEBUG(893, *YYCURSOR);
- ++YYCURSOR;
- YYDEBUG(894, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- { return 0; }
-yy895:
- YYDEBUG(895, *YYCURSOR);
+yy783:
+ YYDEBUG(783, *YYCURSOR);
++YYCURSOR;
yych = *YYCURSOR;
- goto yy900;
-yy896:
- YYDEBUG(896, *YYCURSOR);
+ goto yy788;
+yy784:
+ YYDEBUG(784, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1291 "Zend/zend_language_scanner.l"
{
zend_copy_value(zendlval, yytext, yyleng);
zendlval->type = IS_STRING;
@@ -7781,454 +7003,97 @@ yy896:
yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
return T_STRING_VARNAME;
}
-yy897:
- YYDEBUG(897, *YYCURSOR);
+#line 7007 "Zend/zend_language_scanner.c"
+yy785:
+ YYDEBUG(785, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(898, *YYCURSOR);
+ YYDEBUG(786, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1300 "Zend/zend_language_scanner.l"
{
yyless(0);
yy_pop_state(TSRMLS_C);
yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
goto restart;
}
-yy899:
- YYDEBUG(899, *YYCURSOR);
+#line 7020 "Zend/zend_language_scanner.c"
+yy787:
+ YYDEBUG(787, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
-yy900:
- YYDEBUG(900, *YYCURSOR);
+yy788:
+ YYDEBUG(788, *YYCURSOR);
if (yybm[0+yych] & 128) {
- goto yy899;
+ goto yy787;
}
- goto yy896;
+ goto yy784;
}
/* *********************************** */
yyc_ST_NOWDOC:
+ YYDEBUG(789, *YYCURSOR);
+ YYFILL(1);
+ yych = *YYCURSOR;
+ YYDEBUG(791, *YYCURSOR);
+ ++YYCURSOR;
+ YYDEBUG(792, *YYCURSOR);
+ yyleng = YYCURSOR - SCNG(yy_text);
+#line 2134 "Zend/zend_language_scanner.l"
{
- static const unsigned char yybm[] = {
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 32, 16, 16, 64, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 16, 16, 16, 16, 16, 16,
- 16, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 16, 16, 16, 16, 144,
- 16, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 16, 16, 16, 16, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- 144, 144, 144, 144, 144, 144, 144, 144,
- };
- YYDEBUG(901, *YYCURSOR);
- YYFILL(2);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 32) {
- goto yy907;
- }
- if (yych <= 0x00) goto yy903;
- if (yych == '\r') goto yy909;
- goto yy905;
-yy903:
- YYDEBUG(903, *YYCURSOR);
- yyaccept = 0;
- yych = *(YYMARKER = ++YYCURSOR);
- goto yy906;
- YYDEBUG(904, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- { return 0; }
-yy905:
- YYDEBUG(905, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
-yy906:
- YYDEBUG(906, *YYCURSOR);
- if (yybm[0+yych] & 16) {
- goto yy905;
- }
- if (yych <= '\f') goto yy916;
- goto yy918;
-yy907:
- YYDEBUG(907, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(908, *YYCURSOR);
- if (yybm[0+yych] & 32) {
- goto yy907;
- }
- if (yych <= '^') {
- if (yych <= '\r') {
- if (yych <= '\f') goto yy905;
- } else {
- if (yych <= '@') goto yy905;
- if (yych <= 'Z') goto yy911;
- goto yy905;
- }
- } else {
- if (yych <= '`') {
- if (yych <= '_') goto yy911;
- goto yy905;
- } else {
- if (yych <= 'z') goto yy911;
- if (yych <= '~') goto yy905;
- goto yy911;
- }
- }
-yy909:
- YYDEBUG(909, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(910, *YYCURSOR);
- if (yybm[0+yych] & 32) {
- goto yy907;
- }
- if (yych <= '^') {
- if (yych <= '\r') {
- if (yych <= '\f') goto yy905;
- goto yy909;
- } else {
- if (yych <= '@') goto yy905;
- if (yych >= '[') goto yy905;
- }
- } else {
- if (yych <= '`') {
- if (yych >= '`') goto yy905;
- } else {
- if (yych <= 'z') goto yy911;
- if (yych <= '~') goto yy905;
- }
- }
-yy911:
- YYDEBUG(911, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(912, *YYCURSOR);
- if (yybm[0+yych] & 128) {
- goto yy911;
- }
- if (yych <= '\f') {
- if (yych == '\n') goto yy914;
- goto yy905;
- } else {
- if (yych <= '\r') goto yy914;
- if (yych != ';') goto yy905;
- }
- YYDEBUG(913, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 16) {
- goto yy905;
- }
-yy914:
- YYDEBUG(914, *YYCURSOR);
- ++YYCURSOR;
- YYDEBUG(915, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- char *end = yytext + yyleng - 1;
+ int newline = 0;
- if (end[-1] == ';') {
- end--;
- yyleng--;
+ if (YYCURSOR > YYLIMIT) {
+ return 0;
}
- if (yyleng > CG(heredoc_len) && !memcmp(end - CG(heredoc_len), CG(heredoc), CG(heredoc_len))) {
- int len = yyleng - CG(heredoc_len) - 2; /* 2 for newline before and after label */
+ YYCURSOR--;
- /* May have matched fooLABEL; make sure there's a newline before it */
- if (yytext[len] != '\n') {
- if (yytext[len] != '\r') {
- yyless(yyleng - 1);
- yymore();
- }
- } else if (len > 0 && yytext[len - 1] == '\r') {
- len--; /* Windows newline */
- }
+ while (YYCURSOR < YYLIMIT) {
+ switch (*YYCURSOR++) {
+ case '\r':
+ if (*YYCURSOR == '\n') {
+ YYCURSOR++;
+ }
+ /* fall through */
+ case '\n':
+ /* Check for ending label on the next line */
+ if (IS_LABEL_START(*YYCURSOR) && CG(heredoc_len) < YYLIMIT - YYCURSOR && !memcmp(YYCURSOR, CG(heredoc), CG(heredoc_len))) {
+ YYCTYPE *end = YYCURSOR + CG(heredoc_len);
+
+ if (*end == ';') {
+ end++;
+ }
- /* Go back before label, to match in ST_END_HEREDOC state. yytext will include
- * newline before label, for zend_highlight/strip, tokenizer, etc. */
- yyless(yyleng - CG(heredoc_len) - 1); /* 1 for newline after label */
+ if (*end == '\n' || *end == '\r') {
+ /* newline before label will be subtracted from returned text, but
+ * yyleng/yytext will include it, for zend_highlight/strip, tokenizer, etc. */
+ if (YYCURSOR[-2] == '\r' && YYCURSOR[-1] == '\n') {
+ newline = 2; /* Windows newline */
+ } else {
+ newline = 1;
+ }
- CG(increment_lineno) = 1; /* For newline before label */
- BEGIN(ST_END_HEREDOC);
+ CG(increment_lineno) = 1; /* For newline before label */
+ BEGIN(ST_END_HEREDOC);
- zend_copy_value(zendlval, yytext, len);
- zendlval->type = IS_STRING;
- HANDLE_NEWLINES(yytext, len);
- return T_ENCAPSED_AND_WHITESPACE;
- } else {
- /* Go back to end of label, so the next match works correctly in case of
- * another label at the beginning of the next line */
- yyless(yyleng - 1);
- yymore();
- }
-}
-yy916:
- YYDEBUG(916, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(917, *YYCURSOR);
- if (yych <= 'Z') {
- if (yych <= '\f') {
- if (yych == '\n') goto yy916;
- goto yy905;
- } else {
- if (yych <= '\r') goto yy918;
- if (yych <= '@') goto yy905;
- goto yy911;
- }
- } else {
- if (yych <= '`') {
- if (yych == '_') goto yy911;
- goto yy905;
- } else {
- if (yych <= 'z') goto yy911;
- if (yych <= '~') goto yy905;
- goto yy911;
- }
- }
-yy918:
- YYDEBUG(918, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(919, *YYCURSOR);
- if (yych <= 'Z') {
- if (yych <= '\f') {
- if (yych == '\n') goto yy916;
- goto yy905;
- } else {
- if (yych <= '\r') goto yy918;
- if (yych <= '@') goto yy905;
- goto yy911;
- }
- } else {
- if (yych <= '`') {
- if (yych == '_') goto yy911;
- goto yy905;
- } else {
- if (yych <= 'z') goto yy911;
- if (yych <= '~') goto yy905;
- goto yy911;
- }
- }
- }
-/* *********************************** */
-yyc_ST_ONE_LINE_COMMENT:
- {
- static const unsigned char yybm[] = {
- 128, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 0, 64, 64, 0, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 0, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 0, 0,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64,
- };
- YYDEBUG(920, *YYCURSOR);
- YYFILL(2);
- yych = *YYCURSOR;
- if (yybm[0+yych] & 64) {
- goto yy928;
- }
- if (yych <= '\r') {
- if (yych <= 0x00) goto yy922;
- if (yych <= '\f') goto yy931;
- goto yy932;
- } else {
- if (yych <= '=') goto yy924;
- if (yych <= '>') goto yy926;
- goto yy927;
- }
-yy922:
- YYDEBUG(922, *YYCURSOR);
- yyaccept = 0;
- yych = *(YYMARKER = ++YYCURSOR);
- goto yy937;
- YYDEBUG(923, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- { return 0; }
-yy924:
- YYDEBUG(924, *YYCURSOR);
- ++YYCURSOR;
- if ((yych = *YYCURSOR) == '>') goto yy938;
-yy925:
- YYDEBUG(925, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- yymore();
-}
-yy926:
- YYDEBUG(926, *YYCURSOR);
- yych = *++YYCURSOR;
- goto yy925;
-yy927:
- YYDEBUG(927, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych == '>') goto yy938;
- goto yy925;
-yy928:
- YYDEBUG(928, *YYCURSOR);
- yyaccept = 1;
- YYMARKER = ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
- YYDEBUG(929, *YYCURSOR);
- if (yybm[0+yych] & 128) {
- goto yy936;
- }
- if (yych <= '\r') {
- if (yych == '\n') goto yy935;
- if (yych <= '\f') goto yy928;
- goto yy935;
- } else {
- if (yych <= '%') {
- if (yych <= '$') goto yy928;
- goto yy935;
- } else {
- if (yych <= '=') goto yy928;
- if (yych <= '?') goto yy935;
- goto yy928;
- }
+ goto nowdoc_scan_done;
+ }
+ }
+ /* fall through */
+ default:
+ continue;
}
-yy930:
- YYDEBUG(930, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- switch (yytext[yyleng-1]) {
- case '?': case '%': case '>':
- yyless(yyleng-1);
- yymore();
- break;
- case '\n':
- CG(zend_lineno)++;
- /* intentional fall through */
- default:
- zendlval->value.str.val = yytext; /* no copying - intentional */
- zendlval->value.str.len = yyleng;
- zendlval->type = IS_STRING;
- BEGIN(ST_IN_SCRIPTING);
- return T_COMMENT;
}
-}
-yy931:
- YYDEBUG(931, *YYCURSOR);
- yych = *++YYCURSOR;
- goto yy930;
-yy932:
- YYDEBUG(932, *YYCURSOR);
- yych = *++YYCURSOR;
- if (yych != '\n') goto yy930;
- YYDEBUG(933, *YYCURSOR);
- ++YYCURSOR;
- YYDEBUG(934, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- zendlval->value.str.val = yytext; /* no copying - intentional */
- zendlval->value.str.len = yyleng;
+
+nowdoc_scan_done:
+ yyleng = YYCURSOR - SCNG(yy_text);
+
+ zend_copy_value(zendlval, yytext, yyleng - newline);
zendlval->type = IS_STRING;
- BEGIN(ST_IN_SCRIPTING);
- CG(zend_lineno)++;
- return T_COMMENT;
-}
-yy935:
- YYDEBUG(935, *YYCURSOR);
- yych = *++YYCURSOR;
- goto yy930;
-yy936:
- YYDEBUG(936, *YYCURSOR);
- ++YYCURSOR;
- YYFILL(1);
- yych = *YYCURSOR;
-yy937:
- YYDEBUG(937, *YYCURSOR);
- if (yybm[0+yych] & 128) {
- goto yy936;
- }
- if (yych <= '\r') {
- if (yych == '\n') goto yy935;
- if (yych <= '\f') goto yy928;
- goto yy935;
- } else {
- if (yych <= '%') {
- if (yych <= '$') goto yy928;
- goto yy935;
- } else {
- if (yych <= '=') goto yy928;
- if (yych <= '?') goto yy935;
- goto yy928;
- }
- }
-yy938:
- YYDEBUG(938, *YYCURSOR);
- ++YYCURSOR;
- YYDEBUG(939, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- {
- if (CG(asp_tags) || yytext[yyleng-2] != '%') { /* asp comment? */
- zendlval->value.str.val = yytext; /* no copying - intentional */
- zendlval->value.str.len = yyleng-2;
- zendlval->type = IS_STRING;
- yyless(yyleng - 2);
- BEGIN(ST_IN_SCRIPTING);
- return T_COMMENT;
- } else {
- yymore();
- }
+ HANDLE_NEWLINES(yytext, yyleng - newline);
+ return T_ENCAPSED_AND_WHITESPACE;
}
- }
+#line 7097 "Zend/zend_language_scanner.c"
/* *********************************** */
yyc_ST_VAR_OFFSET:
{
@@ -8266,74 +7131,69 @@ yyc_ST_VAR_OFFSET:
32, 32, 32, 32, 32, 32, 32, 32,
32, 32, 32, 32, 32, 32, 32, 32,
};
- YYDEBUG(940, *YYCURSOR);
+ YYDEBUG(793, *YYCURSOR);
YYFILL(3);
yych = *YYCURSOR;
if (yych <= '/') {
- if (yych <= 0x1F) {
- if (yych <= '\n') {
- if (yych <= 0x00) goto yy942;
- if (yych <= 0x08) goto yy956;
- goto yy952;
+ if (yych <= ' ') {
+ if (yych <= '\f') {
+ if (yych <= 0x08) goto yy807;
+ if (yych <= '\n') goto yy803;
+ goto yy807;
} else {
- if (yych == '\r') goto yy952;
- goto yy956;
+ if (yych <= '\r') goto yy803;
+ if (yych <= 0x1F) goto yy807;
+ goto yy803;
}
} else {
- if (yych <= '#') {
- if (yych <= ' ') goto yy952;
- if (yych <= '"') goto yy951;
- goto yy952;
+ if (yych <= '$') {
+ if (yych <= '"') goto yy802;
+ if (yych <= '#') goto yy803;
+ goto yy798;
} else {
- if (yych <= '$') goto yy947;
- if (yych == '\'') goto yy952;
- goto yy951;
+ if (yych == '\'') goto yy803;
+ goto yy802;
}
}
} else {
if (yych <= '\\') {
if (yych <= '@') {
- if (yych <= '0') goto yy944;
- if (yych <= '9') goto yy946;
- goto yy951;
+ if (yych <= '0') goto yy795;
+ if (yych <= '9') goto yy797;
+ goto yy802;
} else {
- if (yych <= 'Z') goto yy954;
- if (yych <= '[') goto yy951;
- goto yy952;
+ if (yych <= 'Z') goto yy805;
+ if (yych <= '[') goto yy802;
+ goto yy803;
}
} else {
if (yych <= '_') {
- if (yych <= ']') goto yy949;
- if (yych <= '^') goto yy951;
- goto yy954;
+ if (yych <= ']') goto yy800;
+ if (yych <= '^') goto yy802;
+ goto yy805;
} else {
- if (yych <= '`') goto yy951;
- if (yych <= 'z') goto yy954;
- if (yych <= '~') goto yy951;
- goto yy954;
+ if (yych <= '`') goto yy802;
+ if (yych <= 'z') goto yy805;
+ if (yych <= '~') goto yy802;
+ goto yy805;
}
}
}
-yy942:
- YYDEBUG(942, *YYCURSOR);
- ++YYCURSOR;
- YYDEBUG(943, *YYCURSOR);
- yyleng = YYCURSOR - SCNG(yy_text);
- { return 0; }
-yy944:
- YYDEBUG(944, *YYCURSOR);
+yy795:
+ YYDEBUG(795, *YYCURSOR);
yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
if (yych <= 'W') {
- if (yych <= '/') goto yy945;
- if (yych <= '9') goto yy967;
+ if (yych <= '/') goto yy796;
+ if (yych <= '9') goto yy818;
} else {
- if (yych <= 'X') goto yy965;
- if (yych == 'x') goto yy965;
+ if (yych <= 'X') goto yy816;
+ if (yych == 'x') goto yy816;
}
-yy945:
- YYDEBUG(945, *YYCURSOR);
+yy796:
+ YYDEBUG(796, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1350 "Zend/zend_language_scanner.l"
{ /* Offset could be treated as a long */
if (yyleng < MAX_LENGTH_OF_LONG - 1 || (yyleng == MAX_LENGTH_OF_LONG - 1 && strcmp(yytext, long_min_digits) < 0)) {
zendlval->value.lval = strtol(yytext, NULL, 10);
@@ -8345,164 +7205,183 @@ yy945:
}
return T_NUM_STRING;
}
-yy946:
- YYDEBUG(946, *YYCURSOR);
+#line 7209 "Zend/zend_language_scanner.c"
+yy797:
+ YYDEBUG(797, *YYCURSOR);
yych = *++YYCURSOR;
- goto yy964;
-yy947:
- YYDEBUG(947, *YYCURSOR);
+ goto yy815;
+yy798:
+ YYDEBUG(798, *YYCURSOR);
++YYCURSOR;
if ((yych = *YYCURSOR) <= '_') {
- if (yych <= '@') goto yy948;
- if (yych <= 'Z') goto yy960;
- if (yych >= '_') goto yy960;
+ if (yych <= '@') goto yy799;
+ if (yych <= 'Z') goto yy811;
+ if (yych >= '_') goto yy811;
} else {
- if (yych <= '`') goto yy948;
- if (yych <= 'z') goto yy960;
- if (yych >= 0x7F) goto yy960;
+ if (yych <= '`') goto yy799;
+ if (yych <= 'z') goto yy811;
+ if (yych >= 0x7F) goto yy811;
}
-yy948:
- YYDEBUG(948, *YYCURSOR);
+yy799:
+ YYDEBUG(799, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1660 "Zend/zend_language_scanner.l"
{
/* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */
return yytext[0];
}
-yy949:
- YYDEBUG(949, *YYCURSOR);
+#line 7234 "Zend/zend_language_scanner.c"
+yy800:
+ YYDEBUG(800, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(950, *YYCURSOR);
+ YYDEBUG(801, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1655 "Zend/zend_language_scanner.l"
{
yy_pop_state(TSRMLS_C);
return ']';
}
-yy951:
- YYDEBUG(951, *YYCURSOR);
+#line 7245 "Zend/zend_language_scanner.c"
+yy802:
+ YYDEBUG(802, *YYCURSOR);
yych = *++YYCURSOR;
- goto yy948;
-yy952:
- YYDEBUG(952, *YYCURSOR);
+ goto yy799;
+yy803:
+ YYDEBUG(803, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(953, *YYCURSOR);
+ YYDEBUG(804, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1665 "Zend/zend_language_scanner.l"
{
/* Invalid rule to return a more explicit parse error with proper line number */
yyless(0);
yy_pop_state(TSRMLS_C);
- ZVAL_EMPTY_STRING(zendlval); /* Empty since it won't be used */
return T_ENCAPSED_AND_WHITESPACE;
}
-yy954:
- YYDEBUG(954, *YYCURSOR);
+#line 7262 "Zend/zend_language_scanner.c"
+yy805:
+ YYDEBUG(805, *YYCURSOR);
++YYCURSOR;
yych = *YYCURSOR;
- goto yy959;
-yy955:
- YYDEBUG(955, *YYCURSOR);
+ goto yy810;
+yy806:
+ YYDEBUG(806, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1672 "Zend/zend_language_scanner.l"
{
zend_copy_value(zendlval, yytext, yyleng);
zendlval->type = IS_STRING;
return T_STRING;
}
-yy956:
- YYDEBUG(956, *YYCURSOR);
+#line 7277 "Zend/zend_language_scanner.c"
+yy807:
+ YYDEBUG(807, *YYCURSOR);
++YYCURSOR;
- YYDEBUG(957, *YYCURSOR);
+ YYDEBUG(808, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 2190 "Zend/zend_language_scanner.l"
{
+ if (YYCURSOR > YYLIMIT) {
+ return 0;
+ }
+
zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE);
goto restart;
}
-yy958:
- YYDEBUG(958, *YYCURSOR);
+#line 7292 "Zend/zend_language_scanner.c"
+yy809:
+ YYDEBUG(809, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
-yy959:
- YYDEBUG(959, *YYCURSOR);
+yy810:
+ YYDEBUG(810, *YYCURSOR);
if (yybm[0+yych] & 32) {
- goto yy958;
+ goto yy809;
}
- goto yy955;
-yy960:
- YYDEBUG(960, *YYCURSOR);
+ goto yy806;
+yy811:
+ YYDEBUG(811, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
- YYDEBUG(961, *YYCURSOR);
+ YYDEBUG(812, *YYCURSOR);
if (yych <= '^') {
if (yych <= '9') {
- if (yych >= '0') goto yy960;
+ if (yych >= '0') goto yy811;
} else {
- if (yych <= '@') goto yy962;
- if (yych <= 'Z') goto yy960;
+ if (yych <= '@') goto yy813;
+ if (yych <= 'Z') goto yy811;
}
} else {
if (yych <= '`') {
- if (yych <= '_') goto yy960;
+ if (yych <= '_') goto yy811;
} else {
- if (yych <= 'z') goto yy960;
- if (yych >= 0x7F) goto yy960;
+ if (yych <= 'z') goto yy811;
+ if (yych >= 0x7F) goto yy811;
}
}
-yy962:
- YYDEBUG(962, *YYCURSOR);
+yy813:
+ YYDEBUG(813, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1649 "Zend/zend_language_scanner.l"
{
zend_copy_value(zendlval, (yytext+1), (yyleng-1));
zendlval->type = IS_STRING;
return T_VARIABLE;
}
-yy963:
- YYDEBUG(963, *YYCURSOR);
+#line 7334 "Zend/zend_language_scanner.c"
+yy814:
+ YYDEBUG(814, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
-yy964:
- YYDEBUG(964, *YYCURSOR);
+yy815:
+ YYDEBUG(815, *YYCURSOR);
if (yybm[0+yych] & 64) {
- goto yy963;
+ goto yy814;
}
- goto yy945;
-yy965:
- YYDEBUG(965, *YYCURSOR);
+ goto yy796;
+yy816:
+ YYDEBUG(816, *YYCURSOR);
yych = *++YYCURSOR;
if (yybm[0+yych] & 128) {
- goto yy970;
+ goto yy821;
}
- YYDEBUG(966, *YYCURSOR);
+ YYDEBUG(817, *YYCURSOR);
YYCURSOR = YYMARKER;
- goto yy945;
-yy967:
- YYDEBUG(967, *YYCURSOR);
+ goto yy796;
+yy818:
+ YYDEBUG(818, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
- YYDEBUG(968, *YYCURSOR);
- if (yych <= '/') goto yy969;
- if (yych <= '9') goto yy967;
-yy969:
- YYDEBUG(969, *YYCURSOR);
+ YYDEBUG(819, *YYCURSOR);
+ if (yych <= '/') goto yy820;
+ if (yych <= '9') goto yy818;
+yy820:
+ YYDEBUG(820, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
+#line 1362 "Zend/zend_language_scanner.l"
{ /* Offset must be treated as a string */
zendlval->value.str.val = (char *)estrndup(yytext, yyleng);
zendlval->value.str.len = yyleng;
zendlval->type = IS_STRING;
return T_NUM_STRING;
}
-yy970:
- YYDEBUG(970, *YYCURSOR);
+#line 7373 "Zend/zend_language_scanner.c"
+yy821:
+ YYDEBUG(821, *YYCURSOR);
++YYCURSOR;
YYFILL(1);
yych = *YYCURSOR;
- YYDEBUG(971, *YYCURSOR);
+ YYDEBUG(822, *YYCURSOR);
if (yybm[0+yych] & 128) {
- goto yy970;
+ goto yy821;
}
- goto yy969;
+ goto yy820;
}
}
+#line 2199 "Zend/zend_language_scanner.l"
}
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 7ab9f58..23c06a0 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_scanner.l,v 1.131.2.11.2.13.2.37 2009/03/16 01:40:13 shire Exp $ */
+/* $Id: zend_language_scanner.l,v 1.131.2.11.2.13.2.40 2009/05/05 01:35:44 mattwil Exp $ */
#if 0
# define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c)
@@ -109,6 +109,12 @@ do { \
} \
}
+/* To save initial string length after scanning to first variable, CG(doc_comment_len) can be reused */
+#define SET_DOUBLE_QUOTES_SCANNED_LENGTH(len) CG(doc_comment_len) = (len)
+#define GET_DOUBLE_QUOTES_SCANNED_LENGTH() CG(doc_comment_len)
+
+#define IS_LABEL_START(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z') || (c) == '_' || (c) >= 0x7F)
+
#define ZEND_IS_OCT(c) ((c)>='0' && (c)<='7')
#define ZEND_IS_HEX(c) (((c)>='0' && (c)<='9') || ((c)>='a' && (c)<='f') || ((c)>='A' && (c)<='F'))
@@ -143,9 +149,7 @@ void startup_scanner(TSRMLS_D)
CG(heredoc_len) = 0;
CG(doc_comment) = NULL;
CG(doc_comment_len) = 0;
- zend_llist_init(&SCNG(used_state_stacks), sizeof(zend_stack), (llist_dtor_func_t) zend_stack_destroy, 0);
zend_stack_init(&SCNG(state_stack));
- zend_llist_add_element(&SCNG(used_state_stacks), &SCNG(state_stack));
}
void shutdown_scanner(TSRMLS_D)
@@ -154,15 +158,10 @@ void shutdown_scanner(TSRMLS_D)
efree(CG(heredoc));
CG(heredoc_len)=0;
}
- zend_llist_destroy(&SCNG(used_state_stacks));
+ zend_stack_destroy(&SCNG(state_stack));
RESET_DOC_COMMENT();
}
-static int compare_stacks(zend_stack *stack1, zend_stack *stack2)
-{
- return (stack1 == stack2);
-}
-
ZEND_API void zend_save_lexical_state(zend_lex_state *lex_state TSRMLS_DC)
{
lex_state->yy_leng = SCNG(yy_leng);
@@ -174,7 +173,6 @@ ZEND_API void zend_save_lexical_state(zend_lex_state *lex_state TSRMLS_DC)
lex_state->state_stack = SCNG(state_stack);
zend_stack_init(&SCNG(state_stack));
- zend_llist_add_element(&SCNG(used_state_stacks), &SCNG(state_stack));
lex_state->in = SCNG(yy_in);
lex_state->yy_state = YYSTATE;
@@ -202,7 +200,7 @@ ZEND_API void zend_restore_lexical_state(zend_lex_state *lex_state TSRMLS_DC)
SCNG(yy_marker) = lex_state->yy_marker;
SCNG(yy_limit) = lex_state->yy_limit;
- zend_llist_del_element(&SCNG(used_state_stacks), &SCNG(state_stack), (int (*)(void *, void *)) compare_stacks);
+ zend_stack_destroy(&SCNG(state_stack));
SCNG(state_stack) = lex_state->state_stack;
SCNG(yy_in) = lex_state->in;
@@ -361,9 +359,7 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR
retval = NULL;
}
}
- if (compilation_successful) {
- zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
- }
+ zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
return retval;
}
@@ -526,8 +522,8 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC)
zend_release_labels(TSRMLS_C);
retval = op_array;
}
- zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
}
+ zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
zval_dtor(&tmp);
CG(in_compilation) = original_in_compilation;
return retval;
@@ -547,6 +543,7 @@ int highlight_file(char *filename, zend_syntax_highlighter_ini *syntax_highlight
zend_save_lexical_state(&original_lex_state TSRMLS_CC);
if (open_file_for_scanning(&file_handle TSRMLS_CC)==FAILURE) {
zend_message_dispatcher(ZMSG_FAILED_HIGHLIGHT_FOPEN, filename TSRMLS_CC);
+ zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
return FAILURE;
}
zend_highlight(syntax_highlighter_ini TSRMLS_CC);
@@ -574,6 +571,7 @@ int highlight_string(zval *str, zend_syntax_highlighter_ini *syntax_highlighter_
zval_copy_ctor(str);
zend_save_lexical_state(&original_lex_state TSRMLS_CC);
if (zend_prepare_string_for_scanning(str, str_name TSRMLS_CC)==FAILURE) {
+ zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
return FAILURE;
}
BEGIN(INITIAL);
@@ -843,63 +841,8 @@ LABEL [a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*
WHITESPACE [ \n\r\t]+
TABS_AND_SPACES [ \t]*
TOKENS [;:,.\[\]()|^&+-/*=%!~$<>?@]
-ANY_CHAR [^\x00]
+ANY_CHAR [^]
NEWLINE ("\r"|"\n"|"\r\n")
-NULL [\x00]{1}
-
-/*
- * LITERAL_DOLLAR matches unescaped $ that aren't followed by a label character
- * or a { and therefore will be taken literally. The case of literal $ before
- * a variable or "${" is handled in a rule for each string type
- */
-DOUBLE_QUOTES_LITERAL_DOLLAR ("$"+([^a-zA-Z_\x7f-\xff$"\\{]|("\\"{ANY_CHAR})))
-BACKQUOTE_LITERAL_DOLLAR ("$"+([^a-zA-Z_\x7f-\xff$`\\{]|("\\"{ANY_CHAR})))
-HEREDOC_LITERAL_DOLLAR ("$"+([^a-zA-Z_\x7f-\xff$\n\r\\{]|("\\"[^\n\r])))
-
-/*
- * Usually, HEREDOC_NEWLINE will just function like a simple NEWLINE, but some
- * special cases need to be handled. HEREDOC_CHARS doesn't allow a line to
- * match when { or $, and/or \ is at the end. (("{"*|"$"*)"\\"?) handles that,
- * along with cases where { or $, and/or \ is the ONLY thing on a line
- *
- * The other case is when a line contains a label, followed by ONLY
- * { or $, and/or \ Handled by ({LABEL}";"?((("{"+|"$"+)"\\"?)|"\\"))
- */
-HEREDOC_NEWLINE ((({LABEL}";"?((("{"+|"$"+)"\\"?)|"\\"))|(("{"*|"$"*)"\\"?)){NEWLINE})
-
-/*
- * This pattern is just used in the next 2 for matching { or literal $, and/or
- * \ escape sequence immediately at the beginning of a line or after a label
- */
-HEREDOC_CURLY_OR_ESCAPE_OR_DOLLAR (("{"+[^$\n\r\\{])|("{"*"\\"[^\n\r])|{HEREDOC_LITERAL_DOLLAR})
-
-/*
- * These 2 label-related patterns allow HEREDOC_CHARS to continue "regular"
- * matching after a newline that starts with either a non-label character or a
- * label that isn't followed by a newline. Like HEREDOC_CHARS, they won't match
- * a variable or "{$" Matching a newline, and possibly label, up TO a variable
- * or "{$", is handled in the heredoc rules
- *
- * The HEREDOC_LABEL_NO_NEWLINE pattern (";"[^$\n\r\\{]) handles cases where ;
- * follows a label. [^a-zA-Z0-9_\x7f-\xff;$\n\r\\{] is needed to prevent a label
- * character or ; from matching on a possible (real) ending label
- */
-HEREDOC_NON_LABEL ([^a-zA-Z_\x7f-\xff$\n\r\\{]|{HEREDOC_CURLY_OR_ESCAPE_OR_DOLLAR})
-HEREDOC_LABEL_NO_NEWLINE ({LABEL}([^a-zA-Z0-9_\x7f-\xff;$\n\r\\{]|(";"[^$\n\r\\{])|(";"?{HEREDOC_CURLY_OR_ESCAPE_OR_DOLLAR})))
-
-/*
- * CHARS matches everything up to a variable or "{$"
- * {'s are matched as long as they aren't followed by a $
- * The case of { before "{$" is handled in a rule for each string type
- *
- * For heredocs, matching continues across/after newlines if/when it's known
- * that the next line doesn't contain a possible ending label
- */
-DOUBLE_QUOTES_CHARS ("{"*([^$"\\{]|("\\"{ANY_CHAR}))|{DOUBLE_QUOTES_LITERAL_DOLLAR})
-BACKQUOTE_CHARS ("{"*([^$`\\{]|("\\"{ANY_CHAR}))|{BACKQUOTE_LITERAL_DOLLAR})
-HEREDOC_CHARS ("{"*([^$\n\r\\{]|("\\"[^\n\r]))|{HEREDOC_LITERAL_DOLLAR}|({HEREDOC_NEWLINE}+({HEREDOC_NON_LABEL}|{HEREDOC_LABEL_NO_NEWLINE})))
-
-NOWDOC_CHARS ([^\n\r]|{NEWLINE}+([^a-zA-Z_\x7f-\xff\n\r]|({LABEL}([^a-zA-Z0-9_\x7f-\xff;\n\r]|(";"[^\n\r])))))
/* compute yyleng before each rule */
<!*> := yyleng = YYCURSOR - SCNG(yy_text);
@@ -1538,6 +1481,14 @@ NOWDOC_CHARS ([^\n\r]|{NEWLINE}+([^a-zA-Z_\x7f-\xff\n\r]|({LABEL}([^a-zA-
}
<INITIAL>"<script"{WHITESPACE}+"language"{WHITESPACE}*"="{WHITESPACE}*("php"|"\"php\""|"'php'"){WHITESPACE}*">" {
+ YYCTYPE *bracket = zend_memrchr(yytext, '<', yyleng - (sizeof("script language=php>") - 1));
+
+ if (bracket != SCNG(yy_text)) {
+ /* Handle previously scanned HTML, as possible <script> tags found are assumed to not be PHP's */
+ YYCURSOR = bracket;
+ goto inline_html;
+ }
+
HANDLE_NEWLINES(yytext, yyleng);
zendlval->value.str.val = yytext; /* no copying - intentional */
zendlval->value.str.len = yyleng;
@@ -1609,29 +1560,48 @@ NOWDOC_CHARS ([^\n\r]|{NEWLINE}+([^a-zA-Z_\x7f-\xff\n\r]|({LABEL}([^a-zA-
}
<INITIAL>{ANY_CHAR} {
+ if (YYCURSOR > YYLIMIT) {
+ return 0;
+ }
inline_char_handler:
while (1) {
YYCTYPE *ptr = memchr(YYCURSOR, '<', YYLIMIT - YYCURSOR);
- if (ptr == NULL) {
- YYCURSOR = YYLIMIT;
- yyleng = YYCURSOR - SCNG(yy_text);
- break;
-
- } else {
- YYCURSOR = ptr + 1;
+ YYCURSOR = ptr ? ptr + 1 : YYLIMIT;
- /* stop if it may be an opening tag (<?, <%, <script>). this condition is not optimal though */
- if (YYCURSOR < YYLIMIT && (*YYCURSOR == '?' || *YYCURSOR == '%' || *YYCURSOR == 's')) {
- --YYCURSOR;
- yyleng = YYCURSOR - SCNG(yy_text);
- break;
+ if (YYCURSOR < YYLIMIT) {
+ switch (*YYCURSOR) {
+ case '?':
+ if (CG(short_tags) || !strncasecmp(YYCURSOR + 1, "php", 3)) { /* Assume [ \t\n\r] follows "php" */
+ break;
+ }
+ continue;
+ case '%':
+ if (CG(asp_tags)) {
+ break;
+ }
+ continue;
+ case 's':
+ case 'S':
+ /* Probably NOT an opening PHP <script> tag, so don't end the HTML chunk yet
+ * If it is, the PHP <script> tag rule checks for any HTML scanned before it */
+ YYCURSOR--;
+ yymore();
+ default:
+ continue;
}
+
+ YYCURSOR--;
}
+
+ break;
}
+inline_html:
+ yyleng = YYCURSOR - SCNG(yy_text);
+
#ifdef ZEND_MULTIBYTE
if (SCNG(output_filter)) {
int readsize;
@@ -1696,7 +1666,6 @@ inline_char_handler:
/* Invalid rule to return a more explicit parse error with proper line number */
yyless(0);
yy_pop_state(TSRMLS_C);
- ZVAL_EMPTY_STRING(zendlval); /* Empty since it won't be used */
return T_ENCAPSED_AND_WHITESPACE;
}
@@ -1708,91 +1677,71 @@ inline_char_handler:
<ST_IN_SCRIPTING>"#"|"//" {
- BEGIN(ST_ONE_LINE_COMMENT);
- yymore();
-}
-
-<ST_ONE_LINE_COMMENT>"?"|"%"|">" {
- yymore();
-}
+ while (YYCURSOR < YYLIMIT) {
+ switch (*YYCURSOR++) {
+ case '\r':
+ if (*YYCURSOR == '\n') {
+ YYCURSOR++;
+ }
+ /* fall through */
+ case '\n':
+ CG(zend_lineno)++;
+ break;
+ case '%':
+ if (!CG(asp_tags)) {
+ continue;
+ }
+ /* fall through */
+ case '?':
+ if (*YYCURSOR == '>') {
+ YYCURSOR--;
+ break;
+ }
+ /* fall through */
+ default:
+ continue;
+ }
-<ST_ONE_LINE_COMMENT>[^\n\r?%>]*{ANY_CHAR} {
- switch (yytext[yyleng-1]) {
- case '?': case '%': case '>':
- yyless(yyleng-1);
- yymore();
- break;
- case '\n':
- CG(zend_lineno)++;
- /* intentional fall through */
- default:
- zendlval->value.str.val = yytext; /* no copying - intentional */
- zendlval->value.str.len = yyleng;
- zendlval->type = IS_STRING;
- BEGIN(ST_IN_SCRIPTING);
- return T_COMMENT;
+ break;
}
-}
-<ST_ONE_LINE_COMMENT>{NEWLINE} {
- zendlval->value.str.val = yytext; /* no copying - intentional */
- zendlval->value.str.len = yyleng;
- zendlval->type = IS_STRING;
- BEGIN(ST_IN_SCRIPTING);
- CG(zend_lineno)++;
+ yyleng = YYCURSOR - SCNG(yy_text);
+
return T_COMMENT;
}
-<ST_ONE_LINE_COMMENT>"?>"|"%>" {
- if (CG(asp_tags) || yytext[yyleng-2] != '%') { /* asp comment? */
- zendlval->value.str.val = yytext; /* no copying - intentional */
- zendlval->value.str.len = yyleng-2;
- zendlval->type = IS_STRING;
- yyless(yyleng - 2);
- BEGIN(ST_IN_SCRIPTING);
- return T_COMMENT;
+<ST_IN_SCRIPTING>"/*"|"/**"{WHITESPACE} {
+ int doc_com;
+
+ if (yyleng > 2) {
+ doc_com = 1;
+ RESET_DOC_COMMENT();
} else {
- yymore();
+ doc_com = 0;
}
-}
-
-<ST_IN_SCRIPTING>"/**"{WHITESPACE} {
- RESET_DOC_COMMENT();
- BEGIN(ST_DOC_COMMENT);
- yymore();
-}
-
-<ST_COMMENT,ST_DOC_COMMENT>{NULL} {
- zend_error(E_COMPILE_WARNING, "Unterminated comment starting line %d", CG(zend_lineno));
- return 0;
-}
-
-<ST_IN_SCRIPTING>"/*" {
- BEGIN(ST_COMMENT);
- yymore();
-}
+ while (YYCURSOR < YYLIMIT) {
+ if (*YYCURSOR++ == '*' && *YYCURSOR == '/') {
+ break;
+ }
+ }
-<ST_COMMENT,ST_DOC_COMMENT>[^*]+ {
- yymore();
-}
+ if (YYCURSOR < YYLIMIT) {
+ YYCURSOR++;
+ } else {
+ zend_error(E_COMPILE_WARNING, "Unterminated comment starting line %d", CG(zend_lineno));
+ }
-<ST_DOC_COMMENT>"*/" {
- CG(doc_comment) = estrndup(yytext, yyleng);
- CG(doc_comment_len) = yyleng;
+ yyleng = YYCURSOR - SCNG(yy_text);
HANDLE_NEWLINES(yytext, yyleng);
- BEGIN(ST_IN_SCRIPTING);
- return T_DOC_COMMENT;
-}
-<ST_COMMENT>"*/" {
- HANDLE_NEWLINES(yytext, yyleng);
- BEGIN(ST_IN_SCRIPTING);
- return T_COMMENT;
-}
+ if (doc_com) {
+ CG(doc_comment) = estrndup(yytext, yyleng);
+ CG(doc_comment_len) = yyleng;
+ return T_DOC_COMMENT;
+ }
-<ST_COMMENT,ST_DOC_COMMENT>"*" {
- yymore();
+ return T_COMMENT;
}
<ST_IN_SCRIPTING>("?>"|"</script"{WHITESPACE}*">"){NEWLINE}? {
@@ -1818,21 +1767,31 @@ inline_char_handler:
}
-/* ("{"*|"$"*) handles { or $ at the end of a string (or the entire contents)
- */
-<ST_IN_SCRIPTING>(b?["]{DOUBLE_QUOTES_CHARS}*("{"*|"$"*)["]) {
- int bprefix = (yytext[0] != '"') ? 1 : 0;
-
- zend_scan_escape_string(zendlval, yytext+bprefix+1, yyleng-bprefix-2, '"' TSRMLS_CC);
- return T_CONSTANT_ENCAPSED_STRING;
-}
-
-
-<ST_IN_SCRIPTING>(b?[']([^'\\]|("\\"{ANY_CHAR}))*[']) {
+<ST_IN_SCRIPTING>b?['] {
register char *s, *t;
char *end;
int bprefix = (yytext[0] != '\'') ? 1 : 0;
+ while (1) {
+ if (YYCURSOR < YYLIMIT) {
+ if (*YYCURSOR == '\'') {
+ YYCURSOR++;
+ yyleng = YYCURSOR - SCNG(yy_text);
+
+ break;
+ } else if (*YYCURSOR++ == '\\' && YYCURSOR < YYLIMIT) {
+ YYCURSOR++;
+ }
+ } else {
+ yyleng = YYLIMIT - SCNG(yy_text);
+
+ /* Unclosed single quotes; treat similar to double quotes, but without a separate token
+ * for ' (unrecognized by parser), instead of old flex fallback to "Unexpected character..."
+ * rule, which continued in ST_IN_SCRIPTING state after the quote */
+ return T_ENCAPSED_AND_WHITESPACE;
+ }
+ }
+
zendlval->value.str.val = estrndup(yytext+bprefix+1, yyleng-bprefix-2);
zendlval->value.str.len = yyleng-bprefix-2;
zendlval->type = IS_STRING;
@@ -1880,6 +1839,42 @@ inline_char_handler:
<ST_IN_SCRIPTING>b?["] {
+ int bprefix = (yytext[0] != '"') ? 1 : 0;
+
+ while (YYCURSOR < YYLIMIT) {
+ switch (*YYCURSOR++) {
+ case '"':
+ yyleng = YYCURSOR - SCNG(yy_text);
+ zend_scan_escape_string(zendlval, yytext+bprefix+1, yyleng-bprefix-2, '"' TSRMLS_CC);
+ return T_CONSTANT_ENCAPSED_STRING;
+ case '$':
+ if (IS_LABEL_START(*YYCURSOR) || *YYCURSOR == '{') {
+ break;
+ }
+ continue;
+ case '{':
+ if (*YYCURSOR == '$') {
+ break;
+ }
+ continue;
+ case '\\':
+ if (YYCURSOR < YYLIMIT) {
+ YYCURSOR++;
+ }
+ /* fall through */
+ default:
+ continue;
+ }
+
+ YYCURSOR--;
+ break;
+ }
+
+ /* Remember how much was scanned to save rescanning */
+ SET_DOUBLE_QUOTES_SCANNED_LENGTH(YYCURSOR - SCNG(yy_text) - yyleng);
+
+ YYCURSOR = SCNG(yy_text) + yyleng;
+
BEGIN(ST_DOUBLE_QUOTES);
return '"';
}
@@ -1889,6 +1884,10 @@ inline_char_handler:
char *s;
int bprefix = (yytext[0] != '<') ? 1 : 0;
+ /* save old heredoc label */
+ Z_STRVAL_P(zendlval) = CG(heredoc);
+ Z_STRLEN_P(zendlval) = CG(heredoc_len);
+
CG(zend_lineno)++;
CG(heredoc_len) = yyleng-bprefix-3-1-(yytext[yyleng-2]=='\r'?1:0);
s = yytext+bprefix+3;
@@ -1915,7 +1914,7 @@ inline_char_handler:
/* Check for ending label on the next line */
if (CG(heredoc_len) < YYLIMIT - YYCURSOR && !memcmp(YYCURSOR, s, CG(heredoc_len))) {
- unsigned char *end = YYCURSOR + CG(heredoc_len);
+ YYCTYPE *end = YYCURSOR + CG(heredoc_len);
if (*end == ';') {
end++;
@@ -1936,49 +1935,6 @@ inline_char_handler:
}
-/* Match everything up to and including a possible ending label, so if the label
- * doesn't match, it's kept with the rest of the string
- *
- * {HEREDOC_NEWLINE}+ handles the case of more than one newline sequence that
- * couldn't be matched with HEREDOC_CHARS, because of the following label
- */
-<ST_HEREDOC>{HEREDOC_CHARS}*{HEREDOC_NEWLINE}+{LABEL}";"?[\n\r] {
- char *end = yytext + yyleng - 1;
-
- if (end[-1] == ';') {
- end--;
- yyleng--;
- }
-
- if (yyleng > CG(heredoc_len) && !memcmp(end - CG(heredoc_len), CG(heredoc), CG(heredoc_len))) {
- int len = yyleng - CG(heredoc_len) - 2; /* 2 for newline before and after label */
-
- /* May have matched fooLABEL; make sure there's a newline before it */
- if (yytext[len] != '\n') {
- if (yytext[len] != '\r') {
- yyless(yyleng - 1);
- yymore();
- }
- } else if (len > 0 && yytext[len - 1] == '\r') {
- len--; /* Windows newline */
- }
-
- /* Go back before label, to match in ST_END_HEREDOC state. yytext will include
- * newline before label, for zend_highlight/strip, tokenizer, etc. */
- yyless(yyleng - CG(heredoc_len) - 1); /* 1 for newline after label */
-
- CG(increment_lineno) = 1; /* For newline before label */
- BEGIN(ST_END_HEREDOC);
- zend_scan_escape_string(zendlval, yytext, len, 0 TSRMLS_CC);
- return T_ENCAPSED_AND_WHITESPACE;
- } else {
- /* Go back to end of label, so the next match works correctly in case of
- * a variable or another label at the beginning of the next line */
- yyless(yyleng - 1);
- yymore();
- }
-}
-
<ST_END_HEREDOC>{ANY_CHAR} {
YYCURSOR += CG(heredoc_len) - 1;
yyleng = CG(heredoc_len);
@@ -1992,118 +1948,250 @@ inline_char_handler:
}
-/* Will only match when $ follows: "{$" */
-<ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>"{" {
+<ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>"{$" {
zendlval->value.lval = (long) '{';
yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
+ yyless(1);
return T_CURLY_OPEN;
}
-<ST_DOUBLE_QUOTES>{DOUBLE_QUOTES_CHARS}+ {
- zend_scan_escape_string(zendlval, yytext, yyleng, '"' TSRMLS_CC);
- return T_ENCAPSED_AND_WHITESPACE;
+<ST_DOUBLE_QUOTES>["] {
+ BEGIN(ST_IN_SCRIPTING);
+ return '"';
}
-/* "{"{2,}|"$"{2,} handles { before "{$" or literal $ before a variable or "${"
- * (("{"+|"$"+)["]) handles { or $ at the end of a string
- *
- * Same for backquotes and heredocs, except the second case doesn't apply to
- * heredocs. yyless(yyleng - 1) is used to correct taking one character too many
- */
-<ST_DOUBLE_QUOTES>{DOUBLE_QUOTES_CHARS}*("{"{2,}|"$"{2,}|(("{"+|"$"+)["])) {
- yyless(yyleng - 1);
- zend_scan_escape_string(zendlval, yytext, yyleng, '"' TSRMLS_CC);
- return T_ENCAPSED_AND_WHITESPACE;
+<ST_BACKQUOTE>[`] {
+ BEGIN(ST_IN_SCRIPTING);
+ return '`';
}
-<ST_BACKQUOTE>{BACKQUOTE_CHARS}+ {
- zend_scan_escape_string(zendlval, yytext, yyleng, '`' TSRMLS_CC);
- return T_ENCAPSED_AND_WHITESPACE;
-}
+<ST_DOUBLE_QUOTES>{ANY_CHAR} {
+ if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) {
+ YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1;
+ SET_DOUBLE_QUOTES_SCANNED_LENGTH(0);
-<ST_BACKQUOTE>{BACKQUOTE_CHARS}*("{"{2,}|"$"{2,}|(("{"+|"$"+)[`])) {
- yyless(yyleng - 1);
- zend_scan_escape_string(zendlval, yytext, yyleng, '`' TSRMLS_CC);
- return T_ENCAPSED_AND_WHITESPACE;
-}
+ goto double_quotes_scan_done;
+ }
+ if (YYCURSOR > YYLIMIT) {
+ return 0;
+ }
+ if (yytext[0] == '\\' && YYCURSOR < YYLIMIT) {
+ YYCURSOR++;
+ }
-/* ({HEREDOC_NEWLINE}+({LABEL}";"?)?)? handles the possible case of newline
- * sequences, possibly followed by a label, that couldn't be matched with
- * HEREDOC_CHARS because of a following variable or "{$"
- *
- * This doesn't affect real ending labels, as they are followed by a newline,
- * which will result in a longer match for the correct rule if present
- */
-<ST_HEREDOC>{HEREDOC_CHARS}*({HEREDOC_NEWLINE}+({LABEL}";"?)?)? {
- zend_scan_escape_string(zendlval, yytext, yyleng, 0 TSRMLS_CC);
+ while (YYCURSOR < YYLIMIT) {
+ switch (*YYCURSOR++) {
+ case '"':
+ break;
+ case '$':
+ if (IS_LABEL_START(*YYCURSOR) || *YYCURSOR == '{') {
+ break;
+ }
+ continue;
+ case '{':
+ if (*YYCURSOR == '$') {
+ break;
+ }
+ continue;
+ case '\\':
+ if (YYCURSOR < YYLIMIT) {
+ YYCURSOR++;
+ }
+ /* fall through */
+ default:
+ continue;
+ }
+
+ YYCURSOR--;
+ break;
+ }
+
+double_quotes_scan_done:
+ yyleng = YYCURSOR - SCNG(yy_text);
+
+ zend_scan_escape_string(zendlval, yytext, yyleng, '"' TSRMLS_CC);
return T_ENCAPSED_AND_WHITESPACE;
}
-<ST_HEREDOC>{HEREDOC_CHARS}*({HEREDOC_NEWLINE}+({LABEL}";"?)?)?("{"{2,}|"$"{2,}) {
- yyless(yyleng - 1);
- zend_scan_escape_string(zendlval, yytext, yyleng, 0 TSRMLS_CC);
+
+<ST_BACKQUOTE>{ANY_CHAR} {
+ if (YYCURSOR > YYLIMIT) {
+ return 0;
+ }
+ if (yytext[0] == '\\' && YYCURSOR < YYLIMIT) {
+ YYCURSOR++;
+ }
+
+ while (YYCURSOR < YYLIMIT) {
+ switch (*YYCURSOR++) {
+ case '`':
+ break;
+ case '$':
+ if (IS_LABEL_START(*YYCURSOR) || *YYCURSOR == '{') {
+ break;
+ }
+ continue;
+ case '{':
+ if (*YYCURSOR == '$') {
+ break;
+ }
+ continue;
+ case '\\':
+ if (YYCURSOR < YYLIMIT) {
+ YYCURSOR++;
+ }
+ /* fall through */
+ default:
+ continue;
+ }
+
+ YYCURSOR--;
+ break;
+ }
+
+ yyleng = YYCURSOR - SCNG(yy_text);
+
+ zend_scan_escape_string(zendlval, yytext, yyleng, '`' TSRMLS_CC);
return T_ENCAPSED_AND_WHITESPACE;
}
-<ST_NOWDOC>({NOWDOC_CHARS}+{NEWLINE}+|{NEWLINE}+){LABEL}";"?[\n\r] {
- char *end = yytext + yyleng - 1;
+<ST_HEREDOC>{ANY_CHAR} {
+ int newline = 0;
- if (end[-1] == ';') {
- end--;
- yyleng--;
+ if (YYCURSOR > YYLIMIT) {
+ return 0;
}
- if (yyleng > CG(heredoc_len) && !memcmp(end - CG(heredoc_len), CG(heredoc), CG(heredoc_len))) {
- int len = yyleng - CG(heredoc_len) - 2; /* 2 for newline before and after label */
+ YYCURSOR--;
- /* May have matched fooLABEL; make sure there's a newline before it */
- if (yytext[len] != '\n') {
- if (yytext[len] != '\r') {
- yyless(yyleng - 1);
- yymore();
- }
- } else if (len > 0 && yytext[len - 1] == '\r') {
- len--; /* Windows newline */
- }
+ while (YYCURSOR < YYLIMIT) {
+ switch (*YYCURSOR++) {
+ case '\r':
+ if (*YYCURSOR == '\n') {
+ YYCURSOR++;
+ }
+ /* fall through */
+ case '\n':
+ /* Check for ending label on the next line */
+ if (IS_LABEL_START(*YYCURSOR) && CG(heredoc_len) < YYLIMIT - YYCURSOR && !memcmp(YYCURSOR, CG(heredoc), CG(heredoc_len))) {
+ YYCTYPE *end = YYCURSOR + CG(heredoc_len);
- /* Go back before label, to match in ST_END_HEREDOC state. yytext will include
- * newline before label, for zend_highlight/strip, tokenizer, etc. */
- yyless(yyleng - CG(heredoc_len) - 1); /* 1 for newline after label */
+ if (*end == ';') {
+ end++;
+ }
- CG(increment_lineno) = 1; /* For newline before label */
- BEGIN(ST_END_HEREDOC);
+ if (*end == '\n' || *end == '\r') {
+ /* newline before label will be subtracted from returned text, but
+ * yyleng/yytext will include it, for zend_highlight/strip, tokenizer, etc. */
+ if (YYCURSOR[-2] == '\r' && YYCURSOR[-1] == '\n') {
+ newline = 2; /* Windows newline */
+ } else {
+ newline = 1;
+ }
- zend_copy_value(zendlval, yytext, len);
- zendlval->type = IS_STRING;
- HANDLE_NEWLINES(yytext, len);
- return T_ENCAPSED_AND_WHITESPACE;
- } else {
- /* Go back to end of label, so the next match works correctly in case of
- * another label at the beginning of the next line */
- yyless(yyleng - 1);
- yymore();
+ CG(increment_lineno) = 1; /* For newline before label */
+ BEGIN(ST_END_HEREDOC);
+
+ goto heredoc_scan_done;
+ }
+ }
+ continue;
+ case '$':
+ if (IS_LABEL_START(*YYCURSOR) || *YYCURSOR == '{') {
+ break;
+ }
+ continue;
+ case '{':
+ if (*YYCURSOR == '$') {
+ break;
+ }
+ continue;
+ case '\\':
+ if (YYCURSOR < YYLIMIT && *YYCURSOR != '\n' && *YYCURSOR != '\r') {
+ YYCURSOR++;
+ }
+ /* fall through */
+ default:
+ continue;
+ }
+
+ YYCURSOR--;
+ break;
}
-}
+heredoc_scan_done:
+ yyleng = YYCURSOR - SCNG(yy_text);
-<ST_DOUBLE_QUOTES>["] {
- BEGIN(ST_IN_SCRIPTING);
- return '"';
+ zend_scan_escape_string(zendlval, yytext, yyleng - newline, 0 TSRMLS_CC);
+ return T_ENCAPSED_AND_WHITESPACE;
}
-<ST_BACKQUOTE>[`] {
- BEGIN(ST_IN_SCRIPTING);
- return '`';
+<ST_NOWDOC>{ANY_CHAR} {
+ int newline = 0;
+
+ if (YYCURSOR > YYLIMIT) {
+ return 0;
+ }
+
+ YYCURSOR--;
+
+ while (YYCURSOR < YYLIMIT) {
+ switch (*YYCURSOR++) {
+ case '\r':
+ if (*YYCURSOR == '\n') {
+ YYCURSOR++;
+ }
+ /* fall through */
+ case '\n':
+ /* Check for ending label on the next line */
+ if (IS_LABEL_START(*YYCURSOR) && CG(heredoc_len) < YYLIMIT - YYCURSOR && !memcmp(YYCURSOR, CG(heredoc), CG(heredoc_len))) {
+ YYCTYPE *end = YYCURSOR + CG(heredoc_len);
+
+ if (*end == ';') {
+ end++;
+ }
+
+ if (*end == '\n' || *end == '\r') {
+ /* newline before label will be subtracted from returned text, but
+ * yyleng/yytext will include it, for zend_highlight/strip, tokenizer, etc. */
+ if (YYCURSOR[-2] == '\r' && YYCURSOR[-1] == '\n') {
+ newline = 2; /* Windows newline */
+ } else {
+ newline = 1;
+ }
+
+ CG(increment_lineno) = 1; /* For newline before label */
+ BEGIN(ST_END_HEREDOC);
+
+ goto nowdoc_scan_done;
+ }
+ }
+ /* fall through */
+ default:
+ continue;
+ }
+ }
+
+nowdoc_scan_done:
+ yyleng = YYCURSOR - SCNG(yy_text);
+
+ zend_copy_value(zendlval, yytext, yyleng - newline);
+ zendlval->type = IS_STRING;
+ HANDLE_NEWLINES(yytext, yyleng - newline);
+ return T_ENCAPSED_AND_WHITESPACE;
}
-<*>{NULL} { return 0; } /* EOF */
<ST_IN_SCRIPTING,ST_VAR_OFFSET>{ANY_CHAR} {
+ if (YYCURSOR > YYLIMIT) {
+ return 0;
+ }
+
zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE);
goto restart;
}
diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h
index eaedca6..48bd8d5 100644
--- a/Zend/zend_language_scanner_defs.h
+++ b/Zend/zend_language_scanner_defs.h
@@ -1,4 +1,5 @@
-/* Generated by re2c 0.13.5 on Mon Mar 23 21:40:47 2009 */
+/* Generated by re2c 0.13.5 on Mon May 04 19:38:30 2009 */
+#line 3 "Zend/zend_language_scanner_defs.h"
enum YYCONDTYPE {
yycST_IN_SCRIPTING,
@@ -9,9 +10,6 @@ enum YYCONDTYPE {
yycST_LOOKING_FOR_VARNAME,
yycST_VAR_OFFSET,
yycINITIAL,
- yycST_ONE_LINE_COMMENT,
- yycST_COMMENT,
- yycST_DOC_COMMENT,
yycST_END_HEREDOC,
yycST_NOWDOC,
};
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 9c1224e..826a567 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_object_handlers.c,v 1.135.2.6.2.22.2.26 2009/01/14 10:28:22 dmitry Exp $ */
+/* $Id: zend_object_handlers.c,v 1.135.2.6.2.22.2.30 2009/06/18 13:46:16 scottmac Exp $ */
#include "zend.h"
#include "zend_globals.h"
@@ -28,6 +28,7 @@
#include "zend_object_handlers.h"
#include "zend_interfaces.h"
#include "zend_closures.h"
+#include "zend_compile.h"
#define DEBUG_OBJECT_HANDLERS 0
@@ -578,8 +579,8 @@ static zval **zend_std_get_property_ptr_ptr(zval *object, zval *member TSRMLS_DC
zend_guard *guard;
if (!zobj->ce->__get ||
- zend_get_property_guard(zobj, property_info, member, &guard) != SUCCESS ||
- guard->in_get) {
+ zend_get_property_guard(zobj, property_info, member, &guard) != SUCCESS ||
+ (property_info && guard->in_get)) {
/* we don't have access controls - will just add it */
new_zval = &EG(uninitialized_zval);
@@ -777,15 +778,15 @@ static inline zend_class_entry * zend_get_function_root_class(zend_function *fbc
}
/* }}} */
-static inline union _zend_function *zend_get_user_call_function(zend_object *zobj, char *method_name, int method_len) /* {{{ */
+static inline union _zend_function *zend_get_user_call_function(zend_class_entry *ce, const char *method_name, int method_len) /* {{{ */
{
zend_internal_function *call_user_call = emalloc(sizeof(zend_internal_function));
call_user_call->type = ZEND_INTERNAL_FUNCTION;
- call_user_call->module = zobj->ce->module;
+ call_user_call->module = ce->module;
call_user_call->handler = zend_std_call_user_call;
call_user_call->arg_info = NULL;
call_user_call->num_args = 0;
- call_user_call->scope = zobj->ce;
+ call_user_call->scope = ce;
call_user_call->fn_flags = ZEND_ACC_CALL_VIA_HANDLER;
call_user_call->function_name = estrndup(method_name, method_len);
call_user_call->pass_rest_by_reference = 0;
@@ -811,7 +812,7 @@ static union _zend_function *zend_std_get_method(zval **object_ptr, char *method
if (zend_hash_find(&zobj->ce->function_table, lc_method_name, method_len+1, (void **)&fbc) == FAILURE) {
free_alloca(lc_method_name, use_heap);
if (zobj->ce->__call) {
- return zend_get_user_call_function(zobj, method_name, method_len);
+ return zend_get_user_call_function(zobj->ce, method_name, method_len);
} else {
return NULL;
}
@@ -829,7 +830,7 @@ static union _zend_function *zend_std_get_method(zval **object_ptr, char *method
fbc = updated_fbc;
} else {
if (zobj->ce->__call) {
- fbc = zend_get_user_call_function(zobj, method_name, method_len);
+ fbc = zend_get_user_call_function(zobj->ce, method_name, method_len);
} else {
zend_error(E_ERROR, "Call to %s method %s::%s() from context '%s'", zend_visibility_string(fbc->common.fn_flags), ZEND_FN_SCOPE_NAME(fbc), method_name, EG(scope) ? EG(scope)->name : "");
}
@@ -855,7 +856,7 @@ static union _zend_function *zend_std_get_method(zval **object_ptr, char *method
*/
if (!zend_check_protected(zend_get_function_root_class(fbc), EG(scope))) {
if (zobj->ce->__call) {
- fbc = zend_get_user_call_function(zobj, method_name, method_len);
+ fbc = zend_get_user_call_function(zobj->ce, method_name, method_len);
} else {
zend_error(E_ERROR, "Call to %s method %s::%s() from context '%s'", zend_visibility_string(fbc->common.fn_flags), ZEND_FN_SCOPE_NAME(fbc), method_name, EG(scope) ? EG(scope)->name : "");
}
@@ -912,6 +913,24 @@ ZEND_API void zend_std_callstatic_user_call(INTERNAL_FUNCTION_PARAMETERS) /* {{{
}
/* }}} */
+static inline union _zend_function *zend_get_user_callstatic_function(zend_class_entry *ce, const char *method_name, int method_len) /* {{{ */
+{
+ zend_internal_function *callstatic_user_call = emalloc(sizeof(zend_internal_function));
+ callstatic_user_call->type = ZEND_INTERNAL_FUNCTION;
+ callstatic_user_call->module = ce->module;
+ callstatic_user_call->handler = zend_std_callstatic_user_call;
+ callstatic_user_call->arg_info = NULL;
+ callstatic_user_call->num_args = 0;
+ callstatic_user_call->scope = ce;
+ callstatic_user_call->fn_flags = ZEND_ACC_STATIC | ZEND_ACC_PUBLIC | ZEND_ACC_CALL_VIA_HANDLER;
+ callstatic_user_call->function_name = estrndup(method_name, method_len);
+ callstatic_user_call->pass_rest_by_reference = 0;
+ callstatic_user_call->return_reference = ZEND_RETURN_VALUE;
+
+ return (zend_function *)callstatic_user_call;
+}
+/* }}} */
+
/* This is not (yet?) in the API, but it belongs in the built-in objects callbacks */
ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce, char *function_name_strval, int function_name_strlen TSRMLS_DC) /* {{{ */
@@ -923,7 +942,8 @@ ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce, char *f
if (function_name_strlen == ce->name_length && ce->constructor) {
lc_class_name = zend_str_tolower_dup(ce->name, ce->name_length);
- if (!memcmp(lc_class_name, function_name_strval, function_name_strlen)) {
+ /* Only change the method to the constructor if a __construct() method doesn't exist */
+ if (!memcmp(lc_class_name, function_name_strval, function_name_strlen) && memcmp(ce->constructor->common.function_name, ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME))) {
fbc = ce->constructor;
}
efree(lc_class_name);
@@ -935,35 +955,9 @@ ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce, char *f
EG(This) &&
Z_OBJ_HT_P(EG(This))->get_class_entry &&
instanceof_function(Z_OBJCE_P(EG(This)), ce TSRMLS_CC)) {
- zend_internal_function *call_user_call = emalloc(sizeof(zend_internal_function));
-
- call_user_call->type = ZEND_INTERNAL_FUNCTION;
- call_user_call->module = ce->module;
- call_user_call->handler = zend_std_call_user_call;
- call_user_call->arg_info = NULL;
- call_user_call->num_args = 0;
- call_user_call->scope = ce;
- call_user_call->fn_flags = ZEND_ACC_CALL_VIA_HANDLER;
- call_user_call->function_name = estrndup(function_name_strval, function_name_strlen);
- call_user_call->pass_rest_by_reference = 0;
- call_user_call->return_reference = ZEND_RETURN_VALUE;
-
- return (union _zend_function *)call_user_call;
+ return zend_get_user_call_function(ce, function_name_strval, function_name_strlen);
} else if (ce->__callstatic) {
- zend_internal_function *callstatic_user_call = emalloc(sizeof(zend_internal_function));
-
- callstatic_user_call->type = ZEND_INTERNAL_FUNCTION;
- callstatic_user_call->module = ce->module;
- callstatic_user_call->handler = zend_std_callstatic_user_call;
- callstatic_user_call->arg_info = NULL;
- callstatic_user_call->num_args = 0;
- callstatic_user_call->scope = ce;
- callstatic_user_call->fn_flags = ZEND_ACC_STATIC | ZEND_ACC_PUBLIC | ZEND_ACC_CALL_VIA_HANDLER;
- callstatic_user_call->function_name = estrndup(function_name_strval, function_name_strlen);
- callstatic_user_call->pass_rest_by_reference = 0;
- callstatic_user_call->return_reference = ZEND_RETURN_VALUE;
-
- return (zend_function *)callstatic_user_call;
+ return zend_get_user_callstatic_function(ce, function_name_strval, function_name_strlen);
} else {
return NULL;
}
@@ -985,14 +979,21 @@ ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce, char *f
/* Ensure that if we're calling a private function, we're allowed to do so.
*/
updated_fbc = zend_check_private_int(fbc, EG(scope), function_name_strval, function_name_strlen TSRMLS_CC);
- if (!updated_fbc) {
+ if (updated_fbc) {
+ fbc = updated_fbc;
+ } else {
+ if (ce->__callstatic) {
+ return zend_get_user_callstatic_function(ce, function_name_strval, function_name_strlen);
+ }
zend_error(E_ERROR, "Call to %s method %s::%s() from context '%s'", zend_visibility_string(fbc->common.fn_flags), ZEND_FN_SCOPE_NAME(fbc), function_name_strval, EG(scope) ? EG(scope)->name : "");
}
- fbc = updated_fbc;
} else if ((fbc->common.fn_flags & ZEND_ACC_PROTECTED)) {
/* Ensure that if we're calling a protected function, we're allowed to do so.
*/
if (!zend_check_protected(zend_get_function_root_class(fbc), EG(scope))) {
+ if (ce->__callstatic) {
+ return zend_get_user_callstatic_function(ce, function_name_strval, function_name_strlen);
+ }
zend_error(E_ERROR, "Call to %s method %s::%s() from context '%s'", zend_visibility_string(fbc->common.fn_flags), ZEND_FN_SCOPE_NAME(fbc), function_name_strval, EG(scope) ? EG(scope)->name : "");
}
}
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index 07288c0..fd3cb84 100644
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_opcode.c,v 1.110.2.6.2.3.2.10 2008/12/31 11:15:32 sebastian Exp $ */
+/* $Id: zend_opcode.c,v 1.110.2.6.2.3.2.11 2009/06/05 23:20:59 shire Exp $ */
#include <stdio.h>
@@ -359,7 +359,7 @@ static void zend_extension_op_array_handler(zend_extension *extension, zend_op_a
}
}
-int pass_two(zend_op_array *op_array TSRMLS_DC)
+ZEND_API int pass_two(zend_op_array *op_array TSRMLS_DC)
{
zend_op *opline, *end;
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 5c4e878..3b3fef1 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_operators.c,v 1.208.2.4.2.23.2.22 2009/03/18 11:25:37 dmitry Exp $ */
+/* $Id: zend_operators.c,v 1.208.2.4.2.23.2.27 2009/06/04 18:20:42 mattwil Exp $ */
#include <ctype.h>
@@ -36,7 +36,7 @@
#if ZEND_USE_TOLOWER_L
#include <locale.h>
static _locale_t current_locale = NULL;
-/* this is true global! may lead to strange effects on ZTS, but so is setlocale() */
+/* this is true global! may lead to strange effects on ZTS, but so may setlocale() */
#define zend_tolower(c) _tolower_l(c, current_locale)
#else
#define zend_tolower(c) tolower(c)
@@ -44,7 +44,7 @@ static _locale_t current_locale = NULL;
#define TYPE_PAIR(t1,t2) (((t1) << 4) | (t2))
-ZEND_API int zend_atoi(const char *str, int str_len)
+ZEND_API int zend_atoi(const char *str, int str_len) /* {{{ */
{
int retval;
@@ -70,8 +70,9 @@ ZEND_API int zend_atoi(const char *str, int str_len)
}
return retval;
}
+/* }}} */
-ZEND_API long zend_atol(const char *str, int str_len)
+ZEND_API long zend_atol(const char *str, int str_len) /* {{{ */
{
long retval;
@@ -97,9 +98,9 @@ ZEND_API long zend_atol(const char *str, int str_len)
}
return retval;
}
+/* }}} */
-
-ZEND_API double zend_string_to_double(const char *number, zend_uint length)
+ZEND_API double zend_string_to_double(const char *number, zend_uint length) /* {{{ */
{
double divisor = 10.0;
double result = 0.0;
@@ -143,9 +144,9 @@ ZEND_API double zend_string_to_double(const char *number, zend_uint length)
}
return result;
}
+/* }}} */
-
-ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC)
+ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC) /* {{{ */
{
switch (Z_TYPE_P(op)) {
case IS_STRING:
@@ -174,7 +175,9 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC)
break;
}
}
+/* }}} */
+/* {{{ zendi_convert_scalar_to_number */
#define zendi_convert_scalar_to_number(op, holder, result) \
if (op==result) { \
if (Z_TYPE_P(op) != IS_LONG) { \
@@ -210,7 +213,9 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC)
} \
}
+/* }}} */
+/* {{{ zendi_convert_to_long */
#define zendi_convert_to_long(op, holder, result) \
if (op == result) { \
convert_to_long(op); \
@@ -220,13 +225,13 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC)
Z_LVAL(holder) = 0; \
break; \
case IS_DOUBLE: \
- DVAL_TO_LVAL(Z_DVAL_P(op), Z_LVAL(holder)); \
+ Z_LVAL(holder) = zend_dval_to_lval(Z_DVAL_P(op)); \
break; \
case IS_STRING: \
Z_LVAL(holder) = strtol(Z_STRVAL_P(op), NULL, 10); \
break; \
case IS_ARRAY: \
- Z_LVAL(holder) = (zend_hash_num_elements(Z_ARRVAL_P(op))?1:0); \
+ Z_LVAL(holder) = (zend_hash_num_elements(Z_ARRVAL_P(op))?1:0); \
break; \
case IS_OBJECT: \
(holder) = (*(op)); \
@@ -238,7 +243,7 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC)
Z_LVAL(holder) = Z_LVAL_P(op); \
break; \
default: \
- zend_error(E_WARNING, "Cannot convert to ordinal value"); \
+ zend_error(E_WARNING, "Cannot convert to ordinal value"); \
Z_LVAL(holder) = 0; \
break; \
} \
@@ -246,7 +251,9 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC)
(op) = &(holder); \
}
+/* }}} */
+/* {{{ zendi_convert_to_boolean */
#define zendi_convert_to_boolean(op, holder, result) \
if (op==result) { \
convert_to_boolean(op); \
@@ -286,13 +293,15 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC)
(op) = &(holder); \
}
+/* }}} */
+/* {{{ convert_object_to_type */
#define convert_object_to_type(op, ctype, conv_func) \
if (Z_OBJ_HT_P(op)->cast_object) { \
zval dst; \
if (Z_OBJ_HT_P(op)->cast_object(op, &dst, ctype TSRMLS_CC) == FAILURE) { \
- zend_error(E_RECOVERABLE_ERROR, \
- "Object of class %s could not be converted to %s", Z_OBJCE_P(op)->name, \
+ zend_error(E_RECOVERABLE_ERROR, \
+ "Object of class %s could not be converted to %s", Z_OBJCE_P(op)->name, \
zend_get_type_by_const(ctype)); \
} else { \
zval_dtor(op); \
@@ -300,9 +309,9 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC)
op->value = dst.value; \
} \
} else { \
- if(Z_OBJ_HT_P(op)->get) { \
+ if (Z_OBJ_HT_P(op)->get) { \
zval *newop = Z_OBJ_HT_P(op)->get(op TSRMLS_CC); \
- if(Z_TYPE_P(newop) != IS_OBJECT) { \
+ if (Z_TYPE_P(newop) != IS_OBJECT) { \
/* for safety - avoid loop */ \
zval_dtor(op); \
*op = *newop; \
@@ -312,16 +321,18 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC)
} \
}
-ZEND_API void convert_to_long(zval *op)
+/* }}} */
+
+ZEND_API void convert_to_long(zval *op) /* {{{ */
{
if (Z_TYPE_P(op) != IS_LONG) {
convert_to_long_base(op, 10);
}
}
+/* }}} */
-ZEND_API void convert_to_long_base(zval *op, int base)
+ZEND_API void convert_to_long_base(zval *op, int base) /* {{{ */
{
- char *strval;
long tmp;
switch (Z_TYPE_P(op)) {
@@ -338,12 +349,15 @@ ZEND_API void convert_to_long_base(zval *op, int base)
case IS_LONG:
break;
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(op), Z_LVAL_P(op));
+ Z_LVAL_P(op) = zend_dval_to_lval(Z_DVAL_P(op));
break;
case IS_STRING:
- strval = Z_STRVAL_P(op);
- Z_LVAL_P(op) = strtol(strval, NULL, base);
- STR_FREE(strval);
+ {
+ char *strval = Z_STRVAL_P(op);
+
+ Z_LVAL_P(op) = strtol(strval, NULL, base);
+ STR_FREE(strval);
+ }
break;
case IS_ARRAY:
tmp = (zend_hash_num_elements(Z_ARRVAL_P(op))?1:0);
@@ -361,7 +375,7 @@ ZEND_API void convert_to_long_base(zval *op, int base)
return;
}
zend_error(E_NOTICE, "Object of class %s could not be converted to int", Z_OBJCE_P(op)->name);
-
+
zval_dtor(op);
ZVAL_LONG(op, retval);
return;
@@ -375,11 +389,10 @@ ZEND_API void convert_to_long_base(zval *op, int base)
Z_TYPE_P(op) = IS_LONG;
}
+/* }}} */
-
-ZEND_API void convert_to_double(zval *op)
+ZEND_API void convert_to_double(zval *op) /* {{{ */
{
- char *strval;
double tmp;
switch (Z_TYPE_P(op)) {
@@ -399,10 +412,12 @@ ZEND_API void convert_to_double(zval *op)
case IS_DOUBLE:
break;
case IS_STRING:
- strval = Z_STRVAL_P(op);
+ {
+ char *strval = Z_STRVAL_P(op);
- Z_DVAL_P(op) = zend_strtod(strval, NULL);
- STR_FREE(strval);
+ Z_DVAL_P(op) = zend_strtod(strval, NULL);
+ STR_FREE(strval);
+ }
break;
case IS_ARRAY:
tmp = (zend_hash_num_elements(Z_ARRVAL_P(op))?1:0);
@@ -433,9 +448,9 @@ ZEND_API void convert_to_double(zval *op)
}
Z_TYPE_P(op) = IS_DOUBLE;
}
+/* }}} */
-
-ZEND_API void convert_to_null(zval *op)
+ZEND_API void convert_to_null(zval *op) /* {{{ */
{
if (Z_TYPE_P(op) == IS_OBJECT) {
if (Z_OBJ_HT_P(op)->cast_object) {
@@ -456,11 +471,10 @@ ZEND_API void convert_to_null(zval *op)
zval_dtor(op);
Z_TYPE_P(op) = IS_NULL;
}
+/* }}} */
-
-ZEND_API void convert_to_boolean(zval *op)
+ZEND_API void convert_to_boolean(zval *op) /* {{{ */
{
- char *strval;
int tmp;
switch (Z_TYPE_P(op)) {
@@ -482,15 +496,17 @@ ZEND_API void convert_to_boolean(zval *op)
Z_LVAL_P(op) = (Z_DVAL_P(op) ? 1 : 0);
break;
case IS_STRING:
- strval = Z_STRVAL_P(op);
+ {
+ char *strval = Z_STRVAL_P(op);
- if (Z_STRLEN_P(op) == 0
- || (Z_STRLEN_P(op)==1 && Z_STRVAL_P(op)[0]=='0')) {
- Z_LVAL_P(op) = 0;
- } else {
- Z_LVAL_P(op) = 1;
+ if (Z_STRLEN_P(op) == 0
+ || (Z_STRLEN_P(op)==1 && Z_STRVAL_P(op)[0]=='0')) {
+ Z_LVAL_P(op) = 0;
+ } else {
+ Z_LVAL_P(op) = 1;
+ }
+ STR_FREE(strval);
}
- STR_FREE(strval);
break;
case IS_ARRAY:
tmp = (zend_hash_num_elements(Z_ARRVAL_P(op))?1:0);
@@ -519,8 +535,9 @@ ZEND_API void convert_to_boolean(zval *op)
}
Z_TYPE_P(op) = IS_BOOL;
}
+/* }}} */
-ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC)
+ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC) /* {{{ */
{
long lval;
double dval;
@@ -552,12 +569,12 @@ ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC)
case IS_LONG:
lval = Z_LVAL_P(op);
- Z_STRLEN_P(op) = zend_spprintf(&Z_STRVAL_P(op), 0, "%ld", lval); /* SAFE */
+ Z_STRLEN_P(op) = zend_spprintf(&Z_STRVAL_P(op), 0, "%ld", lval);
break;
case IS_DOUBLE: {
TSRMLS_FETCH();
dval = Z_DVAL_P(op);
- Z_STRLEN_P(op) = zend_spprintf(&Z_STRVAL_P(op), 0, "%.*G", (int) EG(precision), dval); /* SAFE */
+ Z_STRLEN_P(op) = zend_spprintf(&Z_STRVAL_P(op), 0, "%.*G", (int) EG(precision), dval);
/* %G already handles removing trailing zeros from the fractional part, yay */
break;
}
@@ -589,9 +606,9 @@ ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC)
}
Z_TYPE_P(op) = IS_STRING;
}
+/* }}} */
-
-static void convert_scalar_to_array(zval *op, int type)
+static void convert_scalar_to_array(zval *op, int type TSRMLS_DC) /* {{{ */
{
zval *entry;
@@ -607,25 +624,19 @@ static void convert_scalar_to_array(zval *op, int type)
Z_TYPE_P(op) = IS_ARRAY;
break;
case IS_OBJECT:
- {
- /* OBJECTS_OPTIMIZE */
- TSRMLS_FETCH();
-
- object_init(op);
- zend_hash_update(Z_OBJPROP_P(op), "scalar", sizeof("scalar"), (void *) &entry, sizeof(zval *), NULL);
- }
+ object_init(op);
+ zend_hash_update(Z_OBJPROP_P(op), "scalar", sizeof("scalar"), (void *) &entry, sizeof(zval *), NULL);
break;
}
}
+/* }}} */
-
-ZEND_API void convert_to_array(zval *op)
+ZEND_API void convert_to_array(zval *op) /* {{{ */
{
TSRMLS_FETCH();
switch (Z_TYPE_P(op)) {
case IS_ARRAY:
- return;
break;
/* OBJECTS_OPTIMIZE */
case IS_OBJECT:
@@ -637,7 +648,7 @@ ZEND_API void convert_to_array(zval *op)
zend_hash_init(ht, 0, NULL, ZVAL_PTR_DTOR, 0);
if (Z_OBJ_HT_P(op)->get_properties) {
HashTable *obj_ht = Z_OBJ_HT_P(op)->get_properties(op TSRMLS_CC);
- if(obj_ht) {
+ if (obj_ht) {
zend_hash_copy(ht, obj_ht, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
}
} else {
@@ -653,48 +664,42 @@ ZEND_API void convert_to_array(zval *op)
Z_TYPE_P(op) = IS_ARRAY;
Z_ARRVAL_P(op) = ht;
}
- return;
+ break;
case IS_NULL:
ALLOC_HASHTABLE(Z_ARRVAL_P(op));
zend_hash_init(Z_ARRVAL_P(op), 0, NULL, ZVAL_PTR_DTOR, 0);
Z_TYPE_P(op) = IS_ARRAY;
break;
default:
- convert_scalar_to_array(op, IS_ARRAY);
+ convert_scalar_to_array(op, IS_ARRAY TSRMLS_CC);
break;
}
}
+/* }}} */
-
-ZEND_API void convert_to_object(zval *op)
+ZEND_API void convert_to_object(zval *op) /* {{{ */
{
+ TSRMLS_FETCH();
+
switch (Z_TYPE_P(op)) {
case IS_ARRAY:
{
- /* OBJECTS_OPTIMIZE */
- TSRMLS_FETCH();
-
object_and_properties_init(op, zend_standard_class_def, Z_ARRVAL_P(op));
- return;
break;
}
case IS_OBJECT:
- return;
+ break;
case IS_NULL:
- {
- /* OBJECTS_OPTIMIZE */
- TSRMLS_FETCH();
-
- object_init(op);
- break;
- }
+ object_init(op);
+ break;
default:
- convert_scalar_to_array(op, IS_OBJECT);
+ convert_scalar_to_array(op, IS_OBJECT TSRMLS_CC);
break;
}
}
+/* }}} */
-ZEND_API void multi_convert_to_long_ex(int argc, ...)
+ZEND_API void multi_convert_to_long_ex(int argc, ...) /* {{{ */
{
zval **arg;
va_list ap;
@@ -708,8 +713,9 @@ ZEND_API void multi_convert_to_long_ex(int argc, ...)
va_end(ap);
}
+/* }}} */
-ZEND_API void multi_convert_to_double_ex(int argc, ...)
+ZEND_API void multi_convert_to_double_ex(int argc, ...) /* {{{ */
{
zval **arg;
va_list ap;
@@ -723,8 +729,9 @@ ZEND_API void multi_convert_to_double_ex(int argc, ...)
va_end(ap);
}
+/* }}} */
-ZEND_API void multi_convert_to_string_ex(int argc, ...)
+ZEND_API void multi_convert_to_string_ex(int argc, ...) /* {{{ */
{
zval **arg;
va_list ap;
@@ -738,8 +745,9 @@ ZEND_API void multi_convert_to_string_ex(int argc, ...)
va_end(ap);
}
+/* }}} */
-ZEND_API int add_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int add_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
zval op1_copy, op2_copy;
int converted = 0;
@@ -799,9 +807,9 @@ ZEND_API int add_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
}
}
}
+/* }}} */
-
-ZEND_API int sub_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int sub_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
zval op1_copy, op2_copy;
int converted = 0;
@@ -846,9 +854,9 @@ ZEND_API int sub_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
}
}
}
+/* }}} */
-
-ZEND_API int mul_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int mul_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
zval op1_copy, op2_copy;
int converted = 0;
@@ -887,8 +895,9 @@ ZEND_API int mul_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
}
}
}
+/* }}} */
-ZEND_API int div_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int div_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
zval op1_copy, op2_copy;
int converted = 0;
@@ -951,9 +960,9 @@ ZEND_API int div_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
}
}
}
+/* }}} */
-
-ZEND_API int mod_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int mod_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
zval op1_copy, op2_copy;
@@ -975,10 +984,9 @@ ZEND_API int mod_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
ZVAL_LONG(result, Z_LVAL_P(op1) % Z_LVAL_P(op2));
return SUCCESS;
}
+/* }}} */
-
-
-ZEND_API int boolean_xor_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int boolean_xor_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
zval op1_copy, op2_copy;
@@ -987,20 +995,19 @@ ZEND_API int boolean_xor_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
ZVAL_BOOL(result, Z_LVAL_P(op1) ^ Z_LVAL_P(op2));
return SUCCESS;
}
+/* }}} */
-
-ZEND_API int boolean_not_function(zval *result, zval *op1 TSRMLS_DC)
+ZEND_API int boolean_not_function(zval *result, zval *op1 TSRMLS_DC) /* {{{ */
{
zval op1_copy;
zendi_convert_to_boolean(op1, op1_copy, result);
-
ZVAL_BOOL(result, !Z_LVAL_P(op1));
return SUCCESS;
}
+/* }}} */
-
-ZEND_API int bitwise_not_function(zval *result, zval *op1 TSRMLS_DC)
+ZEND_API int bitwise_not_function(zval *result, zval *op1 TSRMLS_DC) /* {{{ */
{
zval op1_copy = *op1;
@@ -1010,7 +1017,7 @@ ZEND_API int bitwise_not_function(zval *result, zval *op1 TSRMLS_DC)
ZVAL_LONG(result, ~Z_LVAL_P(op1));
return SUCCESS;
} else if (Z_TYPE_P(op1) == IS_DOUBLE) {
- ZVAL_LONG(result, ~(long) Z_DVAL_P(op1));
+ ZVAL_LONG(result, ~zend_dval_to_lval(Z_DVAL_P(op1)));
return SUCCESS;
} else if (Z_TYPE_P(op1) == IS_STRING) {
int i;
@@ -1026,9 +1033,9 @@ ZEND_API int bitwise_not_function(zval *result, zval *op1 TSRMLS_DC)
zend_error(E_ERROR, "Unsupported operand types");
return FAILURE; /* unknown datatype */
}
+/* }}} */
-
-ZEND_API int bitwise_or_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int bitwise_or_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
zval op1_copy, op2_copy;
@@ -1064,9 +1071,9 @@ ZEND_API int bitwise_or_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
ZVAL_LONG(result, Z_LVAL_P(op1) | Z_LVAL_P(op2));
return SUCCESS;
}
+/* }}} */
-
-ZEND_API int bitwise_and_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int bitwise_and_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
zval op1_copy, op2_copy;
@@ -1104,9 +1111,9 @@ ZEND_API int bitwise_and_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
ZVAL_LONG(result, Z_LVAL_P(op1) & Z_LVAL_P(op2));
return SUCCESS;
}
+/* }}} */
-
-ZEND_API int bitwise_xor_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int bitwise_xor_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
zval op1_copy, op2_copy;
@@ -1143,9 +1150,9 @@ ZEND_API int bitwise_xor_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
ZVAL_LONG(result, Z_LVAL_P(op1) ^ Z_LVAL_P(op2));
return SUCCESS;
}
+/* }}} */
-
-ZEND_API int shift_left_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int shift_left_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
zval op1_copy, op2_copy;
@@ -1154,9 +1161,9 @@ ZEND_API int shift_left_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
ZVAL_LONG(result, Z_LVAL_P(op1) << Z_LVAL_P(op2));
return SUCCESS;
}
+/* }}} */
-
-ZEND_API int shift_right_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int shift_right_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
zval op1_copy, op2_copy;
@@ -1165,36 +1172,35 @@ ZEND_API int shift_right_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
ZVAL_LONG(result, Z_LVAL_P(op1) >> Z_LVAL_P(op2));
return SUCCESS;
}
-
-
+/* }}} */
/* must support result==op1 */
-ZEND_API int add_char_to_string(zval *result, const zval *op1, const zval *op2)
+ZEND_API int add_char_to_string(zval *result, const zval *op1, const zval *op2) /* {{{ */
{
Z_STRLEN_P(result) = Z_STRLEN_P(op1) + 1;
Z_STRVAL_P(result) = (char *) erealloc(Z_STRVAL_P(op1), Z_STRLEN_P(result)+1);
- Z_STRVAL_P(result)[Z_STRLEN_P(result) - 1] = (char) Z_LVAL_P(op2);
+ Z_STRVAL_P(result)[Z_STRLEN_P(result) - 1] = (char) Z_LVAL_P(op2);
Z_STRVAL_P(result)[Z_STRLEN_P(result)] = 0;
Z_TYPE_P(result) = IS_STRING;
return SUCCESS;
}
-
+/* }}} */
/* must support result==op1 */
-ZEND_API int add_string_to_string(zval *result, const zval *op1, const zval *op2)
+ZEND_API int add_string_to_string(zval *result, const zval *op1, const zval *op2) /* {{{ */
{
int length = Z_STRLEN_P(op1) + Z_STRLEN_P(op2);
Z_STRVAL_P(result) = (char *) erealloc(Z_STRVAL_P(op1), length+1);
- memcpy(Z_STRVAL_P(result)+Z_STRLEN_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op2));
- Z_STRVAL_P(result)[length] = 0;
+ memcpy(Z_STRVAL_P(result)+Z_STRLEN_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op2));
+ Z_STRVAL_P(result)[length] = 0;
Z_STRLEN_P(result) = length;
Z_TYPE_P(result) = IS_STRING;
return SUCCESS;
}
+/* }}} */
-
-ZEND_API int concat_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int concat_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
zval op1_copy, op2_copy;
int use_copy1 = 0, use_copy2 = 0;
@@ -1242,9 +1248,9 @@ ZEND_API int concat_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
}
return SUCCESS;
}
+/* }}} */
-
-ZEND_API int string_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int string_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
zval op1_copy, op2_copy;
int use_copy1 = 0, use_copy2 = 0;
@@ -1273,9 +1279,10 @@ ZEND_API int string_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_D
}
return SUCCESS;
}
+/* }}} */
#if HAVE_STRCOLL
-ZEND_API int string_locale_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int string_locale_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
zval op1_copy, op2_copy;
int use_copy1 = 0, use_copy2 = 0;
@@ -1304,9 +1311,10 @@ ZEND_API int string_locale_compare_function(zval *result, zval *op1, zval *op2 T
}
return SUCCESS;
}
+/* }}} */
#endif
-ZEND_API int numeric_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int numeric_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
zval op1_copy, op2_copy;
@@ -1323,9 +1331,9 @@ ZEND_API int numeric_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_
return SUCCESS;
}
+/* }}} */
-
-static inline void zend_free_obj_get_result(zval *op TSRMLS_DC)
+static inline void zend_free_obj_get_result(zval *op TSRMLS_DC) /* {{{ */
{
if (Z_REFCOUNT_P(op) == 0) {
GC_REMOVE_ZVAL_FROM_BUFFER(op);
@@ -1335,10 +1343,11 @@ static inline void zend_free_obj_get_result(zval *op TSRMLS_DC)
zval_ptr_dtor(&op);
}
}
+/* }}} */
-ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
- int ret;
+ int ret;
int converted = 0;
zval op1_copy, op2_copy;
zval *op_free;
@@ -1424,8 +1433,7 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
ret = compare_function(result, op_free, op2 TSRMLS_CC);
zend_free_obj_get_result(op_free TSRMLS_CC);
return ret;
- } else if (Z_TYPE_P(op2) != IS_OBJECT &&
- Z_OBJ_HT_P(op1)->cast_object) {
+ } else if (Z_TYPE_P(op2) != IS_OBJECT && Z_OBJ_HT_P(op1)->cast_object) {
ALLOC_INIT_ZVAL(op_free);
if (Z_OBJ_HT_P(op1)->cast_object(op1, op_free, Z_TYPE_P(op2) TSRMLS_CC) == FAILURE) {
ZVAL_LONG(result, 1);
@@ -1443,8 +1451,7 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
ret = compare_function(result, op1, op_free TSRMLS_CC);
zend_free_obj_get_result(op_free TSRMLS_CC);
return ret;
- } else if (Z_TYPE_P(op1) != IS_OBJECT &&
- Z_OBJ_HT_P(op2)->cast_object) {
+ } else if (Z_TYPE_P(op1) != IS_OBJECT && Z_OBJ_HT_P(op2)->cast_object) {
ALLOC_INIT_ZVAL(op_free);
if (Z_OBJ_HT_P(op2)->cast_object(op2, op_free, Z_TYPE_P(op1) TSRMLS_CC) == FAILURE) {
ZVAL_LONG(result, -1);
@@ -1497,9 +1504,9 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
}
}
}
+/* }}} */
-
-static int hash_zval_identical_function(const zval **z1, const zval **z2)
+static int hash_zval_identical_function(const zval **z1, const zval **z2) /* {{{ */
{
zval result;
TSRMLS_FETCH();
@@ -1512,11 +1519,11 @@ static int hash_zval_identical_function(const zval **z1, const zval **z2)
if (is_identical_function(&result, (zval *) *z1, (zval *) *z2 TSRMLS_CC)==FAILURE) {
return 1;
}
- return !result.value.lval;
+ return !Z_LVAL(result);
}
+/* }}} */
-
-ZEND_API int is_identical_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int is_identical_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
Z_TYPE_P(result) = IS_BOOL;
if (Z_TYPE_P(op1) != Z_TYPE_P(op2)) {
@@ -1555,19 +1562,19 @@ ZEND_API int is_identical_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
}
return SUCCESS;
}
+/* }}} */
-
-ZEND_API int is_not_identical_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int is_not_identical_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
- if (is_identical_function(result, op1, op2 TSRMLS_CC) == FAILURE) {
- return FAILURE;
- }
- Z_LVAL_P(result) = !Z_LVAL_P(result);
- return SUCCESS;
+ if (is_identical_function(result, op1, op2 TSRMLS_CC) == FAILURE) {
+ return FAILURE;
+ }
+ Z_LVAL_P(result) = !Z_LVAL_P(result);
+ return SUCCESS;
}
+/* }}} */
-
-ZEND_API int is_equal_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int is_equal_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
if (compare_function(result, op1, op2 TSRMLS_CC) == FAILURE) {
return FAILURE;
@@ -1575,9 +1582,9 @@ ZEND_API int is_equal_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
ZVAL_BOOL(result, (Z_LVAL_P(result) == 0));
return SUCCESS;
}
+/* }}} */
-
-ZEND_API int is_not_equal_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int is_not_equal_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
if (compare_function(result, op1, op2 TSRMLS_CC) == FAILURE) {
return FAILURE;
@@ -1585,9 +1592,9 @@ ZEND_API int is_not_equal_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
ZVAL_BOOL(result, (Z_LVAL_P(result) != 0));
return SUCCESS;
}
+/* }}} */
-
-ZEND_API int is_smaller_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int is_smaller_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
if (compare_function(result, op1, op2 TSRMLS_CC) == FAILURE) {
return FAILURE;
@@ -1595,9 +1602,9 @@ ZEND_API int is_smaller_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
ZVAL_BOOL(result, (Z_LVAL_P(result) < 0));
return SUCCESS;
}
+/* }}} */
-
-ZEND_API int is_smaller_or_equal_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int is_smaller_or_equal_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
if (compare_function(result, op1, op2 TSRMLS_CC) == FAILURE) {
return FAILURE;
@@ -1605,9 +1612,9 @@ ZEND_API int is_smaller_or_equal_function(zval *result, zval *op1, zval *op2 TSR
ZVAL_BOOL(result, (Z_LVAL_P(result) <= 0));
return SUCCESS;
}
+/* }}} */
-
-ZEND_API zend_bool instanceof_function_ex(const zend_class_entry *instance_ce, const zend_class_entry *ce, zend_bool interfaces_only TSRMLS_DC)
+ZEND_API zend_bool instanceof_function_ex(const zend_class_entry *instance_ce, const zend_class_entry *ce, zend_bool interfaces_only TSRMLS_DC) /* {{{ */
{
zend_uint i;
@@ -1627,25 +1634,26 @@ ZEND_API zend_bool instanceof_function_ex(const zend_class_entry *instance_ce, c
return 0;
}
+/* }}} */
-ZEND_API zend_bool instanceof_function(const zend_class_entry *instance_ce, const zend_class_entry *ce TSRMLS_DC)
+ZEND_API zend_bool instanceof_function(const zend_class_entry *instance_ce, const zend_class_entry *ce TSRMLS_DC) /* {{{ */
{
return instanceof_function_ex(instance_ce, ce, 0 TSRMLS_CC);
}
+/* }}} */
#define LOWER_CASE 1
#define UPPER_CASE 2
#define NUMERIC 3
-
-static void increment_string(zval *str)
+static void increment_string(zval *str) /* {{{ */
{
- int carry=0;
- int pos=Z_STRLEN_P(str)-1;
- char *s=Z_STRVAL_P(str);
- char *t;
- int last=0; /* Shut up the compiler warning */
- int ch;
+ int carry=0;
+ int pos=Z_STRLEN_P(str)-1;
+ char *s=Z_STRVAL_P(str);
+ char *t;
+ int last=0; /* Shut up the compiler warning */
+ int ch;
if (Z_STRLEN_P(str) == 0) {
STR_FREE(Z_STRVAL_P(str));
@@ -1655,67 +1663,67 @@ static void increment_string(zval *str)
}
while (pos >= 0) {
- ch = s[pos];
- if (ch >= 'a' && ch <= 'z') {
- if (ch == 'z') {
- s[pos] = 'a';
- carry=1;
- } else {
- s[pos]++;
- carry=0;
- }
- last=LOWER_CASE;
- } else if (ch >= 'A' && ch <= 'Z') {
- if (ch == 'Z') {
- s[pos] = 'A';
- carry=1;
- } else {
- s[pos]++;
- carry=0;
- }
- last=UPPER_CASE;
- } else if (ch >= '0' && ch <= '9') {
- if (ch == '9') {
- s[pos] = '0';
- carry=1;
- } else {
- s[pos]++;
- carry=0;
- }
- last = NUMERIC;
- } else {
- carry=0;
- break;
- }
- if (carry == 0) {
- break;
- }
- pos--;
- }
-
- if (carry) {
- t = (char *) emalloc(Z_STRLEN_P(str)+1+1);
- memcpy(t+1, Z_STRVAL_P(str), Z_STRLEN_P(str));
- Z_STRLEN_P(str)++;
- t[Z_STRLEN_P(str)] = '\0';
- switch (last) {
- case NUMERIC:
- t[0] = '1';
- break;
- case UPPER_CASE:
- t[0] = 'A';
- break;
- case LOWER_CASE:
- t[0] = 'a';
- break;
- }
- STR_FREE(Z_STRVAL_P(str));
- Z_STRVAL_P(str) = t;
- }
-}
-
-
-ZEND_API int increment_function(zval *op1)
+ ch = s[pos];
+ if (ch >= 'a' && ch <= 'z') {
+ if (ch == 'z') {
+ s[pos] = 'a';
+ carry=1;
+ } else {
+ s[pos]++;
+ carry=0;
+ }
+ last=LOWER_CASE;
+ } else if (ch >= 'A' && ch <= 'Z') {
+ if (ch == 'Z') {
+ s[pos] = 'A';
+ carry=1;
+ } else {
+ s[pos]++;
+ carry=0;
+ }
+ last=UPPER_CASE;
+ } else if (ch >= '0' && ch <= '9') {
+ if (ch == '9') {
+ s[pos] = '0';
+ carry=1;
+ } else {
+ s[pos]++;
+ carry=0;
+ }
+ last = NUMERIC;
+ } else {
+ carry=0;
+ break;
+ }
+ if (carry == 0) {
+ break;
+ }
+ pos--;
+ }
+
+ if (carry) {
+ t = (char *) emalloc(Z_STRLEN_P(str)+1+1);
+ memcpy(t+1, Z_STRVAL_P(str), Z_STRLEN_P(str));
+ Z_STRLEN_P(str)++;
+ t[Z_STRLEN_P(str)] = '\0';
+ switch (last) {
+ case NUMERIC:
+ t[0] = '1';
+ break;
+ case UPPER_CASE:
+ t[0] = 'A';
+ break;
+ case LOWER_CASE:
+ t[0] = 'a';
+ break;
+ }
+ STR_FREE(Z_STRVAL_P(str));
+ Z_STRVAL_P(str) = t;
+ }
+}
+/* }}} */
+
+ZEND_API int increment_function(zval *op1) /* {{{ */
{
switch (Z_TYPE_P(op1)) {
case IS_LONG:
@@ -1764,9 +1772,9 @@ ZEND_API int increment_function(zval *op1)
}
return SUCCESS;
}
+/* }}} */
-
-ZEND_API int decrement_function(zval *op1)
+ZEND_API int decrement_function(zval *op1) /* {{{ */
{
long lval;
double dval;
@@ -1811,22 +1819,24 @@ ZEND_API int decrement_function(zval *op1)
return SUCCESS;
}
+/* }}} */
-
-ZEND_API int zval_is_true(zval *op)
+ZEND_API int zval_is_true(zval *op) /* {{{ */
{
convert_to_boolean(op);
return (Z_LVAL_P(op) ? 1 : 0);
}
+/* }}} */
#ifdef ZEND_USE_TOLOWER_L
-ZEND_API void zend_update_current_locale(void)
+ZEND_API void zend_update_current_locale(void) /* {{{ */
{
current_locale = _get_current_locale();
}
+/* }}} */
#endif
-ZEND_API char *zend_str_tolower_copy(char *dest, const char *source, unsigned int length)
+ZEND_API char *zend_str_tolower_copy(char *dest, const char *source, unsigned int length) /* {{{ */
{
register unsigned char *str = (unsigned char*)source;
register unsigned char *result = (unsigned char*)dest;
@@ -1839,8 +1849,15 @@ ZEND_API char *zend_str_tolower_copy(char *dest, const char *source, unsigned in
return dest;
}
+/* }}} */
-ZEND_API void zend_str_tolower(char *str, unsigned int length)
+ZEND_API char *zend_str_tolower_dup(const char *source, unsigned int length) /* {{{ */
+{
+ return zend_str_tolower_copy((char *)emalloc(length+1), source, length);
+}
+/* }}} */
+
+ZEND_API void zend_str_tolower(char *str, unsigned int length) /* {{{ */
{
register unsigned char *p = (unsigned char*)str;
register unsigned char *end = p + length;
@@ -1850,8 +1867,9 @@ ZEND_API void zend_str_tolower(char *str, unsigned int length)
p++;
}
}
+/* }}} */
-ZEND_API int zend_binary_strcmp(const char *s1, uint len1, const char *s2, uint len2)
+ZEND_API int zend_binary_strcmp(const char *s1, uint len1, const char *s2, uint len2) /* {{{ */
{
int retval;
@@ -1862,8 +1880,9 @@ ZEND_API int zend_binary_strcmp(const char *s1, uint len1, const char *s2, uint
return retval;
}
}
+/* }}} */
-ZEND_API int zend_binary_strncmp(const char *s1, uint len1, const char *s2, uint len2, uint length)
+ZEND_API int zend_binary_strncmp(const char *s1, uint len1, const char *s2, uint len2, uint length) /* {{{ */
{
int retval;
@@ -1874,9 +1893,9 @@ ZEND_API int zend_binary_strncmp(const char *s1, uint len1, const char *s2, uint
return retval;
}
}
+/* }}} */
-
-ZEND_API int zend_binary_strcasecmp(const char *s1, uint len1, const char *s2, uint len2)
+ZEND_API int zend_binary_strcasecmp(const char *s1, uint len1, const char *s2, uint len2) /* {{{ */
{
int len;
int c1, c2;
@@ -1893,9 +1912,9 @@ ZEND_API int zend_binary_strcasecmp(const char *s1, uint len1, const char *s2, u
return len1 - len2;
}
+/* }}} */
-
-ZEND_API int zend_binary_strncasecmp(const char *s1, uint len1, const char *s2, uint len2, uint length)
+ZEND_API int zend_binary_strncasecmp(const char *s1, uint len1, const char *s2, uint len2, uint length) /* {{{ */
{
int len;
int c1, c2;
@@ -1912,32 +1931,33 @@ ZEND_API int zend_binary_strncasecmp(const char *s1, uint len1, const char *s2,
return MIN(length, len1) - MIN(length, len2);
}
+/* }}} */
-
-ZEND_API int zend_binary_zval_strcmp(zval *s1, zval *s2)
+ZEND_API int zend_binary_zval_strcmp(zval *s1, zval *s2) /* {{{ */
{
return zend_binary_strcmp(Z_STRVAL_P(s1), Z_STRLEN_P(s1), Z_STRVAL_P(s2), Z_STRLEN_P(s2));
}
+/* }}} */
-ZEND_API int zend_binary_zval_strncmp(zval *s1, zval *s2, zval *s3)
+ZEND_API int zend_binary_zval_strncmp(zval *s1, zval *s2, zval *s3) /* {{{ */
{
return zend_binary_strncmp(Z_STRVAL_P(s1), Z_STRLEN_P(s1), Z_STRVAL_P(s2), Z_STRLEN_P(s2), Z_LVAL_P(s3));
}
+/* }}} */
-
-ZEND_API int zend_binary_zval_strcasecmp(zval *s1, zval *s2)
+ZEND_API int zend_binary_zval_strcasecmp(zval *s1, zval *s2) /* {{{ */
{
return zend_binary_strcasecmp(Z_STRVAL_P(s1), Z_STRLEN_P(s1), Z_STRVAL_P(s2), Z_STRLEN_P(s2));
}
+/* }}} */
-
-ZEND_API int zend_binary_zval_strncasecmp(zval *s1, zval *s2, zval *s3)
+ZEND_API int zend_binary_zval_strncasecmp(zval *s1, zval *s2, zval *s3) /* {{{ */
{
return zend_binary_strncasecmp(Z_STRVAL_P(s1), Z_STRLEN_P(s1), Z_STRVAL_P(s2), Z_STRLEN_P(s2), Z_LVAL_P(s3));
}
+/* }}} */
-
-ZEND_API void zendi_smart_strcmp(zval *result, zval *s1, zval *s2)
+ZEND_API void zendi_smart_strcmp(zval *result, zval *s1, zval *s2) /* {{{ */
{
int ret1, ret2;
long lval1, lval2;
@@ -1965,40 +1985,39 @@ string_cmp:
Z_LVAL_P(result) = zend_binary_zval_strcmp(s1, s2);
ZVAL_LONG(result, ZEND_NORMALIZE_BOOL(Z_LVAL_P(result)));
}
- return;
}
+/* }}} */
-
-static int hash_zval_compare_function(const zval **z1, const zval **z2 TSRMLS_DC)
+static int hash_zval_compare_function(const zval **z1, const zval **z2 TSRMLS_DC) /* {{{ */
{
zval result;
if (compare_function(&result, (zval *) *z1, (zval *) *z2 TSRMLS_CC)==FAILURE) {
return 1;
}
- return result.value.lval;
+ return Z_LVAL(result);
}
+/* }}} */
-ZEND_API int zend_compare_symbol_tables_i(HashTable *ht1, HashTable *ht2 TSRMLS_DC)
+ZEND_API int zend_compare_symbol_tables_i(HashTable *ht1, HashTable *ht2 TSRMLS_DC) /* {{{ */
{
return zend_hash_compare(ht1, ht2, (compare_func_t) hash_zval_compare_function, 0 TSRMLS_CC);
}
+/* }}} */
-
-
-ZEND_API void zend_compare_symbol_tables(zval *result, HashTable *ht1, HashTable *ht2 TSRMLS_DC)
+ZEND_API void zend_compare_symbol_tables(zval *result, HashTable *ht1, HashTable *ht2 TSRMLS_DC) /* {{{ */
{
ZVAL_LONG(result, zend_hash_compare(ht1, ht2, (compare_func_t) hash_zval_compare_function, 0 TSRMLS_CC));
}
+/* }}} */
-
-ZEND_API void zend_compare_arrays(zval *result, zval *a1, zval *a2 TSRMLS_DC)
+ZEND_API void zend_compare_arrays(zval *result, zval *a1, zval *a2 TSRMLS_DC) /* {{{ */
{
zend_compare_symbol_tables(result, Z_ARRVAL_P(a1), Z_ARRVAL_P(a2) TSRMLS_CC);
}
+/* }}} */
-
-ZEND_API void zend_compare_objects(zval *result, zval *o1, zval *o2 TSRMLS_DC)
+ZEND_API void zend_compare_objects(zval *result, zval *o1, zval *o2 TSRMLS_DC) /* {{{ */
{
Z_TYPE_P(result) = IS_LONG;
@@ -2013,13 +2032,15 @@ ZEND_API void zend_compare_objects(zval *result, zval *o1, zval *o2 TSRMLS_DC)
Z_LVAL_P(result) = Z_OBJ_HT_P(o1)->compare_objects(o1, o2 TSRMLS_CC);
}
}
+/* }}} */
-ZEND_API void zend_locale_sprintf_double(zval *op ZEND_FILE_LINE_DC)
+ZEND_API void zend_locale_sprintf_double(zval *op ZEND_FILE_LINE_DC) /* {{{ */
{
TSRMLS_FETCH();
Z_STRLEN_P(op) = zend_spprintf(&Z_STRVAL_P(op), 0, "%.*G", (int) EG(precision), (double)Z_DVAL_P(op));
}
+/* }}} */
/*
* Local variables:
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 35ebc86..8896d0f 100644
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -5,7 +5,7 @@
| Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
- | that is bundled with this package in the file LICENSE, and is |
+ | that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.zend.com/license/2_00.txt. |
| If you did not receive a copy of the Zend license and are unable to |
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_operators.h,v 1.94.2.4.2.10.2.14 2009/03/18 01:08:12 mattwil Exp $ */
+/* $Id: zend_operators.h,v 1.94.2.4.2.10.2.16 2009/06/04 18:20:42 mattwil Exp $ */
#ifndef ZEND_OPERATORS_H
#define ZEND_OPERATORS_H
@@ -63,42 +63,29 @@ ZEND_API zend_bool instanceof_function_ex(const zend_class_entry *instance_ce, c
ZEND_API zend_bool instanceof_function(const zend_class_entry *instance_ce, const zend_class_entry *ce TSRMLS_DC);
END_EXTERN_C()
-#define MAX_UNSIGNED_INT ((double) LONG_MAX * 2) + 1
-#ifdef _WIN64
-# define DVAL_TO_LVAL(d, l) \
- if ((d) > LONG_MAX) { \
- (l) = (long)(unsigned long)(__int64) (d); \
- } else { \
- (l) = (long) (d); \
+#if ZEND_DVAL_TO_LVAL_CAST_OK
+# define zend_dval_to_lval(d) ((long) (d))
+#elif SIZEOF_LONG == 4 && defined(HAVE_ZEND_LONG64)
+static zend_always_inline long zend_dval_to_lval(double d)
+{
+ if (d > LONG_MAX || d < LONG_MIN) {
+ return (long)(unsigned long)(zend_long64) d;
}
-#elif !defined(_WIN64) && __WORDSIZE == 64
-# define DVAL_TO_LVAL(d, l) \
- if ((d) >= LONG_MAX) { \
- (l) = LONG_MAX; \
- } else if ((d) <= LONG_MIN) { \
- (l) = LONG_MIN; \
- } else {\
- (l) = (long) (d); \
- }
+ return (long) d;
+}
#else
-# define DVAL_TO_LVAL(d, l) \
- if ((d) > LONG_MAX) { \
- if ((d) > MAX_UNSIGNED_INT) { \
- (l) = LONG_MAX; \
- } else { \
- (l) = (unsigned long) (d); \
- } \
- } else { \
- if((d) < LONG_MIN) { \
- (l) = LONG_MIN; \
- } else { \
- (l) = (long) (d); \
- } \
- }
+static zend_always_inline long zend_dval_to_lval(double d)
+{
+ if (d > LONG_MAX) {
+ return (long)(unsigned long) d;
+ }
+ return (long) d;
+}
#endif
+/* }}} */
#define ZEND_IS_DIGIT(c) ((c) >= '0' && (c) <= '9')
-#define ZEND_IS_XDIGIT(c) (((c) >= 'A' && (c) <= 'F') || ((c) >= 'a' && (c) <= 'f'))
+#define ZEND_IS_XDIGIT(c) (((c) >= 'A' && (c) <= 'F') || ((c) >= 'a' && (c) <= 'f'))
/**
* Checks whether the string "str" with length "length" is numeric. The value
@@ -246,7 +233,7 @@ zend_memnstr(char *haystack, char *needle, int needle_len, char *end)
return (char *)memchr(p, *needle, (end-p));
}
- if(needle_len > end-haystack) {
+ if (needle_len > end-haystack) {
return NULL;
}
@@ -318,15 +305,8 @@ ZEND_API int string_locale_compare_function(zval *result, zval *op1, zval *op2 T
ZEND_API void zend_str_tolower(char *str, unsigned int length);
ZEND_API char *zend_str_tolower_copy(char *dest, const char *source, unsigned int length);
-END_EXTERN_C()
-
-static inline char *
-zend_str_tolower_dup(const char *source, unsigned int length)
-{
- return zend_str_tolower_copy((char *)emalloc(length+1), source, length);
-}
+ZEND_API char *zend_str_tolower_dup(const char *source, unsigned int length);
-BEGIN_EXTERN_C()
ZEND_API int zend_binary_zval_strcmp(zval *s1, zval *s2);
ZEND_API int zend_binary_zval_strncmp(zval *s1, zval *s2, zval *s3);
ZEND_API int zend_binary_zval_strcasecmp(zval *s1, zval *s2);
@@ -346,14 +326,15 @@ ZEND_API long zend_atol(const char *str, int str_len);
ZEND_API void zend_locale_sprintf_double(zval *op ZEND_FILE_LINE_DC);
END_EXTERN_C()
+
#define convert_to_ex_master(ppzv, lower_type, upper_type) \
- if ((*ppzv)->type!=IS_##upper_type) { \
+ if (Z_TYPE_PP(ppzv)!=IS_##upper_type) { \
SEPARATE_ZVAL_IF_NOT_REF(ppzv); \
convert_to_##lower_type(*ppzv); \
}
#define convert_to_explicit_type(pzv, type) \
- do { \
+ do { \
switch (type) { \
case IS_NULL: \
convert_to_null(pzv); \
@@ -361,26 +342,26 @@ END_EXTERN_C()
case IS_LONG: \
convert_to_long(pzv); \
break; \
- case IS_DOUBLE: \
- convert_to_double(pzv); \
- break; \
- case IS_BOOL: \
- convert_to_boolean(pzv); \
- break; \
- case IS_ARRAY: \
- convert_to_array(pzv); \
- break; \
- case IS_OBJECT: \
- convert_to_object(pzv); \
- break; \
- case IS_STRING: \
- convert_to_string(pzv); \
- break; \
- default: \
- assert(0); \
- break; \
+ case IS_DOUBLE: \
+ convert_to_double(pzv); \
+ break; \
+ case IS_BOOL: \
+ convert_to_boolean(pzv); \
+ break; \
+ case IS_ARRAY: \
+ convert_to_array(pzv); \
+ break; \
+ case IS_OBJECT: \
+ convert_to_object(pzv); \
+ break; \
+ case IS_STRING: \
+ convert_to_string(pzv); \
+ break; \
+ default: \
+ assert(0); \
+ break; \
} \
- } while (0); \
+ } while (0);
#define convert_to_explicit_type_ex(ppzv, str_type) \
if (Z_TYPE_PP(ppzv) != str_type) { \
@@ -397,8 +378,8 @@ END_EXTERN_C()
#define convert_to_null_ex(ppzv) convert_to_ex_master(ppzv, null, NULL)
#define convert_scalar_to_number_ex(ppzv) \
- if (Z_TYPE_PP(ppzv)!=IS_LONG && Z_TYPE_PP(ppzv)!=IS_DOUBLE) { \
- if (!Z_ISREF_PP(ppzv)) { \
+ if (Z_TYPE_PP(ppzv)!=IS_LONG && Z_TYPE_PP(ppzv)!=IS_DOUBLE) { \
+ if (!Z_ISREF_PP(ppzv)) { \
SEPARATE_ZVAL(ppzv); \
} \
convert_scalar_to_number(*ppzv TSRMLS_CC); \
@@ -429,11 +410,11 @@ END_EXTERN_C()
#define Z_OBJPROP_P(zval_p) Z_OBJPROP(*zval_p)
#define Z_OBJCE_P(zval_p) Z_OBJCE(*zval_p)
#define Z_RESVAL_P(zval_p) Z_RESVAL(*zval_p)
-#define Z_OBJVAL_P(zval_p) Z_OBJVAL(*zval_p)
-#define Z_OBJ_HANDLE_P(zval_p) Z_OBJ_HANDLE(*zval_p)
-#define Z_OBJ_HT_P(zval_p) Z_OBJ_HT(*zval_p)
-#define Z_OBJ_HANDLER_P(zval_p, h) Z_OBJ_HANDLER(*zval_p, h)
-#define Z_OBJDEBUG_P(zval_p,is_tmp) Z_OBJDEBUG(*zval_p,is_tmp)
+#define Z_OBJVAL_P(zval_p) Z_OBJVAL(*zval_p)
+#define Z_OBJ_HANDLE_P(zval_p) Z_OBJ_HANDLE(*zval_p)
+#define Z_OBJ_HT_P(zval_p) Z_OBJ_HT(*zval_p)
+#define Z_OBJ_HANDLER_P(zval_p, h) Z_OBJ_HANDLER(*zval_p, h)
+#define Z_OBJDEBUG_P(zval_p,is_tmp) Z_OBJDEBUG(*zval_p,is_tmp)
#define Z_LVAL_PP(zval_pp) Z_LVAL(**zval_pp)
#define Z_BVAL_PP(zval_pp) Z_BVAL(**zval_pp)
@@ -444,11 +425,11 @@ END_EXTERN_C()
#define Z_OBJPROP_PP(zval_pp) Z_OBJPROP(**zval_pp)
#define Z_OBJCE_PP(zval_pp) Z_OBJCE(**zval_pp)
#define Z_RESVAL_PP(zval_pp) Z_RESVAL(**zval_pp)
-#define Z_OBJVAL_PP(zval_pp) Z_OBJVAL(**zval_pp)
-#define Z_OBJ_HANDLE_PP(zval_p) Z_OBJ_HANDLE(**zval_p)
-#define Z_OBJ_HT_PP(zval_p) Z_OBJ_HT(**zval_p)
-#define Z_OBJ_HANDLER_PP(zval_p, h) Z_OBJ_HANDLER(**zval_p, h)
-#define Z_OBJDEBUG_PP(zval_pp,is_tmp) Z_OBJDEBUG(**zval_pp,is_tmp)
+#define Z_OBJVAL_PP(zval_pp) Z_OBJVAL(**zval_pp)
+#define Z_OBJ_HANDLE_PP(zval_p) Z_OBJ_HANDLE(**zval_p)
+#define Z_OBJ_HT_PP(zval_p) Z_OBJ_HT(**zval_p)
+#define Z_OBJ_HANDLER_PP(zval_p, h) Z_OBJ_HANDLER(**zval_p, h)
+#define Z_OBJDEBUG_PP(zval_pp,is_tmp) Z_OBJDEBUG(**zval_pp,is_tmp)
#define Z_TYPE(zval) (zval).type
#define Z_TYPE_P(zval_p) Z_TYPE(*zval_p)
@@ -456,7 +437,7 @@ END_EXTERN_C()
#if HAVE_SETLOCALE && defined(ZEND_WIN32) && !defined(ZTS) && defined(_MSC_VER) && (_MSC_VER >= 1400)
/* This is performance improvement of tolower() on Windows and VC2005
- * GIves 10-18% on bench.php
+ * Gives 10-18% on bench.php
*/
#define ZEND_USE_TOLOWER_L 1
#endif
diff --git a/Zend/zend_ptr_stack.h b/Zend/zend_ptr_stack.h
index 9df4490..f4536ce 100644
--- a/Zend/zend_ptr_stack.h
+++ b/Zend/zend_ptr_stack.h
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_ptr_stack.h,v 1.22.2.2.2.1.2.3 2008/12/31 11:15:32 sebastian Exp $ */
+/* $Id: zend_ptr_stack.h,v 1.22.2.2.2.1.2.5 2009/06/05 11:21:31 lbarnaud Exp $ */
#ifndef ZEND_PTR_STACK_H
#define ZEND_PTR_STACK_H
diff --git a/Zend/zend_stream.c b/Zend/zend_stream.c
index ff8a5d2..7befee8 100644
--- a/Zend/zend_stream.c
+++ b/Zend/zend_stream.c
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_stream.c,v 1.13.2.1.2.1.2.10 2009/01/28 23:18:49 nlopess Exp $ */
+/* $Id: zend_stream.c,v 1.13.2.1.2.1.2.11 2009/03/26 17:28:49 dmitry Exp $ */
#include "zend.h"
@@ -29,6 +29,9 @@
#include <sys/stat.h>
#if HAVE_SYS_MMAN_H
# include <sys/mman.h>
+# ifndef PAGE_SIZE
+# define PAGE_SIZE 4096
+# endif
#endif
ZEND_DLIMPORT int isatty(int fd);
@@ -212,7 +215,9 @@ ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t
if (old_type == ZEND_HANDLE_FP && !file_handle->handle.stream.isatty && size) {
#if HAVE_MMAP
- if (file_handle->handle.fp) {
+ if (file_handle->handle.fp &&
+ size != 0 &&
+ ((size - 1) % PAGE_SIZE) <= PAGE_SIZE - ZEND_MMAP_AHEAD) {
/* *buf[size] is zeroed automatically by the kernel */
*buf = mmap(0, size + ZEND_MMAP_AHEAD, PROT_READ, MAP_PRIVATE, fileno(file_handle->handle.fp), 0);
if (*buf != MAP_FAILED) {
diff --git a/Zend/zend_stream.h b/Zend/zend_stream.h
index 9c9bdef..ced3cff 100644
--- a/Zend/zend_stream.h
+++ b/Zend/zend_stream.h
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_stream.h,v 1.8.2.1.2.1.2.5 2009/03/11 22:11:53 shire Exp $ */
+/* $Id: zend_stream.h,v 1.8.2.1.2.1.2.6 2009/06/16 14:33:33 felipe Exp $ */
#ifndef ZEND_STREAM_H
#define ZEND_STREAM_H
@@ -38,7 +38,7 @@ typedef enum {
ZEND_HANDLE_FD,
ZEND_HANDLE_FP,
ZEND_HANDLE_STREAM,
- ZEND_HANDLE_MAPPED,
+ ZEND_HANDLE_MAPPED
} zend_stream_type;
typedef struct _zend_mmap {
diff --git a/Zend/zend_types.h b/Zend/zend_types.h
index e8260aa..cce63c6 100644
--- a/Zend/zend_types.h
+++ b/Zend/zend_types.h
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_types.h,v 1.6.2.2.2.3.2.3 2008/12/31 11:15:32 sebastian Exp $ */
+/* $Id: zend_types.h,v 1.6.2.2.2.3.2.5 2009/06/05 11:21:31 lbarnaud Exp $ */
#ifndef ZEND_TYPES_H
#define ZEND_TYPES_H
diff --git a/Zend/zend_variables.h b/Zend/zend_variables.h
index 43dcc45..32fe34c 100644
--- a/Zend/zend_variables.h
+++ b/Zend/zend_variables.h
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_variables.h,v 1.34.2.1.2.1.2.4 2008/12/31 11:15:32 sebastian Exp $ */
+/* $Id: zend_variables.h,v 1.34.2.1.2.1.2.5 2009/05/01 21:46:53 jani Exp $ */
#ifndef ZEND_VARIABLES_H
#define ZEND_VARIABLES_H
@@ -32,7 +32,7 @@ static inline void _zval_dtor(zval *zvalue ZEND_FILE_LINE_DC)
if (zvalue->type <= IS_BOOL) {
return;
}
- _zval_dtor_func(zvalue ZEND_FILE_LINE_CC);
+ _zval_dtor_func(zvalue ZEND_FILE_LINE_RELAY_CC);
}
ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC);
@@ -42,7 +42,7 @@ static inline void _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC)
if (zvalue->type <= IS_BOOL) {
return;
}
- _zval_copy_ctor_func(zvalue ZEND_FILE_LINE_CC);
+ _zval_copy_ctor_func(zvalue ZEND_FILE_LINE_RELAY_CC);
}
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 3f8adba..7946fea 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_vm_def.h,v 1.59.2.29.2.48.2.88 2009/03/18 18:49:27 dmitry Exp $ */
+/* $Id: zend_vm_def.h,v 1.59.2.29.2.48.2.95 2009/06/07 15:46:51 mattwil Exp $ */
/* If you change this file, please regenerate the zend_vm_execute.h and
* zend_vm_opcodes.h files by running:
@@ -899,7 +899,8 @@ ZEND_VM_HANDLER(40, ZEND_ECHO, CONST|TMP|VAR|CV, ANY)
zval z_copy;
zval *z = GET_OP1_ZVAL_PTR(BP_VAR_R);
- if (Z_TYPE_P(z) == IS_OBJECT && Z_OBJ_HT_P(z)->get_method != NULL &&
+ if (OP1_TYPE != IS_CONST &&
+ Z_TYPE_P(z) == IS_OBJECT && Z_OBJ_HT_P(z)->get_method != NULL &&
zend_std_cast_object_tostring(z, &z_copy, IS_STRING TSRMLS_CC) == SUCCESS) {
zend_print_variable(&z_copy);
zval_dtor(&z_copy);
@@ -1892,31 +1893,26 @@ ZEND_VM_HANDLER(56, ZEND_ADD_VAR, TMP|UNUSED, TMP|VAR|CV)
ZEND_VM_HANDLER(109, ZEND_FETCH_CLASS, ANY, CONST|TMP|VAR|UNUSED|CV)
{
zend_op *opline = EX(opline);
- zval *class_name;
- zend_free_op free_op2;
if (OP2_TYPE == IS_UNUSED) {
EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, 0, opline->extended_value TSRMLS_CC);
ZEND_VM_NEXT_OPCODE();
- }
-
- class_name = GET_OP2_ZVAL_PTR(BP_VAR_R);
+ } else {
+ zend_free_op free_op2;
+ zval *class_name = GET_OP2_ZVAL_PTR(BP_VAR_R);
- switch (Z_TYPE_P(class_name)) {
- case IS_OBJECT:
+ if (OP2_TYPE != IS_CONST && Z_TYPE_P(class_name) == IS_OBJECT) {
EX_T(opline->result.u.var).class_entry = Z_OBJCE_P(class_name);
- break;
- case IS_STRING:
+ } else if (Z_TYPE_P(class_name) == IS_STRING) {
EX_T(opline->result.u.var).class_entry = zend_fetch_class(Z_STRVAL_P(class_name), Z_STRLEN_P(class_name), opline->extended_value TSRMLS_CC);
- break;
- default:
+ } else {
zend_error_noreturn(E_ERROR, "Class name must be a valid object or a string");
- break;
- }
+ }
- FREE_OP2();
- ZEND_VM_NEXT_OPCODE();
+ FREE_OP2();
+ ZEND_VM_NEXT_OPCODE();
+ }
}
ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV)
@@ -2035,7 +2031,7 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, CONST|VAR, CONST|TMP|VAR|UNUS
}
} else {
if(!ce->constructor) {
- zend_error_noreturn(E_ERROR, "Can not call constructor");
+ zend_error_noreturn(E_ERROR, "Cannot call constructor");
}
if (EG(This) && Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
@@ -2090,7 +2086,8 @@ ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST|TMP|VAR|CV)
} else {
function_name = GET_OP2_ZVAL_PTR(BP_VAR_R);
- if (Z_TYPE_P(function_name) == IS_OBJECT &&
+ if (OP2_TYPE != IS_CONST &&
+ Z_TYPE_P(function_name) == IS_OBJECT &&
Z_OBJ_HANDLER_P(function_name, get_closure) &&
Z_OBJ_HANDLER_P(function_name, get_closure)(function_name, &EX(called_scope), &EX(fbc), &EX(object) TSRMLS_CC) == SUCCESS) {
if (EX(object)) {
@@ -2291,7 +2288,7 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
EG(called_scope) = EX(called_scope);
}
- zend_ptr_stack_3_pop(&EG(arg_types_stack), (void*)&EX(called_scope), (void**)&EX(current_object), (void**)&EX(fbc));
+ zend_arg_types_stack_3_pop(&EG(arg_types_stack), &EX(called_scope), &EX(current_object), &EX(fbc));
EX(function_state).arguments = zend_vm_stack_push_args(opline->extended_value TSRMLS_CC);
if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {
@@ -2524,7 +2521,7 @@ ZEND_VM_HANDLER(108, ZEND_THROW, CONST|TMP|VAR|CV, ANY)
value = GET_OP1_ZVAL_PTR(BP_VAR_R);
- if (Z_TYPE_P(value) != IS_OBJECT) {
+ if (OP1_TYPE == IS_CONST || Z_TYPE_P(value) != IS_OBJECT) {
zend_error_noreturn(E_ERROR, "Can only throw objects");
}
zend_exception_save(TSRMLS_C);
@@ -2936,7 +2933,9 @@ ZEND_VM_HANDLER(110, ZEND_CLONE, CONST|TMP|VAR|UNUSED|CV, ANY)
zend_function *clone;
zend_object_clone_obj_t clone_call;
- if (!obj || Z_TYPE_P(obj) != IS_OBJECT) {
+ if (OP1_TYPE == IS_CONST ||
+ (OP1_TYPE == IS_VAR && !obj) ||
+ Z_TYPE_P(obj) != IS_OBJECT) {
zend_error_noreturn(E_ERROR, "__clone method called on non-object");
}
@@ -3086,11 +3085,9 @@ ZEND_VM_HANDLER(72, ZEND_ADD_ARRAY_ELEMENT, CONST|TMP|VAR|CV, CONST|TMP|VAR|UNUS
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -3409,7 +3406,6 @@ ZEND_VM_HANDLER(75, ZEND_UNSET_DIM, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
zend_free_op free_op1, free_op2;
zval **container = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_UNSET);
zval *offset = GET_OP2_ZVAL_PTR(BP_VAR_R);
- long index;
if (OP1_TYPE != IS_VAR || container) {
if (OP1_TYPE == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -3421,14 +3417,12 @@ ZEND_VM_HANDLER(75, ZEND_UNSET_DIM, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, zend_dval_to_lval(Z_DVAL_P(offset)));
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, Z_LVAL_P(offset));
break;
case IS_STRING:
if (OP2_TYPE == IS_CV || OP2_TYPE == IS_VAR) {
@@ -3549,7 +3543,7 @@ ZEND_VM_HANDLER(77, ZEND_FE_RESET, CONST|TMP|VAR|CV, ANY)
ALLOC_INIT_ZVAL(array_ptr);
} else if (Z_TYPE_PP(array_ptr_ptr) == IS_OBJECT) {
if(Z_OBJ_HT_PP(array_ptr_ptr)->get_class_entry == NULL) {
- zend_error(E_WARNING, "foreach() can not iterate over objects without PHP class");
+ zend_error(E_WARNING, "foreach() cannot iterate over objects without PHP class");
ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.u.opline_num);
}
@@ -3908,7 +3902,6 @@ ZEND_VM_HELPER_EX(zend_isset_isempty_dim_prop_obj_handler, VAR|UNUSED|CV, CONST|
zval **container = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_IS);
zval **value = NULL;
int result = 0;
- long index;
if (OP1_TYPE != IS_VAR || container) {
zend_free_op free_op2;
@@ -3922,16 +3915,14 @@ ZEND_VM_HELPER_EX(zend_isset_isempty_dim_prop_obj_handler, VAR|UNUSED|CV, CONST|
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, zend_dval_to_lval(Z_DVAL_P(offset)), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, Z_LVAL_P(offset), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
@@ -4286,13 +4277,18 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)
while (EX(fbc)) {
EX(called_scope) = (zend_class_entry*)zend_ptr_stack_pop(&EG(arg_types_stack));
if (EX(object)) {
- if (IS_CTOR_USED(EX(called_scope))) {
- Z_DELREF_P(EX(object));
+ if (IS_CTOR_CALL(EX(called_scope))) {
+ if (IS_CTOR_USED(EX(called_scope))) {
+ Z_DELREF_P(EX(object));
+ }
+ if (Z_REFCOUNT_P(EX(object)) == 1) {
+ zend_object_store_ctor_failed(EX(object) TSRMLS_CC);
+ }
}
zval_ptr_dtor(&EX(object));
}
EX(called_scope) = DECODE_CTOR(EX(called_scope));
- zend_ptr_stack_2_pop(&EG(arg_types_stack), (void**)&EX(object), (void**)&EX(fbc));
+ zend_arg_types_stack_2_pop(&EG(arg_types_stack), &EX(object), &EX(fbc));
}
for (i=0; i<EX(op_array)->last_brk_cont; i++) {
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 11bd18b..2c3e787 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -290,7 +290,7 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR
EG(called_scope) = EX(called_scope);
}
- zend_ptr_stack_3_pop(&EG(arg_types_stack), (void*)&EX(called_scope), (void**)&EX(current_object), (void**)&EX(fbc));
+ zend_arg_types_stack_3_pop(&EG(arg_types_stack), &EX(called_scope), &EX(current_object), &EX(fbc));
EX(function_state).arguments = zend_vm_stack_push_args(opline->extended_value TSRMLS_CC);
if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {
@@ -625,13 +625,18 @@ static int ZEND_FASTCALL ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(ZEND_OPCODE_HANDLER
while (EX(fbc)) {
EX(called_scope) = (zend_class_entry*)zend_ptr_stack_pop(&EG(arg_types_stack));
if (EX(object)) {
- if (IS_CTOR_USED(EX(called_scope))) {
- Z_DELREF_P(EX(object));
+ if (IS_CTOR_CALL(EX(called_scope))) {
+ if (IS_CTOR_USED(EX(called_scope))) {
+ Z_DELREF_P(EX(object));
+ }
+ if (Z_REFCOUNT_P(EX(object)) == 1) {
+ zend_object_store_ctor_failed(EX(object) TSRMLS_CC);
+ }
}
zval_ptr_dtor(&EX(object));
}
EX(called_scope) = DECODE_CTOR(EX(called_scope));
- zend_ptr_stack_2_pop(&EG(arg_types_stack), (void**)&EX(object), (void**)&EX(fbc));
+ zend_arg_types_stack_2_pop(&EG(arg_types_stack), &EX(object), &EX(fbc));
}
for (i=0; i<EX(op_array)->last_brk_cont; i++) {
@@ -704,30 +709,25 @@ static int ZEND_FASTCALL ZEND_USER_OPCODE_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS
static int ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
zend_op *opline = EX(opline);
- zval *class_name;
-
if (IS_CONST == IS_UNUSED) {
EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, 0, opline->extended_value TSRMLS_CC);
ZEND_VM_NEXT_OPCODE();
- }
+ } else {
- class_name = &opline->op2.u.constant;
+ zval *class_name = &opline->op2.u.constant;
- switch (Z_TYPE_P(class_name)) {
- case IS_OBJECT:
+ if (IS_CONST != IS_CONST && Z_TYPE_P(class_name) == IS_OBJECT) {
EX_T(opline->result.u.var).class_entry = Z_OBJCE_P(class_name);
- break;
- case IS_STRING:
+ } else if (Z_TYPE_P(class_name) == IS_STRING) {
EX_T(opline->result.u.var).class_entry = zend_fetch_class(Z_STRVAL_P(class_name), Z_STRLEN_P(class_name), opline->extended_value TSRMLS_CC);
- break;
- default:
+ } else {
zend_error_noreturn(E_ERROR, "Class name must be a valid object or a string");
- break;
- }
+ }
- ZEND_VM_NEXT_OPCODE();
+ ZEND_VM_NEXT_OPCODE();
+ }
}
static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -747,7 +747,8 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE
} else {
function_name = &opline->op2.u.constant;
- if (Z_TYPE_P(function_name) == IS_OBJECT &&
+ if (IS_CONST != IS_CONST &&
+ Z_TYPE_P(function_name) == IS_OBJECT &&
Z_OBJ_HANDLER_P(function_name, get_closure) &&
Z_OBJ_HANDLER_P(function_name, get_closure)(function_name, &EX(called_scope), &EX(fbc), &EX(object) TSRMLS_CC) == SUCCESS) {
if (EX(object)) {
@@ -900,31 +901,26 @@ static int ZEND_FASTCALL ZEND_ADD_INTERFACE_SPEC_CONST_HANDLER(ZEND_OPCODE_HAND
static int ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
zend_op *opline = EX(opline);
- zval *class_name;
- zend_free_op free_op2;
if (IS_TMP_VAR == IS_UNUSED) {
EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, 0, opline->extended_value TSRMLS_CC);
ZEND_VM_NEXT_OPCODE();
- }
-
- class_name = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
+ } else {
+ zend_free_op free_op2;
+ zval *class_name = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
- switch (Z_TYPE_P(class_name)) {
- case IS_OBJECT:
+ if (IS_TMP_VAR != IS_CONST && Z_TYPE_P(class_name) == IS_OBJECT) {
EX_T(opline->result.u.var).class_entry = Z_OBJCE_P(class_name);
- break;
- case IS_STRING:
+ } else if (Z_TYPE_P(class_name) == IS_STRING) {
EX_T(opline->result.u.var).class_entry = zend_fetch_class(Z_STRVAL_P(class_name), Z_STRLEN_P(class_name), opline->extended_value TSRMLS_CC);
- break;
- default:
+ } else {
zend_error_noreturn(E_ERROR, "Class name must be a valid object or a string");
- break;
- }
+ }
- zval_dtor(free_op2.var);
- ZEND_VM_NEXT_OPCODE();
+ zval_dtor(free_op2.var);
+ ZEND_VM_NEXT_OPCODE();
+ }
}
static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -944,7 +940,8 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_TMP_HANDLER(ZEND_OPCODE_H
} else {
function_name = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
- if (Z_TYPE_P(function_name) == IS_OBJECT &&
+ if (IS_TMP_VAR != IS_CONST &&
+ Z_TYPE_P(function_name) == IS_OBJECT &&
Z_OBJ_HANDLER_P(function_name, get_closure) &&
Z_OBJ_HANDLER_P(function_name, get_closure)(function_name, &EX(called_scope), &EX(fbc), &EX(object) TSRMLS_CC) == SUCCESS) {
if (EX(object)) {
@@ -1005,31 +1002,26 @@ static int ZEND_FASTCALL ZEND_CONT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
static int ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
zend_op *opline = EX(opline);
- zval *class_name;
- zend_free_op free_op2;
if (IS_VAR == IS_UNUSED) {
EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, 0, opline->extended_value TSRMLS_CC);
ZEND_VM_NEXT_OPCODE();
- }
-
- class_name = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
+ } else {
+ zend_free_op free_op2;
+ zval *class_name = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
- switch (Z_TYPE_P(class_name)) {
- case IS_OBJECT:
+ if (IS_VAR != IS_CONST && Z_TYPE_P(class_name) == IS_OBJECT) {
EX_T(opline->result.u.var).class_entry = Z_OBJCE_P(class_name);
- break;
- case IS_STRING:
+ } else if (Z_TYPE_P(class_name) == IS_STRING) {
EX_T(opline->result.u.var).class_entry = zend_fetch_class(Z_STRVAL_P(class_name), Z_STRLEN_P(class_name), opline->extended_value TSRMLS_CC);
- break;
- default:
+ } else {
zend_error_noreturn(E_ERROR, "Class name must be a valid object or a string");
- break;
- }
+ }
- if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
- ZEND_VM_NEXT_OPCODE();
+ if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
+ ZEND_VM_NEXT_OPCODE();
+ }
}
static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -1049,7 +1041,8 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_VAR_HANDLER(ZEND_OPCODE_H
} else {
function_name = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
- if (Z_TYPE_P(function_name) == IS_OBJECT &&
+ if (IS_VAR != IS_CONST &&
+ Z_TYPE_P(function_name) == IS_OBJECT &&
Z_OBJ_HANDLER_P(function_name, get_closure) &&
Z_OBJ_HANDLER_P(function_name, get_closure)(function_name, &EX(called_scope), &EX(fbc), &EX(object) TSRMLS_CC) == SUCCESS) {
if (EX(object)) {
@@ -1110,59 +1103,49 @@ static int ZEND_FASTCALL ZEND_CONT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
static int ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
zend_op *opline = EX(opline);
- zval *class_name;
-
if (IS_UNUSED == IS_UNUSED) {
EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, 0, opline->extended_value TSRMLS_CC);
ZEND_VM_NEXT_OPCODE();
- }
+ } else {
- class_name = NULL;
+ zval *class_name = NULL;
- switch (Z_TYPE_P(class_name)) {
- case IS_OBJECT:
+ if (IS_UNUSED != IS_CONST && Z_TYPE_P(class_name) == IS_OBJECT) {
EX_T(opline->result.u.var).class_entry = Z_OBJCE_P(class_name);
- break;
- case IS_STRING:
+ } else if (Z_TYPE_P(class_name) == IS_STRING) {
EX_T(opline->result.u.var).class_entry = zend_fetch_class(Z_STRVAL_P(class_name), Z_STRLEN_P(class_name), opline->extended_value TSRMLS_CC);
- break;
- default:
+ } else {
zend_error_noreturn(E_ERROR, "Class name must be a valid object or a string");
- break;
- }
+ }
- ZEND_VM_NEXT_OPCODE();
+ ZEND_VM_NEXT_OPCODE();
+ }
}
static int ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
zend_op *opline = EX(opline);
- zval *class_name;
-
if (IS_CV == IS_UNUSED) {
EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, 0, opline->extended_value TSRMLS_CC);
ZEND_VM_NEXT_OPCODE();
- }
+ } else {
- class_name = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
+ zval *class_name = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
- switch (Z_TYPE_P(class_name)) {
- case IS_OBJECT:
+ if (IS_CV != IS_CONST && Z_TYPE_P(class_name) == IS_OBJECT) {
EX_T(opline->result.u.var).class_entry = Z_OBJCE_P(class_name);
- break;
- case IS_STRING:
+ } else if (Z_TYPE_P(class_name) == IS_STRING) {
EX_T(opline->result.u.var).class_entry = zend_fetch_class(Z_STRVAL_P(class_name), Z_STRLEN_P(class_name), opline->extended_value TSRMLS_CC);
- break;
- default:
+ } else {
zend_error_noreturn(E_ERROR, "Class name must be a valid object or a string");
- break;
- }
+ }
- ZEND_VM_NEXT_OPCODE();
+ ZEND_VM_NEXT_OPCODE();
+ }
}
static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -1182,7 +1165,8 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HA
} else {
function_name = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
- if (Z_TYPE_P(function_name) == IS_OBJECT &&
+ if (IS_CV != IS_CONST &&
+ Z_TYPE_P(function_name) == IS_OBJECT &&
Z_OBJ_HANDLER_P(function_name, get_closure) &&
Z_OBJ_HANDLER_P(function_name, get_closure)(function_name, &EX(called_scope), &EX(fbc), &EX(object) TSRMLS_CC) == SUCCESS) {
if (EX(object)) {
@@ -1307,7 +1291,8 @@ static int ZEND_FASTCALL ZEND_ECHO_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
zval z_copy;
zval *z = &opline->op1.u.constant;
- if (Z_TYPE_P(z) == IS_OBJECT && Z_OBJ_HT_P(z)->get_method != NULL &&
+ if (IS_CONST != IS_CONST &&
+ Z_TYPE_P(z) == IS_OBJECT && Z_OBJ_HT_P(z)->get_method != NULL &&
zend_std_cast_object_tostring(z, &z_copy, IS_STRING TSRMLS_CC) == SUCCESS) {
zend_print_variable(&z_copy);
zval_dtor(&z_copy);
@@ -1699,7 +1684,7 @@ static int ZEND_FASTCALL ZEND_THROW_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
value = &opline->op1.u.constant;
- if (Z_TYPE_P(value) != IS_OBJECT) {
+ if (IS_CONST == IS_CONST || Z_TYPE_P(value) != IS_OBJECT) {
zend_error_noreturn(E_ERROR, "Can only throw objects");
}
zend_exception_save(TSRMLS_C);
@@ -1762,7 +1747,9 @@ static int ZEND_FASTCALL ZEND_CLONE_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
zend_function *clone;
zend_object_clone_obj_t clone_call;
- if (!obj || Z_TYPE_P(obj) != IS_OBJECT) {
+ if (IS_CONST == IS_CONST ||
+ (IS_CONST == IS_VAR && !obj) ||
+ Z_TYPE_P(obj) != IS_OBJECT) {
zend_error_noreturn(E_ERROR, "__clone method called on non-object");
}
@@ -2093,7 +2080,7 @@ static int ZEND_FASTCALL ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
ALLOC_INIT_ZVAL(array_ptr);
} else if (Z_TYPE_PP(array_ptr_ptr) == IS_OBJECT) {
if(Z_OBJ_HT_PP(array_ptr_ptr)->get_class_entry == NULL) {
- zend_error(E_WARNING, "foreach() can not iterate over objects without PHP class");
+ zend_error(E_WARNING, "foreach() cannot iterate over objects without PHP class");
ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.u.opline_num);
}
@@ -2690,7 +2677,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CONST_HANDLER(
}
} else {
if(!ce->constructor) {
- zend_error_noreturn(E_ERROR, "Can not call constructor");
+ zend_error_noreturn(E_ERROR, "Cannot call constructor");
}
if (EG(This) && Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
@@ -2863,11 +2850,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_CONST_HANDLER(ZEND_O
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -3263,7 +3248,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_TMP_HANDLER(ZE
}
} else {
if(!ce->constructor) {
- zend_error_noreturn(E_ERROR, "Can not call constructor");
+ zend_error_noreturn(E_ERROR, "Cannot call constructor");
}
if (EG(This) && Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
@@ -3380,11 +3365,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_TMP_HANDLER(ZEND_OPC
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -3731,7 +3714,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_VAR_HANDLER(ZE
}
} else {
if(!ce->constructor) {
- zend_error_noreturn(E_ERROR, "Can not call constructor");
+ zend_error_noreturn(E_ERROR, "Cannot call constructor");
}
if (EG(This) && Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
@@ -3848,11 +3831,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_VAR_HANDLER(ZEND_OPC
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -3955,7 +3936,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_UNUSED_HANDLER
}
} else {
if(!ce->constructor) {
- zend_error_noreturn(E_ERROR, "Can not call constructor");
+ zend_error_noreturn(E_ERROR, "Cannot call constructor");
}
if (EG(This) && Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
@@ -4040,11 +4021,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_UNUSED_HANDLER(ZEND_
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -4391,7 +4370,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CV_HANDLER(ZEN
}
} else {
if(!ce->constructor) {
- zend_error_noreturn(E_ERROR, "Can not call constructor");
+ zend_error_noreturn(E_ERROR, "Cannot call constructor");
}
if (EG(This) && Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
@@ -4507,11 +4486,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_CV_HANDLER(ZEND_OPCO
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -4584,7 +4561,8 @@ static int ZEND_FASTCALL ZEND_ECHO_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
zval z_copy;
zval *z = _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
- if (Z_TYPE_P(z) == IS_OBJECT && Z_OBJ_HT_P(z)->get_method != NULL &&
+ if (IS_TMP_VAR != IS_CONST &&
+ Z_TYPE_P(z) == IS_OBJECT && Z_OBJ_HT_P(z)->get_method != NULL &&
zend_std_cast_object_tostring(z, &z_copy, IS_STRING TSRMLS_CC) == SUCCESS) {
zend_print_variable(&z_copy);
zval_dtor(&z_copy);
@@ -4967,7 +4945,7 @@ static int ZEND_FASTCALL ZEND_THROW_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
value = _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
- if (Z_TYPE_P(value) != IS_OBJECT) {
+ if (IS_TMP_VAR == IS_CONST || Z_TYPE_P(value) != IS_OBJECT) {
zend_error_noreturn(E_ERROR, "Can only throw objects");
}
zend_exception_save(TSRMLS_C);
@@ -5031,7 +5009,9 @@ static int ZEND_FASTCALL ZEND_CLONE_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
zend_function *clone;
zend_object_clone_obj_t clone_call;
- if (!obj || Z_TYPE_P(obj) != IS_OBJECT) {
+ if (IS_TMP_VAR == IS_CONST ||
+ (IS_TMP_VAR == IS_VAR && !obj) ||
+ Z_TYPE_P(obj) != IS_OBJECT) {
zend_error_noreturn(E_ERROR, "__clone method called on non-object");
}
@@ -5362,7 +5342,7 @@ static int ZEND_FASTCALL ZEND_FE_RESET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
ALLOC_INIT_ZVAL(array_ptr);
} else if (Z_TYPE_PP(array_ptr_ptr) == IS_OBJECT) {
if(Z_OBJ_HT_PP(array_ptr_ptr)->get_class_entry == NULL) {
- zend_error(E_WARNING, "foreach() can not iterate over objects without PHP class");
+ zend_error(E_WARNING, "foreach() cannot iterate over objects without PHP class");
ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.u.opline_num);
}
@@ -6096,11 +6076,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_CONST_HANDLER(ZEND_OPC
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -6564,11 +6542,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_TMP_HANDLER(ZEND_OPCOD
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -7032,11 +7008,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_VAR_HANDLER(ZEND_OPCOD
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -7127,11 +7101,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_UNUSED_HANDLER(ZEND_OP
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -7592,11 +7564,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_CV_HANDLER(ZEND_OPCODE
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -7827,7 +7797,8 @@ static int ZEND_FASTCALL ZEND_ECHO_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
zval z_copy;
zval *z = _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
- if (Z_TYPE_P(z) == IS_OBJECT && Z_OBJ_HT_P(z)->get_method != NULL &&
+ if (IS_VAR != IS_CONST &&
+ Z_TYPE_P(z) == IS_OBJECT && Z_OBJ_HT_P(z)->get_method != NULL &&
zend_std_cast_object_tostring(z, &z_copy, IS_STRING TSRMLS_CC) == SUCCESS) {
zend_print_variable(&z_copy);
zval_dtor(&z_copy);
@@ -8204,7 +8175,7 @@ static int ZEND_FASTCALL ZEND_THROW_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
value = _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
- if (Z_TYPE_P(value) != IS_OBJECT) {
+ if (IS_VAR == IS_CONST || Z_TYPE_P(value) != IS_OBJECT) {
zend_error_noreturn(E_ERROR, "Can only throw objects");
}
zend_exception_save(TSRMLS_C);
@@ -8383,7 +8354,9 @@ static int ZEND_FASTCALL ZEND_CLONE_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
zend_function *clone;
zend_object_clone_obj_t clone_call;
- if (!obj || Z_TYPE_P(obj) != IS_OBJECT) {
+ if (IS_VAR == IS_CONST ||
+ (IS_VAR == IS_VAR && !obj) ||
+ Z_TYPE_P(obj) != IS_OBJECT) {
zend_error_noreturn(E_ERROR, "__clone method called on non-object");
}
@@ -8714,7 +8687,7 @@ static int ZEND_FASTCALL ZEND_FE_RESET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
ALLOC_INIT_ZVAL(array_ptr);
} else if (Z_TYPE_PP(array_ptr_ptr) == IS_OBJECT) {
if(Z_OBJ_HT_PP(array_ptr_ptr)->get_class_entry == NULL) {
- zend_error(E_WARNING, "foreach() can not iterate over objects without PHP class");
+ zend_error(E_WARNING, "foreach() cannot iterate over objects without PHP class");
ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.u.opline_num);
}
@@ -10450,7 +10423,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZE
}
} else {
if(!ce->constructor) {
- zend_error_noreturn(E_ERROR, "Can not call constructor");
+ zend_error_noreturn(E_ERROR, "Cannot call constructor");
}
if (EG(This) && Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
@@ -10623,11 +10596,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_CONST_HANDLER(ZEND_OPC
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -10677,7 +10648,6 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HAND
zend_free_op free_op1;
zval **container = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
zval *offset = &opline->op2.u.constant;
- long index;
if (IS_VAR != IS_VAR || container) {
if (IS_VAR == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -10689,14 +10659,12 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HAND
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, zend_dval_to_lval(Z_DVAL_P(offset)));
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, Z_LVAL_P(offset));
break;
case IS_STRING:
if (IS_CONST == IS_CV || IS_CONST == IS_VAR) {
@@ -10808,7 +10776,6 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CONST(
zval **container = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
zval **value = NULL;
int result = 0;
- long index;
if (IS_VAR != IS_VAR || container) {
@@ -10822,16 +10789,14 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CONST(
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, zend_dval_to_lval(Z_DVAL_P(offset)), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, Z_LVAL_P(offset), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
@@ -12263,7 +12228,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND
}
} else {
if(!ce->constructor) {
- zend_error_noreturn(E_ERROR, "Can not call constructor");
+ zend_error_noreturn(E_ERROR, "Cannot call constructor");
}
if (EG(This) && Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
@@ -12380,11 +12345,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_TMP_HANDLER(ZEND_OPCOD
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -12434,7 +12397,6 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLE
zend_free_op free_op1, free_op2;
zval **container = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
zval *offset = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
- long index;
if (IS_VAR != IS_VAR || container) {
if (IS_VAR == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -12446,14 +12408,12 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLE
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, zend_dval_to_lval(Z_DVAL_P(offset)));
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, Z_LVAL_P(offset));
break;
case IS_STRING:
if (IS_TMP_VAR == IS_CV || IS_TMP_VAR == IS_VAR) {
@@ -12565,7 +12525,6 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_TMP(in
zval **container = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
zval **value = NULL;
int result = 0;
- long index;
if (IS_VAR != IS_VAR || container) {
zend_free_op free_op2;
@@ -12579,16 +12538,14 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_TMP(in
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, zend_dval_to_lval(Z_DVAL_P(offset)), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, Z_LVAL_P(offset), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
@@ -14071,7 +14028,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND
}
} else {
if(!ce->constructor) {
- zend_error_noreturn(E_ERROR, "Can not call constructor");
+ zend_error_noreturn(E_ERROR, "Cannot call constructor");
}
if (EG(This) && Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
@@ -14188,11 +14145,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_VAR_HANDLER(ZEND_OPCOD
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -14242,7 +14197,6 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLE
zend_free_op free_op1, free_op2;
zval **container = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
zval *offset = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
- long index;
if (IS_VAR != IS_VAR || container) {
if (IS_VAR == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -14254,14 +14208,12 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLE
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, zend_dval_to_lval(Z_DVAL_P(offset)));
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, Z_LVAL_P(offset));
break;
case IS_STRING:
if (IS_VAR == IS_CV || IS_VAR == IS_VAR) {
@@ -14373,7 +14325,6 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_VAR(in
zval **container = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
zval **value = NULL;
int result = 0;
- long index;
if (IS_VAR != IS_VAR || container) {
zend_free_op free_op2;
@@ -14387,16 +14338,14 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_VAR(in
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, zend_dval_to_lval(Z_DVAL_P(offset)), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, Z_LVAL_P(offset), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
@@ -14973,7 +14922,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_UNUSED_HANDLER(Z
}
} else {
if(!ce->constructor) {
- zend_error_noreturn(E_ERROR, "Can not call constructor");
+ zend_error_noreturn(E_ERROR, "Cannot call constructor");
}
if (EG(This) && Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
@@ -15058,11 +15007,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_UNUSED_HANDLER(ZEND_OP
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -16468,7 +16415,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_
}
} else {
if(!ce->constructor) {
- zend_error_noreturn(E_ERROR, "Can not call constructor");
+ zend_error_noreturn(E_ERROR, "Cannot call constructor");
}
if (EG(This) && Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
@@ -16584,11 +16531,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_CV_HANDLER(ZEND_OPCODE
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -16638,7 +16583,6 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER
zend_free_op free_op1;
zval **container = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
zval *offset = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
- long index;
if (IS_VAR != IS_VAR || container) {
if (IS_VAR == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -16650,14 +16594,12 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, zend_dval_to_lval(Z_DVAL_P(offset)));
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, Z_LVAL_P(offset));
break;
case IS_STRING:
if (IS_CV == IS_CV || IS_CV == IS_VAR) {
@@ -16769,7 +16711,6 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CV(int
zval **container = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
zval **value = NULL;
int result = 0;
- long index;
if (IS_VAR != IS_VAR || container) {
@@ -16783,16 +16724,14 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CV(int
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, zend_dval_to_lval(Z_DVAL_P(offset)), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, Z_LVAL_P(offset), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
@@ -16917,7 +16856,9 @@ static int ZEND_FASTCALL ZEND_CLONE_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARG
zend_function *clone;
zend_object_clone_obj_t clone_call;
- if (!obj || Z_TYPE_P(obj) != IS_OBJECT) {
+ if (IS_UNUSED == IS_CONST ||
+ (IS_UNUSED == IS_VAR && !obj) ||
+ Z_TYPE_P(obj) != IS_OBJECT) {
zend_error_noreturn(E_ERROR, "__clone method called on non-object");
}
@@ -17834,7 +17775,6 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_H
zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
zval *offset = &opline->op2.u.constant;
- long index;
if (IS_UNUSED != IS_VAR || container) {
if (IS_UNUSED == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -17846,14 +17786,12 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_H
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, zend_dval_to_lval(Z_DVAL_P(offset)));
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, Z_LVAL_P(offset));
break;
case IS_STRING:
if (IS_CONST == IS_CV || IS_CONST == IS_VAR) {
@@ -17963,7 +17901,6 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CON
zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
zval **value = NULL;
int result = 0;
- long index;
if (IS_UNUSED != IS_VAR || container) {
@@ -17977,16 +17914,14 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CON
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, zend_dval_to_lval(Z_DVAL_P(offset)), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, Z_LVAL_P(offset), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
@@ -18897,7 +18832,6 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HAN
zend_free_op free_op2;
zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
zval *offset = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
- long index;
if (IS_UNUSED != IS_VAR || container) {
if (IS_UNUSED == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -18909,14 +18843,12 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HAN
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, zend_dval_to_lval(Z_DVAL_P(offset)));
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, Z_LVAL_P(offset));
break;
case IS_STRING:
if (IS_TMP_VAR == IS_CV || IS_TMP_VAR == IS_VAR) {
@@ -19026,7 +18958,6 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_TMP
zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
zval **value = NULL;
int result = 0;
- long index;
if (IS_UNUSED != IS_VAR || container) {
zend_free_op free_op2;
@@ -19040,16 +18971,14 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_TMP
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, zend_dval_to_lval(Z_DVAL_P(offset)), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, Z_LVAL_P(offset), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
@@ -19960,7 +19889,6 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HAN
zend_free_op free_op2;
zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
zval *offset = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
- long index;
if (IS_UNUSED != IS_VAR || container) {
if (IS_UNUSED == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -19972,14 +19900,12 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HAN
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, zend_dval_to_lval(Z_DVAL_P(offset)));
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, Z_LVAL_P(offset));
break;
case IS_STRING:
if (IS_VAR == IS_CV || IS_VAR == IS_VAR) {
@@ -20089,7 +20015,6 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_VAR
zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
zval **value = NULL;
int result = 0;
- long index;
if (IS_UNUSED != IS_VAR || container) {
zend_free_op free_op2;
@@ -20103,16 +20028,14 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_VAR
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, zend_dval_to_lval(Z_DVAL_P(offset)), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, Z_LVAL_P(offset), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
@@ -21282,7 +21205,6 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HAND
zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
zval *offset = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
- long index;
if (IS_UNUSED != IS_VAR || container) {
if (IS_UNUSED == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -21294,14 +21216,12 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HAND
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, zend_dval_to_lval(Z_DVAL_P(offset)));
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, Z_LVAL_P(offset));
break;
case IS_STRING:
if (IS_CV == IS_CV || IS_CV == IS_VAR) {
@@ -21411,7 +21331,6 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CV(
zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
zval **value = NULL;
int result = 0;
- long index;
if (IS_UNUSED != IS_VAR || container) {
@@ -21425,16 +21344,14 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CV(
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, zend_dval_to_lval(Z_DVAL_P(offset)), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, Z_LVAL_P(offset), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
@@ -21731,7 +21648,8 @@ static int ZEND_FASTCALL ZEND_ECHO_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
zval z_copy;
zval *z = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);
- if (Z_TYPE_P(z) == IS_OBJECT && Z_OBJ_HT_P(z)->get_method != NULL &&
+ if (IS_CV != IS_CONST &&
+ Z_TYPE_P(z) == IS_OBJECT && Z_OBJ_HT_P(z)->get_method != NULL &&
zend_std_cast_object_tostring(z, &z_copy, IS_STRING TSRMLS_CC) == SUCCESS) {
zend_print_variable(&z_copy);
zval_dtor(&z_copy);
@@ -22107,7 +22025,7 @@ static int ZEND_FASTCALL ZEND_THROW_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
value = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);
- if (Z_TYPE_P(value) != IS_OBJECT) {
+ if (IS_CV == IS_CONST || Z_TYPE_P(value) != IS_OBJECT) {
zend_error_noreturn(E_ERROR, "Can only throw objects");
}
zend_exception_save(TSRMLS_C);
@@ -22276,7 +22194,9 @@ static int ZEND_FASTCALL ZEND_CLONE_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
zend_function *clone;
zend_object_clone_obj_t clone_call;
- if (!obj || Z_TYPE_P(obj) != IS_OBJECT) {
+ if (IS_CV == IS_CONST ||
+ (IS_CV == IS_VAR && !obj) ||
+ Z_TYPE_P(obj) != IS_OBJECT) {
zend_error_noreturn(E_ERROR, "__clone method called on non-object");
}
@@ -22607,7 +22527,7 @@ static int ZEND_FASTCALL ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
ALLOC_INIT_ZVAL(array_ptr);
} else if (Z_TYPE_PP(array_ptr_ptr) == IS_OBJECT) {
if(Z_OBJ_HT_PP(array_ptr_ptr)->get_class_entry == NULL) {
- zend_error(E_WARNING, "foreach() can not iterate over objects without PHP class");
+ zend_error(E_WARNING, "foreach() cannot iterate over objects without PHP class");
ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.u.opline_num);
}
@@ -24207,11 +24127,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_CONST_HANDLER(ZEND_OPCO
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -24261,7 +24179,6 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDL
zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_UNSET TSRMLS_CC);
zval *offset = &opline->op2.u.constant;
- long index;
if (IS_CV != IS_VAR || container) {
if (IS_CV == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -24273,14 +24190,12 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDL
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, zend_dval_to_lval(Z_DVAL_P(offset)));
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, Z_LVAL_P(offset));
break;
case IS_STRING:
if (IS_CONST == IS_CV || IS_CONST == IS_VAR) {
@@ -24390,7 +24305,6 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CONST(i
zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_IS TSRMLS_CC);
zval **value = NULL;
int result = 0;
- long index;
if (IS_CV != IS_VAR || container) {
@@ -24404,16 +24318,14 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CONST(i
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, zend_dval_to_lval(Z_DVAL_P(offset)), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, Z_LVAL_P(offset), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
@@ -25855,11 +25767,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_TMP_HANDLER(ZEND_OPCODE
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -25909,7 +25819,6 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER
zend_free_op free_op2;
zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_UNSET TSRMLS_CC);
zval *offset = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
- long index;
if (IS_CV != IS_VAR || container) {
if (IS_CV == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -25921,14 +25830,12 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, zend_dval_to_lval(Z_DVAL_P(offset)));
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, Z_LVAL_P(offset));
break;
case IS_STRING:
if (IS_TMP_VAR == IS_CV || IS_TMP_VAR == IS_VAR) {
@@ -26038,7 +25945,6 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_TMP(int
zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_IS TSRMLS_CC);
zval **value = NULL;
int result = 0;
- long index;
if (IS_CV != IS_VAR || container) {
zend_free_op free_op2;
@@ -26052,16 +25958,14 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_TMP(int
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, zend_dval_to_lval(Z_DVAL_P(offset)), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, Z_LVAL_P(offset), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
@@ -27553,11 +27457,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_VAR_HANDLER(ZEND_OPCODE
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -27607,7 +27509,6 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER
zend_free_op free_op2;
zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_UNSET TSRMLS_CC);
zval *offset = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
- long index;
if (IS_CV != IS_VAR || container) {
if (IS_CV == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -27619,14 +27520,12 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, zend_dval_to_lval(Z_DVAL_P(offset)));
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, Z_LVAL_P(offset));
break;
case IS_STRING:
if (IS_VAR == IS_CV || IS_VAR == IS_VAR) {
@@ -27736,7 +27635,6 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_VAR(int
zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_IS TSRMLS_CC);
zval **value = NULL;
int result = 0;
- long index;
if (IS_CV != IS_VAR || container) {
zend_free_op free_op2;
@@ -27750,16 +27648,14 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_VAR(int
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, zend_dval_to_lval(Z_DVAL_P(offset)), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, Z_LVAL_P(offset), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
@@ -28320,11 +28216,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_UNUSED_HANDLER(ZEND_OPC
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -29740,11 +29634,9 @@ static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_CV_HANDLER(ZEND_OPCODE_
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), zend_dval_to_lval(Z_DVAL_P(offset)), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -29794,7 +29686,6 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_
zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_UNSET TSRMLS_CC);
zval *offset = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
- long index;
if (IS_CV != IS_VAR || container) {
if (IS_CV == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -29806,14 +29697,12 @@ static int ZEND_FASTCALL ZEND_UNSET_DIM_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, zend_dval_to_lval(Z_DVAL_P(offset)));
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- zend_hash_index_del(ht, index);
+ zend_hash_index_del(ht, Z_LVAL_P(offset));
break;
case IS_STRING:
if (IS_CV == IS_CV || IS_CV == IS_VAR) {
@@ -29923,7 +29812,6 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CV(int
zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_IS TSRMLS_CC);
zval **value = NULL;
int result = 0;
- long index;
if (IS_CV != IS_VAR || container) {
@@ -29937,16 +29825,14 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CV(int
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- index = (long) Z_DVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, zend_dval_to_lval(Z_DVAL_P(offset)), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
- index = Z_LVAL_P(offset);
- if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
+ if (zend_hash_index_find(ht, Z_LVAL_P(offset), (void **) &value) == SUCCESS) {
isset = 1;
}
break;
diff --git a/acinclude.m4 b/acinclude.m4
index 34b69c5..82c1f8e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.332.2.14.2.26.2.12 2008/12/03 19:53:45 dsp Exp $
+dnl $Id: acinclude.m4,v 1.332.2.14.2.26.2.13 2009/05/09 20:26:51 jani Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -920,7 +920,7 @@ AC_DEFUN([PHP_GEN_BUILD_DIRS],[
])
dnl
-dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[, cxx[, zend_ext]]]]])
+dnl PHP_NEW_EXTENSION(extname, sources [, shared [, sapi_class [, extra-cflags [, cxx [, zend_ext]]]]])
dnl
dnl Includes an extension in the build.
dnl
@@ -968,12 +968,15 @@ dnl ---------------------------------------------- Shared module
if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
dnl ---------------------------------------------- CLI static module
[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
- if test "$PHP_SAPI" = "cgi"; then
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
- EXT_STATIC="$EXT_STATIC $1"
- else
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
- fi
+ case "$PHP_SAPI" in
+ cgi|embed[)]
+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
+ EXT_STATIC="$EXT_STATIC $1"
+ ;;
+ *[)]
+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
fi
PHP_ADD_BUILD_DIR($ext_builddir)
diff --git a/aclocal.m4 b/aclocal.m4
index 32dcf86..67570c5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.332.2.14.2.26.2.12 2008/12/03 19:53:45 dsp Exp $
+dnl $Id: acinclude.m4,v 1.332.2.14.2.26.2.13 2009/05/09 20:26:51 jani Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -920,7 +920,7 @@ AC_DEFUN([PHP_GEN_BUILD_DIRS],[
])
dnl
-dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[, cxx[, zend_ext]]]]])
+dnl PHP_NEW_EXTENSION(extname, sources [, shared [, sapi_class [, extra-cflags [, cxx [, zend_ext]]]]])
dnl
dnl Includes an extension in the build.
dnl
@@ -968,12 +968,15 @@ dnl ---------------------------------------------- Shared module
if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
dnl ---------------------------------------------- CLI static module
[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
- if test "$PHP_SAPI" = "cgi"; then
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
- EXT_STATIC="$EXT_STATIC $1"
- else
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
- fi
+ case "$PHP_SAPI" in
+ cgi|embed[)]
+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
+ EXT_STATIC="$EXT_STATIC $1"
+ ;;
+ *[)]
+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
fi
PHP_ADD_BUILD_DIR($ext_builddir)
diff --git a/build/order_by_dep.awk b/build/order_by_dep.awk
index 38128b2..0fdd960 100644
--- a/build/order_by_dep.awk
+++ b/build/order_by_dep.awk
@@ -51,8 +51,6 @@ function do_deps(mod_idx, module_name, mod_name_len, dep, ext, val, depid
do_deps(depidx);
}
}
-
- #printf(" phpext_%s_ptr,\n", module_name);
printf(" phpext_%s_ptr, at NEWLINE@", module_name);
delete mods[mod_idx];
}
@@ -79,8 +77,7 @@ END {
out_count = 0;
while (count(mods)) {
- # count down, since we need to assemble it in reverse order
- for (i = mod_count-1; i >= 0; --i) {
+ for (i = 0; i <= mod_count - 1; i++) {
if (i in mods) {
do_deps(i);
}
diff --git a/configure b/configure
index 44dd555..1aa00d4 100755
--- a/configure
+++ b/configure
@@ -2427,7 +2427,7 @@ echo "$ac_t""$target" 1>&6
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=3
PHP_RELEASE_VERSION=0
-PHP_EXTRA_VERSION="RC1"
+PHP_EXTRA_VERSION="RC4"
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
PHP_VERSION_ID=`expr $PHP_MAJOR_VERSION \* 10000 + $PHP_MINOR_VERSION \* 100 + $PHP_RELEASE_VERSION`
@@ -18206,7 +18206,7 @@ if test "$PHP_GCOV" = "yes"; then
{ echo "configure: error: ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." 1>&2; exit 1; }
fi
- ltp_version_list="1.5 1.6"
+ ltp_version_list="1.5 1.6 1.7"
# Extract the first word of "lcov", so it can be a program name with args.
set dummy lcov; ac_word=$2
@@ -18947,6 +18947,684 @@ fi
# reading config stubs
+
+
+echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:18954: checking size of long" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$cross_compiling" = yes; then
+ ac_cv_sizeof_long=8
+else
+ cat > conftest.$ac_ext <<EOF
+#line 18962 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int main()
+{
+ FILE *f=fopen("conftestval", "w");
+ if (!f) return(1);
+ fprintf(f, "%d\n", sizeof(long));
+ return(0);
+}
+EOF
+if { (eval echo configure:18973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+ ac_cv_sizeof_long=`cat conftestval`
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ ac_cv_sizeof_long=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+EOF
+
+
+echo $ac_n "checking size of int""... $ac_c" 1>&6
+echo "configure:18993: checking size of int" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$cross_compiling" = yes; then
+ ac_cv_sizeof_int=4
+else
+ cat > conftest.$ac_ext <<EOF
+#line 19001 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int main()
+{
+ FILE *f=fopen("conftestval", "w");
+ if (!f) return(1);
+ fprintf(f, "%d\n", sizeof(int));
+ return(0);
+}
+EOF
+if { (eval echo configure:19012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+ ac_cv_sizeof_int=`cat conftestval`
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ ac_cv_sizeof_int=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+EOF
+
+
+
+echo $ac_n "checking for int32_t""... $ac_c" 1>&6
+echo "configure:19033: checking for int32_t" >&5
+if eval "test \"`echo '$''{'ac_cv_int_type_int32_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+cat > conftest.$ac_ext <<EOF
+#line 19039 "configure"
+#include "confdefs.h"
+
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#elif HAVE_STDINT_H
+# include <stdint.h>
+#endif
+int main() {
+if ((int32_t *) 0)
+ return 0;
+if (sizeof (int32_t))
+ return 0;
+
+; return 0; }
+EOF
+if { (eval echo configure:19058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_int_type_int32_t=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_int_type_int32_t=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_int_type_int32_t" 1>&6
+if test "$ac_cv_int_type_int32_t" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_INT32_T 1
+EOF
+
+fi
+
+
+echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
+echo "configure:19081: checking for uint32_t" >&5
+if eval "test \"`echo '$''{'ac_cv_int_type_uint32_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+cat > conftest.$ac_ext <<EOF
+#line 19087 "configure"
+#include "confdefs.h"
+
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#elif HAVE_STDINT_H
+# include <stdint.h>
+#endif
+int main() {
+if ((uint32_t *) 0)
+ return 0;
+if (sizeof (uint32_t))
+ return 0;
+
+; return 0; }
+EOF
+if { (eval echo configure:19106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_int_type_uint32_t=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_int_type_uint32_t=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_int_type_uint32_t" 1>&6
+if test "$ac_cv_int_type_uint32_t" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_UINT32_T 1
+EOF
+
+fi
+
+
+for ac_hdr in \
+sys/types.h \
+inttypes.h \
+stdint.h \
+string.h \
+stdlib.h
+
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:19138: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 19143 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:19148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+
+for ac_func in strtoll atoll strftime
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:19178: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 19183 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:19206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+
+
+
+PHP_DATE_CFLAGS="-I at ext_builddir@/lib"
+timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
+ lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
+
+
+ ext_builddir=ext/date
+ ext_srcdir=$abs_srcdir/ext/date
+
+ ac_extra=`echo "$PHP_DATE_CFLAGS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
+
+ if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then
+ PHP_DATE_SHARED=no
+
+
+ case ext/date in
+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+ /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+ *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; 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 php_date.c $timelib_sources; 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_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
+ esac
+
+ cat >>Makefile.objects<<EOF
+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
+ $ac_comp
+EOF
+ done
+
+
+ EXT_STATIC="$EXT_STATIC date"
+ if test "no" != "nocli"; then
+ EXT_CLI_STATIC="$EXT_CLI_STATIC date"
+ fi
+ else
+ if test "no" = "shared" || test "no" = "yes"; then
+ PHP_DATE_SHARED=yes
+
+ case ext/date in
+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+ /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+ *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+ esac
+
+
+
+ b_c_pre=$shared_c_pre
+ b_cxx_pre=$shared_cxx_pre
+ b_c_meta=$shared_c_meta
+ b_cxx_meta=$shared_cxx_meta
+ b_c_post=$shared_c_post
+ b_cxx_post=$shared_cxx_post
+ b_lo=$shared_lo
+
+
+ old_IFS=$IFS
+ for ac_src in php_date.c $timelib_sources; do
+
+ IFS=.
+ set $ac_src
+ ac_obj=$1
+ IFS=$old_IFS
+
+ shared_objects_date="$shared_objects_date $ac_bdir$ac_obj.lo"
+
+ case $ac_src in
+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
+ esac
+
+ cat >>Makefile.objects<<EOF
+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
+ $ac_comp
+EOF
+ done
+
+ case $host_alias in
+ *netware*)
+
+ install_modules="install-modules"
+
+ case $host_alias in
+ *aix*)
+ suffix=so
+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpdate.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_date) $(PHPDATE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpdate.so '$ext_builddir'/phpdate.so'
+ ;;
+ *netware*)
+ suffix=nlm
+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_date) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPDATE, 3)_SHARED_LIBADD)'
+ ;;
+ *)
+ suffix=la
+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_date) $(PHPDATE_SHARED_LIBADD)'
+ ;;
+ esac
+
+ if test "x" = "xyes"; then
+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpdate.$suffix"
+ else
+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpdate.$suffix"
+ fi
+
+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_date"
+
+ cat >>Makefile.objects<<EOF
+\$(phplibdir)/phpdate.$suffix: $ext_builddir/phpdate.$suffix
+ \$(LIBTOOL) --mode=install cp $ext_builddir/phpdate.$suffix \$(phplibdir)
+
+$ext_builddir/phpdate.$suffix: \$(shared_objects_date) \$(PHPDATE_SHARED_DEPENDENCIES)
+ $link_cmd
+
+EOF
+
+ ;;
+ *)
+
+ install_modules="install-modules"
+
+ case $host_alias in
+ *aix*)
+ suffix=so
+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/date.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_date) $(DATE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/date.so '$ext_builddir'/date.so'
+ ;;
+ *netware*)
+ suffix=nlm
+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_date) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(DATE, 3)_SHARED_LIBADD)'
+ ;;
+ *)
+ suffix=la
+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_date) $(DATE_SHARED_LIBADD)'
+ ;;
+ esac
+
+ if test "x" = "xyes"; then
+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/date.$suffix"
+ else
+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/date.$suffix"
+ fi
+
+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_date"
+
+ cat >>Makefile.objects<<EOF
+\$(phplibdir)/date.$suffix: $ext_builddir/date.$suffix
+ \$(LIBTOOL) --mode=install cp $ext_builddir/date.$suffix \$(phplibdir)
+
+$ext_builddir/date.$suffix: \$(shared_objects_date) \$(DATE_SHARED_DEPENDENCIES)
+ $link_cmd
+
+EOF
+
+ ;;
+ esac
+ cat >> confdefs.h <<EOF
+#define COMPILE_DL_DATE 1
+EOF
+
+ fi
+ fi
+
+ if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then
+ PHP_DATE_SHARED=no
+ case "$PHP_SAPI" in
+ cgi|embed)
+
+
+ case ext/date in
+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+ /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+ *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; 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 php_date.c $timelib_sources; 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_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
+ esac
+
+ cat >>Makefile.objects<<EOF
+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
+ $ac_comp
+EOF
+ done
+
+
+ EXT_STATIC="$EXT_STATIC date"
+ ;;
+ *)
+
+
+ case ext/date in
+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+ /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+ *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; 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 php_date.c $timelib_sources; do
+
+ IFS=.
+ set $ac_src
+ ac_obj=$1
+ IFS=$old_IFS
+
+ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+
+ case $ac_src in
+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
+ esac
+
+ cat >>Makefile.objects<<EOF
+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
+ $ac_comp
+EOF
+ done
+
+
+ ;;
+ esac
+ EXT_CLI_STATIC="$EXT_CLI_STATIC date"
+ fi
+
+
+ BUILD_DIR="$BUILD_DIR $ext_builddir"
+
+
+
+ if test "$ext_builddir" = "."; then
+ PHP_PECL_EXTENSION=date
+
+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
+
+ fi
+
+
+
+
+ $php_shtool mkdir -p $ext_builddir/lib
+
+
+
+ if test "$ext_builddir/lib" != "/usr/include"; then
+
+ if test -z "$ext_builddir/lib" || echo "$ext_builddir/lib" | grep '^/' >/dev/null ; then
+ ai_p=$ext_builddir/lib
+ else
+
+ ep_dir="`echo $ext_builddir/lib|$SED 's%/*[^/][^/]*/*$%%'`"
+
+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
+ ai_p="$ep_realdir/`basename \"$ext_builddir/lib\"`"
+ fi
+
+
+
+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
+
+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
+ eval "INCLUDEPATH$unique=set"
+
+ if test ""; then
+ INCLUDES="-I$ai_p $INCLUDES"
+ else
+ INCLUDES="$INCLUDES -I$ai_p"
+ fi
+
+ fi
+
+ fi
+
+
+ if test "$ext_srcdir/lib" != "/usr/include"; then
+
+ if test -z "$ext_srcdir/lib" || echo "$ext_srcdir/lib" | grep '^/' >/dev/null ; then
+ ai_p=$ext_srcdir/lib
+ else
+
+ ep_dir="`echo $ext_srcdir/lib|$SED 's%/*[^/][^/]*/*$%%'`"
+
+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
+ ai_p="$ep_realdir/`basename \"$ext_srcdir/lib\"`"
+ fi
+
+
+
+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
+
+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
+ eval "INCLUDEPATH$unique=set"
+
+ if test ""; then
+ INCLUDES="-I$ai_p $INCLUDES"
+ else
+ INCLUDES="$INCLUDES -I$ai_p"
+ fi
+
+ fi
+
+ fi
+
+
+
+
+ header_path=ext/date
+ for header_file in php_date.h lib/timelib.h lib/timelib_structs.h lib/timelib_config.h; do
+ hp_hf="$header_path/$header_file"
+
+
+ unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
+
+ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
+ eval "INSTALLHEADERS$unique=set"
+
+ INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
+
+ fi
+
+ done
+
+
+
+cat > $ext_builddir/lib/timelib_config.h <<EOF
+#ifdef PHP_WIN32
+# include "config.w32.h"
+#else
+# include <php_config.h>
+#endif
+EOF
+
+
+
php_with_regex=php
@@ -18989,7 +19667,7 @@ case $PHP_REGEX in
esac
echo $ac_n "checking which regex library to use""... $ac_c" 1>&6
-echo "configure:18993: checking which regex library to use" >&5
+echo "configure:19671: checking which regex library to use" >&5
echo "$ac_t""$REGEX_TYPE" 1>&6
if test "$REGEX_TYPE" = "php"; then
@@ -19182,8 +19860,9 @@ EOF
if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then
PHP_EREG_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/ereg in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -19226,9 +19905,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC ereg"
- else
-
+ EXT_STATIC="$EXT_STATIC ereg"
+ ;;
+ *)
+
case ext/ereg in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -19271,7 +19951,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC ereg"
fi
@@ -19363,13 +20044,13 @@ elif test "$REGEX_TYPE" = "system"; then
EOF
echo $ac_n "checking whether field re_magic exists in struct regex_t""... $ac_c" 1>&6
-echo "configure:19367: checking whether field re_magic exists in struct regex_t" >&5
+echo "configure:20048: checking whether field re_magic exists in struct regex_t" >&5
if eval "test \"`echo '$''{'ac_cv_regex_t_re_magic'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 19373 "configure"
+#line 20054 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <regex.h>
@@ -19377,7 +20058,7 @@ int main() {
regex_t rt; rt.re_magic;
; return 0; }
EOF
-if { (eval echo configure:19381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_regex_t_re_magic=yes
else
@@ -19403,7 +20084,7 @@ fi
php_enable_libxml=yes
echo $ac_n "checking whether to enable LIBXML support""... $ac_c" 1>&6
-echo "configure:19407: checking whether to enable LIBXML support" >&5
+echo "configure:20088: checking whether to enable LIBXML support" >&5
# Check whether --enable-libxml or --disable-libxml was given.
if test "${enable_libxml+set}" = set; then
enableval="$enable_libxml"
@@ -19451,7 +20132,7 @@ if test -z "$PHP_LIBXML_DIR"; then
php_with_libxml_dir=no
echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
-echo "configure:19455: checking libxml2 install dir" >&5
+echo "configure:20136: checking libxml2 install dir" >&5
# Check whether --with-libxml-dir or --without-libxml-dir was given.
if test "${with_libxml_dir+set}" = set; then
withval="$with_libxml_dir"
@@ -19480,7 +20161,7 @@ if test "$PHP_LIBXML" != "no"; then
echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
-echo "configure:19484: checking for xml2-config path" >&5
+echo "configure:20165: checking for xml2-config path" >&5
if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -19638,7 +20319,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
-echo "configure:19642: checking whether libxml build works" >&5
+echo "configure:20323: checking whether libxml build works" >&5
if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -19654,7 +20335,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 19658 "configure"
+#line 20339 "configure"
#include "confdefs.h"
@@ -19665,7 +20346,7 @@ else
}
EOF
-if { (eval echo configure:19669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:20350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -19888,8 +20569,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_LIBXML_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/libxml in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -19932,9 +20614,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC libxml"
- else
-
+ EXT_STATIC="$EXT_STATIC libxml"
+ ;;
+ *)
+
case ext/libxml in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -19977,7 +20660,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC libxml"
fi
@@ -20027,7 +20711,7 @@ fi
php_with_openssl=no
echo $ac_n "checking for OpenSSL support""... $ac_c" 1>&6
-echo "configure:20031: checking for OpenSSL support" >&5
+echo "configure:20715: checking for OpenSSL support" >&5
# Check whether --with-openssl or --without-openssl was given.
if test "${with_openssl+set}" = set; then
withval="$with_openssl"
@@ -20074,7 +20758,7 @@ echo "$ac_t""$ext_output" 1>&6
php_with_kerberos=no
echo $ac_n "checking for Kerberos support""... $ac_c" 1>&6
-echo "configure:20078: checking for Kerberos support" >&5
+echo "configure:20762: checking for Kerberos support" >&5
# Check whether --with-kerberos or --without-kerberos was given.
if test "${with_kerberos+set}" = set; then
withval="$with_kerberos"
@@ -20281,8 +20965,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_OPENSSL_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/openssl in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -20325,9 +21010,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC openssl"
- else
-
+ EXT_STATIC="$EXT_STATIC openssl"
+ ;;
+ *)
+
case ext/openssl in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -20370,7 +21056,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC openssl"
fi
@@ -20400,7 +21087,7 @@ EOF
# Extract the first word of "krb5-config", so it can be a program name with args.
set dummy krb5-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:20404: checking for $ac_word" >&5
+echo "configure:21091: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -20760,7 +21447,7 @@ fi
fi
echo $ac_n "checking for DSA_get_default_method in -lssl""... $ac_c" 1>&6
-echo "configure:20764: checking for DSA_get_default_method in -lssl" >&5
+echo "configure:21451: checking for DSA_get_default_method in -lssl" >&5
ac_lib_var=`echo ssl'_'DSA_get_default_method | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -20768,7 +21455,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 20772 "configure"
+#line 21459 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -20779,7 +21466,7 @@ int main() {
DSA_get_default_method()
; return 0; }
EOF
-if { (eval echo configure:20783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:21470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -20821,7 +21508,7 @@ fi
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:20825: checking for $ac_word" >&5
+echo "configure:21512: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -21026,9 +21713,9 @@ fi
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$OPENSSL_INCDIR
echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
-echo "configure:21030: checking for OpenSSL version" >&5
+echo "configure:21717: checking for OpenSSL version" >&5
cat > conftest.$ac_ext <<EOF
-#line 21032 "configure"
+#line 21719 "configure"
#include "confdefs.h"
#include <openssl/opensslv.h>
@@ -21183,7 +21870,7 @@ rm -f conftest*
done
echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
-echo "configure:21187: checking for CRYPTO_free in -lcrypto" >&5
+echo "configure:21874: checking for CRYPTO_free in -lcrypto" >&5
ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -21191,7 +21878,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 21195 "configure"
+#line 21882 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -21202,7 +21889,7 @@ int main() {
CRYPTO_free()
; return 0; }
EOF
-if { (eval echo configure:21206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:21893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -21359,7 +22046,7 @@ fi
done
echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
-echo "configure:21363: checking for SSL_CTX_set_ssl_version in -lssl" >&5
+echo "configure:22050: checking for SSL_CTX_set_ssl_version in -lssl" >&5
ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -21367,7 +22054,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 21371 "configure"
+#line 22058 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -21378,7 +22065,7 @@ int main() {
SSL_CTX_set_ssl_version()
; return 0; }
EOF
-if { (eval echo configure:21382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:22069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -21523,7 +22210,7 @@ ext_output=$PHP_PCRE_REGEX
if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then
echo $ac_n "checking for PCRE headers location""... $ac_c" 1>&6
-echo "configure:21527: checking for PCRE headers location" >&5
+echo "configure:22214: checking for PCRE headers location" >&5
for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre; do
test -f $i/pcre.h && PCRE_INCDIR=$i
done
@@ -21534,7 +22221,7 @@ echo "configure:21527: checking for PCRE headers location" >&5
echo "$ac_t""$PCRE_INCDIR" 1>&6
echo $ac_n "checking for PCRE library location""... $ac_c" 1>&6
-echo "configure:21538: checking for PCRE library location" >&5
+echo "configure:22225: checking for PCRE library location" >&5
for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do
test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
done
@@ -21826,8 +22513,9 @@ EOF
if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then
PHP_PCRE_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/pcre in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -21870,9 +22558,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC pcre"
- else
-
+ EXT_STATIC="$EXT_STATIC pcre"
+ ;;
+ *)
+
case ext/pcre in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -21915,7 +22604,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC pcre"
fi
@@ -21953,7 +22643,7 @@ EOF
else
echo $ac_n "checking for PCRE library to use""... $ac_c" 1>&6
-echo "configure:21957: checking for PCRE library to use" >&5
+echo "configure:22647: checking for PCRE library to use" >&5
echo "$ac_t""bundled" 1>&6
pcrelib_sources="pcrelib/pcre_chartables.c pcrelib/pcre_ucd.c \
pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c \
@@ -22146,8 +22836,9 @@ EOF
if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then
PHP_PCRE_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/pcre in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -22190,9 +22881,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC pcre"
- else
-
+ EXT_STATIC="$EXT_STATIC pcre"
+ ;;
+ *)
+
case ext/pcre in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -22235,7 +22927,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC pcre"
fi
@@ -22287,7 +22980,7 @@ EOF
php_with_sqlite3=yes
echo $ac_n "checking whether to enable the SQLite3 extension""... $ac_c" 1>&6
-echo "configure:22291: checking whether to enable the SQLite3 extension" >&5
+echo "configure:22984: checking whether to enable the SQLite3 extension" >&5
# Check whether --with-sqlite3 or --without-sqlite3 was given.
if test "${with_sqlite3+set}" = set; then
withval="$with_sqlite3"
@@ -22345,7 +23038,7 @@ if test $PHP_SQLITE3 != "no"; then
if test $PHP_SQLITE3 != "yes"; then
echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6
-echo "configure:22349: checking for sqlite3 files in default path" >&5
+echo "configure:23042: checking for sqlite3 files in default path" >&5
for i in $PHP_SQLITE3 /usr/local /usr; do
if test -r $i/include/sqlite3.h; then
SQLITE3_DIR=$i
@@ -22360,7 +23053,7 @@ echo "configure:22349: checking for sqlite3 files in default path" >&5
fi
echo $ac_n "checking for SQLite 3.3.9+""... $ac_c" 1>&6
-echo "configure:22364: checking for SQLite 3.3.9+" >&5
+echo "configure:23057: checking for SQLite 3.3.9+" >&5
save_old_LDFLAGS=$LDFLAGS
ac_stuff="
@@ -22459,7 +23152,7 @@ echo "configure:22364: checking for SQLite 3.3.9+" >&5
done
echo $ac_n "checking for sqlite3_prepare_v2 in -lsqlite3""... $ac_c" 1>&6
-echo "configure:22463: checking for sqlite3_prepare_v2 in -lsqlite3" >&5
+echo "configure:23156: checking for sqlite3_prepare_v2 in -lsqlite3" >&5
ac_lib_var=`echo sqlite3'_'sqlite3_prepare_v2 | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -22467,7 +23160,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsqlite3 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 22471 "configure"
+#line 23164 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -22478,7 +23171,7 @@ int main() {
sqlite3_prepare_v2()
; return 0; }
EOF
-if { (eval echo configure:22482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:23175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -22738,7 +23431,7 @@ fi
done
echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6
-echo "configure:22742: checking for sqlite3_key in -lsqlite3" >&5
+echo "configure:23435: checking for sqlite3_key in -lsqlite3" >&5
ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -22746,7 +23439,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsqlite3 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 22750 "configure"
+#line 23443 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -22757,7 +23450,7 @@ int main() {
sqlite3_key()
; return 0; }
EOF
-if { (eval echo configure:22761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:23454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -22889,7 +23582,7 @@ fi
done
echo $ac_n "checking for sqlite3_load_extension in -lsqlite3""... $ac_c" 1>&6
-echo "configure:22893: checking for sqlite3_load_extension in -lsqlite3" >&5
+echo "configure:23586: checking for sqlite3_load_extension in -lsqlite3" >&5
ac_lib_var=`echo sqlite3'_'sqlite3_load_extension | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -22897,7 +23590,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsqlite3 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 22901 "configure"
+#line 23594 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -22908,7 +23601,7 @@ int main() {
sqlite3_load_extension()
; return 0; }
EOF
-if { (eval echo configure:22912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:23605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -22927,11 +23620,6 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
LDFLAGS=$save_old_LDFLAGS
ext_shared=$save_ext_shared
- cat >> confdefs.h <<\EOF
-#define SQLITE_OMIT_LOAD_EXTENSION 1
-EOF
-
-
else
echo "$ac_t""no" 1>&6
@@ -22939,6 +23627,10 @@ else
LDFLAGS=$save_old_LDFLAGS
ext_shared=$save_ext_shared
unset ac_cv_lib_sqlite3_sqlite3_load_extension
+ cat >> confdefs.h <<\EOF
+#define SQLITE_OMIT_LOAD_EXTENSION 1
+EOF
+
fi
@@ -22946,7 +23638,7 @@ fi
else
echo $ac_n "checking bundled sqlite3 library""... $ac_c" 1>&6
-echo "configure:22950: checking bundled sqlite3 library" >&5
+echo "configure:23642: checking bundled sqlite3 library" >&5
echo "$ac_t""yes" 1>&6
sqlite3_extra_sources="libsqlite/sqlite3.c"
@@ -23161,8 +23853,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_SQLITE3_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/sqlite3 in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -23205,9 +23898,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC sqlite3"
- else
-
+ EXT_STATIC="$EXT_STATIC sqlite3"
+ ;;
+ *)
+
case ext/sqlite3 in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -23250,7 +23944,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite3"
fi
@@ -23281,7 +23976,7 @@ fi
php_with_zlib=no
echo $ac_n "checking for ZLIB support""... $ac_c" 1>&6
-echo "configure:23285: checking for ZLIB support" >&5
+echo "configure:23980: checking for ZLIB support" >&5
# Check whether --with-zlib or --without-zlib was given.
if test "${with_zlib+set}" = set; then
withval="$with_zlib"
@@ -23328,7 +24023,7 @@ echo "$ac_t""$ext_output" 1>&6
php_with_zlib_dir=no
echo $ac_n "checking if the location of ZLIB install directory is defined""... $ac_c" 1>&6
-echo "configure:23332: checking if the location of ZLIB install directory is defined" >&5
+echo "configure:24027: checking if the location of ZLIB install directory is defined" >&5
# Check whether --with-zlib-dir or --without-zlib-dir was given.
if test "${with_zlib_dir+set}" = set; then
withval="$with_zlib_dir"
@@ -23535,8 +24230,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_ZLIB_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/zlib in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -23579,9 +24275,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC zlib"
- else
-
+ EXT_STATIC="$EXT_STATIC zlib"
+ ;;
+ *)
+
case ext/zlib in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -23624,7 +24321,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC zlib"
fi
@@ -23771,7 +24469,7 @@ EOF
done
echo $ac_n "checking for gzgets in -lz""... $ac_c" 1>&6
-echo "configure:23775: checking for gzgets in -lz" >&5
+echo "configure:24473: checking for gzgets in -lz" >&5
ac_lib_var=`echo z'_'gzgets | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -23779,7 +24477,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 23783 "configure"
+#line 24481 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -23790,7 +24488,7 @@ int main() {
gzgets()
; return 0; }
EOF
-if { (eval echo configure:23794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:24492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -23930,7 +24628,7 @@ fi
php_enable_bcmath=no
echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6
-echo "configure:23934: checking whether to enable bc style precision math functions" >&5
+echo "configure:24632: checking whether to enable bc style precision math functions" >&5
# Check whether --enable-bcmath or --disable-bcmath was given.
if test "${enable_bcmath+set}" = set; then
enableval="$enable_bcmath"
@@ -24166,8 +24864,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_BCMATH_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/bcmath in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -24214,9 +24913,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC bcmath"
- else
-
+ EXT_STATIC="$EXT_STATIC bcmath"
+ ;;
+ *)
+
case ext/bcmath in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -24263,7 +24963,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath"
fi
@@ -24295,7 +24996,7 @@ fi
php_with_bz2=no
echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6
-echo "configure:24299: checking for BZip2 support" >&5
+echo "configure:25000: checking for BZip2 support" >&5
# Check whether --with-bz2 or --without-bz2 was given.
if test "${with_bz2+set}" = set; then
withval="$with_bz2"
@@ -24343,7 +25044,7 @@ if test "$PHP_BZ2" != "no"; then
BZIP_DIR=$PHP_BZ2
else
echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6
-echo "configure:24347: checking for BZip2 in default path" >&5
+echo "configure:25048: checking for BZip2 in default path" >&5
for i in /usr/local /usr; do
if test -r $i/include/bzlib.h; then
BZIP_DIR=$i
@@ -24456,7 +25157,7 @@ echo "configure:24347: checking for BZip2 in default path" >&5
done
echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6
-echo "configure:24460: checking for BZ2_bzerror in -lbz2" >&5
+echo "configure:25161: checking for BZ2_bzerror in -lbz2" >&5
ac_lib_var=`echo bz2'_'BZ2_bzerror | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -24464,7 +25165,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbz2 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 24468 "configure"
+#line 25169 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -24475,7 +25176,7 @@ int main() {
BZ2_bzerror()
; return 0; }
EOF
-if { (eval echo configure:24479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:25180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -24825,8 +25526,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_BZ2_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/bz2 in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -24869,9 +25571,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC bz2"
- else
-
+ EXT_STATIC="$EXT_STATIC bz2"
+ ;;
+ *)
+
case ext/bz2 in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -24914,7 +25617,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC bz2"
fi
@@ -24940,7 +25644,7 @@ fi
php_enable_calendar=no
echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6
-echo "configure:24944: checking whether to enable calendar conversion support" >&5
+echo "configure:25648: checking whether to enable calendar conversion support" >&5
# Check whether --enable-calendar or --disable-calendar was given.
if test "${enable_calendar+set}" = set; then
enableval="$enable_calendar"
@@ -25172,8 +25876,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_CALENDAR_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/calendar in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -25216,9 +25921,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC calendar"
- else
-
+ EXT_STATIC="$EXT_STATIC calendar"
+ ;;
+ *)
+
case ext/calendar in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -25261,7 +25967,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC calendar"
fi
@@ -25284,7 +25991,7 @@ fi
php_enable_ctype=yes
echo $ac_n "checking whether to enable ctype functions""... $ac_c" 1>&6
-echo "configure:25288: checking whether to enable ctype functions" >&5
+echo "configure:25995: checking whether to enable ctype functions" >&5
# Check whether --enable-ctype or --disable-ctype was given.
if test "${enable_ctype+set}" = set; then
enableval="$enable_ctype"
@@ -25516,8 +26223,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_CTYPE_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/ctype in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -25560,9 +26268,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC ctype"
- else
-
+ EXT_STATIC="$EXT_STATIC ctype"
+ ;;
+ *)
+
case ext/ctype in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -25605,7 +26314,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC ctype"
fi
@@ -25628,7 +26338,7 @@ fi
php_with_curl=no
echo $ac_n "checking for cURL support""... $ac_c" 1>&6
-echo "configure:25632: checking for cURL support" >&5
+echo "configure:26342: checking for cURL support" >&5
# Check whether --with-curl or --without-curl was given.
if test "${with_curl+set}" = set; then
withval="$with_curl"
@@ -25675,7 +26385,7 @@ echo "$ac_t""$ext_output" 1>&6
php_with_curlwrappers=no
echo $ac_n "checking if we should use cURL for url streams""... $ac_c" 1>&6
-echo "configure:25679: checking if we should use cURL for url streams" >&5
+echo "configure:26389: checking if we should use cURL for url streams" >&5
# Check whether --with-curlwrappers or --without-curlwrappers was given.
if test "${with_curlwrappers+set}" = set; then
withval="$with_curlwrappers"
@@ -25702,7 +26412,7 @@ if test "$PHP_CURL" != "no"; then
CURL_DIR=$PHP_CURL
else
echo $ac_n "checking for cURL in default path""... $ac_c" 1>&6
-echo "configure:25706: checking for cURL in default path" >&5
+echo "configure:26416: checking for cURL in default path" >&5
for i in /usr/local /usr; do
if test -r $i/include/curl/easy.h; then
CURL_DIR=$i
@@ -25720,7 +26430,7 @@ echo "configure:25706: checking for cURL in default path" >&5
CURL_CONFIG="curl-config"
echo $ac_n "checking for cURL 7.10.5 or greater""... $ac_c" 1>&6
-echo "configure:25724: checking for cURL 7.10.5 or greater" >&5
+echo "configure:26434: checking for cURL 7.10.5 or greater" >&5
if ${CURL_DIR}/bin/curl-config --libs > /dev/null 2>&1; then
CURL_CONFIG=${CURL_DIR}/bin/curl-config
@@ -25738,270 +26448,6 @@ echo "configure:25724: checking for cURL 7.10.5 or greater" >&5
else
{ echo "configure: error: cURL version 7.10.5 or later is required to compile php with cURL support" 1>&2; exit 1; }
fi
-
- echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6
-echo "configure:25744: checking for SSL support in libcurl" >&5
- CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
- if test "$CURL_SSL" = "SSL"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-#define HAVE_CURL_SSL 1
-EOF
-
-
- save_CFLAGS="$CFLAGS"
- CFLAGS="`$CURL_CONFIG --cflags`"
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="`$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
-
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:25759: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- # This must be in double quotes, not single quotes, because CPP may get
- # substituted into the Makefile and "${CC-cc}" will confuse make.
- CPP="${CC-cc} -E"
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp.
- cat > conftest.$ac_ext <<EOF
-#line 25774 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:25780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- :
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CPP="${CC-cc} -E -traditional-cpp"
- cat > conftest.$ac_ext <<EOF
-#line 25791 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:25797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- :
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CPP="${CC-cc} -nologo -E"
- cat > conftest.$ac_ext <<EOF
-#line 25808 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:25814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- :
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
- ac_cv_prog_CPP="$CPP"
-fi
- CPP="$ac_cv_prog_CPP"
-else
- ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
- echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6
-echo "configure:25839: checking for openssl support in libcurl" >&5
- if test "$cross_compiling" = yes; then
-
- echo "$ac_t""no" 1>&6
-
-else
- cat > conftest.$ac_ext <<EOF
-#line 25846 "configure"
-#include "confdefs.h"
-
- #include <curl/curl.h>
- int main(int argc, char *argv[]) {
- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
- if (data && data->ssl_version && *data->ssl_version) {
- const char *ptr = data->ssl_version;
- while(*ptr == ' ') ++ptr;
- return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
- }
- return 1;
- }
-
-EOF
-if { (eval echo configure:25861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-
- echo "$ac_t""yes" 1>&6
- for ac_hdr in openssl/crypto.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:25869: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 25874 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:25879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
-
- cat >> confdefs.h <<\EOF
-#define HAVE_CURL_OPENSSL 1
-EOF
-
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
-
-
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
-
- echo "$ac_t""no" 1>&6
-
-fi
-rm -fr conftest*
-fi
-
-
- echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6
-echo "configure:25924: checking for gnutls support in libcurl" >&5
- if test "$cross_compiling" = yes; then
-
- echo "$ac_t""no" 1>&6
-
-else
- cat > conftest.$ac_ext <<EOF
-#line 25931 "configure"
-#include "confdefs.h"
-
- #include <curl/curl.h>
- int main(int argc, char *argv[]) {
- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
- if (data && data->ssl_version && *data->ssl_version) {
- const char *ptr = data->ssl_version;
- while(*ptr == ' ') ++ptr;
- return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
- }
- return 1;
- }
-
-EOF
-if { (eval echo configure:25946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-
- echo "$ac_t""yes" 1>&6
- ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6
-echo "configure:25952: checking for gcrypt.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 25957 "configure"
-#include "confdefs.h"
-#include <gcrypt.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:25962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-
- cat >> confdefs.h <<\EOF
-#define HAVE_CURL_GNUTLS 1
-EOF
-
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
-
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
-
- echo "$ac_t""no" 1>&6
-
-fi
-rm -fr conftest*
-fi
-
-
- CFLAGS="$save_CFLAGS"
- LDFLAGS="$save_LDFLAGS"
- else
- echo "$ac_t""no" 1>&6
- fi
if test "$CURL_DIR/include" != "/usr/include"; then
@@ -26220,6 +26666,275 @@ fi
fi
+
+ echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6
+echo "configure:26672: checking for SSL support in libcurl" >&5
+ CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
+ if test "$CURL_SSL" = "SSL"; then
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+#define HAVE_CURL_SSL 1
+EOF
+
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="`$CURL_CONFIG --cflags`"
+
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:26685: checking how to run the C preprocessor" >&5
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
+if test -z "$CPP"; then
+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ # This must be in double quotes, not single quotes, because CPP may get
+ # substituted into the Makefile and "${CC-cc}" will confuse make.
+ CPP="${CC-cc} -E"
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp.
+ cat > conftest.$ac_ext <<EOF
+#line 26700 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:26706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ :
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ CPP="${CC-cc} -E -traditional-cpp"
+ cat > conftest.$ac_ext <<EOF
+#line 26717 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:26723: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ :
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ CPP="${CC-cc} -nologo -E"
+ cat > conftest.$ac_ext <<EOF
+#line 26734 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:26740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ :
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ CPP=/lib/cpp
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+ ac_cv_prog_CPP="$CPP"
+fi
+ CPP="$ac_cv_prog_CPP"
+else
+ ac_cv_prog_CPP="$CPP"
+fi
+echo "$ac_t""$CPP" 1>&6
+
+ echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6
+echo "configure:26765: checking for openssl support in libcurl" >&5
+ if test "$cross_compiling" = yes; then
+
+ echo "$ac_t""no" 1>&6
+
+else
+ cat > conftest.$ac_ext <<EOF
+#line 26772 "configure"
+#include "confdefs.h"
+
+#include <curl/curl.h>
+
+int main(int argc, char *argv[])
+{
+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+
+ if (data && data->ssl_version && *data->ssl_version) {
+ const char *ptr = data->ssl_version;
+
+ while(*ptr == ' ') ++ptr;
+ return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
+ }
+ return 1;
+}
+
+EOF
+if { (eval echo configure:26791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+
+ echo "$ac_t""yes" 1>&6
+ for ac_hdr in openssl/crypto.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:26799: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 26804 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:26809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define HAVE_CURL_OPENSSL 1
+EOF
+
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+
+ echo "$ac_t""no" 1>&6
+
+fi
+rm -fr conftest*
+fi
+
+
+ echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6
+echo "configure:26854: checking for gnutls support in libcurl" >&5
+ if test "$cross_compiling" = yes; then
+
+ echo "$ac_t""no" 1>&6
+
+else
+ cat > conftest.$ac_ext <<EOF
+#line 26861 "configure"
+#include "confdefs.h"
+
+#include <curl/curl.h>
+
+int main(int argc, char *argv[])
+{
+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+
+ if (data && data->ssl_version && *data->ssl_version) {
+ const char *ptr = data->ssl_version;
+
+ while(*ptr == ' ') ++ptr;
+ return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
+ }
+ return 1;
+}
+
+EOF
+if { (eval echo configure:26880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+
+ echo "$ac_t""yes" 1>&6
+ ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6
+echo "configure:26886: checking for gcrypt.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 26891 "configure"
+#include "confdefs.h"
+#include <gcrypt.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:26896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+
+ cat >> confdefs.h <<\EOF
+#define HAVE_CURL_GNUTLS 1
+EOF
+
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+
+ echo "$ac_t""no" 1>&6
+
+fi
+rm -fr conftest*
+fi
+
+
+ CFLAGS="$save_CFLAGS"
+ else
+ echo "$ac_t""no" 1>&6
+ fi
save_old_LDFLAGS=$LDFLAGS
@@ -26319,7 +27034,7 @@ fi
done
echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6
-echo "configure:26323: checking for curl_easy_perform in -lcurl" >&5
+echo "configure:27038: checking for curl_easy_perform in -lcurl" >&5
ac_lib_var=`echo curl'_'curl_easy_perform | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -26327,7 +27042,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcurl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 26331 "configure"
+#line 27046 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -26338,7 +27053,7 @@ int main() {
curl_easy_perform()
; return 0; }
EOF
-if { (eval echo configure:26342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:27057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -26474,7 +27189,7 @@ fi
done
echo $ac_n "checking for curl_version_info in -lcurl""... $ac_c" 1>&6
-echo "configure:26478: checking for curl_version_info in -lcurl" >&5
+echo "configure:27193: checking for curl_version_info in -lcurl" >&5
ac_lib_var=`echo curl'_'curl_version_info | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -26482,7 +27197,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcurl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 26486 "configure"
+#line 27201 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -26493,7 +27208,7 @@ int main() {
curl_version_info()
; return 0; }
EOF
-if { (eval echo configure:26497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:27212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -26627,7 +27342,7 @@ fi
done
echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6
-echo "configure:26631: checking for curl_easy_strerror in -lcurl" >&5
+echo "configure:27346: checking for curl_easy_strerror in -lcurl" >&5
ac_lib_var=`echo curl'_'curl_easy_strerror | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -26635,7 +27350,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcurl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 26639 "configure"
+#line 27354 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -26646,7 +27361,7 @@ int main() {
curl_easy_strerror()
; return 0; }
EOF
-if { (eval echo configure:26650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:27365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -26780,7 +27495,7 @@ fi
done
echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6
-echo "configure:26784: checking for curl_multi_strerror in -lcurl" >&5
+echo "configure:27499: checking for curl_multi_strerror in -lcurl" >&5
ac_lib_var=`echo curl'_'curl_multi_strerror | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -26788,7 +27503,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcurl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 26792 "configure"
+#line 27507 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -26799,7 +27514,7 @@ int main() {
curl_multi_strerror()
; return 0; }
EOF
-if { (eval echo configure:26803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:27518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -27026,8 +27741,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_CURL_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/curl in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -27070,9 +27786,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC curl"
- else
-
+ EXT_STATIC="$EXT_STATIC curl"
+ ;;
+ *)
+
case ext/curl in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -27115,7 +27832,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC curl"
fi
@@ -27140,681 +27858,6 @@ fi
-echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:27145: checking size of long" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_sizeof_long=8
-else
- cat > conftest.$ac_ext <<EOF
-#line 27153 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-int main()
-{
- FILE *f=fopen("conftestval", "w");
- if (!f) return(1);
- fprintf(f, "%d\n", sizeof(long));
- return(0);
-}
-EOF
-if { (eval echo configure:27164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- ac_cv_sizeof_long=`cat conftestval`
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- ac_cv_sizeof_long=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_long" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-EOF
-
-
-echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:27184: checking size of int" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_sizeof_int=4
-else
- cat > conftest.$ac_ext <<EOF
-#line 27192 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-int main()
-{
- FILE *f=fopen("conftestval", "w");
- if (!f) return(1);
- fprintf(f, "%d\n", sizeof(int));
- return(0);
-}
-EOF
-if { (eval echo configure:27203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- ac_cv_sizeof_int=`cat conftestval`
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- ac_cv_sizeof_int=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_int" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-EOF
-
-
-
-echo $ac_n "checking for int32_t""... $ac_c" 1>&6
-echo "configure:27224: checking for int32_t" >&5
-if eval "test \"`echo '$''{'ac_cv_int_type_int32_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
-
-cat > conftest.$ac_ext <<EOF
-#line 27230 "configure"
-#include "confdefs.h"
-
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#elif HAVE_STDINT_H
-# include <stdint.h>
-#endif
-int main() {
-if ((int32_t *) 0)
- return 0;
-if (sizeof (int32_t))
- return 0;
-
-; return 0; }
-EOF
-if { (eval echo configure:27249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_int_type_int32_t=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- ac_cv_int_type_int32_t=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_int_type_int32_t" 1>&6
-if test "$ac_cv_int_type_int32_t" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define HAVE_INT32_T 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
-echo "configure:27272: checking for uint32_t" >&5
-if eval "test \"`echo '$''{'ac_cv_int_type_uint32_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
-
-cat > conftest.$ac_ext <<EOF
-#line 27278 "configure"
-#include "confdefs.h"
-
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#elif HAVE_STDINT_H
-# include <stdint.h>
-#endif
-int main() {
-if ((uint32_t *) 0)
- return 0;
-if (sizeof (uint32_t))
- return 0;
-
-; return 0; }
-EOF
-if { (eval echo configure:27297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_int_type_uint32_t=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- ac_cv_int_type_uint32_t=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_int_type_uint32_t" 1>&6
-if test "$ac_cv_int_type_uint32_t" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define HAVE_UINT32_T 1
-EOF
-
-fi
-
-
-for ac_hdr in \
-sys/types.h \
-inttypes.h \
-stdint.h \
-string.h \
-stdlib.h
-
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:27329: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 27334 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:27339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
-
-
-for ac_func in strtoll atoll strftime
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:27369: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 27374 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:27397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
-
-
-
-
-PHP_DATE_CFLAGS="-I at ext_builddir@/lib"
-timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
- lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
-
-
- ext_builddir=ext/date
- ext_srcdir=$abs_srcdir/ext/date
-
- ac_extra=`echo "$PHP_DATE_CFLAGS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
-
- if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then
- PHP_DATE_SHARED=no
-
-
- case ext/date in
- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
- /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
- *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; 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 php_date.c $timelib_sources; 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_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
- esac
-
- cat >>Makefile.objects<<EOF
-$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
- $ac_comp
-EOF
- done
-
-
- EXT_STATIC="$EXT_STATIC date"
- if test "no" != "nocli"; then
- EXT_CLI_STATIC="$EXT_CLI_STATIC date"
- fi
- else
- if test "no" = "shared" || test "no" = "yes"; then
- PHP_DATE_SHARED=yes
-
- case ext/date in
- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
- /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
- *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
- esac
-
-
-
- b_c_pre=$shared_c_pre
- b_cxx_pre=$shared_cxx_pre
- b_c_meta=$shared_c_meta
- b_cxx_meta=$shared_cxx_meta
- b_c_post=$shared_c_post
- b_cxx_post=$shared_cxx_post
- b_lo=$shared_lo
-
-
- old_IFS=$IFS
- for ac_src in php_date.c $timelib_sources; do
-
- IFS=.
- set $ac_src
- ac_obj=$1
- IFS=$old_IFS
-
- shared_objects_date="$shared_objects_date $ac_bdir$ac_obj.lo"
-
- case $ac_src in
- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
- esac
-
- cat >>Makefile.objects<<EOF
-$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
- $ac_comp
-EOF
- done
-
- case $host_alias in
- *netware*)
-
- install_modules="install-modules"
-
- case $host_alias in
- *aix*)
- suffix=so
- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpdate.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_date) $(PHPDATE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpdate.so '$ext_builddir'/phpdate.so'
- ;;
- *netware*)
- suffix=nlm
- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_date) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPDATE, 3)_SHARED_LIBADD)'
- ;;
- *)
- suffix=la
- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_date) $(PHPDATE_SHARED_LIBADD)'
- ;;
- esac
-
- if test "x" = "xyes"; then
- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpdate.$suffix"
- else
- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpdate.$suffix"
- fi
-
- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_date"
-
- cat >>Makefile.objects<<EOF
-\$(phplibdir)/phpdate.$suffix: $ext_builddir/phpdate.$suffix
- \$(LIBTOOL) --mode=install cp $ext_builddir/phpdate.$suffix \$(phplibdir)
-
-$ext_builddir/phpdate.$suffix: \$(shared_objects_date) \$(PHPDATE_SHARED_DEPENDENCIES)
- $link_cmd
-
-EOF
-
- ;;
- *)
-
- install_modules="install-modules"
-
- case $host_alias in
- *aix*)
- suffix=so
- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/date.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_date) $(DATE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/date.so '$ext_builddir'/date.so'
- ;;
- *netware*)
- suffix=nlm
- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_date) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(DATE, 3)_SHARED_LIBADD)'
- ;;
- *)
- suffix=la
- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_date) $(DATE_SHARED_LIBADD)'
- ;;
- esac
-
- if test "x" = "xyes"; then
- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/date.$suffix"
- else
- PHP_MODULES="$PHP_MODULES \$(phplibdir)/date.$suffix"
- fi
-
- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_date"
-
- cat >>Makefile.objects<<EOF
-\$(phplibdir)/date.$suffix: $ext_builddir/date.$suffix
- \$(LIBTOOL) --mode=install cp $ext_builddir/date.$suffix \$(phplibdir)
-
-$ext_builddir/date.$suffix: \$(shared_objects_date) \$(DATE_SHARED_DEPENDENCIES)
- $link_cmd
-
-EOF
-
- ;;
- esac
- cat >> confdefs.h <<EOF
-#define COMPILE_DL_DATE 1
-EOF
-
- fi
- fi
-
- if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then
- PHP_DATE_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
-
- case ext/date in
- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
- /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
- *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; 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 php_date.c $timelib_sources; 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_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
- esac
-
- cat >>Makefile.objects<<EOF
-$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
- $ac_comp
-EOF
- done
-
-
- EXT_STATIC="$EXT_STATIC date"
- else
-
-
- case ext/date in
- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
- /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
- *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; 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 php_date.c $timelib_sources; do
-
- IFS=.
- set $ac_src
- ac_obj=$1
- IFS=$old_IFS
-
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
-
- case $ac_src in
- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
- esac
-
- cat >>Makefile.objects<<EOF
-$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
- $ac_comp
-EOF
- done
-
-
- fi
- EXT_CLI_STATIC="$EXT_CLI_STATIC date"
- fi
-
-
- BUILD_DIR="$BUILD_DIR $ext_builddir"
-
-
-
- if test "$ext_builddir" = "."; then
- PHP_PECL_EXTENSION=date
-
- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
-
- fi
-
-
-
-
- $php_shtool mkdir -p $ext_builddir/lib
-
-
-
- if test "$ext_builddir/lib" != "/usr/include"; then
-
- if test -z "$ext_builddir/lib" || echo "$ext_builddir/lib" | grep '^/' >/dev/null ; then
- ai_p=$ext_builddir/lib
- else
-
- ep_dir="`echo $ext_builddir/lib|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
- ai_p="$ep_realdir/`basename \"$ext_builddir/lib\"`"
- fi
-
-
-
- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
- eval "INCLUDEPATH$unique=set"
-
- if test ""; then
- INCLUDES="-I$ai_p $INCLUDES"
- else
- INCLUDES="$INCLUDES -I$ai_p"
- fi
-
- fi
-
- fi
-
-
- if test "$ext_srcdir/lib" != "/usr/include"; then
-
- if test -z "$ext_srcdir/lib" || echo "$ext_srcdir/lib" | grep '^/' >/dev/null ; then
- ai_p=$ext_srcdir/lib
- else
-
- ep_dir="`echo $ext_srcdir/lib|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
- ai_p="$ep_realdir/`basename \"$ext_srcdir/lib\"`"
- fi
-
-
-
- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
- eval "INCLUDEPATH$unique=set"
-
- if test ""; then
- INCLUDES="-I$ai_p $INCLUDES"
- else
- INCLUDES="$INCLUDES -I$ai_p"
- fi
-
- fi
-
- fi
-
-
-
-
- header_path=ext/date
- for header_file in php_date.h lib/timelib.h lib/timelib_structs.h lib/timelib_config.h; do
- hp_hf="$header_path/$header_file"
-
-
- unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
-
- cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
- eval "INSTALLHEADERS$unique=set"
-
- INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
-
- fi
-
- done
-
-
-
-cat > $ext_builddir/lib/timelib_config.h <<EOF
-#ifdef PHP_WIN32
-# include "config.w32.h"
-#else
-# include <php_config.h>
-#endif
-EOF
-
-
-
-
-
@@ -28184,7 +28227,7 @@ if test "$PHP_QDBM" != "no"; then
done
echo $ac_n "checking for dpopen in -l$LIB""... $ac_c" 1>&6
-echo "configure:28188: checking for dpopen in -l$LIB" >&5
+echo "configure:28231: checking for dpopen in -l$LIB" >&5
ac_lib_var=`echo $LIB'_'dpopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -28192,7 +28235,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 28196 "configure"
+#line 28239 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -28203,7 +28246,7 @@ int main() {
dpopen()
; return 0; }
EOF
-if { (eval echo configure:28207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:28250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -28372,7 +28415,7 @@ fi
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:28376: checking for $THIS_FULL_NAME support" >&5
+echo "configure:28419: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -28400,7 +28443,7 @@ if test "$PHP_GDBM" != "no"; then
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:28404: checking for $THIS_FULL_NAME support" >&5
+echo "configure:28447: checking for $THIS_FULL_NAME support" >&5
if test -n "You cannot combine --with-gdbm with --with-qdbm"; then
{ echo "configure: error: You cannot combine --with-gdbm with --with-qdbm" 1>&2; exit 1; }
fi
@@ -28519,7 +28562,7 @@ echo "configure:28404: checking for $THIS_FULL_NAME support" >&5
done
echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:28523: checking for gdbm_open in -lgdbm" >&5
+echo "configure:28566: checking for gdbm_open in -lgdbm" >&5
ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -28527,7 +28570,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgdbm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 28531 "configure"
+#line 28574 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -28538,7 +28581,7 @@ int main() {
gdbm_open()
; return 0; }
EOF
-if { (eval echo configure:28542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:28585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -28703,7 +28746,7 @@ fi
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:28707: checking for $THIS_FULL_NAME support" >&5
+echo "configure:28750: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -28832,7 +28875,7 @@ if test "$PHP_NDBM" != "no"; then
done
echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6
-echo "configure:28836: checking for dbm_open in -l$LIB" >&5
+echo "configure:28879: checking for dbm_open in -l$LIB" >&5
ac_lib_var=`echo $LIB'_'dbm_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -28840,7 +28883,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 28844 "configure"
+#line 28887 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -28851,7 +28894,7 @@ int main() {
dbm_open()
; return 0; }
EOF
-if { (eval echo configure:28855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:28898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -29020,7 +29063,7 @@ fi
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:29024: checking for $THIS_FULL_NAME support" >&5
+echo "configure:29067: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -29087,7 +29130,7 @@ if test "$PHP_DB4" != "no"; then
LIBS="-l$LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 29091 "configure"
+#line 29134 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -29098,11 +29141,11 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:29102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:29145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 29106 "configure"
+#line 29149 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -29139,14 +29182,14 @@ rm -f conftest*
done
if test -z "$THIS_LIBS"; then
echo $ac_n "checking for db4 major version""... $ac_c" 1>&6
-echo "configure:29143: checking for db4 major version" >&5
+echo "configure:29186: checking for db4 major version" >&5
{ echo "configure: error: Header contains different version" 1>&2; exit 1; }
fi
if test "4" = "4"; then
echo $ac_n "checking for db4 minor version and patch level""... $ac_c" 1>&6
-echo "configure:29148: checking for db4 minor version and patch level" >&5
+echo "configure:29191: checking for db4 minor version and patch level" >&5
cat > conftest.$ac_ext <<EOF
-#line 29150 "configure"
+#line 29193 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -29172,9 +29215,9 @@ rm -f conftest*
fi
if test "$ext_shared" = "yes"; then
echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
-echo "configure:29176: checking if dba can be used as shared extension" >&5
+echo "configure:29219: checking if dba can be used as shared extension" >&5
cat > conftest.$ac_ext <<EOF
-#line 29178 "configure"
+#line 29221 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -29331,7 +29374,7 @@ fi
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:29335: checking for $THIS_FULL_NAME support" >&5
+echo "configure:29378: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -29359,7 +29402,7 @@ if test "$PHP_DB3" != "no"; then
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:29363: checking for $THIS_FULL_NAME support" >&5
+echo "configure:29406: checking for $THIS_FULL_NAME support" >&5
if test -n "You cannot combine --with-db3 with --with-db4"; then
{ echo "configure: error: You cannot combine --with-db3 with --with-db4" 1>&2; exit 1; }
fi
@@ -29410,7 +29453,7 @@ echo "configure:29363: checking for $THIS_FULL_NAME support" >&5
LIBS="-l$LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 29414 "configure"
+#line 29457 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -29421,11 +29464,11 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:29425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:29468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 29429 "configure"
+#line 29472 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -29462,14 +29505,14 @@ rm -f conftest*
done
if test -z "$THIS_LIBS"; then
echo $ac_n "checking for db3 major version""... $ac_c" 1>&6
-echo "configure:29466: checking for db3 major version" >&5
+echo "configure:29509: checking for db3 major version" >&5
{ echo "configure: error: Header contains different version" 1>&2; exit 1; }
fi
if test "3" = "4"; then
echo $ac_n "checking for db4 minor version and patch level""... $ac_c" 1>&6
-echo "configure:29471: checking for db4 minor version and patch level" >&5
+echo "configure:29514: checking for db4 minor version and patch level" >&5
cat > conftest.$ac_ext <<EOF
-#line 29473 "configure"
+#line 29516 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -29495,9 +29538,9 @@ rm -f conftest*
fi
if test "$ext_shared" = "yes"; then
echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
-echo "configure:29499: checking if dba can be used as shared extension" >&5
+echo "configure:29542: checking if dba can be used as shared extension" >&5
cat > conftest.$ac_ext <<EOF
-#line 29501 "configure"
+#line 29544 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -29654,7 +29697,7 @@ fi
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:29658: checking for $THIS_FULL_NAME support" >&5
+echo "configure:29701: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -29682,7 +29725,7 @@ if test "$PHP_DB2" != "no"; then
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:29686: checking for $THIS_FULL_NAME support" >&5
+echo "configure:29729: checking for $THIS_FULL_NAME support" >&5
if test -n "You cannot combine --with-db2 with --with-db3 or --with-db4"; then
{ echo "configure: error: You cannot combine --with-db2 with --with-db3 or --with-db4" 1>&2; exit 1; }
fi
@@ -29733,7 +29776,7 @@ echo "configure:29686: checking for $THIS_FULL_NAME support" >&5
LIBS="-l$LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 29737 "configure"
+#line 29780 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -29744,11 +29787,11 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:29748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:29791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 29752 "configure"
+#line 29795 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -29785,14 +29828,14 @@ rm -f conftest*
done
if test -z "$THIS_LIBS"; then
echo $ac_n "checking for db2 major version""... $ac_c" 1>&6
-echo "configure:29789: checking for db2 major version" >&5
+echo "configure:29832: checking for db2 major version" >&5
{ echo "configure: error: Header contains different version" 1>&2; exit 1; }
fi
if test "2" = "4"; then
echo $ac_n "checking for db4 minor version and patch level""... $ac_c" 1>&6
-echo "configure:29794: checking for db4 minor version and patch level" >&5
+echo "configure:29837: checking for db4 minor version and patch level" >&5
cat > conftest.$ac_ext <<EOF
-#line 29796 "configure"
+#line 29839 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -29818,9 +29861,9 @@ rm -f conftest*
fi
if test "$ext_shared" = "yes"; then
echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
-echo "configure:29822: checking if dba can be used as shared extension" >&5
+echo "configure:29865: checking if dba can be used as shared extension" >&5
cat > conftest.$ac_ext <<EOF
-#line 29824 "configure"
+#line 29867 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -29977,7 +30020,7 @@ fi
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:29981: checking for $THIS_FULL_NAME support" >&5
+echo "configure:30024: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -29997,7 +30040,7 @@ if test "$PHP_DB1" != "no"; then
unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
echo $ac_n "checking for DB1 in library""... $ac_c" 1>&6
-echo "configure:30001: checking for DB1 in library" >&5
+echo "configure:30044: checking for DB1 in library" >&5
if test "$HAVE_DB4" = "1"; then
THIS_VERSION=4
THIS_LIBS=$DB4_LIBS
@@ -30045,7 +30088,7 @@ EOF
fi
echo "$ac_t""$THIS_LIBS" 1>&6
echo $ac_n "checking for DB1 in header""... $ac_c" 1>&6
-echo "configure:30049: checking for DB1 in header" >&5
+echo "configure:30092: checking for DB1 in header" >&5
echo "$ac_t""$THIS_INCLUDE" 1>&6
if test -n "$THIS_INCLUDE"; then
@@ -30055,7 +30098,7 @@ echo "configure:30049: checking for DB1 in header" >&5
LIBS="-l$THIS_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 30059 "configure"
+#line 30102 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -30066,7 +30109,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:30070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:30113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<EOF
@@ -30216,7 +30259,7 @@ fi
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:30220: checking for $THIS_FULL_NAME support" >&5
+echo "configure:30263: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -30244,7 +30287,7 @@ if test "$PHP_DBM" != "no"; then
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:30248: checking for $THIS_FULL_NAME support" >&5
+echo "configure:30291: checking for $THIS_FULL_NAME support" >&5
if test -n "You cannot combine --with-dbm with --with-qdbm"; then
{ echo "configure: error: You cannot combine --with-dbm with --with-qdbm" 1>&2; exit 1; }
fi
@@ -30368,7 +30411,7 @@ echo "configure:30248: checking for $THIS_FULL_NAME support" >&5
done
echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6
-echo "configure:30372: checking for dbminit in -l$LIB" >&5
+echo "configure:30415: checking for dbminit in -l$LIB" >&5
ac_lib_var=`echo $LIB'_'dbminit | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -30376,7 +30419,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 30380 "configure"
+#line 30423 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -30387,7 +30430,7 @@ int main() {
dbminit()
; return 0; }
EOF
-if { (eval echo configure:30391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:30434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -30407,7 +30450,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
ext_shared=$save_ext_shared
echo $ac_n "checking for DBM using GDBM""... $ac_c" 1>&6
-echo "configure:30411: checking for DBM using GDBM" >&5
+echo "configure:30454: checking for DBM using GDBM" >&5
cat >> confdefs.h <<EOF
#define DBM_INCLUDE_FILE "$THIS_INCLUDE"
EOF
@@ -30571,7 +30614,7 @@ fi
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:30575: checking for $THIS_FULL_NAME support" >&5
+echo "configure:30618: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -30792,7 +30835,7 @@ elif test "$PHP_CDB" != "no"; then
done
echo $ac_n "checking for cdb_read in -l$LIB""... $ac_c" 1>&6
-echo "configure:30796: checking for cdb_read in -l$LIB" >&5
+echo "configure:30839: checking for cdb_read in -l$LIB" >&5
ac_lib_var=`echo $LIB'_'cdb_read | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -30800,7 +30843,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 30804 "configure"
+#line 30847 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -30811,7 +30854,7 @@ int main() {
cdb_read()
; return 0; }
EOF
-if { (eval echo configure:30815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:30858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -30980,7 +31023,7 @@ fi
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:30984: checking for $THIS_FULL_NAME support" >&5
+echo "configure:31027: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -31011,7 +31054,7 @@ fi
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:31015: checking for $THIS_FULL_NAME support" >&5
+echo "configure:31058: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -31042,7 +31085,7 @@ fi
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:31046: checking for $THIS_FULL_NAME support" >&5
+echo "configure:31089: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -31057,7 +31100,7 @@ echo "configure:31046: checking for $THIS_FULL_NAME support" >&5
echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6
-echo "configure:31061: checking whether to enable DBA interface" >&5
+echo "configure:31104: checking whether to enable DBA interface" >&5
if test "$HAVE_DBA" = "1"; then
if test "$ext_shared" = "yes"; then
echo "$ac_t""yes, shared" 1>&6
@@ -31252,8 +31295,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_DBA_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/dba in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -31296,9 +31340,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC dba"
- else
-
+ EXT_STATIC="$EXT_STATIC dba"
+ ;;
+ *)
+
case ext/dba in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -31341,7 +31386,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC dba"
fi
@@ -31384,7 +31430,7 @@ fi
php_enable_dom=yes
echo $ac_n "checking whether to enable DOM support""... $ac_c" 1>&6
-echo "configure:31388: checking whether to enable DOM support" >&5
+echo "configure:31434: checking whether to enable DOM support" >&5
# Check whether --enable-dom or --disable-dom was given.
if test "${enable_dom+set}" = set; then
enableval="$enable_dom"
@@ -31432,7 +31478,7 @@ if test -z "$PHP_LIBXML_DIR"; then
php_with_libxml_dir=no
echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
-echo "configure:31436: checking libxml2 install dir" >&5
+echo "configure:31482: checking libxml2 install dir" >&5
# Check whether --with-libxml-dir or --without-libxml-dir was given.
if test "${with_libxml_dir+set}" = set; then
withval="$with_libxml_dir"
@@ -31463,7 +31509,7 @@ if test "$PHP_DOM" != "no"; then
echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
-echo "configure:31467: checking for xml2-config path" >&5
+echo "configure:31513: checking for xml2-config path" >&5
if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -31621,7 +31667,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
-echo "configure:31625: checking whether libxml build works" >&5
+echo "configure:31671: checking whether libxml build works" >&5
if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -31637,7 +31683,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 31641 "configure"
+#line 31687 "configure"
#include "confdefs.h"
@@ -31648,7 +31694,7 @@ else
}
EOF
-if { (eval echo configure:31652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:31698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -31889,8 +31935,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_DOM_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/dom in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -31942,9 +31989,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC dom"
- else
-
+ EXT_STATIC="$EXT_STATIC dom"
+ ;;
+ *)
+
case ext/dom in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -31996,7 +32044,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC dom"
fi
@@ -32068,7 +32117,7 @@ fi
php_with_enchant=no
echo $ac_n "checking for ENCHANT support""... $ac_c" 1>&6
-echo "configure:32072: checking for ENCHANT support" >&5
+echo "configure:32121: checking for ENCHANT support" >&5
# Check whether --with-enchant or --without-enchant was given.
if test "${with_enchant+set}" = set; then
withval="$with_enchant"
@@ -32296,8 +32345,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_ENCHANT_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/enchant in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -32340,9 +32390,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC enchant"
- else
-
+ EXT_STATIC="$EXT_STATIC enchant"
+ ;;
+ *)
+
case ext/enchant in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -32385,7 +32436,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC enchant"
fi
@@ -32564,7 +32616,7 @@ fi
php_enable_exif=no
echo $ac_n "checking whether to enable EXIF (metadata from images) support""... $ac_c" 1>&6
-echo "configure:32568: checking whether to enable EXIF (metadata from images) support" >&5
+echo "configure:32620: checking whether to enable EXIF (metadata from images) support" >&5
# Check whether --enable-exif or --disable-exif was given.
if test "${enable_exif+set}" = set; then
enableval="$enable_exif"
@@ -32796,8 +32848,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_EXIF_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/exif in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -32840,9 +32893,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC exif"
- else
-
+ EXT_STATIC="$EXT_STATIC exif"
+ ;;
+ *)
+
case ext/exif in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -32885,7 +32939,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC exif"
fi
@@ -32908,7 +32963,7 @@ fi
php_enable_fileinfo=yes
echo $ac_n "checking for fileinfo support""... $ac_c" 1>&6
-echo "configure:32912: checking for fileinfo support" >&5
+echo "configure:32967: checking for fileinfo support" >&5
# Check whether --enable-fileinfo or --disable-fileinfo was given.
if test "${enable_fileinfo+set}" = set; then
enableval="$enable_fileinfo"
@@ -33144,8 +33199,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_FILEINFO_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/fileinfo in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -33188,9 +33244,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC fileinfo"
- else
-
+ EXT_STATIC="$EXT_STATIC fileinfo"
+ ;;
+ *)
+
case ext/fileinfo in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -33233,7 +33290,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC fileinfo"
fi
@@ -33258,12 +33316,12 @@ EOF
for ac_func in utimes strndup
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:33262: checking for $ac_func" >&5
+echo "configure:33320: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 33267 "configure"
+#line 33325 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -33286,7 +33344,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:33290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:33348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -33324,7 +33382,7 @@ fi
php_enable_filter=yes
echo $ac_n "checking whether to enable input filter support""... $ac_c" 1>&6
-echo "configure:33328: checking whether to enable input filter support" >&5
+echo "configure:33386: checking whether to enable input filter support" >&5
# Check whether --enable-filter or --disable-filter was given.
if test "${enable_filter+set}" = set; then
enableval="$enable_filter"
@@ -33371,7 +33429,7 @@ echo "$ac_t""$ext_output" 1>&6
php_with_pcre_dir=no
echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6
-echo "configure:33375: checking pcre install prefix" >&5
+echo "configure:33433: checking pcre install prefix" >&5
# Check whether --with-pcre-dir or --without-pcre-dir was given.
if test "${with_pcre_dir+set}" = set; then
withval="$with_pcre_dir"
@@ -33401,7 +33459,7 @@ if test "$PHP_FILTER" != "no"; then
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=$INCLUDES
cat > conftest.$ac_ext <<EOF
-#line 33405 "configure"
+#line 33463 "configure"
#include "confdefs.h"
#include <main/php_config.h>
@@ -33420,7 +33478,7 @@ else
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 33424 "configure"
+#line 33482 "configure"
#include "confdefs.h"
#include <main/php_config.h>
@@ -33634,8 +33692,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_FILTER_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/filter in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -33678,9 +33737,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC filter"
- else
-
+ EXT_STATIC="$EXT_STATIC filter"
+ ;;
+ *)
+
case ext/filter in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -33723,7 +33783,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC filter"
fi
@@ -33787,7 +33848,7 @@ fi
php_enable_ftp=no
echo $ac_n "checking whether to enable FTP support""... $ac_c" 1>&6
-echo "configure:33791: checking whether to enable FTP support" >&5
+echo "configure:33852: checking whether to enable FTP support" >&5
# Check whether --enable-ftp or --disable-ftp was given.
if test "${enable_ftp+set}" = set; then
enableval="$enable_ftp"
@@ -33834,7 +33895,7 @@ echo "$ac_t""$ext_output" 1>&6
php_with_openssl_dir=no
echo $ac_n "checking OpenSSL dir for FTP""... $ac_c" 1>&6
-echo "configure:33838: checking OpenSSL dir for FTP" >&5
+echo "configure:33899: checking OpenSSL dir for FTP" >&5
# Check whether --with-openssl-dir or --without-openssl-dir was given.
if test "${with_openssl_dir+set}" = set; then
withval="$with_openssl_dir"
@@ -34045,8 +34106,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_FTP_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/ftp in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -34089,9 +34151,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC ftp"
- else
-
+ EXT_STATIC="$EXT_STATIC ftp"
+ ;;
+ *)
+
case ext/ftp in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -34134,7 +34197,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC ftp"
fi
@@ -34172,7 +34236,7 @@ EOF
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:34176: checking for $ac_word" >&5
+echo "configure:34240: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -34377,9 +34441,9 @@ fi
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$OPENSSL_INCDIR
echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
-echo "configure:34381: checking for OpenSSL version" >&5
+echo "configure:34445: checking for OpenSSL version" >&5
cat > conftest.$ac_ext <<EOF
-#line 34383 "configure"
+#line 34447 "configure"
#include "confdefs.h"
#include <openssl/opensslv.h>
@@ -34534,7 +34598,7 @@ rm -f conftest*
done
echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
-echo "configure:34538: checking for CRYPTO_free in -lcrypto" >&5
+echo "configure:34602: checking for CRYPTO_free in -lcrypto" >&5
ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -34542,7 +34606,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 34546 "configure"
+#line 34610 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -34553,7 +34617,7 @@ int main() {
CRYPTO_free()
; return 0; }
EOF
-if { (eval echo configure:34557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:34621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -34710,7 +34774,7 @@ fi
done
echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
-echo "configure:34714: checking for SSL_CTX_set_ssl_version in -lssl" >&5
+echo "configure:34778: checking for SSL_CTX_set_ssl_version in -lssl" >&5
ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -34718,7 +34782,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 34722 "configure"
+#line 34786 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -34729,7 +34793,7 @@ int main() {
SSL_CTX_set_ssl_version()
; return 0; }
EOF
-if { (eval echo configure:34733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:34797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -34848,7 +34912,7 @@ fi
php_with_gd=no
echo $ac_n "checking for GD support""... $ac_c" 1>&6
-echo "configure:34852: checking for GD support" >&5
+echo "configure:34916: checking for GD support" >&5
# Check whether --with-gd or --without-gd was given.
if test "${with_gd+set}" = set; then
withval="$with_gd"
@@ -34896,7 +34960,7 @@ if test -z "$PHP_JPEG_DIR"; then
php_with_jpeg_dir=no
echo $ac_n "checking for the location of libjpeg""... $ac_c" 1>&6
-echo "configure:34900: checking for the location of libjpeg" >&5
+echo "configure:34964: checking for the location of libjpeg" >&5
# Check whether --with-jpeg-dir or --without-jpeg-dir was given.
if test "${with_jpeg_dir+set}" = set; then
withval="$with_jpeg_dir"
@@ -34924,7 +34988,7 @@ if test -z "$PHP_PNG_DIR"; then
php_with_png_dir=no
echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6
-echo "configure:34928: checking for the location of libpng" >&5
+echo "configure:34992: checking for the location of libpng" >&5
# Check whether --with-png-dir or --without-png-dir was given.
if test "${with_png_dir+set}" = set; then
withval="$with_png_dir"
@@ -34952,7 +35016,7 @@ if test -z "$PHP_ZLIB_DIR"; then
php_with_zlib_dir=no
echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
-echo "configure:34956: checking for the location of libz" >&5
+echo "configure:35020: checking for the location of libz" >&5
# Check whether --with-zlib-dir or --without-zlib-dir was given.
if test "${with_zlib_dir+set}" = set; then
withval="$with_zlib_dir"
@@ -34979,7 +35043,7 @@ fi
php_with_xpm_dir=no
echo $ac_n "checking for the location of libXpm""... $ac_c" 1>&6
-echo "configure:34983: checking for the location of libXpm" >&5
+echo "configure:35047: checking for the location of libXpm" >&5
# Check whether --with-xpm-dir or --without-xpm-dir was given.
if test "${with_xpm_dir+set}" = set; then
withval="$with_xpm_dir"
@@ -35005,7 +35069,7 @@ echo "$ac_t""$ext_output" 1>&6
php_with_freetype_dir=no
echo $ac_n "checking for FreeType 2""... $ac_c" 1>&6
-echo "configure:35009: checking for FreeType 2" >&5
+echo "configure:35073: checking for FreeType 2" >&5
# Check whether --with-freetype-dir or --without-freetype-dir was given.
if test "${with_freetype_dir+set}" = set; then
withval="$with_freetype_dir"
@@ -35031,7 +35095,7 @@ echo "$ac_t""$ext_output" 1>&6
php_with_t1lib=no
echo $ac_n "checking for T1lib support""... $ac_c" 1>&6
-echo "configure:35035: checking for T1lib support" >&5
+echo "configure:35099: checking for T1lib support" >&5
# Check whether --with-t1lib or --without-t1lib was given.
if test "${with_t1lib+set}" = set; then
withval="$with_t1lib"
@@ -35057,7 +35121,7 @@ echo "$ac_t""$ext_output" 1>&6
php_enable_gd_native_ttf=no
echo $ac_n "checking whether to enable truetype string function in GD""... $ac_c" 1>&6
-echo "configure:35061: checking whether to enable truetype string function in GD" >&5
+echo "configure:35125: checking whether to enable truetype string function in GD" >&5
# Check whether --enable-gd-native-ttf or --disable-gd-native-ttf was given.
if test "${enable_gd_native_ttf+set}" = set; then
enableval="$enable_gd_native_ttf"
@@ -35083,7 +35147,7 @@ echo "$ac_t""$ext_output" 1>&6
php_enable_gd_jis_conv=no
echo $ac_n "checking whether to enable JIS-mapped Japanese font support in GD""... $ac_c" 1>&6
-echo "configure:35087: checking whether to enable JIS-mapped Japanese font support in GD" >&5
+echo "configure:35151: checking whether to enable JIS-mapped Japanese font support in GD" >&5
# Check whether --enable-gd-jis-conv or --disable-gd-jis-conv was given.
if test "${enable_gd_jis_conv+set}" = set; then
enableval="$enable_gd_jis_conv"
@@ -35132,17 +35196,18 @@ if test "$PHP_GD" = "yes"; then
libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c libgd/gdfontmb.c libgd/gdfontl.c \
libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c libgd/gdkanji.c \
libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c libgd/gd_topal.c libgd/gd_gif_in.c \
- libgd/xbm.c libgd/gd_gif_out.c libgd/gd_security.c libgd/gd_pixelate.c"
+ libgd/xbm.c libgd/gd_gif_out.c libgd/gd_security.c libgd/gd_filter.c \
+ libgd/gd_pixelate.c libgd/gd_arc.c libgd/gd_rotate.c libgd/gd_color.c"
for ac_func in fabsf floorf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:35141: checking for $ac_func" >&5
+echo "configure:35206: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 35146 "configure"
+#line 35211 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -35165,7 +35230,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:35169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:35234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -35337,7 +35402,7 @@ EOF
done
echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:35341: checking for jpeg_read_header in -ljpeg" >&5
+echo "configure:35406: checking for jpeg_read_header in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -35345,7 +35410,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 35349 "configure"
+#line 35414 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -35356,7 +35421,7 @@ int main() {
jpeg_read_header()
; return 0; }
EOF
-if { (eval echo configure:35360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:35425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -35638,7 +35703,7 @@ fi
done
echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
-echo "configure:35642: checking for png_write_image in -lpng" >&5
+echo "configure:35707: checking for png_write_image in -lpng" >&5
ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -35646,7 +35711,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpng $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 35650 "configure"
+#line 35715 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -35657,7 +35722,7 @@ int main() {
png_write_image()
; return 0; }
EOF
-if { (eval echo configure:35661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:35726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -36037,7 +36102,7 @@ fi
done
echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
-echo "configure:36041: checking for XpmFreeXpmImage in -lXpm" >&5
+echo "configure:36106: checking for XpmFreeXpmImage in -lXpm" >&5
ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -36045,7 +36110,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXpm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 36049 "configure"
+#line 36114 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -36056,7 +36121,7 @@ int main() {
XpmFreeXpmImage()
; return 0; }
EOF
-if { (eval echo configure:36060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:36125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -36431,7 +36496,7 @@ fi
done
echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6
-echo "configure:36435: checking for FT_New_Face in -lfreetype" >&5
+echo "configure:36500: checking for FT_New_Face in -lfreetype" >&5
ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -36439,7 +36504,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lfreetype $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 36443 "configure"
+#line 36508 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -36450,7 +36515,7 @@ int main() {
FT_New_Face()
; return 0; }
EOF
-if { (eval echo configure:36454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:36519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -36636,6 +36701,10 @@ EOF
#define HAVE_LIBFREETYPE 1
EOF
+ cat >> confdefs.h <<\EOF
+#define ENABLE_GD_TTF 1
+EOF
+
else
@@ -36763,7 +36832,7 @@ fi
done
echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6
-echo "configure:36767: checking for T1_StrError in -lt1" >&5
+echo "configure:36836: checking for T1_StrError in -lt1" >&5
ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -36771,7 +36840,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lt1 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 36775 "configure"
+#line 36844 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -36782,7 +36851,7 @@ int main() {
T1_StrError()
; return 0; }
EOF
-if { (eval echo configure:36786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:36855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -37063,7 +37132,11 @@ EOF
#define HAVE_GD_STRINGFTEX 1
EOF
- GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBFREETYPE"
+ cat >> confdefs.h <<\EOF
+#define ENABLE_GD_TTF 1
+EOF
+
+ GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBFREETYPE -DENABLE_GD_TTF"
fi
if test -n "$USE_GD_JIS_CONV"; then
@@ -37078,7 +37151,8 @@ else
if test "$PHP_GD" != "no"; then
GD_MODULE_TYPE=external
- extra_sources="gdcache.c"
+ extra_sources="gdcache.c libgd/gd_compat.c libgd/gd_filter.c libgd/gd_pixelate.c libgd/gd_arc.c \
+ libgd/gd_rotate.c libgd/gd_color.c"
if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
@@ -37220,7 +37294,7 @@ EOF
done
echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:37224: checking for jpeg_read_header in -ljpeg" >&5
+echo "configure:37298: checking for jpeg_read_header in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -37228,7 +37302,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 37232 "configure"
+#line 37306 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -37239,7 +37313,7 @@ int main() {
jpeg_read_header()
; return 0; }
EOF
-if { (eval echo configure:37243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:37317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -37521,7 +37595,7 @@ fi
done
echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
-echo "configure:37525: checking for png_write_image in -lpng" >&5
+echo "configure:37599: checking for png_write_image in -lpng" >&5
ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -37529,7 +37603,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpng $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 37533 "configure"
+#line 37607 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -37540,7 +37614,7 @@ int main() {
png_write_image()
; return 0; }
EOF
-if { (eval echo configure:37544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:37618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -37920,7 +37994,7 @@ fi
done
echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
-echo "configure:37924: checking for XpmFreeXpmImage in -lXpm" >&5
+echo "configure:37998: checking for XpmFreeXpmImage in -lXpm" >&5
ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -37928,7 +38002,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXpm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 37932 "configure"
+#line 38006 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -37939,7 +38013,7 @@ int main() {
XpmFreeXpmImage()
; return 0; }
EOF
-if { (eval echo configure:37943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:38017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -38314,7 +38388,7 @@ fi
done
echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6
-echo "configure:38318: checking for FT_New_Face in -lfreetype" >&5
+echo "configure:38392: checking for FT_New_Face in -lfreetype" >&5
ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -38322,7 +38396,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lfreetype $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 38326 "configure"
+#line 38400 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -38333,7 +38407,7 @@ int main() {
FT_New_Face()
; return 0; }
EOF
-if { (eval echo configure:38337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:38411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -38519,6 +38593,10 @@ EOF
#define HAVE_LIBFREETYPE 1
EOF
+ cat >> confdefs.h <<\EOF
+#define ENABLE_GD_TTF 1
+EOF
+
else
@@ -38646,7 +38724,7 @@ fi
done
echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6
-echo "configure:38650: checking for T1_StrError in -lt1" >&5
+echo "configure:38728: checking for T1_StrError in -lt1" >&5
ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -38654,7 +38732,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lt1 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 38658 "configure"
+#line 38736 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -38665,7 +38743,7 @@ int main() {
T1_StrError()
; return 0; }
EOF
-if { (eval echo configure:38669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:38747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -39040,7 +39118,7 @@ EOF
done
echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6
-echo "configure:39044: checking for gdImageString16 in -lgd" >&5
+echo "configure:39122: checking for gdImageString16 in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageString16 | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -39048,7 +39126,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 39052 "configure"
+#line 39130 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -39059,7 +39137,7 @@ int main() {
gdImageString16()
; return 0; }
EOF
-if { (eval echo configure:39063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:39141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -39188,7 +39266,7 @@ fi
done
echo $ac_n "checking for gdImagePaletteCopy in -lgd""... $ac_c" 1>&6
-echo "configure:39192: checking for gdImagePaletteCopy in -lgd" >&5
+echo "configure:39270: checking for gdImagePaletteCopy in -lgd" >&5
ac_lib_var=`echo gd'_'gdImagePaletteCopy | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -39196,7 +39274,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 39200 "configure"
+#line 39278 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -39207,7 +39285,7 @@ int main() {
gdImagePaletteCopy()
; return 0; }
EOF
-if { (eval echo configure:39211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:39289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -39336,7 +39414,7 @@ fi
done
echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6
-echo "configure:39340: checking for gdImageCreateFromPng in -lgd" >&5
+echo "configure:39418: checking for gdImageCreateFromPng in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -39344,7 +39422,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 39348 "configure"
+#line 39426 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -39355,7 +39433,7 @@ int main() {
gdImageCreateFromPng()
; return 0; }
EOF
-if { (eval echo configure:39359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:39437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -39484,7 +39562,7 @@ fi
done
echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6
-echo "configure:39488: checking for gdImageCreateFromGif in -lgd" >&5
+echo "configure:39566: checking for gdImageCreateFromGif in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageCreateFromGif | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -39492,7 +39570,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 39496 "configure"
+#line 39574 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -39503,7 +39581,7 @@ int main() {
gdImageCreateFromGif()
; return 0; }
EOF
-if { (eval echo configure:39507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:39585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -39632,7 +39710,7 @@ fi
done
echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6
-echo "configure:39636: checking for gdImageGif in -lgd" >&5
+echo "configure:39714: checking for gdImageGif in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageGif | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -39640,7 +39718,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 39644 "configure"
+#line 39722 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -39651,7 +39729,7 @@ int main() {
gdImageGif()
; return 0; }
EOF
-if { (eval echo configure:39655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:39733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -39780,7 +39858,7 @@ fi
done
echo $ac_n "checking for gdImageWBMP in -lgd""... $ac_c" 1>&6
-echo "configure:39784: checking for gdImageWBMP in -lgd" >&5
+echo "configure:39862: checking for gdImageWBMP in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageWBMP | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -39788,7 +39866,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 39792 "configure"
+#line 39870 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -39799,7 +39877,7 @@ int main() {
gdImageWBMP()
; return 0; }
EOF
-if { (eval echo configure:39803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:39881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -39928,7 +40006,7 @@ fi
done
echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6
-echo "configure:39932: checking for gdImageCreateFromJpeg in -lgd" >&5
+echo "configure:40010: checking for gdImageCreateFromJpeg in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageCreateFromJpeg | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -39936,7 +40014,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 39940 "configure"
+#line 40018 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -39947,7 +40025,7 @@ int main() {
gdImageCreateFromJpeg()
; return 0; }
EOF
-if { (eval echo configure:39951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:40029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -40076,7 +40154,7 @@ fi
done
echo $ac_n "checking for gdImageCreateFromXpm in -lgd""... $ac_c" 1>&6
-echo "configure:40080: checking for gdImageCreateFromXpm in -lgd" >&5
+echo "configure:40158: checking for gdImageCreateFromXpm in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageCreateFromXpm | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -40084,7 +40162,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 40088 "configure"
+#line 40166 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -40095,7 +40173,7 @@ int main() {
gdImageCreateFromXpm()
; return 0; }
EOF
-if { (eval echo configure:40099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:40177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -40224,7 +40302,7 @@ fi
done
echo $ac_n "checking for gdImageCreateFromGd2 in -lgd""... $ac_c" 1>&6
-echo "configure:40228: checking for gdImageCreateFromGd2 in -lgd" >&5
+echo "configure:40306: checking for gdImageCreateFromGd2 in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageCreateFromGd2 | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -40232,7 +40310,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 40236 "configure"
+#line 40314 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -40243,7 +40321,7 @@ int main() {
gdImageCreateFromGd2()
; return 0; }
EOF
-if { (eval echo configure:40247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:40325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -40372,7 +40450,7 @@ fi
done
echo $ac_n "checking for gdImageCreateTrueColor in -lgd""... $ac_c" 1>&6
-echo "configure:40376: checking for gdImageCreateTrueColor in -lgd" >&5
+echo "configure:40454: checking for gdImageCreateTrueColor in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageCreateTrueColor | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -40380,7 +40458,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 40384 "configure"
+#line 40462 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -40391,7 +40469,7 @@ int main() {
gdImageCreateTrueColor()
; return 0; }
EOF
-if { (eval echo configure:40395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:40473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -40520,7 +40598,7 @@ fi
done
echo $ac_n "checking for gdImageSetTile in -lgd""... $ac_c" 1>&6
-echo "configure:40524: checking for gdImageSetTile in -lgd" >&5
+echo "configure:40602: checking for gdImageSetTile in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageSetTile | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -40528,7 +40606,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 40532 "configure"
+#line 40610 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -40539,7 +40617,7 @@ int main() {
gdImageSetTile()
; return 0; }
EOF
-if { (eval echo configure:40543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:40621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -40668,7 +40746,7 @@ fi
done
echo $ac_n "checking for gdImageEllipse in -lgd""... $ac_c" 1>&6
-echo "configure:40672: checking for gdImageEllipse in -lgd" >&5
+echo "configure:40750: checking for gdImageEllipse in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageEllipse | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -40676,7 +40754,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 40680 "configure"
+#line 40758 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -40687,7 +40765,7 @@ int main() {
gdImageEllipse()
; return 0; }
EOF
-if { (eval echo configure:40691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:40769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -40816,7 +40894,7 @@ fi
done
echo $ac_n "checking for gdImageSetBrush in -lgd""... $ac_c" 1>&6
-echo "configure:40820: checking for gdImageSetBrush in -lgd" >&5
+echo "configure:40898: checking for gdImageSetBrush in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageSetBrush | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -40824,7 +40902,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 40828 "configure"
+#line 40906 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -40835,7 +40913,7 @@ int main() {
gdImageSetBrush()
; return 0; }
EOF
-if { (eval echo configure:40839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:40917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -40964,7 +41042,7 @@ fi
done
echo $ac_n "checking for gdImageStringTTF in -lgd""... $ac_c" 1>&6
-echo "configure:40968: checking for gdImageStringTTF in -lgd" >&5
+echo "configure:41046: checking for gdImageStringTTF in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageStringTTF | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -40972,7 +41050,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 40976 "configure"
+#line 41054 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -40983,7 +41061,7 @@ int main() {
gdImageStringTTF()
; return 0; }
EOF
-if { (eval echo configure:40987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:41065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -41112,7 +41190,7 @@ fi
done
echo $ac_n "checking for gdImageStringFT in -lgd""... $ac_c" 1>&6
-echo "configure:41116: checking for gdImageStringFT in -lgd" >&5
+echo "configure:41194: checking for gdImageStringFT in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageStringFT | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -41120,7 +41198,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 41124 "configure"
+#line 41202 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -41131,7 +41209,7 @@ int main() {
gdImageStringFT()
; return 0; }
EOF
-if { (eval echo configure:41135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:41213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -41260,7 +41338,7 @@ fi
done
echo $ac_n "checking for gdImageStringFTEx in -lgd""... $ac_c" 1>&6
-echo "configure:41264: checking for gdImageStringFTEx in -lgd" >&5
+echo "configure:41342: checking for gdImageStringFTEx in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageStringFTEx | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -41268,7 +41346,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 41272 "configure"
+#line 41350 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -41279,7 +41357,7 @@ int main() {
gdImageStringFTEx()
; return 0; }
EOF
-if { (eval echo configure:41283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:41361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -41408,7 +41486,7 @@ fi
done
echo $ac_n "checking for gdImageColorClosestHWB in -lgd""... $ac_c" 1>&6
-echo "configure:41412: checking for gdImageColorClosestHWB in -lgd" >&5
+echo "configure:41490: checking for gdImageColorClosestHWB in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageColorClosestHWB | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -41416,7 +41494,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 41420 "configure"
+#line 41498 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -41427,7 +41505,7 @@ int main() {
gdImageColorClosestHWB()
; return 0; }
EOF
-if { (eval echo configure:41431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:41509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -41556,7 +41634,7 @@ fi
done
echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6
-echo "configure:41560: checking for gdImageColorResolve in -lgd" >&5
+echo "configure:41638: checking for gdImageColorResolve in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageColorResolve | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -41564,7 +41642,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 41568 "configure"
+#line 41646 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -41575,7 +41653,7 @@ int main() {
gdImageColorResolve()
; return 0; }
EOF
-if { (eval echo configure:41579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:41657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -41704,7 +41782,7 @@ fi
done
echo $ac_n "checking for gdImageGifCtx in -lgd""... $ac_c" 1>&6
-echo "configure:41708: checking for gdImageGifCtx in -lgd" >&5
+echo "configure:41786: checking for gdImageGifCtx in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageGifCtx | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -41712,7 +41790,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 41716 "configure"
+#line 41794 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -41723,7 +41801,7 @@ int main() {
gdImageGifCtx()
; return 0; }
EOF
-if { (eval echo configure:41727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:41805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -41852,7 +41930,7 @@ fi
done
echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
-echo "configure:41856: checking for gdCacheCreate in -lgd" >&5
+echo "configure:41934: checking for gdCacheCreate in -lgd" >&5
ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -41860,7 +41938,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 41864 "configure"
+#line 41942 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -41871,7 +41949,7 @@ int main() {
gdCacheCreate()
; return 0; }
EOF
-if { (eval echo configure:41875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:41953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -42000,7 +42078,7 @@ fi
done
echo $ac_n "checking for gdFontCacheShutdown in -lgd""... $ac_c" 1>&6
-echo "configure:42004: checking for gdFontCacheShutdown in -lgd" >&5
+echo "configure:42082: checking for gdFontCacheShutdown in -lgd" >&5
ac_lib_var=`echo gd'_'gdFontCacheShutdown | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -42008,7 +42086,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 42012 "configure"
+#line 42090 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -42019,7 +42097,7 @@ int main() {
gdFontCacheShutdown()
; return 0; }
EOF
-if { (eval echo configure:42023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:42101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -42148,7 +42226,7 @@ fi
done
echo $ac_n "checking for gdFreeFontCache in -lgd""... $ac_c" 1>&6
-echo "configure:42152: checking for gdFreeFontCache in -lgd" >&5
+echo "configure:42230: checking for gdFreeFontCache in -lgd" >&5
ac_lib_var=`echo gd'_'gdFreeFontCache | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -42156,7 +42234,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 42160 "configure"
+#line 42238 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -42167,7 +42245,7 @@ int main() {
gdFreeFontCache()
; return 0; }
EOF
-if { (eval echo configure:42171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:42249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -42296,7 +42374,7 @@ fi
done
echo $ac_n "checking for gdFontCacheMutexSetup in -lgd""... $ac_c" 1>&6
-echo "configure:42300: checking for gdFontCacheMutexSetup in -lgd" >&5
+echo "configure:42378: checking for gdFontCacheMutexSetup in -lgd" >&5
ac_lib_var=`echo gd'_'gdFontCacheMutexSetup | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -42304,7 +42382,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 42308 "configure"
+#line 42386 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -42315,7 +42393,7 @@ int main() {
gdFontCacheMutexSetup()
; return 0; }
EOF
-if { (eval echo configure:42319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:42397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -42444,7 +42522,7 @@ fi
done
echo $ac_n "checking for gdNewDynamicCtxEx in -lgd""... $ac_c" 1>&6
-echo "configure:42448: checking for gdNewDynamicCtxEx in -lgd" >&5
+echo "configure:42526: checking for gdNewDynamicCtxEx in -lgd" >&5
ac_lib_var=`echo gd'_'gdNewDynamicCtxEx | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -42452,7 +42530,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 42456 "configure"
+#line 42534 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -42463,7 +42541,7 @@ int main() {
gdNewDynamicCtxEx()
; return 0; }
EOF
-if { (eval echo configure:42467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:42545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -42518,7 +42596,7 @@ fi
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$GD_INCLUDE
cat > conftest.$ac_ext <<EOF
-#line 42522 "configure"
+#line 42600 "configure"
#include "confdefs.h"
#include <gd.h>
@@ -42532,7 +42610,7 @@ ctx->gd_free = 1;
; return 0; }
EOF
-if { (eval echo configure:42536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:42614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -42735,8 +42813,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_GD_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/gd in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -42779,9 +42858,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC gd"
- else
-
+ EXT_STATIC="$EXT_STATIC gd"
+ ;;
+ *)
+
case ext/gd in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -42824,7 +42904,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC gd"
fi
@@ -42841,13 +42922,14 @@ EOF
fi
- if test "$GD_MODULE_TYPE" = "builtin"; then
- GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS"
-
+
BUILD_DIR="$BUILD_DIR $ext_builddir/libgd"
+
+ if test "$GD_MODULE_TYPE" = "builtin"; then
+ GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS"
GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/"
@@ -42859,7 +42941,7 @@ EOF
else
cat > conftest.$ac_ext <<EOF
-#line 42863 "configure"
+#line 42945 "configure"
#include "confdefs.h"
char foobar () {}
@@ -42870,7 +42952,7 @@ else
}
EOF
-if { (eval echo configure:42874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:42956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -42925,7 +43007,6 @@ fi
fi
-
save_old_LDFLAGS=$LDFLAGS
ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
@@ -43022,7 +43103,7 @@ fi
done
echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6
-echo "configure:43026: checking for gdImageCreate in -lgd" >&5
+echo "configure:43107: checking for gdImageCreate in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -43030,7 +43111,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 43034 "configure"
+#line 43115 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -43041,7 +43122,7 @@ int main() {
gdImageCreate()
; return 0; }
EOF
-if { (eval echo configure:43045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:43126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -43106,7 +43187,7 @@ fi
php_with_gettext=no
echo $ac_n "checking for GNU gettext support""... $ac_c" 1>&6
-echo "configure:43110: checking for GNU gettext support" >&5
+echo "configure:43191: checking for GNU gettext support" >&5
# Check whether --with-gettext or --without-gettext was given.
if test "${with_gettext+set}" = set; then
withval="$with_gettext"
@@ -43164,7 +43245,7 @@ if test "$PHP_GETTEXT" != "no"; then
O_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:43168: checking for bindtextdomain in -lintl" >&5
+echo "configure:43249: checking for bindtextdomain in -lintl" >&5
ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -43172,7 +43253,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 43176 "configure"
+#line 43257 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -43183,7 +43264,7 @@ int main() {
bindtextdomain()
; return 0; }
EOF
-if { (eval echo configure:43187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:43268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -43205,7 +43286,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for bindtextdomain in -lc""... $ac_c" 1>&6
-echo "configure:43209: checking for bindtextdomain in -lc" >&5
+echo "configure:43290: checking for bindtextdomain in -lc" >&5
ac_lib_var=`echo c'_'bindtextdomain | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -43213,7 +43294,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 43217 "configure"
+#line 43298 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -43224,7 +43305,7 @@ int main() {
bindtextdomain()
; return 0; }
EOF
-if { (eval echo configure:43228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:43309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -43443,8 +43524,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_GETTEXT_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/gettext in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -43487,9 +43569,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC gettext"
- else
-
+ EXT_STATIC="$EXT_STATIC gettext"
+ ;;
+ *)
+
case ext/gettext in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -43532,7 +43615,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC gettext"
fi
@@ -43685,7 +43769,7 @@ EOF
echo $ac_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
-echo "configure:43689: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
+echo "configure:43773: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'ngettext | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -43693,7 +43777,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 43697 "configure"
+#line 43781 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -43704,7 +43788,7 @@ int main() {
ngettext()
; return 0; }
EOF
-if { (eval echo configure:43708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:43792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -43728,7 +43812,7 @@ else
fi
echo $ac_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
-echo "configure:43732: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
+echo "configure:43816: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dngettext | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -43736,7 +43820,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 43740 "configure"
+#line 43824 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -43747,7 +43831,7 @@ int main() {
dngettext()
; return 0; }
EOF
-if { (eval echo configure:43751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:43835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -43771,7 +43855,7 @@ else
fi
echo $ac_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
-echo "configure:43775: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
+echo "configure:43859: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dcngettext | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -43779,7 +43863,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 43783 "configure"
+#line 43867 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -43790,7 +43874,7 @@ int main() {
dcngettext()
; return 0; }
EOF
-if { (eval echo configure:43794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:43878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -43814,7 +43898,7 @@ else
fi
echo $ac_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
-echo "configure:43818: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
+echo "configure:43902: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'bind_textdomain_codeset | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -43822,7 +43906,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 43826 "configure"
+#line 43910 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -43833,7 +43917,7 @@ int main() {
bind_textdomain_codeset()
; return 0; }
EOF
-if { (eval echo configure:43837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:43921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -43864,7 +43948,7 @@ fi
php_with_gmp=no
echo $ac_n "checking for GNU MP support""... $ac_c" 1>&6
-echo "configure:43868: checking for GNU MP support" >&5
+echo "configure:43952: checking for GNU MP support" >&5
# Check whether --with-gmp or --without-gmp was given.
if test "${with_gmp+set}" = set; then
withval="$with_gmp"
@@ -44015,7 +44099,7 @@ if test "$PHP_GMP" != "no"; then
done
echo $ac_n "checking for __gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6
-echo "configure:44019: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
+echo "configure:44103: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
ac_lib_var=`echo gmp'_'__gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -44023,7 +44107,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgmp $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 44027 "configure"
+#line 44111 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -44034,7 +44118,7 @@ int main() {
__gmp_randinit_lc_2exp_size()
; return 0; }
EOF
-if { (eval echo configure:44038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:44122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -44159,7 +44243,7 @@ else
done
echo $ac_n "checking for gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6
-echo "configure:44163: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
+echo "configure:44247: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
ac_lib_var=`echo gmp'_'gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -44167,7 +44251,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgmp $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 44171 "configure"
+#line 44255 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -44178,7 +44262,7 @@ int main() {
gmp_randinit_lc_2exp_size()
; return 0; }
EOF
-if { (eval echo configure:44182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:44266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -44528,8 +44612,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_GMP_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/gmp in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -44572,9 +44657,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC gmp"
- else
-
+ EXT_STATIC="$EXT_STATIC gmp"
+ ;;
+ *)
+
case ext/gmp in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -44617,7 +44703,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC gmp"
fi
@@ -44647,7 +44734,7 @@ fi
php_with_mhash=no
echo $ac_n "checking for mhash support""... $ac_c" 1>&6
-echo "configure:44651: checking for mhash support" >&5
+echo "configure:44738: checking for mhash support" >&5
# Check whether --with-mhash or --without-mhash was given.
if test "${with_mhash+set}" = set; then
withval="$with_mhash"
@@ -44694,7 +44781,7 @@ echo "$ac_t""$ext_output" 1>&6
php_enable_hash=yes
echo $ac_n "checking whether to enable hash support""... $ac_c" 1>&6
-echo "configure:44698: checking whether to enable hash support" >&5
+echo "configure:44785: checking whether to enable hash support" >&5
# Check whether --enable-hash or --disable-hash was given.
if test "${enable_hash+set}" = set; then
enableval="$enable_hash"
@@ -44755,7 +44842,7 @@ EOF
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:44759: checking whether byte ordering is bigendian" >&5
+echo "configure:44846: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -44765,7 +44852,7 @@ else
ac_cv_c_bigendian_php=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 44769 "configure"
+#line 44856 "configure"
#include "confdefs.h"
int main(void)
@@ -44781,7 +44868,7 @@ int main(void)
}
EOF
-if { (eval echo configure:44785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:44872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian_php=yes
else
@@ -44806,7 +44893,7 @@ EOF
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:44810: checking size of short" >&5
+echo "configure:44897: checking size of short" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -44814,7 +44901,7 @@ else
ac_cv_sizeof_short=2
else
cat > conftest.$ac_ext <<EOF
-#line 44818 "configure"
+#line 44905 "configure"
#include "confdefs.h"
#include <stdio.h>
int main()
@@ -44825,7 +44912,7 @@ int main()
return(0);
}
EOF
-if { (eval echo configure:44829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:44916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_short=`cat conftestval`
else
@@ -44845,7 +44932,7 @@ EOF
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:44849: checking size of int" >&5
+echo "configure:44936: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -44853,7 +44940,7 @@ else
ac_cv_sizeof_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 44857 "configure"
+#line 44944 "configure"
#include "confdefs.h"
#include <stdio.h>
int main()
@@ -44864,7 +44951,7 @@ int main()
return(0);
}
EOF
-if { (eval echo configure:44868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:44955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
@@ -44884,7 +44971,7 @@ EOF
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:44888: checking size of long" >&5
+echo "configure:44975: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -44892,7 +44979,7 @@ else
ac_cv_sizeof_long=4
else
cat > conftest.$ac_ext <<EOF
-#line 44896 "configure"
+#line 44983 "configure"
#include "confdefs.h"
#include <stdio.h>
int main()
@@ -44903,7 +44990,7 @@ int main()
return(0);
}
EOF
-if { (eval echo configure:44907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:44994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
@@ -44923,7 +45010,7 @@ EOF
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:44927: checking size of long long" >&5
+echo "configure:45014: checking size of long long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -44931,7 +45018,7 @@ else
ac_cv_sizeof_long_long=8
else
cat > conftest.$ac_ext <<EOF
-#line 44935 "configure"
+#line 45022 "configure"
#include "confdefs.h"
#include <stdio.h>
int main()
@@ -44942,7 +45029,7 @@ int main()
return(0);
}
EOF
-if { (eval echo configure:44946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:45033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_long=`cat conftestval`
else
@@ -45154,8 +45241,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_HASH_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/hash in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -45198,9 +45286,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC hash"
- else
-
+ EXT_STATIC="$EXT_STATIC hash"
+ ;;
+ *)
+
case ext/hash in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -45243,7 +45332,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC hash"
fi
@@ -45288,7 +45378,7 @@ fi
php_with_iconv=yes
echo $ac_n "checking for iconv support""... $ac_c" 1>&6
-echo "configure:45292: checking for iconv support" >&5
+echo "configure:45382: checking for iconv support" >&5
# Check whether --with-iconv or --without-iconv was given.
if test "${with_iconv+set}" = set; then
withval="$with_iconv"
@@ -45351,12 +45441,12 @@ if test "$PHP_ICONV" != "no"; then
if test "$PHP_ICONV" = "yes"; then
echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:45355: checking for iconv" >&5
+echo "configure:45445: checking for iconv" >&5
if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 45360 "configure"
+#line 45450 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char iconv(); below. */
@@ -45379,7 +45469,7 @@ iconv();
; return 0; }
EOF
-if { (eval echo configure:45383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:45473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_iconv=yes"
else
@@ -45400,12 +45490,12 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv""... $ac_c" 1>&6
-echo "configure:45404: checking for libiconv" >&5
+echo "configure:45494: checking for libiconv" >&5
if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 45409 "configure"
+#line 45499 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char libiconv(); below. */
@@ -45428,7 +45518,7 @@ libiconv();
; return 0; }
EOF
-if { (eval echo configure:45432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:45522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_libiconv=yes"
else
@@ -45584,7 +45674,7 @@ EOF
done
echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
-echo "configure:45588: checking for libiconv in -l$iconv_lib_name" >&5
+echo "configure:45678: checking for libiconv in -l$iconv_lib_name" >&5
ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -45592,7 +45682,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$iconv_lib_name $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 45596 "configure"
+#line 45686 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -45603,7 +45693,7 @@ int main() {
libiconv()
; return 0; }
EOF
-if { (eval echo configure:45607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:45697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -45737,7 +45827,7 @@ else
done
echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
-echo "configure:45741: checking for iconv in -l$iconv_lib_name" >&5
+echo "configure:45831: checking for iconv in -l$iconv_lib_name" >&5
ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -45745,7 +45835,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$iconv_lib_name $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 45749 "configure"
+#line 45839 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -45756,7 +45846,7 @@ int main() {
iconv()
; return 0; }
EOF
-if { (eval echo configure:45760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:45850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -45967,16 +46057,16 @@ else
fi
echo $ac_n "checking if iconv is glibc's""... $ac_c" 1>&6
-echo "configure:45971: checking if iconv is glibc's" >&5
+echo "configure:46061: checking if iconv is glibc's" >&5
cat > conftest.$ac_ext <<EOF
-#line 45973 "configure"
+#line 46063 "configure"
#include "confdefs.h"
#include <gnu/libc-version.h>
int main() {
gnu_get_libc_version();
; return 0; }
EOF
-if { (eval echo configure:45980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:46070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -45994,7 +46084,7 @@ rm -f conftest*
if test -z "$iconv_impl_name"; then
echo $ac_n "checking if using GNU libiconv""... $ac_c" 1>&6
-echo "configure:45998: checking if using GNU libiconv" >&5
+echo "configure:46088: checking if using GNU libiconv" >&5
php_iconv_old_ld="$LDFLAGS"
LDFLAGS="-liconv $LDFLAGS"
if test "$cross_compiling" = yes; then
@@ -46004,7 +46094,7 @@ echo "configure:45998: checking if using GNU libiconv" >&5
else
cat > conftest.$ac_ext <<EOF
-#line 46008 "configure"
+#line 46098 "configure"
#include "confdefs.h"
#include <$PHP_ICONV_H_PATH>
@@ -46014,7 +46104,7 @@ int main() {
}
EOF
-if { (eval echo configure:46018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:46108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6
@@ -46036,16 +46126,16 @@ fi
if test -z "$iconv_impl_name"; then
echo $ac_n "checking if iconv is Konstantin Chuguev's""... $ac_c" 1>&6
-echo "configure:46040: checking if iconv is Konstantin Chuguev's" >&5
+echo "configure:46130: checking if iconv is Konstantin Chuguev's" >&5
cat > conftest.$ac_ext <<EOF
-#line 46042 "configure"
+#line 46132 "configure"
#include "confdefs.h"
#include <iconv.h>
int main() {
iconv_ccs_init(NULL, NULL);
; return 0; }
EOF
-if { (eval echo configure:46049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:46139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -46064,18 +46154,18 @@ rm -f conftest*
if test -z "$iconv_impl_name"; then
echo $ac_n "checking if using IBM iconv""... $ac_c" 1>&6
-echo "configure:46068: checking if using IBM iconv" >&5
+echo "configure:46158: checking if using IBM iconv" >&5
php_iconv_old_ld="$LDFLAGS"
LDFLAGS="-liconv $LDFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 46072 "configure"
+#line 46162 "configure"
#include "confdefs.h"
#include <iconv.h>
int main() {
cstoccsid("");
; return 0; }
EOF
-if { (eval echo configure:46079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:46169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -46261,7 +46351,7 @@ EOF
esac
echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6
-echo "configure:46265: checking if iconv supports errno" >&5
+echo "configure:46355: checking if iconv supports errno" >&5
if test "$cross_compiling" = yes; then
echo "$ac_t""no" 1>&6
@@ -46275,7 +46365,7 @@ EOF
else
cat > conftest.$ac_ext <<EOF
-#line 46279 "configure"
+#line 46369 "configure"
#include "confdefs.h"
#include <$PHP_ICONV_H_PATH>
@@ -46296,7 +46386,7 @@ int main() {
}
EOF
-if { (eval echo configure:46300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:46390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6
@@ -46328,9 +46418,9 @@ fi
echo $ac_n "checking if your cpp allows macro usage in include lines""... $ac_c" 1>&6
-echo "configure:46332: checking if your cpp allows macro usage in include lines" >&5
+echo "configure:46422: checking if your cpp allows macro usage in include lines" >&5
cat > conftest.$ac_ext <<EOF
-#line 46334 "configure"
+#line 46424 "configure"
#include "confdefs.h"
#define FOO <$PHP_ICONV_H_PATH>
@@ -46340,7 +46430,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:46344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:46434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -46546,8 +46636,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_ICONV_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/iconv in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -46590,9 +46681,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC iconv"
- else
-
+ EXT_STATIC="$EXT_STATIC iconv"
+ ;;
+ *)
+
case ext/iconv in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -46635,7 +46727,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC iconv"
fi
@@ -46693,7 +46786,7 @@ fi
php_with_imap=no
echo $ac_n "checking for IMAP support""... $ac_c" 1>&6
-echo "configure:46697: checking for IMAP support" >&5
+echo "configure:46790: checking for IMAP support" >&5
# Check whether --with-imap or --without-imap was given.
if test "${with_imap+set}" = set; then
withval="$with_imap"
@@ -46740,7 +46833,7 @@ echo "$ac_t""$ext_output" 1>&6
php_with_kerberos=no
echo $ac_n "checking for IMAP Kerberos support""... $ac_c" 1>&6
-echo "configure:46744: checking for IMAP Kerberos support" >&5
+echo "configure:46837: checking for IMAP Kerberos support" >&5
# Check whether --with-kerberos or --without-kerberos was given.
if test "${with_kerberos+set}" = set; then
withval="$with_kerberos"
@@ -46766,7 +46859,7 @@ echo "$ac_t""$ext_output" 1>&6
php_with_imap_ssl=no
echo $ac_n "checking for IMAP SSL support""... $ac_c" 1>&6
-echo "configure:46770: checking for IMAP SSL support" >&5
+echo "configure:46863: checking for IMAP SSL support" >&5
# Check whether --with-imap-ssl or --without-imap-ssl was given.
if test "${with_imap_ssl+set}" = set; then
withval="$with_imap_ssl"
@@ -46977,8 +47070,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_IMAP_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/imap in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -47021,9 +47115,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC imap"
- else
-
+ EXT_STATIC="$EXT_STATIC imap"
+ ;;
+ *)
+
case ext/imap in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -47066,7 +47161,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC imap"
fi
@@ -47170,7 +47266,7 @@ EOF
done
cat > conftest.$ac_ext <<EOF
-#line 47174 "configure"
+#line 47270 "configure"
#include "confdefs.h"
#include <$IMAP_INC_DIR/mail.h>
EOF
@@ -47190,12 +47286,12 @@ rm -f conftest*
old_CFLAGS=$CFLAGS
CFLAGS="-I$IMAP_INC_DIR"
echo $ac_n "checking for utf8_mime2text signature""... $ac_c" 1>&6
-echo "configure:47194: checking for utf8_mime2text signature" >&5
+echo "configure:47290: checking for utf8_mime2text signature" >&5
if eval "test \"`echo '$''{'ac_cv_utf8_mime2text'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 47199 "configure"
+#line 47295 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -47208,7 +47304,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:47212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:47308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_utf8_mime2text=old
@@ -47237,12 +47333,12 @@ EOF
old_CFLAGS=$CFLAGS
CFLAGS="-I$IMAP_INC_DIR"
echo $ac_n "checking for U8T_CANONICAL""... $ac_c" 1>&6
-echo "configure:47241: checking for U8T_CANONICAL" >&5
+echo "configure:47337: checking for U8T_CANONICAL" >&5
if eval "test \"`echo '$''{'ac_cv_u8t_canonical'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 47246 "configure"
+#line 47342 "configure"
#include "confdefs.h"
#include <c-client.h>
@@ -47253,7 +47349,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:47257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:47353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_u8t_canonical=yes
@@ -47283,7 +47379,7 @@ echo "$ac_t""$ac_cv_u8t_canonical" 1>&6
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$IMAP_INC_DIR
cat > conftest.$ac_ext <<EOF
-#line 47287 "configure"
+#line 47383 "configure"
#include "confdefs.h"
#include "imap4r1.h"
@@ -47402,7 +47498,7 @@ rm -f conftest*
done
echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
-echo "configure:47406: checking for pam_start in -lpam" >&5
+echo "configure:47502: checking for pam_start in -lpam" >&5
ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -47410,7 +47506,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpam $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 47414 "configure"
+#line 47510 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -47421,7 +47517,7 @@ int main() {
pam_start()
; return 0; }
EOF
-if { (eval echo configure:47425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:47521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -47576,7 +47672,7 @@ fi
done
echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:47580: checking for crypt in -lcrypt" >&5
+echo "configure:47676: checking for crypt in -lcrypt" >&5
ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -47584,7 +47680,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcrypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 47588 "configure"
+#line 47684 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -47595,7 +47691,7 @@ int main() {
crypt()
; return 0; }
EOF
-if { (eval echo configure:47599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:47695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -47799,7 +47895,7 @@ fi
# Extract the first word of "krb5-config", so it can be a program name with args.
set dummy krb5-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:47803: checking for $ac_word" >&5
+echo "configure:47899: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -48168,7 +48264,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 48172 "configure"
+#line 48268 "configure"
#include "confdefs.h"
#include <$IMAP_INC_DIR/linkage.h>
EOF
@@ -48209,7 +48305,7 @@ rm -f conftest*
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:48213: checking for $ac_word" >&5
+echo "configure:48309: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -48414,9 +48510,9 @@ fi
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$OPENSSL_INCDIR
echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
-echo "configure:48418: checking for OpenSSL version" >&5
+echo "configure:48514: checking for OpenSSL version" >&5
cat > conftest.$ac_ext <<EOF
-#line 48420 "configure"
+#line 48516 "configure"
#include "confdefs.h"
#include <openssl/opensslv.h>
@@ -48571,7 +48667,7 @@ rm -f conftest*
done
echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
-echo "configure:48575: checking for CRYPTO_free in -lcrypto" >&5
+echo "configure:48671: checking for CRYPTO_free in -lcrypto" >&5
ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -48579,7 +48675,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 48583 "configure"
+#line 48679 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -48590,7 +48686,7 @@ int main() {
CRYPTO_free()
; return 0; }
EOF
-if { (eval echo configure:48594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:48690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -48747,7 +48843,7 @@ fi
done
echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
-echo "configure:48751: checking for SSL_CTX_set_ssl_version in -lssl" >&5
+echo "configure:48847: checking for SSL_CTX_set_ssl_version in -lssl" >&5
ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -48755,7 +48851,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 48759 "configure"
+#line 48855 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -48766,7 +48862,7 @@ int main() {
SSL_CTX_set_ssl_version()
; return 0; }
EOF
-if { (eval echo configure:48770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:48866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -48885,7 +48981,7 @@ else
elif test -f "$IMAP_INC_DIR/linkage.c"; then
cat > conftest.$ac_ext <<EOF
-#line 48889 "configure"
+#line 48985 "configure"
#include "confdefs.h"
#include <$IMAP_INC_DIR/linkage.c>
EOF
@@ -48916,7 +49012,7 @@ rm -f conftest*
else
cat > conftest.$ac_ext <<EOF
-#line 48920 "configure"
+#line 49016 "configure"
#include "confdefs.h"
@@ -48949,7 +49045,7 @@ else
}
EOF
-if { (eval echo configure:48953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:49049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -48975,9 +49071,7 @@ fi
- echo $ac_n "checking whether build with IMAP works""... $ac_c" 1>&6
-echo "configure:48980: checking whether build with IMAP works" >&5
-
+
old_LIBS=$LIBS
LIBS="$TST_LIBS $LIBS"
@@ -48987,7 +49081,7 @@ echo "configure:48980: checking whether build with IMAP works" >&5
else
cat > conftest.$ac_ext <<EOF
-#line 48991 "configure"
+#line 49085 "configure"
#include "confdefs.h"
@@ -49013,19 +49107,22 @@ else
PHP_IMAP_EXPORT void mm_searched(void){}
PHP_IMAP_EXPORT void mm_expunged(void){}
- char mail_newbody();
+ char utf8_to_mutf7();
int main() {
- mail_newbody();
+ utf8_to_mutf7();
return 0;
}
EOF
-if { (eval echo configure:49024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:49118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
- echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+#define HAVE_IMAP_MUTF7 1
+EOF
+
else
@@ -49035,9 +49132,6 @@ else
LIBS=$old_LIBS
- echo "$ac_t""no" 1>&6
- { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; }
-
fi
rm -fr conftest*
@@ -49047,7 +49141,7 @@ fi
echo $ac_n "checking whether rfc822_output_address_list function present""... $ac_c" 1>&6
-echo "configure:49051: checking whether rfc822_output_address_list function present" >&5
+echo "configure:49145: checking whether rfc822_output_address_list function present" >&5
old_LIBS=$LIBS
LIBS="
@@ -49059,7 +49153,7 @@ echo "configure:49051: checking whether rfc822_output_address_list function pres
else
cat > conftest.$ac_ext <<EOF
-#line 49063 "configure"
+#line 49157 "configure"
#include "confdefs.h"
@@ -49095,7 +49189,7 @@ else
}
EOF
-if { (eval echo configure:49099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:49193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -49123,6 +49217,76 @@ fi
+ echo $ac_n "checking whether build with IMAP works""... $ac_c" 1>&6
+echo "configure:49222: checking whether build with IMAP works" >&5
+
+
+ old_LIBS=$LIBS
+ LIBS="$TST_LIBS $LIBS"
+ if test "$cross_compiling" = yes; then
+
+ LIBS=$old_LIBS
+
+else
+ cat > conftest.$ac_ext <<EOF
+#line 49233 "configure"
+#include "confdefs.h"
+
+
+#if defined(__GNUC__) && __GNUC__ >= 4
+# define PHP_IMAP_EXPORT __attribute__ ((visibility("default")))
+#else
+# define PHP_IMAP_EXPORT
+#endif
+
+ PHP_IMAP_EXPORT void mm_log(void){}
+ PHP_IMAP_EXPORT void mm_dlog(void){}
+ PHP_IMAP_EXPORT void mm_flags(void){}
+ PHP_IMAP_EXPORT void mm_fatal(void){}
+ PHP_IMAP_EXPORT void mm_critical(void){}
+ PHP_IMAP_EXPORT void mm_nocritical(void){}
+ PHP_IMAP_EXPORT void mm_notify(void){}
+ PHP_IMAP_EXPORT void mm_login(void){}
+ PHP_IMAP_EXPORT void mm_diskerror(void){}
+ PHP_IMAP_EXPORT void mm_status(void){}
+ PHP_IMAP_EXPORT void mm_lsub(void){}
+ PHP_IMAP_EXPORT void mm_list(void){}
+ PHP_IMAP_EXPORT void mm_exists(void){}
+ PHP_IMAP_EXPORT void mm_searched(void){}
+ PHP_IMAP_EXPORT void mm_expunged(void){}
+
+ char mail_newbody();
+ int main() {
+ mail_newbody();
+ return 0;
+ }
+
+EOF
+if { (eval echo configure:49266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+
+ LIBS=$old_LIBS
+
+ echo "$ac_t""yes" 1>&6
+
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+
+ LIBS=$old_LIBS
+
+ echo "$ac_t""no" 1>&6
+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; }
+
+
+fi
+rm -fr conftest*
+fi
+
+
+
fi
@@ -49130,7 +49294,7 @@ fi
php_with_interbase=no
echo $ac_n "checking for InterBase support""... $ac_c" 1>&6
-echo "configure:49134: checking for InterBase support" >&5
+echo "configure:49298: checking for InterBase support" >&5
# Check whether --with-interbase or --without-interbase was given.
if test "${with_interbase+set}" = set; then
withval="$with_interbase"
@@ -49280,7 +49444,7 @@ if test "$PHP_INTERBASE" != "no"; then
done
echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6
-echo "configure:49284: checking for isc_detach_database in -lfbclient" >&5
+echo "configure:49448: checking for isc_detach_database in -lfbclient" >&5
ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -49288,7 +49452,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lfbclient $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 49292 "configure"
+#line 49456 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -49299,7 +49463,7 @@ int main() {
isc_detach_database()
; return 0; }
EOF
-if { (eval echo configure:49303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:49467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -49426,7 +49590,7 @@ else
done
echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
-echo "configure:49430: checking for isc_detach_database in -lgds" >&5
+echo "configure:49594: checking for isc_detach_database in -lgds" >&5
ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -49434,7 +49598,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgds $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 49438 "configure"
+#line 49602 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -49445,7 +49609,7 @@ int main() {
isc_detach_database()
; return 0; }
EOF
-if { (eval echo configure:49449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:49613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -49572,7 +49736,7 @@ else
done
echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
-echo "configure:49576: checking for isc_detach_database in -lib_util" >&5
+echo "configure:49740: checking for isc_detach_database in -lib_util" >&5
ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -49580,7 +49744,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lib_util $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 49584 "configure"
+#line 49748 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -49591,7 +49755,7 @@ int main() {
isc_detach_database()
; return 0; }
EOF
-if { (eval echo configure:49595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:49759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -49950,8 +50114,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_INTERBASE_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/interbase in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -49994,9 +50159,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC interbase"
- else
-
+ EXT_STATIC="$EXT_STATIC interbase"
+ ;;
+ *)
+
case ext/interbase in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -50039,7 +50205,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC interbase"
fi
@@ -50065,7 +50232,7 @@ fi
php_enable_intl=no
echo $ac_n "checking whether to enable internationalization support""... $ac_c" 1>&6
-echo "configure:50069: checking whether to enable internationalization support" >&5
+echo "configure:50236: checking whether to enable internationalization support" >&5
# Check whether --enable-intl or --disable-intl was given.
if test "${enable_intl+set}" = set; then
enableval="$enable_intl"
@@ -50143,7 +50310,7 @@ ext_output=$PHP_ICU_DIR
# Extract the first word of "icu-config", so it can be a program name with args.
set dummy icu-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:50147: checking for $ac_word" >&5
+echo "configure:50314: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_ICU_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -50181,7 +50348,7 @@ fi
fi
echo $ac_n "checking for location of ICU headers and libraries""... $ac_c" 1>&6
-echo "configure:50185: checking for location of ICU headers and libraries" >&5
+echo "configure:50352: checking for location of ICU headers and libraries" >&5
icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null`
if test "$?" != "0" || test -z "$icu_install_prefix"; then
@@ -50191,7 +50358,7 @@ echo "configure:50185: checking for location of ICU headers and libraries" >&5
echo "$ac_t""$icu_install_prefix" 1>&6
echo $ac_n "checking for ICU 3.4 or greater""... $ac_c" 1>&6
-echo "configure:50195: checking for ICU 3.4 or greater" >&5
+echo "configure:50362: checking for ICU 3.4 or greater" >&5
icu_version_full=`$ICU_CONFIG --version`
ac_IFS=$IFS
IFS="."
@@ -50347,7 +50514,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
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:50351: checking for $ac_word" >&5
+echo "configure:50518: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -50379,7 +50546,7 @@ test -n "$CXX" || CXX="gcc"
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:50383: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:50550: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -50390,12 +50557,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext << EOF
-#line 50394 "configure"
+#line 50561 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:50399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:50566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -50421,12 +50588,12 @@ if test $ac_cv_prog_cxx_works = no; then
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:50425: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:50592: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:50430: checking whether we are using GNU C++" >&5
+echo "configure:50597: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -50435,7 +50602,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:50439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:50606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
@@ -50454,7 +50621,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:50458: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:50625: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -50495,7 +50662,7 @@ for ac_declaration in \
'void exit (int);'
do
cat > conftest.$ac_ext <<EOF
-#line 50499 "configure"
+#line 50666 "configure"
#include "confdefs.h"
#include <stdlib.h>
$ac_declaration
@@ -50503,7 +50670,7 @@ int main() {
exit (42);
; return 0; }
EOF
-if { (eval echo configure:50507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:50674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -50513,14 +50680,14 @@ else
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 50517 "configure"
+#line 50684 "configure"
#include "confdefs.h"
$ac_declaration
int main() {
exit (42);
; return 0; }
EOF
-if { (eval echo configure:50524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:50691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
break
else
@@ -50537,7 +50704,7 @@ fi
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:50541: checking how to run the C++ preprocessor" >&5
+echo "configure:50708: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -50550,12 +50717,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
-#line 50554 "configure"
+#line 50721 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:50559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:50726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -50851,8 +51018,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_INTL_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/intl in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -50937,9 +51105,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC intl"
- else
-
+ EXT_STATIC="$EXT_STATIC intl"
+ ;;
+ *)
+
case ext/intl in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -51024,7 +51193,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC intl"
fi
@@ -51093,7 +51263,7 @@ fi
php_enable_json=yes
echo $ac_n "checking whether to enable JavaScript Object Serialization support""... $ac_c" 1>&6
-echo "configure:51097: checking whether to enable JavaScript Object Serialization support" >&5
+echo "configure:51267: checking whether to enable JavaScript Object Serialization support" >&5
# Check whether --enable-json or --disable-json was given.
if test "${enable_json+set}" = set; then
enableval="$enable_json"
@@ -51142,12 +51312,12 @@ if test "$PHP_JSON" != "no"; then
EOF
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:51146: checking for ANSI C header files" >&5
+echo "configure:51316: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 51151 "configure"
+#line 51321 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -51155,7 +51325,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:51159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:51329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -51172,7 +51342,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 51176 "configure"
+#line 51346 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -51190,7 +51360,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 51194 "configure"
+#line 51364 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -51211,7 +51381,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 51215 "configure"
+#line 51385 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -51222,7 +51392,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:51226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:51396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -51430,8 +51600,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_JSON_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/json in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -51474,9 +51645,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC json"
- else
-
+ EXT_STATIC="$EXT_STATIC json"
+ ;;
+ *)
+
case ext/json in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -51519,7 +51691,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC json"
fi
@@ -51549,7 +51722,7 @@ fi
php_with_ldap=no
echo $ac_n "checking for LDAP support""... $ac_c" 1>&6
-echo "configure:51553: checking for LDAP support" >&5
+echo "configure:51726: checking for LDAP support" >&5
# Check whether --with-ldap or --without-ldap was given.
if test "${with_ldap+set}" = set; then
withval="$with_ldap"
@@ -51596,7 +51769,7 @@ echo "$ac_t""$ext_output" 1>&6
php_with_ldap_sasl=no
echo $ac_n "checking for LDAP Cyrus SASL support""... $ac_c" 1>&6
-echo "configure:51600: checking for LDAP Cyrus SASL support" >&5
+echo "configure:51773: checking for LDAP Cyrus SASL support" >&5
# Check whether --with-ldap-sasl or --without-ldap-sasl was given.
if test "${with_ldap_sasl+set}" = set; then
withval="$with_ldap_sasl"
@@ -51804,8 +51977,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_LDAP_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/ldap in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -51848,9 +52022,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC ldap"
- else
-
+ EXT_STATIC="$EXT_STATIC ldap"
+ ;;
+ *)
+
case ext/ldap in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -51893,7 +52068,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC ldap"
fi
@@ -53938,19 +54114,19 @@ EOF
LIBS="$LIBS $LDAP_SHARED_LIBADD"
echo $ac_n "checking for 3 arg ldap_set_rebind_proc""... $ac_c" 1>&6
-echo "configure:53942: checking for 3 arg ldap_set_rebind_proc" >&5
+echo "configure:54118: checking for 3 arg ldap_set_rebind_proc" >&5
if eval "test \"`echo '$''{'ac_cv_3arg_setrebindproc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 53947 "configure"
+#line 54123 "configure"
#include "confdefs.h"
#include <ldap.h>
int main() {
ldap_set_rebind_proc(0,0,0)
; return 0; }
EOF
-if { (eval echo configure:53954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:54130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_3arg_setrebindproc=yes
else
@@ -53973,12 +54149,12 @@ EOF
for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:53977: checking for $ac_func" >&5
+echo "configure:54153: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 53982 "configure"
+#line 54158 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -54001,7 +54177,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:54005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:54181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -54163,7 +54339,7 @@ EOF
done
echo $ac_n "checking for sasl_version in -lldap""... $ac_c" 1>&6
-echo "configure:54167: checking for sasl_version in -lldap" >&5
+echo "configure:54343: checking for sasl_version in -lldap" >&5
ac_lib_var=`echo ldap'_'sasl_version | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -54171,7 +54347,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lldap $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 54175 "configure"
+#line 54351 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -54182,7 +54358,7 @@ int main() {
sasl_version()
; return 0; }
EOF
-if { (eval echo configure:54186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:54362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -54351,12 +54527,12 @@ fi
fi
echo $ac_n "checking for ldap_bind_s""... $ac_c" 1>&6
-echo "configure:54355: checking for ldap_bind_s" >&5
+echo "configure:54531: checking for ldap_bind_s" >&5
if eval "test \"`echo '$''{'ac_cv_func_ldap_bind_s'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 54360 "configure"
+#line 54536 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char ldap_bind_s(); below. */
@@ -54379,7 +54555,7 @@ ldap_bind_s();
; return 0; }
EOF
-if { (eval echo configure:54383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:54559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_ldap_bind_s=yes"
else
@@ -54432,7 +54608,7 @@ fi
php_enable_mbstring=no
echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6
-echo "configure:54436: checking whether to enable multibyte string support" >&5
+echo "configure:54612: checking whether to enable multibyte string support" >&5
# Check whether --enable-mbstring or --disable-mbstring was given.
if test "${enable_mbstring+set}" = set; then
enableval="$enable_mbstring"
@@ -54479,7 +54655,7 @@ echo "$ac_t""$ext_output" 1>&6
php_enable_mbregex=yes
echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6
-echo "configure:54483: checking whether to enable multibyte regex support" >&5
+echo "configure:54659: checking whether to enable multibyte regex support" >&5
# Check whether --enable-mbregex or --disable-mbregex was given.
if test "${enable_mbregex+set}" = set; then
enableval="$enable_mbregex"
@@ -54505,7 +54681,7 @@ echo "$ac_t""$ext_output" 1>&6
php_enable_mbregex_backtrack=yes
echo $ac_n "checking whether to check multibyte regex backtrack""... $ac_c" 1>&6
-echo "configure:54509: checking whether to check multibyte regex backtrack" >&5
+echo "configure:54685: checking whether to check multibyte regex backtrack" >&5
# Check whether --enable-mbregex_backtrack or --disable-mbregex_backtrack was given.
if test "${enable_mbregex_backtrack+set}" = set; then
enableval="$enable_mbregex_backtrack"
@@ -54531,7 +54707,7 @@ echo "$ac_t""$ext_output" 1>&6
php_with_libmbfl=no
echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6
-echo "configure:54535: checking for external libmbfl" >&5
+echo "configure:54711: checking for external libmbfl" >&5
# Check whether --with-libmbfl or --without-libmbfl was given.
if test "${with_libmbfl+set}" = set; then
withval="$with_libmbfl"
@@ -54557,7 +54733,7 @@ echo "$ac_t""$ext_output" 1>&6
php_with_onig=no
echo $ac_n "checking for external oniguruma""... $ac_c" 1>&6
-echo "configure:54561: checking for external oniguruma" >&5
+echo "configure:54737: checking for external oniguruma" >&5
# Check whether --with-onig or --without-onig was given.
if test "${with_onig+set}" = set; then
withval="$with_onig"
@@ -54601,7 +54777,7 @@ EOF
fi
echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6
-echo "configure:54605: checking for variable length prototypes and stdarg.h" >&5
+echo "configure:54781: checking for variable length prototypes and stdarg.h" >&5
if eval "test \"`echo '$''{'cv_php_mbstring_stdarg'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -54619,7 +54795,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 54623 "configure"
+#line 54799 "configure"
#include "confdefs.h"
#include <stdarg.h>
@@ -54634,7 +54810,7 @@ int foo(int x, ...) {
int main() { return foo(10, "", 3.14); }
EOF
-if { (eval echo configure:54638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:54814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cv_php_mbstring_stdarg=yes
else
@@ -54655,17 +54831,17 @@ echo "$ac_t""$cv_php_mbstring_stdarg" 1>&6
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:54659: checking for $ac_hdr" >&5
+echo "configure:54835: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 54664 "configure"
+#line 54840 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:54669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:54845: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -54692,7 +54868,7 @@ fi
done
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:54696: checking size of int" >&5
+echo "configure:54872: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -54700,7 +54876,7 @@ else
ac_cv_sizeof_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 54704 "configure"
+#line 54880 "configure"
#include "confdefs.h"
#include <stdio.h>
int main()
@@ -54711,7 +54887,7 @@ int main()
return(0);
}
EOF
-if { (eval echo configure:54715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:54891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
@@ -54731,7 +54907,7 @@ EOF
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:54735: checking size of short" >&5
+echo "configure:54911: checking size of short" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -54739,7 +54915,7 @@ else
ac_cv_sizeof_short=2
else
cat > conftest.$ac_ext <<EOF
-#line 54743 "configure"
+#line 54919 "configure"
#include "confdefs.h"
#include <stdio.h>
int main()
@@ -54750,7 +54926,7 @@ int main()
return(0);
}
EOF
-if { (eval echo configure:54754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:54930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_short=`cat conftestval`
else
@@ -54770,7 +54946,7 @@ EOF
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:54774: checking size of long" >&5
+echo "configure:54950: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -54778,7 +54954,7 @@ else
ac_cv_sizeof_long=4
else
cat > conftest.$ac_ext <<EOF
-#line 54782 "configure"
+#line 54958 "configure"
#include "confdefs.h"
#include <stdio.h>
int main()
@@ -54789,7 +54965,7 @@ int main()
return(0);
}
EOF
-if { (eval echo configure:54793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:54969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
@@ -54809,12 +54985,12 @@ EOF
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:54813: checking for working const" >&5
+echo "configure:54989: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 54818 "configure"
+#line 54994 "configure"
#include "confdefs.h"
int main() {
@@ -54863,7 +55039,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:54867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:55043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -54884,12 +55060,12 @@ EOF
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:54888: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:55064: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 54893 "configure"
+#line 55069 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -54898,7 +55074,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:54902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:55078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -54921,19 +55097,19 @@ fi
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:54925: checking for working alloca.h" >&5
+echo "configure:55101: checking for working alloca.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 54930 "configure"
+#line 55106 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:54937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:55113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -54954,12 +55130,12 @@ EOF
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:54958: checking for alloca" >&5
+echo "configure:55134: checking for alloca" >&5
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 54963 "configure"
+#line 55139 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -54987,7 +55163,7 @@ int main() {
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:54991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:55167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
@@ -55019,12 +55195,12 @@ EOF
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:55023: checking whether alloca needs Cray hooks" >&5
+echo "configure:55199: checking whether alloca needs Cray hooks" >&5
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 55028 "configure"
+#line 55204 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -55049,12 +55225,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:55053: checking for $ac_func" >&5
+echo "configure:55229: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 55058 "configure"
+#line 55234 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -55077,7 +55253,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:55081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:55257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -55104,7 +55280,7 @@ done
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:55108: checking stack direction for C alloca" >&5
+echo "configure:55284: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -55112,7 +55288,7 @@ else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 55116 "configure"
+#line 55292 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -55131,7 +55307,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:55135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:55311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_stack_direction=1
else
@@ -55153,7 +55329,7 @@ EOF
fi
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:55157: checking for 8-bit clean memcmp" >&5
+echo "configure:55333: checking for 8-bit clean memcmp" >&5
if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -55161,7 +55337,7 @@ else
ac_cv_func_memcmp_clean=no
else
cat > conftest.$ac_ext <<EOF
-#line 55165 "configure"
+#line 55341 "configure"
#include "confdefs.h"
main()
@@ -55171,7 +55347,7 @@ main()
}
EOF
-if { (eval echo configure:55175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:55351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_memcmp_clean=yes
else
@@ -55190,17 +55366,17 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
ac_safe=`echo "stdarg.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for stdarg.h""... $ac_c" 1>&6
-echo "configure:55194: checking for stdarg.h" >&5
+echo "configure:55370: checking for stdarg.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 55199 "configure"
+#line 55375 "configure"
#include "confdefs.h"
#include <stdarg.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:55204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:55380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -55430,7 +55606,7 @@ EOF
done
echo $ac_n "checking for onig_init in -lonig""... $ac_c" 1>&6
-echo "configure:55434: checking for onig_init in -lonig" >&5
+echo "configure:55610: checking for onig_init in -lonig" >&5
ac_lib_var=`echo onig'_'onig_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -55438,7 +55614,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lonig $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 55442 "configure"
+#line 55618 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -55449,7 +55625,7 @@ int main() {
onig_init()
; return 0; }
EOF
-if { (eval echo configure:55453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:55629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -55675,9 +55851,9 @@ fi
done
echo $ac_n "checking if oniguruma has an invalid entry for KOI8 encoding""... $ac_c" 1>&6
-echo "configure:55679: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
+echo "configure:55855: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
cat > conftest.$ac_ext <<EOF
-#line 55681 "configure"
+#line 55857 "configure"
#include "confdefs.h"
#include <oniguruma.h>
@@ -55688,7 +55864,7 @@ return (int)(ONIG_ENCODING_KOI8 + 1);
; return 0; }
EOF
-if { (eval echo configure:55692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:55868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""no" 1>&6
@@ -55706,7 +55882,7 @@ EOF
fi
rm -f conftest*
- LDFLAGS=$save_old_LDFLAGS
+ LDFLAGS=$save_old_LDFLAGS
fi
@@ -55983,7 +56159,7 @@ EOF
done
echo $ac_n "checking for mbfl_buffer_converter_new in -lmbfl""... $ac_c" 1>&6
-echo "configure:55987: checking for mbfl_buffer_converter_new in -lmbfl" >&5
+echo "configure:56163: checking for mbfl_buffer_converter_new in -lmbfl" >&5
ac_lib_var=`echo mbfl'_'mbfl_buffer_converter_new | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -55991,7 +56167,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lmbfl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 55995 "configure"
+#line 56171 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -56002,7 +56178,7 @@ int main() {
mbfl_buffer_converter_new()
; return 0; }
EOF
-if { (eval echo configure:56006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:56182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -56319,8 +56495,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_MBSTRING_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/mbstring in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -56363,9 +56540,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC mbstring"
- else
-
+ EXT_STATIC="$EXT_STATIC mbstring"
+ ;;
+ *)
+
case ext/mbstring in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -56408,7 +56586,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC mbstring"
fi
@@ -56636,7 +56815,7 @@ fi
php_with_mcrypt=no
echo $ac_n "checking for mcrypt support""... $ac_c" 1>&6
-echo "configure:56640: checking for mcrypt support" >&5
+echo "configure:56819: checking for mcrypt support" >&5
# Check whether --with-mcrypt or --without-mcrypt was given.
if test "${with_mcrypt+set}" = set; then
withval="$with_mcrypt"
@@ -56692,9 +56871,9 @@ if test "$PHP_MCRYPT" != "no"; then
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$MCRYPT_DIR/include
echo $ac_n "checking for libmcrypt version""... $ac_c" 1>&6
-echo "configure:56696: checking for libmcrypt version" >&5
+echo "configure:56875: checking for libmcrypt version" >&5
cat > conftest.$ac_ext <<EOF
-#line 56698 "configure"
+#line 56877 "configure"
#include "confdefs.h"
#include <mcrypt.h>
@@ -56818,7 +56997,7 @@ rm -f conftest*
done
echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
-echo "configure:56822: checking for mcrypt_module_open in -lmcrypt" >&5
+echo "configure:57001: checking for mcrypt_module_open in -lmcrypt" >&5
ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -56826,7 +57005,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lmcrypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 56830 "configure"
+#line 57009 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -56837,7 +57016,7 @@ int main() {
mcrypt_module_open()
; return 0; }
EOF
-if { (eval echo configure:56841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:57020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -56990,7 +57169,7 @@ else
done
echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
-echo "configure:56994: checking for mcrypt_module_open in -lmcrypt" >&5
+echo "configure:57173: checking for mcrypt_module_open in -lmcrypt" >&5
ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -56998,7 +57177,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lmcrypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 57002 "configure"
+#line 57181 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -57009,7 +57188,7 @@ int main() {
mcrypt_module_open()
; return 0; }
EOF
-if { (eval echo configure:57013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:57192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -57367,8 +57546,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_MCRYPT_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/mcrypt in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -57411,9 +57591,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC mcrypt"
- else
-
+ EXT_STATIC="$EXT_STATIC mcrypt"
+ ;;
+ *)
+
case ext/mcrypt in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -57456,7 +57637,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC mcrypt"
fi
@@ -57479,7 +57661,7 @@ fi
php_with_mssql=no
echo $ac_n "checking for MSSQL support via FreeTDS""... $ac_c" 1>&6
-echo "configure:57483: checking for MSSQL support via FreeTDS" >&5
+echo "configure:57665: checking for MSSQL support via FreeTDS" >&5
# Check whether --with-mssql or --without-mssql was given.
if test "${with_mssql+set}" = set; then
withval="$with_mssql"
@@ -57871,8 +58053,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_MSSQL_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/mssql in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -57915,9 +58098,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC mssql"
- else
-
+ EXT_STATIC="$EXT_STATIC mssql"
+ ;;
+ *)
+
case ext/mssql in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -57960,7 +58144,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC mssql"
fi
@@ -57977,7 +58162,7 @@ EOF
fi
echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:57981: checking for dnet_addr in -ldnet_stub" >&5
+echo "configure:58166: checking for dnet_addr in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -57985,7 +58170,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 57989 "configure"
+#line 58174 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -57996,7 +58181,7 @@ int main() {
dnet_addr()
; return 0; }
EOF
-if { (eval echo configure:58000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:58185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -58140,7 +58325,7 @@ fi
php_with_mysql=no
echo $ac_n "checking for MySQL support""... $ac_c" 1>&6
-echo "configure:58144: checking for MySQL support" >&5
+echo "configure:58329: checking for MySQL support" >&5
# Check whether --with-mysql or --without-mysql was given.
if test "${with_mysql+set}" = set; then
withval="$with_mysql"
@@ -58187,7 +58372,7 @@ echo "$ac_t""$ext_output" 1>&6
php_with_mysql_sock=no
echo $ac_n "checking for specified location of the MySQL UNIX socket""... $ac_c" 1>&6
-echo "configure:58191: checking for specified location of the MySQL UNIX socket" >&5
+echo "configure:58376: checking for specified location of the MySQL UNIX socket" >&5
# Check whether --with-mysql-sock or --without-mysql-sock was given.
if test "${with_mysql_sock+set}" = set; then
withval="$with_mysql_sock"
@@ -58214,7 +58399,7 @@ if test -z "$PHP_ZLIB_DIR"; then
php_with_zlib_dir=no
echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
-echo "configure:58218: checking for the location of libz" >&5
+echo "configure:58403: checking for the location of libz" >&5
# Check whether --with-zlib-dir or --without-zlib-dir was given.
if test "${with_zlib_dir+set}" = set; then
withval="$with_zlib_dir"
@@ -58243,7 +58428,7 @@ if test "$PHP_MYSQL" = "mysqlnd"; then
elif test "$PHP_MYSQL" != "no"; then
echo $ac_n "checking for MySQL UNIX socket location""... $ac_c" 1>&6
-echo "configure:58247: checking for MySQL UNIX socket location" >&5
+echo "configure:58432: checking for MySQL UNIX socket location" >&5
if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
MYSQL_SOCK=$PHP_MYSQL_SOCK
cat >> confdefs.h <<EOF
@@ -58434,7 +58619,7 @@ Note that the MySQL client library is not bundled anymore!" 1>&2; exit 1; }
done
echo $ac_n "checking for mysql_close in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
-echo "configure:58438: checking for mysql_close in -l$MYSQL_LIBNAME" >&5
+echo "configure:58623: checking for mysql_close in -l$MYSQL_LIBNAME" >&5
ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_close | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -58442,7 +58627,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$MYSQL_LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 58446 "configure"
+#line 58631 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -58453,7 +58638,7 @@ int main() {
mysql_close()
; return 0; }
EOF
-if { (eval echo configure:58457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:58642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -58676,7 +58861,7 @@ else
done
echo $ac_n "checking for mysql_error in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
-echo "configure:58680: checking for mysql_error in -l$MYSQL_LIBNAME" >&5
+echo "configure:58865: checking for mysql_error in -l$MYSQL_LIBNAME" >&5
ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_error | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -58684,7 +58869,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$MYSQL_LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 58688 "configure"
+#line 58873 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -58695,7 +58880,7 @@ int main() {
mysql_error()
; return 0; }
EOF
-if { (eval echo configure:58699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:58884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -58850,7 +59035,7 @@ fi
done
echo $ac_n "checking for mysql_errno in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
-echo "configure:58854: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5
+echo "configure:59039: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5
ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_errno | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -58858,7 +59043,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$MYSQL_LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 58862 "configure"
+#line 59047 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -58869,7 +59054,7 @@ int main() {
mysql_errno()
; return 0; }
EOF
-if { (eval echo configure:58873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:59058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -59250,8 +59435,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_MYSQL_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/mysql in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -59294,9 +59480,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC mysql"
- else
-
+ EXT_STATIC="$EXT_STATIC mysql"
+ ;;
+ *)
+
case ext/mysql in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -59339,7 +59526,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC mysql"
fi
@@ -59391,7 +59579,7 @@ fi
php_with_mysqli=no
echo $ac_n "checking for MySQLi support""... $ac_c" 1>&6
-echo "configure:59395: checking for MySQLi support" >&5
+echo "configure:59583: checking for MySQLi support" >&5
# Check whether --with-mysqli or --without-mysqli was given.
if test "${with_mysqli+set}" = set; then
withval="$with_mysqli"
@@ -59438,7 +59626,7 @@ echo "$ac_t""$ext_output" 1>&6
php_enable_embedded_mysqli=no
echo $ac_n "checking whether to enable embedded MySQLi support""... $ac_c" 1>&6
-echo "configure:59442: checking whether to enable embedded MySQLi support" >&5
+echo "configure:59630: checking whether to enable embedded MySQLi support" >&5
# Check whether --enable-embedded_mysqli or --disable-embedded_mysqli was given.
if test "${enable_embedded_mysqli+set}" = set; then
enableval="$enable_embedded_mysqli"
@@ -59592,7 +59780,7 @@ EOF
done
echo $ac_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
-echo "configure:59596: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5
+echo "configure:59784: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5
ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_server_option | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -59600,7 +59788,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$MYSQL_LIB_NAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 59604 "configure"
+#line 59792 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -59611,7 +59799,7 @@ int main() {
mysql_set_server_option()
; return 0; }
EOF
-if { (eval echo configure:59615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:59803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -59859,7 +60047,7 @@ EOF
done
echo $ac_n "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
-echo "configure:59863: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5
+echo "configure:60051: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5
ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_character_set | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -59867,7 +60055,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$MYSQL_LIB_NAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 59871 "configure"
+#line 60059 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -59878,7 +60066,7 @@ int main() {
mysql_set_character_set()
; return 0; }
EOF
-if { (eval echo configure:59882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:60070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -59924,6 +60112,159 @@ else
fi
+
+ save_old_LDFLAGS=$LDFLAGS
+ ac_stuff="
+ $MYSQLI_LIBLINE
+ "
+
+ save_ext_shared=$ext_shared
+ ext_shared=yes
+
+ for ac_i in $ac_stuff; do
+ case $ac_i in
+ -pthread)
+ if test "$ext_shared" = "yes"; then
+ LDFLAGS="$LDFLAGS -pthread"
+ else
+
+
+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
+
+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
+ eval "EXTRA_LDFLAGS$unique=set"
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
+ fi
+
+ fi
+ ;;
+ -l*)
+ ac_ii=`echo $ac_i|cut -c 3-`
+
+
+ case $ac_ii in
+ c|c_r|pthread*) ;;
+ *)
+ if test "$ext_shared" = "yes"; then
+ LDFLAGS="$LDFLAGS -l$ac_ii"
+ else
+
+
+ case $ac_ii in
+ c|c_r|pthread*) ;;
+ *)
+ LIBS="$LIBS -l$ac_ii"
+ ;;
+ esac
+
+
+ fi
+ ;;
+ esac
+
+
+ ;;
+ -L*)
+ ac_ii=`echo $ac_i|cut -c 3-`
+
+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
+
+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
+ ai_p=$ac_ii
+ else
+
+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+
+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
+ ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+ fi
+
+
+ if test "$ext_shared" = "yes"; then
+ LDFLAGS="-L$ai_p $LDFLAGS"
+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
+ else
+
+
+
+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
+
+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
+ eval "LIBPATH$unique=set"
+
+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
+ LDFLAGS="$LDFLAGS -L$ai_p"
+ PHP_RPATHS="$PHP_RPATHS $ai_p"
+
+ fi
+
+
+ fi
+
+ fi
+
+ ;;
+ esac
+ done
+
+ echo $ac_n "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
+echo "configure:60214: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5
+ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_stmt_next_result | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-l$MYSQL_LIB_NAME $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 60222 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char mysql_stmt_next_result();
+
+int main() {
+mysql_stmt_next_result()
+; return 0; }
+EOF
+if { (eval echo configure:60233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+
+ LDFLAGS=$save_old_LDFLAGS
+ ext_shared=$save_ext_shared
+
+ cat >> confdefs.h <<\EOF
+#define HAVE_STMT_NEXT_RESULT 1
+EOF
+
+
+
+else
+ echo "$ac_t""no" 1>&6
+
+ LDFLAGS=$save_old_LDFLAGS
+ ext_shared=$save_ext_shared
+ unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_stmt_next_result
+
+
+
+fi
+
fi
if test "$PHP_MYSQLI" != "no"; then
@@ -60114,8 +60455,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_MYSQLI_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/mysqli in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -60158,9 +60500,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC mysqli"
- else
-
+ EXT_STATIC="$EXT_STATIC mysqli"
+ ;;
+ *)
+
case ext/mysqli in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -60203,7 +60546,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC mysqli"
fi
@@ -60271,7 +60615,7 @@ fi
php_with_oci8=no
echo $ac_n "checking for Oracle (OCI8) support""... $ac_c" 1>&6
-echo "configure:60275: checking for Oracle (OCI8) support" >&5
+echo "configure:60619: checking for Oracle (OCI8) support" >&5
# Check whether --with-oci8 or --without-oci8 was given.
if test "${with_oci8+set}" = set; then
withval="$with_oci8"
@@ -60322,7 +60666,7 @@ if test "$PHP_OCI8" != "no"; then
echo $ac_n "checking PHP version""... $ac_c" 1>&6
-echo "configure:60326: checking PHP version" >&5
+echo "configure:60670: checking PHP version" >&5
tmp_version=$PHP_VERSION
if test -z "$tmp_version"; then
@@ -60354,7 +60698,7 @@ echo "configure:60326: checking PHP version" >&5
echo $ac_n "checking size of long int""... $ac_c" 1>&6
-echo "configure:60358: checking size of long int" >&5
+echo "configure:60702: checking size of long int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -60362,7 +60706,7 @@ else
ac_cv_sizeof_long_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 60366 "configure"
+#line 60710 "configure"
#include "confdefs.h"
#include <stdio.h>
int main()
@@ -60373,7 +60717,7 @@ int main()
return(0);
}
EOF
-if { (eval echo configure:60377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:60721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_int=`cat conftestval`
else
@@ -60393,7 +60737,7 @@ EOF
echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6
-echo "configure:60397: checking checking if we're on a 64-bit platform" >&5
+echo "configure:60741: checking checking if we're on a 64-bit platform" >&5
if test "$ac_cv_sizeof_long_int" = "4"; then
echo "$ac_t""no" 1>&6
PHP_OCI8_OH_LIBDIR=lib32
@@ -60437,7 +60781,7 @@ echo "configure:60397: checking checking if we're on a 64-bit platform" >&5
if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
echo $ac_n "checking Oracle ORACLE_HOME install directory""... $ac_c" 1>&6
-echo "configure:60441: checking Oracle ORACLE_HOME install directory" >&5
+echo "configure:60785: checking Oracle ORACLE_HOME install directory" >&5
if test "$PHP_OCI8" = "yes"; then
OCI8_DIR=$ORACLE_HOME
@@ -60448,7 +60792,7 @@ echo "configure:60441: checking Oracle ORACLE_HOME install directory" >&5
echo $ac_n "checking ORACLE_HOME library validity""... $ac_c" 1>&6
-echo "configure:60452: checking ORACLE_HOME library validity" >&5
+echo "configure:60796: checking ORACLE_HOME library validity" >&5
if test ! -d "$OCI8_DIR"; then
{ echo "configure: error: ${OCI8_DIR} is not a directory" 1>&2; exit 1; }
fi
@@ -60789,7 +61133,7 @@ echo "configure:60452: checking ORACLE_HOME library validity" >&5
echo $ac_n "checking Oracle version""... $ac_c" 1>&6
-echo "configure:60793: checking Oracle version" >&5
+echo "configure:61137: checking Oracle version" >&5
if test -s "$OCI8_DIR/orainst/unix.rgs"; then
OCI8_ORACLE_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | $PHP_OCI8_SED 's/ */:/g' | cut -d: -f 6 | cut -c 2-4`
test -z "$OCI8_ORACLE_VERSION" && OCI8_ORACLE_VERSION=7.3
@@ -60919,7 +61263,7 @@ echo "configure:60793: checking Oracle version" >&5
done
echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
-echo "configure:60923: checking for OCIEnvNlsCreate in -lclntsh" >&5
+echo "configure:61267: checking for OCIEnvNlsCreate in -lclntsh" >&5
ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -60927,7 +61271,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lclntsh $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 60931 "configure"
+#line 61275 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -60938,7 +61282,7 @@ int main() {
OCIEnvNlsCreate()
; return 0; }
EOF
-if { (eval echo configure:60942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:61286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -61231,8 +61575,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_OCI8_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/oci8 in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -61275,9 +61620,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC oci8"
- else
-
+ EXT_STATIC="$EXT_STATIC oci8"
+ ;;
+ *)
+
case ext/oci8 in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -61320,7 +61666,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
fi
@@ -61372,7 +61719,7 @@ EOF
else
echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6
-echo "configure:61376: checking Oracle Instant Client directory" >&5
+echo "configure:61723: checking Oracle Instant Client directory" >&5
if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2> /dev/null | tail -1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'`
@@ -61385,7 +61732,7 @@ echo "configure:61376: checking Oracle Instant Client directory" >&5
OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT
echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6
-echo "configure:61389: checking Oracle Instant Client SDK header directory" >&5
+echo "configure:61736: checking Oracle Instant Client SDK header directory" >&5
OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib/*$!/usr/include/oracle/\1/client\2!'`
@@ -61594,7 +61941,7 @@ echo "configure:61389: checking Oracle Instant Client SDK header directory" >&5
echo $ac_n "checking Oracle Instant Client version""... $ac_c" 1>&6
-echo "configure:61598: checking Oracle Instant Client version" >&5
+echo "configure:61945: checking Oracle Instant Client version" >&5
if test -f $PHP_OCI8_INSTANT_CLIENT/libnnz11.$SHLIB_SUFFIX_NAME; then
if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then
@@ -61881,8 +62228,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_OCI8_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/oci8 in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -61925,9 +62273,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC oci8"
- else
-
+ EXT_STATIC="$EXT_STATIC oci8"
+ ;;
+ *)
+
case ext/oci8 in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -61970,7 +62319,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC oci8"
fi
@@ -62073,7 +62423,7 @@ esac
if test "$PHP_ADABAS" != "no"; then
echo $ac_n "checking for Adabas support""... $ac_c" 1>&6
-echo "configure:62077: checking for Adabas support" >&5
+echo "configure:62427: checking for Adabas support" >&5
if test "$PHP_ADABAS" = "yes"; then
PHP_ADABAS=/usr/local
fi
@@ -62279,7 +62629,7 @@ esac
if test "$PHP_SAPDB" != "no"; then
echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6
-echo "configure:62283: checking for SAP DB support" >&5
+echo "configure:62633: checking for SAP DB support" >&5
if test "$PHP_SAPDB" = "yes"; then
PHP_SAPDB=/usr/local
fi
@@ -62415,7 +62765,7 @@ esac
if test "$PHP_SOLID" != "no"; then
echo $ac_n "checking for Solid support""... $ac_c" 1>&6
-echo "configure:62419: checking for Solid support" >&5
+echo "configure:62769: checking for Solid support" >&5
if test "$PHP_SOLID" = "yes"; then
PHP_SOLID=/usr/local/solid
fi
@@ -62442,7 +62792,7 @@ EOF
echo "$ac_t""$ext_output" 1>&6
echo $ac_n "checking Solid library file""... $ac_c" 1>&6
-echo "configure:62446: checking Solid library file" >&5
+echo "configure:62796: checking Solid library file" >&5
ac_solid_uname_r=`uname -r 2>/dev/null`
ac_solid_uname_s=`uname -s 2>/dev/null`
case $ac_solid_uname_s in
@@ -62566,7 +62916,7 @@ esac
if test "$PHP_IBM_DB2" != "no"; then
echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6
-echo "configure:62570: checking for IBM DB2 support" >&5
+echo "configure:62920: checking for IBM DB2 support" >&5
if test "$PHP_IBM_DB2" = "yes"; then
ODBC_INCDIR=/home/db2inst1/sqllib/include
ODBC_LIBDIR=/home/db2inst1/sqllib/lib
@@ -62597,7 +62947,7 @@ fi
else
cat > conftest.$ac_ext <<EOF
-#line 62601 "configure"
+#line 62951 "configure"
#include "confdefs.h"
@@ -62608,7 +62958,7 @@ else
}
EOF
-if { (eval echo configure:62612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:62962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -62692,7 +63042,7 @@ esac
if test "$PHP_ODBCROUTER" != "no"; then
echo $ac_n "checking for ODBCRouter.com support""... $ac_c" 1>&6
-echo "configure:62696: checking for ODBCRouter.com support" >&5
+echo "configure:63046: checking for ODBCRouter.com support" >&5
if test "$PHP_ODBCROUTER" = "yes"; then
PHP_ODBCROUTER=/usr
fi
@@ -62759,7 +63109,7 @@ esac
if test "$PHP_EMPRESS" != "no"; then
echo $ac_n "checking for Empress support""... $ac_c" 1>&6
-echo "configure:62763: checking for Empress support" >&5
+echo "configure:63113: checking for Empress support" >&5
if test "$PHP_EMPRESS" = "yes"; then
ODBC_INCDIR=$EMPRESSPATH/include/odbc
ODBC_LIBDIR=$EMPRESSPATH/shlib
@@ -62777,7 +63127,7 @@ EOF
echo "$ac_t""$ext_output" 1>&6
echo $ac_n "checking Empress library file""... $ac_c" 1>&6
-echo "configure:62781: checking Empress library file" >&5
+echo "configure:63131: checking Empress library file" >&5
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`
@@ -62836,7 +63186,7 @@ esac
if test "$PHP_EMPRESS_BCS" != "no"; then
echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6
-echo "configure:62840: checking for Empress local access support" >&5
+echo "configure:63190: checking for Empress local access support" >&5
if test "$PHP_EMPRESS_BCS" = "yes"; then
ODBC_INCDIR=$EMPRESSPATH/include/odbc
ODBC_LIBDIR=$EMPRESSPATH/shlib
@@ -62870,7 +63220,7 @@ EOF
echo "$ac_t""$ext_output" 1>&6
echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6
-echo "configure:62874: checking Empress local access library file" >&5
+echo "configure:63224: checking Empress local access library file" >&5
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`
@@ -62929,7 +63279,7 @@ esac
if test "$PHP_BIRDSTEP" != "no"; then
echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6
-echo "configure:62933: checking for Birdstep support" >&5
+echo "configure:63283: checking for Birdstep support" >&5
if test "$PHP_BIRDSTEP" = "yes"; then
ODBC_INCDIR=/usr/local/birdstep/include
ODBC_LIBDIR=/usr/local/birdstep/lib
@@ -63044,7 +63394,7 @@ esac
if test "$PHP_CUSTOM_ODBC" != "no"; then
echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6
-echo "configure:63048: checking for a custom ODBC support" >&5
+echo "configure:63398: checking for a custom ODBC support" >&5
if test "$PHP_CUSTOM_ODBC" = "yes"; then
PHP_CUSTOM_ODBC=/usr/local
fi
@@ -63111,7 +63461,7 @@ esac
if test "$PHP_IODBC" != "no"; then
echo $ac_n "checking for iODBC support""... $ac_c" 1>&6
-echo "configure:63115: checking for iODBC support" >&5
+echo "configure:63465: checking for iODBC support" >&5
if test "$PHP_IODBC" = "yes"; then
PHP_IODBC=/usr/local
fi
@@ -63260,7 +63610,7 @@ esac
if test "$PHP_ESOOB" != "no"; then
echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6
-echo "configure:63264: checking for Easysoft ODBC-ODBC Bridge support" >&5
+echo "configure:63614: checking for Easysoft ODBC-ODBC Bridge support" >&5
if test "$PHP_ESOOB" = "yes"; then
PHP_ESOOB=/usr/local/easysoft/oob/client
fi
@@ -63327,7 +63677,7 @@ esac
if test "$PHP_UNIXODBC" != "no"; then
echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6
-echo "configure:63331: checking for unixODBC support" >&5
+echo "configure:63681: checking for unixODBC support" >&5
if test "$PHP_UNIXODBC" = "yes"; then
PHP_UNIXODBC=/usr/local
fi
@@ -63399,7 +63749,7 @@ esac
if test "$PHP_DBMAKER" != "no"; then
echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6
-echo "configure:63403: checking for DBMaker support" >&5
+echo "configure:63753: checking for DBMaker support" >&5
if test "$PHP_DBMAKER" = "yes"; then
# find dbmaker's home directory
DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'`
@@ -63846,8 +64196,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_ODBC_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/odbc in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -63890,9 +64241,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC odbc"
- else
-
+ EXT_STATIC="$EXT_STATIC odbc"
+ ;;
+ *)
+
case ext/odbc in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -63935,7 +64287,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC odbc"
fi
@@ -63958,7 +64311,7 @@ fi
php_enable_pcntl=no
echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6
-echo "configure:63962: checking whether to enable pcntl support" >&5
+echo "configure:64315: checking whether to enable pcntl support" >&5
# Check whether --enable-pcntl or --disable-pcntl was given.
if test "${enable_pcntl+set}" = set; then
enableval="$enable_pcntl"
@@ -64005,12 +64358,12 @@ if test "$PHP_PCNTL" != "no"; then
for ac_func in fork
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:64009: checking for $ac_func" >&5
+echo "configure:64362: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 64014 "configure"
+#line 64367 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -64033,7 +64386,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:64037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:64390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -64064,12 +64417,12 @@ done
for ac_func in waitpid
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:64068: checking for $ac_func" >&5
+echo "configure:64421: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 64073 "configure"
+#line 64426 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -64092,7 +64445,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:64096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:64449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -64123,12 +64476,12 @@ done
for ac_func in sigaction
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:64127: checking for $ac_func" >&5
+echo "configure:64480: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 64132 "configure"
+#line 64485 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -64151,7 +64504,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:64155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:64508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -64182,12 +64535,12 @@ done
for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:64186: checking for $ac_func" >&5
+echo "configure:64539: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 64191 "configure"
+#line 64544 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -64210,7 +64563,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:64214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:64567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -64418,8 +64771,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" = "cli"; then
PHP_PCNTL_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/pcntl in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -64462,9 +64816,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC pcntl"
- else
-
+ EXT_STATIC="$EXT_STATIC pcntl"
+ ;;
+ *)
+
case ext/pcntl in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -64507,7 +64862,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC pcntl"
fi
@@ -64532,7 +64888,7 @@ fi
php_enable_pdo=yes
echo $ac_n "checking whether to enable PDO support""... $ac_c" 1>&6
-echo "configure:64536: checking whether to enable PDO support" >&5
+echo "configure:64892: checking whether to enable PDO support" >&5
# Check whether --enable-pdo or --disable-pdo was given.
if test "${enable_pdo+set}" = set; then
enableval="$enable_pdo"
@@ -64802,8 +65158,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_PDO_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/pdo in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -64846,9 +65203,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC pdo"
- else
-
+ EXT_STATIC="$EXT_STATIC pdo"
+ ;;
+ *)
+
case ext/pdo in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -64891,7 +65249,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC pdo"
fi
@@ -64966,7 +65325,7 @@ fi
php_with_pdo_dblib=no
echo $ac_n "checking for PDO_DBLIB support via FreeTDS""... $ac_c" 1>&6
-echo "configure:64970: checking for PDO_DBLIB support via FreeTDS" >&5
+echo "configure:65329: checking for PDO_DBLIB support via FreeTDS" >&5
# Check whether --with-pdo-dblib or --without-pdo-dblib was given.
if test "${with_pdo_dblib+set}" = set; then
withval="$with_pdo_dblib"
@@ -65186,13 +65545,13 @@ if test "$PHP_PDO_DBLIB" != "no"; then
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:65190: checking for PDO includes" >&5
+echo "configure:65549: checking for PDO includes" >&5
if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:65196: checking for PDO includes" >&5
+echo "configure:65555: checking for PDO includes" >&5
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -65397,8 +65756,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_PDO_DBLIB_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/pdo_dblib in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -65441,9 +65801,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC pdo_dblib"
- else
-
+ EXT_STATIC="$EXT_STATIC pdo_dblib"
+ ;;
+ *)
+
case ext/pdo_dblib in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -65486,7 +65847,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_dblib"
fi
@@ -65503,7 +65865,7 @@ EOF
fi
echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:65507: checking for dnet_addr in -ldnet_stub" >&5
+echo "configure:65869: checking for dnet_addr in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -65511,7 +65873,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 65515 "configure"
+#line 65877 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -65522,7 +65884,7 @@ int main() {
dnet_addr()
; return 0; }
EOF
-if { (eval echo configure:65526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:65888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -65683,7 +66045,7 @@ fi
php_with_pdo_firebird=no
echo $ac_n "checking for Firebird support for PDO""... $ac_c" 1>&6
-echo "configure:65687: checking for Firebird support for PDO" >&5
+echo "configure:66049: checking for Firebird support for PDO" >&5
# Check whether --with-pdo-firebird or --without-pdo-firebird was given.
if test "${with_pdo_firebird+set}" = set; then
withval="$with_pdo_firebird"
@@ -65733,17 +66095,19 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then
fi
if test "$PHP_PDO_FIREBIRD" = "yes"; then
- FIREBIRD_INCDIR=/opt/firebird/include
- FIREBIRD_LIBDIR=/opt/firebird/lib
+ FIREBIRD_INCDIR=
+ FIREBIRD_LIBDIR=
+ FIREBIRD_LIBDIR_FLAG=
else
FIREBIRD_INCDIR=$PHP_PDO_FIREBIRD/include
FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/$PHP_LIBDIR
+ FIREBIRD_LIBDIR_FLAG=-L$FIREBIRD_LIBDIR
fi
save_old_LDFLAGS=$LDFLAGS
ac_stuff="
- -L$FIREBIRD_LIBDIR
+ $FIREBIRD_LIBDIR_FLAG
"
save_ext_shared=$ext_shared
@@ -65838,7 +66202,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then
done
echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6
-echo "configure:65842: checking for isc_detach_database in -lfbclient" >&5
+echo "configure:66206: checking for isc_detach_database in -lfbclient" >&5
ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -65846,7 +66210,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lfbclient $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 65850 "configure"
+#line 66214 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -65857,7 +66221,7 @@ int main() {
isc_detach_database()
; return 0; }
EOF
-if { (eval echo configure:65861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:66225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -65889,7 +66253,7 @@ else
save_old_LDFLAGS=$LDFLAGS
ac_stuff="
- -L$FIREBIRD_LIBDIR
+ $FIREBIRD_LIBDIR_FLAG
"
save_ext_shared=$ext_shared
@@ -65984,7 +66348,7 @@ else
done
echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
-echo "configure:65988: checking for isc_detach_database in -lgds" >&5
+echo "configure:66352: checking for isc_detach_database in -lgds" >&5
ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -65992,7 +66356,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgds $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 65996 "configure"
+#line 66360 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -66003,7 +66367,7 @@ int main() {
isc_detach_database()
; return 0; }
EOF
-if { (eval echo configure:66007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:66371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -66035,7 +66399,7 @@ else
save_old_LDFLAGS=$LDFLAGS
ac_stuff="
- -L$FIREBIRD_LIBDIR
+ $FIREBIRD_LIBDIR_FLAG
"
save_ext_shared=$ext_shared
@@ -66130,7 +66494,7 @@ else
done
echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
-echo "configure:66134: checking for isc_detach_database in -lib_util" >&5
+echo "configure:66498: checking for isc_detach_database in -lib_util" >&5
ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -66138,7 +66502,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lib_util $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 66142 "configure"
+#line 66506 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -66149,7 +66513,7 @@ int main() {
isc_detach_database()
; return 0; }
EOF
-if { (eval echo configure:66153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:66517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -66194,13 +66558,13 @@ fi
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:66198: checking for PDO includes" >&5
+echo "configure:66562: checking for PDO includes" >&5
if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:66204: checking for PDO includes" >&5
+echo "configure:66568: checking for PDO includes" >&5
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -66535,8 +66899,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_PDO_FIREBIRD_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/pdo_firebird in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -66579,9 +66944,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC pdo_firebird"
- else
-
+ EXT_STATIC="$EXT_STATIC pdo_firebird"
+ ;;
+ *)
+
case ext/pdo_firebird in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -66624,7 +66990,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_firebird"
fi
@@ -66669,7 +67036,7 @@ fi
php_with_pdo_mysql=no
echo $ac_n "checking for MySQL support for PDO""... $ac_c" 1>&6
-echo "configure:66673: checking for MySQL support for PDO" >&5
+echo "configure:67040: checking for MySQL support for PDO" >&5
# Check whether --with-pdo-mysql or --without-pdo-mysql was given.
if test "${with_pdo_mysql+set}" = set; then
withval="$with_pdo_mysql"
@@ -66717,7 +67084,7 @@ if test -z "$PHP_ZLIB_DIR"; then
php_with_zlib_dir=no
echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
-echo "configure:66721: checking for the location of libz" >&5
+echo "configure:67088: checking for the location of libz" >&5
# Check whether --with-zlib-dir or --without-zlib-dir was given.
if test "${with_zlib_dir+set}" = set; then
withval="$with_zlib_dir"
@@ -66760,7 +67127,7 @@ EOF
EOF
echo $ac_n "checking for mysql_config""... $ac_c" 1>&6
-echo "configure:66764: checking for mysql_config" >&5
+echo "configure:67131: checking for mysql_config" >&5
if test -f $PHP_PDO_MYSQL && test -x $PHP_PDO_MYSQL ; then
PDO_MYSQL_CONFIG=$PHP_PDO_MYSQL
@@ -66794,7 +67161,7 @@ echo "configure:66764: checking for mysql_config" >&5
# Extract the first word of "sed", so it can be a program name with args.
set dummy sed; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:66798: checking for $ac_word" >&5
+echo "configure:67165: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -66843,7 +67210,7 @@ fi
else
echo "$ac_t""not found" 1>&6
echo $ac_n "checking for mysql install under $PDO_MYSQL_DIR""... $ac_c" 1>&6
-echo "configure:66847: checking for mysql install under $PDO_MYSQL_DIR" >&5
+echo "configure:67214: checking for mysql install under $PDO_MYSQL_DIR" >&5
if test -r $PDO_MYSQL_DIR/include/mysql; then
PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql
else
@@ -66999,7 +67366,7 @@ EOF
done
echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
-echo "configure:67003: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
+echo "configure:67370: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -67007,7 +67374,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$PDO_MYSQL_LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 67011 "configure"
+#line 67378 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -67018,7 +67385,7 @@ int main() {
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:67022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:67389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -67371,7 +67738,7 @@ else
done
echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
-echo "configure:67375: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
+echo "configure:67742: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -67379,7 +67746,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$PDO_MYSQL_LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 67383 "configure"
+#line 67750 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -67390,7 +67757,7 @@ int main() {
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:67394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:67761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -67545,7 +67912,7 @@ fi
done
echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
-echo "configure:67549: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
+echo "configure:67916: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -67553,7 +67920,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$PDO_MYSQL_LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 67557 "configure"
+#line 67924 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -67564,7 +67931,7 @@ int main() {
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:67568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:67935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -67738,12 +68105,12 @@ fi
for ac_func in mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:67742: checking for $ac_func" >&5
+echo "configure:68109: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 67747 "configure"
+#line 68114 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -67766,7 +68133,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:67770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:68137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -67796,13 +68163,13 @@ done
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:67800: checking for PDO includes" >&5
+echo "configure:68167: checking for PDO includes" >&5
if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:67806: checking for PDO includes" >&5
+echo "configure:68173: checking for PDO includes" >&5
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -68007,8 +68374,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_PDO_MYSQL_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/pdo_mysql in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -68051,9 +68419,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC pdo_mysql"
- else
-
+ EXT_STATIC="$EXT_STATIC pdo_mysql"
+ ;;
+ *)
+
case ext/pdo_mysql in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -68096,7 +68465,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_mysql"
fi
@@ -68174,7 +68544,7 @@ SUPPORTED_LIB_VERS="9.0 10.1 11.1" # This caters for all Oracle 9.x, 10.x and 1
php_with_pdo_oci=no
echo $ac_n "checking Oracle OCI support for PDO""... $ac_c" 1>&6
-echo "configure:68178: checking Oracle OCI support for PDO" >&5
+echo "configure:68548: checking Oracle OCI support for PDO" >&5
# Check whether --with-pdo-oci or --without-pdo-oci was given.
if test "${with_pdo_oci+set}" = set; then
withval="$with_pdo_oci"
@@ -68224,7 +68594,7 @@ if test "$PHP_PDO_OCI" != "no"; then
fi
echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6
-echo "configure:68228: checking Oracle Install-Dir" >&5
+echo "configure:68598: checking Oracle Install-Dir" >&5
if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then
PDO_OCI_DIR=$ORACLE_HOME
else
@@ -68233,7 +68603,7 @@ echo "configure:68228: checking Oracle Install-Dir" >&5
echo "$ac_t""$PHP_PDO_OCI" 1>&6
echo $ac_n "checking if that is sane""... $ac_c" 1>&6
-echo "configure:68237: checking if that is sane" >&5
+echo "configure:68607: checking if that is sane" >&5
if test -z "$PDO_OCI_DIR"; then
{ echo "configure: error:
You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME.
@@ -68246,7 +68616,7 @@ You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_
PDO_OCI_IC_PREFIX="`echo $PDO_OCI_DIR | cut -d, -f2`"
PDO_OCI_IC_VERS="`echo $PDO_OCI_DIR | cut -d, -f3`"
echo $ac_n "checking for oci.h""... $ac_c" 1>&6
-echo "configure:68250: checking for oci.h" >&5
+echo "configure:68620: checking for oci.h" >&5
if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client/oci.h ; then
if test "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" != "/usr/include"; then
@@ -68395,7 +68765,7 @@ echo "configure:68250: checking for oci.h" >&5
else
echo $ac_n "checking size of long int""... $ac_c" 1>&6
-echo "configure:68399: checking size of long int" >&5
+echo "configure:68769: checking size of long int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -68403,7 +68773,7 @@ else
ac_cv_sizeof_long_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 68407 "configure"
+#line 68777 "configure"
#include "confdefs.h"
#include <stdio.h>
int main()
@@ -68414,7 +68784,7 @@ int main()
return(0);
}
EOF
-if { (eval echo configure:68418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:68788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_int=`cat conftestval`
else
@@ -68434,7 +68804,7 @@ EOF
echo $ac_n "checking if we're on a 64-bit platform""... $ac_c" 1>&6
-echo "configure:68438: checking if we're on a 64-bit platform" >&5
+echo "configure:68808: checking if we're on a 64-bit platform" >&5
if test "$ac_cv_sizeof_long_int" = "4" ; then
echo "$ac_t""no" 1>&6
TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32"
@@ -68444,7 +68814,7 @@ echo "configure:68438: checking if we're on a 64-bit platform" >&5
fi
echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6
-echo "configure:68448: checking OCI8 libraries dir" >&5
+echo "configure:68818: checking OCI8 libraries dir" >&5
if test -d "$PDO_OCI_DIR/lib" && test ! -d "$PDO_OCI_DIR/lib32"; then
PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib"
elif test ! -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then
@@ -68811,7 +69181,7 @@ echo "configure:68448: checking OCI8 libraries dir" >&5
fi
echo $ac_n "checking Oracle version""... $ac_c" 1>&6
-echo "configure:68815: checking Oracle version" >&5
+echo "configure:69185: checking Oracle version" >&5
for OCI_VER in $SUPPORTED_LIB_VERS; do
if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then
PDO_OCI_VERSION="$OCI_VER"
@@ -68993,7 +69363,7 @@ echo "configure:68815: checking Oracle version" >&5
done
echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6
-echo "configure:68997: checking for OCIEnvCreate in -lclntsh" >&5
+echo "configure:69367: checking for OCIEnvCreate in -lclntsh" >&5
ac_lib_var=`echo clntsh'_'OCIEnvCreate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -69001,7 +69371,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lclntsh $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 69005 "configure"
+#line 69375 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -69012,7 +69382,7 @@ int main() {
OCIEnvCreate()
; return 0; }
EOF
-if { (eval echo configure:69016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:69386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -69146,7 +69516,7 @@ fi
done
echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
-echo "configure:69150: checking for OCIEnvNlsCreate in -lclntsh" >&5
+echo "configure:69520: checking for OCIEnvNlsCreate in -lclntsh" >&5
ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -69154,7 +69524,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lclntsh $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 69158 "configure"
+#line 69528 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -69165,7 +69535,7 @@ int main() {
OCIEnvNlsCreate()
; return 0; }
EOF
-if { (eval echo configure:69169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:69539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -69299,7 +69669,7 @@ fi
done
echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6
-echo "configure:69303: checking for OCILobIsTemporary in -lclntsh" >&5
+echo "configure:69673: checking for OCILobIsTemporary in -lclntsh" >&5
ac_lib_var=`echo clntsh'_'OCILobIsTemporary | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -69307,7 +69677,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lclntsh $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 69311 "configure"
+#line 69681 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -69318,7 +69688,7 @@ int main() {
OCILobIsTemporary()
; return 0; }
EOF
-if { (eval echo configure:69322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:69692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -69448,7 +69818,7 @@ else
done
echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6
-echo "configure:69452: checking for OCILobIsTemporary in -locijdbc8" >&5
+echo "configure:69822: checking for OCILobIsTemporary in -locijdbc8" >&5
ac_lib_var=`echo ocijdbc8'_'OCILobIsTemporary | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -69456,7 +69826,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-locijdbc8 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 69460 "configure"
+#line 69830 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -69467,7 +69837,7 @@ int main() {
OCILobIsTemporary()
; return 0; }
EOF
-if { (eval echo configure:69471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:69841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -69628,7 +69998,7 @@ fi
done
echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6
-echo "configure:69632: checking for OCICollAssign in -lclntsh" >&5
+echo "configure:70002: checking for OCICollAssign in -lclntsh" >&5
ac_lib_var=`echo clntsh'_'OCICollAssign | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -69636,7 +70006,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lclntsh $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 69640 "configure"
+#line 70010 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -69647,7 +70017,7 @@ int main() {
OCICollAssign()
; return 0; }
EOF
-if { (eval echo configure:69651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:70021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -69781,7 +70151,7 @@ fi
done
echo $ac_n "checking for OCIStmtFetch2 in -lclntsh""... $ac_c" 1>&6
-echo "configure:69785: checking for OCIStmtFetch2 in -lclntsh" >&5
+echo "configure:70155: checking for OCIStmtFetch2 in -lclntsh" >&5
ac_lib_var=`echo clntsh'_'OCIStmtFetch2 | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -69789,7 +70159,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lclntsh $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 69793 "configure"
+#line 70163 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -69800,7 +70170,7 @@ int main() {
OCIStmtFetch2()
; return 0; }
EOF
-if { (eval echo configure:69804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:70174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -69839,13 +70209,13 @@ fi
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:69843: checking for PDO includes" >&5
+echo "configure:70213: checking for PDO includes" >&5
if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:69849: checking for PDO includes" >&5
+echo "configure:70219: checking for PDO includes" >&5
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -70049,8 +70419,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_PDO_OCI_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/pdo_oci in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -70093,9 +70464,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC pdo_oci"
- else
-
+ EXT_STATIC="$EXT_STATIC pdo_oci"
+ ;;
+ *)
+
case ext/pdo_oci in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -70138,7 +70510,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_oci"
fi
@@ -70210,7 +70583,7 @@ fi
php_with_pdo_odbc=no
echo $ac_n "checking for ODBC v3 support for PDO""... $ac_c" 1>&6
-echo "configure:70214: checking for ODBC v3 support for PDO" >&5
+echo "configure:70587: checking for ODBC v3 support for PDO" >&5
# Check whether --with-pdo-odbc or --without-pdo-odbc was given.
if test "${with_pdo_odbc+set}" = set; then
withval="$with_pdo_odbc"
@@ -70265,13 +70638,13 @@ if test "$PHP_PDO_ODBC" != "no"; then
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:70269: checking for PDO includes" >&5
+echo "configure:70642: checking for PDO includes" >&5
if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:70275: checking for PDO includes" >&5
+echo "configure:70648: checking for PDO includes" >&5
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -70292,7 +70665,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6
echo $ac_n "checking for selected PDO ODBC flavour""... $ac_c" 1>&6
-echo "configure:70296: checking for selected PDO ODBC flavour" >&5
+echo "configure:70669: checking for selected PDO ODBC flavour" >&5
pdo_odbc_flavour="`echo $PHP_PDO_ODBC | cut -d, -f1`"
pdo_odbc_dir="`echo $PHP_PDO_ODBC | cut -d, -f2`"
@@ -70371,7 +70744,7 @@ echo "configure:70296: checking for selected PDO ODBC flavour" >&5
echo $ac_n "checking for odbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:70375: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:70748: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/odbc.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -70385,7 +70758,7 @@ EOF
echo $ac_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:70389: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:70762: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/odbcsdk.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -70399,7 +70772,7 @@ EOF
echo $ac_n "checking for iodbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:70403: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:70776: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/iodbc.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -70413,7 +70786,7 @@ EOF
echo $ac_n "checking for sqlunix.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:70417: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:70790: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/sqlunix.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -70427,7 +70800,7 @@ EOF
echo $ac_n "checking for sqltypes.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:70431: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:70804: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/sqltypes.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -70441,7 +70814,7 @@ EOF
echo $ac_n "checking for sqlucode.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:70445: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:70818: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/sqlucode.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -70455,7 +70828,7 @@ EOF
echo $ac_n "checking for sql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:70459: checking for sql.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:70832: checking for sql.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/sql.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -70469,7 +70842,7 @@ EOF
echo $ac_n "checking for isql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:70473: checking for isql.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:70846: checking for isql.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/isql.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -70483,7 +70856,7 @@ EOF
echo $ac_n "checking for sqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:70487: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:70860: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/sqlext.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -70497,7 +70870,7 @@ EOF
echo $ac_n "checking for isqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:70501: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:70874: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/isqlext.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -70511,7 +70884,7 @@ EOF
echo $ac_n "checking for udbcext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:70515: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:70888: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/udbcext.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -70525,7 +70898,7 @@ EOF
echo $ac_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:70529: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:70902: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/sqlcli1.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -70539,7 +70912,7 @@ EOF
echo $ac_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:70543: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:70916: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/LibraryManager.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -70553,7 +70926,7 @@ EOF
echo $ac_n "checking for cli0core.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:70557: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:70930: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/cli0core.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -70567,7 +70940,7 @@ EOF
echo $ac_n "checking for cli0ext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:70571: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:70944: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/cli0ext.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -70581,7 +70954,7 @@ EOF
echo $ac_n "checking for cli0cli.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:70585: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:70958: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/cli0cli.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -70595,7 +70968,7 @@ EOF
echo $ac_n "checking for cli0defs.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:70599: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:70972: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/cli0defs.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -70609,7 +70982,7 @@ EOF
echo $ac_n "checking for cli0env.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:70613: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:70986: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/cli0env.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -70815,7 +71188,7 @@ EOF
done
echo $ac_n "checking for SQLBindCol in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
-echo "configure:70819: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
+echo "configure:71192: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLBindCol | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -70823,7 +71196,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$pdo_odbc_def_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 70827 "configure"
+#line 71200 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -70834,7 +71207,7 @@ int main() {
SQLBindCol()
; return 0; }
EOF
-if { (eval echo configure:70838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:71211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -70949,7 +71322,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
done
echo $ac_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
-echo "configure:70953: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
+echo "configure:71326: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLAllocHandle | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -70957,7 +71330,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$pdo_odbc_def_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 70961 "configure"
+#line 71334 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -70968,7 +71341,7 @@ int main() {
SQLAllocHandle()
; return 0; }
EOF
-if { (eval echo configure:70972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:71345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -71203,8 +71576,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_PDO_ODBC_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/pdo_odbc in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -71247,9 +71621,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC pdo_odbc"
- else
-
+ EXT_STATIC="$EXT_STATIC pdo_odbc"
+ ;;
+ *)
+
case ext/pdo_odbc in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -71292,7 +71667,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_odbc"
fi
@@ -71339,7 +71715,7 @@ fi
php_with_pdo_pgsql=no
echo $ac_n "checking for PostgreSQL support for PDO""... $ac_c" 1>&6
-echo "configure:71343: checking for PostgreSQL support for PDO" >&5
+echo "configure:71719: checking for PostgreSQL support for PDO" >&5
# Check whether --with-pdo-pgsql or --without-pdo-pgsql was given.
if test "${with_pdo_pgsql+set}" = set; then
withval="$with_pdo_pgsql"
@@ -71401,7 +71777,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then
echo $ac_n "checking for pg_config""... $ac_c" 1>&6
-echo "configure:71405: checking for pg_config" >&5
+echo "configure:71781: checking for pg_config" >&5
for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
if test -x $i/pg_config; then
PG_CONFIG="$i/pg_config"
@@ -71465,13 +71841,13 @@ EOF
echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6
-echo "configure:71469: checking for openssl dependencies" >&5
+echo "configure:71845: checking for openssl dependencies" >&5
if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; then
echo "$ac_t""yes" 1>&6
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:71475: checking for $ac_word" >&5
+echo "configure:71851: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -71513,310 +71889,9 @@ fi
old_LIBS=$LIBS
old_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -L$PGSQL_LIBDIR"
- echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6
-echo "configure:71519: checking for PQescapeString in -lpq" >&5
-ac_lib_var=`echo pq'_'PQescapeString | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lpq $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 71527 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char PQescapeString();
-
-int main() {
-PQescapeString()
-; return 0; }
-EOF
-if { (eval echo configure:71538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-#define HAVE_PQESCAPE 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
- echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
-echo "configure:71562: checking for PQescapeStringConn in -lpq" >&5
-ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lpq $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 71570 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char PQescapeStringConn();
-
-int main() {
-PQescapeStringConn()
-; return 0; }
-EOF
-if { (eval echo configure:71581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-#define HAVE_PQESCAPE_CONN 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
- echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
-echo "configure:71605: checking for PQescapeByteaConn in -lpq" >&5
-ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lpq $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 71613 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char PQescapeByteaConn();
-
-int main() {
-PQescapeByteaConn()
-; return 0; }
-EOF
-if { (eval echo configure:71624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-#define HAVE_PQESCAPE_BYTEA_CONN 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
- echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6
-echo "configure:71648: checking for PQsetnonblocking in -lpq" >&5
-ac_lib_var=`echo pq'_'PQsetnonblocking | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lpq $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 71656 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char PQsetnonblocking();
-
-int main() {
-PQsetnonblocking()
-; return 0; }
-EOF
-if { (eval echo configure:71667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-#define HAVE_PQSETNONBLOCKING 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
- echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:71691: checking for PQcmdTuples in -lpq" >&5
-ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lpq $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 71699 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char PQcmdTuples();
-
-int main() {
-PQcmdTuples()
-; return 0; }
-EOF
-if { (eval echo configure:71710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-#define HAVE_PQCMDTUPLES 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
- echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6
-echo "configure:71734: checking for PQoidValue in -lpq" >&5
-ac_lib_var=`echo pq'_'PQoidValue | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lpq $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 71742 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char PQoidValue();
-
-int main() {
-PQoidValue()
-; return 0; }
-EOF
-if { (eval echo configure:71753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-#define HAVE_PQOIDVALUE 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
- echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6
-echo "configure:71777: checking for PQclientEncoding in -lpq" >&5
-ac_lib_var=`echo pq'_'PQclientEncoding | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lpq $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 71785 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char PQclientEncoding();
-
-int main() {
-PQclientEncoding()
-; return 0; }
-EOF
-if { (eval echo configure:71796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-#define HAVE_PQCLIENTENCODING 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
+ LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
-echo "configure:71820: checking for PQparameterStatus in -lpq" >&5
+echo "configure:71895: checking for PQparameterStatus in -lpq" >&5
ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -71824,7 +71899,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 71828 "configure"
+#line 71903 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -71835,7 +71910,7 @@ int main() {
PQparameterStatus()
; return 0; }
EOF
-if { (eval echo configure:71839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:71914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -71856,72 +71931,34 @@ EOF
else
echo "$ac_t""no" 1>&6
-fi
-
- echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6
-echo "configure:71863: checking for PQprotocolVersion in -lpq" >&5
-ac_lib_var=`echo pq'_'PQprotocolVersion | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lpq $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 71871 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char PQprotocolVersion();
-int main() {
-PQprotocolVersion()
-; return 0; }
-EOF
-if { (eval echo configure:71882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ echo "Unable to build the PDO PostgreSQL driver: libpq 7.4+ is required"
+ exit 1
+
fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-#define HAVE_PQPROTOCOLVERSION 1
-EOF
-else
- echo "$ac_t""no" 1>&6
-fi
-
- echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6
-echo "configure:71906: checking for PQtransactionStatus in -lpq" >&5
-ac_lib_var=`echo pq'_'PQtransactionStatus | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
+echo "configure:71943: checking for PQprepare in -lpq" >&5
+ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 71914 "configure"
+#line 71951 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char PQtransactionStatus();
+char PQprepare();
int main() {
-PQtransactionStatus()
+PQprepare()
; return 0; }
EOF
-if { (eval echo configure:71925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:71962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -71937,34 +71974,34 @@ fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
-#define HAVE_PGTRANSACTIONSTATUS 1
+#define HAVE_PQPREPARE 1
EOF
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6
-echo "configure:71949: checking for PQunescapeBytea in -lpq" >&5
-ac_lib_var=`echo pq'_'PQunescapeBytea | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
+echo "configure:71986: checking for PQescapeStringConn in -lpq" >&5
+ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 71957 "configure"
+#line 71994 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char PQunescapeBytea();
+char PQescapeStringConn();
int main() {
-PQunescapeBytea()
+PQescapeStringConn()
; return 0; }
EOF
-if { (eval echo configure:71968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:72005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -71980,34 +72017,34 @@ fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
-#define HAVE_PQUNESCAPEBYTEA 1
+#define HAVE_PQESCAPE_CONN 1
EOF
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking for PQExecParams in -lpq""... $ac_c" 1>&6
-echo "configure:71992: checking for PQExecParams in -lpq" >&5
-ac_lib_var=`echo pq'_'PQExecParams | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
+echo "configure:72029: checking for PQescapeByteaConn in -lpq" >&5
+ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 72000 "configure"
+#line 72037 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char PQExecParams();
+char PQescapeByteaConn();
int main() {
-PQExecParams()
+PQescapeByteaConn()
; return 0; }
EOF
-if { (eval echo configure:72011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:72048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -72023,58 +72060,16 @@ fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
-#define HAVE_PQEXECPARAMS 1
+#define HAVE_PQESCAPE_BYTEA_CONN 1
EOF
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6
-echo "configure:72035: checking for PQresultErrorField in -lpq" >&5
-ac_lib_var=`echo pq'_'PQresultErrorField | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lpq $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 72043 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char PQresultErrorField();
-
-int main() {
-PQresultErrorField()
-; return 0; }
-EOF
-if { (eval echo configure:72054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-#define HAVE_PQRESULTERRORFIELD 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
-echo "configure:72078: checking for pg_encoding_to_char in -lpq" >&5
+echo "configure:72073: checking for pg_encoding_to_char in -lpq" >&5
ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -72082,7 +72077,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 72086 "configure"
+#line 72081 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -72093,7 +72088,7 @@ int main() {
pg_encoding_to_char()
; return 0; }
EOF
-if { (eval echo configure:72097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:72092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -72117,49 +72112,6 @@ else
fi
- echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
-echo "configure:72122: checking for PQprepare in -lpq" >&5
-ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lpq $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 72130 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char PQprepare();
-
-int main() {
-PQprepare()
-; return 0; }
-EOF
-if { (eval echo configure:72141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-#define HAVE_PQPREPARE 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
LIBS=$old_LIBS
LDFLAGS=$old_LDFLAGS
@@ -72300,13 +72252,13 @@ fi
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:72304: checking for PDO includes" >&5
+echo "configure:72256: checking for PDO includes" >&5
if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:72310: checking for PDO includes" >&5
+echo "configure:72262: checking for PDO includes" >&5
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -72510,8 +72462,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_PDO_PGSQL_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/pdo_pgsql in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -72554,9 +72507,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC pdo_pgsql"
- else
-
+ EXT_STATIC="$EXT_STATIC pdo_pgsql"
+ ;;
+ *)
+
case ext/pdo_pgsql in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -72599,7 +72553,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_pgsql"
fi
@@ -72643,7 +72598,7 @@ fi
php_with_pdo_sqlite=$PHP_PDO
echo $ac_n "checking for sqlite 3 support for PDO""... $ac_c" 1>&6
-echo "configure:72647: checking for sqlite 3 support for PDO" >&5
+echo "configure:72602: checking for sqlite 3 support for PDO" >&5
# Check whether --with-pdo-sqlite or --without-pdo-sqlite was given.
if test "${with_pdo_sqlite+set}" = set; then
withval="$with_pdo_sqlite"
@@ -72695,13 +72650,13 @@ if test "$PHP_PDO_SQLITE" != "no"; then
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:72699: checking for PDO includes" >&5
+echo "configure:72654: checking for PDO includes" >&5
if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:72705: checking for PDO includes" >&5
+echo "configure:72660: checking for PDO includes" >&5
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -72730,7 +72685,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6
PDO_SQLITE_DIR=$PHP_PDO_SQLITE
else # search default path list
echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6
-echo "configure:72734: checking for sqlite3 files in default path" >&5
+echo "configure:72689: checking for sqlite3 files in default path" >&5
for i in $SEARCH_PATH ; do
if test -r $i/$SEARCH_FOR; then
PDO_SQLITE_DIR=$i
@@ -72876,7 +72831,7 @@ echo "configure:72734: checking for sqlite3 files in default path" >&5
done
echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
-echo "configure:72880: checking for $LIBSYMBOL in -l$LIBNAME" >&5
+echo "configure:72835: checking for $LIBSYMBOL in -l$LIBNAME" >&5
ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -72884,7 +72839,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 72888 "configure"
+#line 72843 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -72895,7 +72850,7 @@ int main() {
$LIBSYMBOL()
; return 0; }
EOF
-if { (eval echo configure:72899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:72854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -73125,7 +73080,7 @@ fi
done
echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6
-echo "configure:73129: checking for sqlite3_key in -lsqlite3" >&5
+echo "configure:73084: checking for sqlite3_key in -lsqlite3" >&5
ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -73133,7 +73088,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsqlite3 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 73137 "configure"
+#line 73092 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -73144,7 +73099,7 @@ int main() {
sqlite3_key()
; return 0; }
EOF
-if { (eval echo configure:73148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:73103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -73367,8 +73322,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_PDO_SQLITE_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/pdo_sqlite in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -73411,9 +73367,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC pdo_sqlite"
- else
-
+ EXT_STATIC="$EXT_STATIC pdo_sqlite"
+ ;;
+ *)
+
case ext/pdo_sqlite in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -73456,7 +73413,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite"
fi
@@ -73716,8 +73674,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_PDO_SQLITE_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/pdo_sqlite in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -73760,9 +73719,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC pdo_sqlite"
- else
-
+ EXT_STATIC="$EXT_STATIC pdo_sqlite"
+ ;;
+ *)
+
case ext/pdo_sqlite in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -73805,7 +73765,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite"
fi
@@ -73879,12 +73840,12 @@ but you've either not enabled sqlite3, or have disabled it.
for ac_func in usleep nanosleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:73883: checking for $ac_func" >&5
+echo "configure:73844: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 73888 "configure"
+#line 73849 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -73907,7 +73868,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:73911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:73872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -73935,17 +73896,17 @@ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:73939: checking for $ac_hdr" >&5
+echo "configure:73900: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 73944 "configure"
+#line 73905 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:73949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:73910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -74069,7 +74030,7 @@ done
done
echo $ac_n "checking for fdatasync in -lrt""... $ac_c" 1>&6
-echo "configure:74073: checking for fdatasync in -lrt" >&5
+echo "configure:74034: checking for fdatasync in -lrt" >&5
ac_lib_var=`echo rt'_'fdatasync | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74077,7 +74038,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lrt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74081 "configure"
+#line 74042 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74088,7 +74049,7 @@ int main() {
fdatasync()
; return 0; }
EOF
-if { (eval echo configure:74092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74169,7 +74130,7 @@ fi
php_with_pgsql=no
echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6
-echo "configure:74173: checking for PostgreSQL support" >&5
+echo "configure:74134: checking for PostgreSQL support" >&5
# Check whether --with-pgsql or --without-pgsql was given.
if test "${with_pgsql+set}" = set; then
withval="$with_pgsql"
@@ -74226,7 +74187,7 @@ if test "$PHP_PGSQL" != "no"; then
echo $ac_n "checking for pg_config""... $ac_c" 1>&6
-echo "configure:74230: checking for pg_config" >&5
+echo "configure:74191: checking for pg_config" >&5
for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
if test -x $i/pg_config; then
PG_CONFIG="$i/pg_config"
@@ -74294,7 +74255,7 @@ EOF
old_LDFLAGS=$LDFLAGS
LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6
-echo "configure:74298: checking for PQescapeString in -lpq" >&5
+echo "configure:74259: checking for PQescapeString in -lpq" >&5
ac_lib_var=`echo pq'_'PQescapeString | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74302,7 +74263,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74306 "configure"
+#line 74267 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74313,7 +74274,7 @@ int main() {
PQescapeString()
; return 0; }
EOF
-if { (eval echo configure:74317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74337,7 +74298,7 @@ else
fi
echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6
-echo "configure:74341: checking for PQunescapeBytea in -lpq" >&5
+echo "configure:74302: checking for PQunescapeBytea in -lpq" >&5
ac_lib_var=`echo pq'_'PQunescapeBytea | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74345,7 +74306,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74349 "configure"
+#line 74310 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74356,7 +74317,7 @@ int main() {
PQunescapeBytea()
; return 0; }
EOF
-if { (eval echo configure:74360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74380,7 +74341,7 @@ else
fi
echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6
-echo "configure:74384: checking for PQsetnonblocking in -lpq" >&5
+echo "configure:74345: checking for PQsetnonblocking in -lpq" >&5
ac_lib_var=`echo pq'_'PQsetnonblocking | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74388,7 +74349,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74392 "configure"
+#line 74353 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74399,7 +74360,7 @@ int main() {
PQsetnonblocking()
; return 0; }
EOF
-if { (eval echo configure:74403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74423,7 +74384,7 @@ else
fi
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:74427: checking for PQcmdTuples in -lpq" >&5
+echo "configure:74388: checking for PQcmdTuples in -lpq" >&5
ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74431,7 +74392,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74435 "configure"
+#line 74396 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74442,7 +74403,7 @@ int main() {
PQcmdTuples()
; return 0; }
EOF
-if { (eval echo configure:74446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74466,7 +74427,7 @@ else
fi
echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6
-echo "configure:74470: checking for PQoidValue in -lpq" >&5
+echo "configure:74431: checking for PQoidValue in -lpq" >&5
ac_lib_var=`echo pq'_'PQoidValue | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74474,7 +74435,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74478 "configure"
+#line 74439 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74485,7 +74446,7 @@ int main() {
PQoidValue()
; return 0; }
EOF
-if { (eval echo configure:74489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74509,7 +74470,7 @@ else
fi
echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6
-echo "configure:74513: checking for PQclientEncoding in -lpq" >&5
+echo "configure:74474: checking for PQclientEncoding in -lpq" >&5
ac_lib_var=`echo pq'_'PQclientEncoding | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74517,7 +74478,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74521 "configure"
+#line 74482 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74528,7 +74489,7 @@ int main() {
PQclientEncoding()
; return 0; }
EOF
-if { (eval echo configure:74532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74552,7 +74513,7 @@ else
fi
echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
-echo "configure:74556: checking for PQparameterStatus in -lpq" >&5
+echo "configure:74517: checking for PQparameterStatus in -lpq" >&5
ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74560,7 +74521,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74564 "configure"
+#line 74525 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74571,7 +74532,7 @@ int main() {
PQparameterStatus()
; return 0; }
EOF
-if { (eval echo configure:74575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74595,7 +74556,7 @@ else
fi
echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6
-echo "configure:74599: checking for PQprotocolVersion in -lpq" >&5
+echo "configure:74560: checking for PQprotocolVersion in -lpq" >&5
ac_lib_var=`echo pq'_'PQprotocolVersion | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74603,7 +74564,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74607 "configure"
+#line 74568 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74614,7 +74575,7 @@ int main() {
PQprotocolVersion()
; return 0; }
EOF
-if { (eval echo configure:74618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74638,7 +74599,7 @@ else
fi
echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6
-echo "configure:74642: checking for PQtransactionStatus in -lpq" >&5
+echo "configure:74603: checking for PQtransactionStatus in -lpq" >&5
ac_lib_var=`echo pq'_'PQtransactionStatus | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74646,7 +74607,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74650 "configure"
+#line 74611 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74657,7 +74618,7 @@ int main() {
PQtransactionStatus()
; return 0; }
EOF
-if { (eval echo configure:74661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74681,7 +74642,7 @@ else
fi
echo $ac_n "checking for PQexecParams in -lpq""... $ac_c" 1>&6
-echo "configure:74685: checking for PQexecParams in -lpq" >&5
+echo "configure:74646: checking for PQexecParams in -lpq" >&5
ac_lib_var=`echo pq'_'PQexecParams | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74689,7 +74650,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74693 "configure"
+#line 74654 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74700,7 +74661,7 @@ int main() {
PQexecParams()
; return 0; }
EOF
-if { (eval echo configure:74704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74724,7 +74685,7 @@ else
fi
echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
-echo "configure:74728: checking for PQprepare in -lpq" >&5
+echo "configure:74689: checking for PQprepare in -lpq" >&5
ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74732,7 +74693,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74736 "configure"
+#line 74697 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74743,7 +74704,7 @@ int main() {
PQprepare()
; return 0; }
EOF
-if { (eval echo configure:74747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74767,7 +74728,7 @@ else
fi
echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6
-echo "configure:74771: checking for PQexecPrepared in -lpq" >&5
+echo "configure:74732: checking for PQexecPrepared in -lpq" >&5
ac_lib_var=`echo pq'_'PQexecPrepared | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74775,7 +74736,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74779 "configure"
+#line 74740 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74786,7 +74747,7 @@ int main() {
PQexecPrepared()
; return 0; }
EOF
-if { (eval echo configure:74790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74810,7 +74771,7 @@ else
fi
echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6
-echo "configure:74814: checking for PQresultErrorField in -lpq" >&5
+echo "configure:74775: checking for PQresultErrorField in -lpq" >&5
ac_lib_var=`echo pq'_'PQresultErrorField | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74818,7 +74779,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74822 "configure"
+#line 74783 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74829,7 +74790,7 @@ int main() {
PQresultErrorField()
; return 0; }
EOF
-if { (eval echo configure:74833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74853,7 +74814,7 @@ else
fi
echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6
-echo "configure:74857: checking for PQsendQueryParams in -lpq" >&5
+echo "configure:74818: checking for PQsendQueryParams in -lpq" >&5
ac_lib_var=`echo pq'_'PQsendQueryParams | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74861,7 +74822,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74865 "configure"
+#line 74826 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74872,7 +74833,7 @@ int main() {
PQsendQueryParams()
; return 0; }
EOF
-if { (eval echo configure:74876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74896,7 +74857,7 @@ else
fi
echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6
-echo "configure:74900: checking for PQsendPrepare in -lpq" >&5
+echo "configure:74861: checking for PQsendPrepare in -lpq" >&5
ac_lib_var=`echo pq'_'PQsendPrepare | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74904,7 +74865,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74908 "configure"
+#line 74869 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74915,7 +74876,7 @@ int main() {
PQsendPrepare()
; return 0; }
EOF
-if { (eval echo configure:74919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74939,7 +74900,7 @@ else
fi
echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6
-echo "configure:74943: checking for PQsendQueryPrepared in -lpq" >&5
+echo "configure:74904: checking for PQsendQueryPrepared in -lpq" >&5
ac_lib_var=`echo pq'_'PQsendQueryPrepared | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74947,7 +74908,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74951 "configure"
+#line 74912 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74958,7 +74919,7 @@ int main() {
PQsendQueryPrepared()
; return 0; }
EOF
-if { (eval echo configure:74962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74982,7 +74943,7 @@ else
fi
echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6
-echo "configure:74986: checking for PQputCopyData in -lpq" >&5
+echo "configure:74947: checking for PQputCopyData in -lpq" >&5
ac_lib_var=`echo pq'_'PQputCopyData | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74990,7 +74951,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74994 "configure"
+#line 74955 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -75001,7 +74962,7 @@ int main() {
PQputCopyData()
; return 0; }
EOF
-if { (eval echo configure:75005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -75025,7 +74986,7 @@ else
fi
echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6
-echo "configure:75029: checking for PQputCopyEnd in -lpq" >&5
+echo "configure:74990: checking for PQputCopyEnd in -lpq" >&5
ac_lib_var=`echo pq'_'PQputCopyEnd | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -75033,7 +74994,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 75037 "configure"
+#line 74998 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -75044,7 +75005,7 @@ int main() {
PQputCopyEnd()
; return 0; }
EOF
-if { (eval echo configure:75048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -75068,7 +75029,7 @@ else
fi
echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6
-echo "configure:75072: checking for PQgetCopyData in -lpq" >&5
+echo "configure:75033: checking for PQgetCopyData in -lpq" >&5
ac_lib_var=`echo pq'_'PQgetCopyData | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -75076,7 +75037,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 75080 "configure"
+#line 75041 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -75087,7 +75048,7 @@ int main() {
PQgetCopyData()
; return 0; }
EOF
-if { (eval echo configure:75091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -75111,7 +75072,7 @@ else
fi
echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6
-echo "configure:75115: checking for PQfreemem in -lpq" >&5
+echo "configure:75076: checking for PQfreemem in -lpq" >&5
ac_lib_var=`echo pq'_'PQfreemem | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -75119,7 +75080,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 75123 "configure"
+#line 75084 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -75130,7 +75091,7 @@ int main() {
PQfreemem()
; return 0; }
EOF
-if { (eval echo configure:75134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -75154,7 +75115,7 @@ else
fi
echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6
-echo "configure:75158: checking for PQsetErrorVerbosity in -lpq" >&5
+echo "configure:75119: checking for PQsetErrorVerbosity in -lpq" >&5
ac_lib_var=`echo pq'_'PQsetErrorVerbosity | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -75162,7 +75123,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 75166 "configure"
+#line 75127 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -75173,7 +75134,7 @@ int main() {
PQsetErrorVerbosity()
; return 0; }
EOF
-if { (eval echo configure:75177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -75197,7 +75158,7 @@ else
fi
echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6
-echo "configure:75201: checking for PQftable in -lpq" >&5
+echo "configure:75162: checking for PQftable in -lpq" >&5
ac_lib_var=`echo pq'_'PQftable | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -75205,7 +75166,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 75209 "configure"
+#line 75170 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -75216,7 +75177,7 @@ int main() {
PQftable()
; return 0; }
EOF
-if { (eval echo configure:75220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -75240,7 +75201,7 @@ else
fi
echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
-echo "configure:75244: checking for PQescapeStringConn in -lpq" >&5
+echo "configure:75205: checking for PQescapeStringConn in -lpq" >&5
ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -75248,7 +75209,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 75252 "configure"
+#line 75213 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -75259,7 +75220,7 @@ int main() {
PQescapeStringConn()
; return 0; }
EOF
-if { (eval echo configure:75263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -75283,7 +75244,7 @@ else
fi
echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
-echo "configure:75287: checking for PQescapeByteaConn in -lpq" >&5
+echo "configure:75248: checking for PQescapeByteaConn in -lpq" >&5
ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -75291,7 +75252,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 75295 "configure"
+#line 75256 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -75302,7 +75263,7 @@ int main() {
PQescapeByteaConn()
; return 0; }
EOF
-if { (eval echo configure:75306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -75326,7 +75287,7 @@ else
fi
echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
-echo "configure:75330: checking for pg_encoding_to_char in -lpq" >&5
+echo "configure:75291: checking for pg_encoding_to_char in -lpq" >&5
ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -75334,7 +75295,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 75338 "configure"
+#line 75299 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -75345,7 +75306,7 @@ int main() {
pg_encoding_to_char()
; return 0; }
EOF
-if { (eval echo configure:75349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -75369,7 +75330,7 @@ else
fi
echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6
-echo "configure:75373: checking for lo_create in -lpq" >&5
+echo "configure:75334: checking for lo_create in -lpq" >&5
ac_lib_var=`echo pq'_'lo_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -75377,7 +75338,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 75381 "configure"
+#line 75342 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -75388,7 +75349,7 @@ int main() {
lo_create()
; return 0; }
EOF
-if { (eval echo configure:75392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -75412,7 +75373,7 @@ else
fi
echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6
-echo "configure:75416: checking for lo_import_with_oid in -lpq" >&5
+echo "configure:75377: checking for lo_import_with_oid in -lpq" >&5
ac_lib_var=`echo pq'_'lo_import_with_oid | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -75420,7 +75381,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 75424 "configure"
+#line 75385 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -75431,7 +75392,7 @@ int main() {
lo_import_with_oid()
; return 0; }
EOF
-if { (eval echo configure:75435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -75774,8 +75735,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_PGSQL_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/pgsql in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -75818,9 +75780,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC pgsql"
- else
-
+ EXT_STATIC="$EXT_STATIC pgsql"
+ ;;
+ *)
+
case ext/pgsql in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -75863,7 +75826,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC pgsql"
fi
@@ -75888,7 +75852,7 @@ fi
php_enable_phar=yes
echo $ac_n "checking for phar archive support""... $ac_c" 1>&6
-echo "configure:75892: checking for phar archive support" >&5
+echo "configure:75856: checking for phar archive support" >&5
# Check whether --enable-phar or --disable-phar was given.
if test "${enable_phar+set}" = set; then
enableval="$enable_phar"
@@ -76116,8 +76080,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_PHAR_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/phar in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -76160,9 +76125,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC phar"
- else
-
+ EXT_STATIC="$EXT_STATIC phar"
+ ;;
+ *)
+
case ext/phar in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -76205,7 +76171,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC phar"
fi
@@ -76222,7 +76189,7 @@ EOF
fi
echo $ac_n "checking for phar openssl support""... $ac_c" 1>&6
-echo "configure:76226: checking for phar openssl support" >&5
+echo "configure:76193: checking for phar openssl support" >&5
if test "$PHP_HASH_SHARED" != "yes"; then
if test "$PHP_HASH" != "no"; then
cat >> confdefs.h <<\EOF
@@ -76297,7 +76264,7 @@ fi
php_enable_posix=yes
echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6
-echo "configure:76301: checking whether to enable POSIX-like functions" >&5
+echo "configure:76268: checking whether to enable POSIX-like functions" >&5
# Check whether --enable-posix or --disable-posix was given.
if test "${enable_posix+set}" = set; then
enableval="$enable_posix"
@@ -76529,8 +76496,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_POSIX_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/posix in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -76573,9 +76541,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC posix"
- else
-
+ EXT_STATIC="$EXT_STATIC posix"
+ ;;
+ *)
+
case ext/posix in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -76618,7 +76587,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC posix"
fi
@@ -76639,17 +76609,17 @@ EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:76643: checking for $ac_hdr" >&5
+echo "configure:76613: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 76648 "configure"
+#line 76618 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:76653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:76623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -76679,12 +76649,12 @@ done
for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:76683: checking for $ac_func" >&5
+echo "configure:76653: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 76688 "configure"
+#line 76658 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -76707,7 +76677,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:76711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:76681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -76733,14 +76703,14 @@ done
echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6
-echo "configure:76737: checking for working ttyname_r() implementation" >&5
+echo "configure:76707: checking for working ttyname_r() implementation" >&5
if test "$cross_compiling" = yes; then
echo "$ac_t""no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 76744 "configure"
+#line 76714 "configure"
#include "confdefs.h"
#include <unistd.h>
@@ -76753,7 +76723,7 @@ int main(int argc, char *argv[])
}
EOF
-if { (eval echo configure:76757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:76727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6
@@ -76775,13 +76745,13 @@ fi
echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6
-echo "configure:76779: checking for utsname.domainname" >&5
+echo "configure:76749: checking for utsname.domainname" >&5
if eval "test \"`echo '$''{'ac_cv_have_utsname_domainname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 76785 "configure"
+#line 76755 "configure"
#include "confdefs.h"
#define _GNU_SOURCE
@@ -76793,7 +76763,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:76797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:76767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_have_utsname_domainname=yes
@@ -76824,7 +76794,7 @@ fi
php_with_pspell=no
echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6
-echo "configure:76828: checking for PSPELL support" >&5
+echo "configure:76798: checking for PSPELL support" >&5
# Check whether --with-pspell or --without-pspell was given.
if test "${with_pspell+set}" = set; then
withval="$with_pspell"
@@ -77052,8 +77022,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_PSPELL_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/pspell in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -77096,9 +77067,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC pspell"
- else
-
+ EXT_STATIC="$EXT_STATIC pspell"
+ ;;
+ *)
+
case ext/pspell in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -77141,7 +77113,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC pspell"
fi
@@ -77374,7 +77347,7 @@ EOF
done
echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6
-echo "configure:77378: checking for new_aspell_config in -laspell" >&5
+echo "configure:77351: checking for new_aspell_config in -laspell" >&5
ac_lib_var=`echo aspell'_'new_aspell_config | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -77382,7 +77355,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-laspell $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 77386 "configure"
+#line 77359 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -77393,7 +77366,7 @@ int main() {
new_aspell_config()
; return 0; }
EOF
-if { (eval echo configure:77397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:77370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -77567,7 +77540,7 @@ fi
php_with_libedit=no
echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6
-echo "configure:77571: checking for libedit readline replacement" >&5
+echo "configure:77544: checking for libedit readline replacement" >&5
# Check whether --with-libedit or --without-libedit was given.
if test "${with_libedit+set}" = set; then
withval="$with_libedit"
@@ -77615,7 +77588,7 @@ if test "$PHP_LIBEDIT" = "no"; then
php_with_readline=no
echo $ac_n "checking for readline support""... $ac_c" 1>&6
-echo "configure:77619: checking for readline support" >&5
+echo "configure:77592: checking for readline support" >&5
# Check whether --with-readline or --without-readline was given.
if test "${with_readline+set}" = set; then
withval="$with_readline"
@@ -77702,7 +77675,7 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
PHP_READLINE_LIBS=""
echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:77706: checking for tgetent in -lncurses" >&5
+echo "configure:77679: checking for tgetent in -lncurses" >&5
ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -77710,7 +77683,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lncurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 77714 "configure"
+#line 77687 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -77721,7 +77694,7 @@ int main() {
tgetent()
; return 0; }
EOF
-if { (eval echo configure:77725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:77698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -77766,7 +77739,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:77770: checking for tgetent in -ltermcap" >&5
+echo "configure:77743: checking for tgetent in -ltermcap" >&5
ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -77774,7 +77747,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 77778 "configure"
+#line 77751 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -77785,7 +77758,7 @@ int main() {
tgetent()
; return 0; }
EOF
-if { (eval echo configure:77789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:77762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -77932,7 +77905,7 @@ fi
done
echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-echo "configure:77936: checking for readline in -lreadline" >&5
+echo "configure:77909: checking for readline in -lreadline" >&5
ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -77940,7 +77913,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lreadline $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 77944 "configure"
+#line 77917 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -77951,7 +77924,7 @@ int main() {
readline()
; return 0; }
EOF
-if { (eval echo configure:77955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:77928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -78180,7 +78153,7 @@ fi
done
echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6
-echo "configure:78184: checking for rl_callback_read_char in -lreadline" >&5
+echo "configure:78157: checking for rl_callback_read_char in -lreadline" >&5
ac_lib_var=`echo readline'_'rl_callback_read_char | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -78188,7 +78161,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lreadline $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 78192 "configure"
+#line 78165 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -78199,7 +78172,7 @@ int main() {
rl_callback_read_char()
; return 0; }
EOF
-if { (eval echo configure:78203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:78176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -78235,254 +78208,6 @@ else
fi
-
- save_old_LDFLAGS=$LDFLAGS
- ac_stuff="
- -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
- "
-
- save_ext_shared=$ext_shared
- ext_shared=yes
-
- for ac_i in $ac_stuff; do
- case $ac_i in
- -pthread)
- if test "$ext_shared" = "yes"; then
- LDFLAGS="$LDFLAGS -pthread"
- else
-
-
- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
-
- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
- eval "EXTRA_LDFLAGS$unique=set"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
- fi
-
- fi
- ;;
- -l*)
- ac_ii=`echo $ac_i|cut -c 3-`
-
-
- case $ac_ii in
- c|c_r|pthread*) ;;
- *)
- if test "$ext_shared" = "yes"; then
- LDFLAGS="$LDFLAGS -l$ac_ii"
- else
-
-
- case $ac_ii in
- c|c_r|pthread*) ;;
- *)
- LIBS="$LIBS -l$ac_ii"
- ;;
- esac
-
-
- fi
- ;;
- esac
-
-
- ;;
- -L*)
- ac_ii=`echo $ac_i|cut -c 3-`
-
- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
-
- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
- ai_p=$ac_ii
- else
-
- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
- ai_p="$ep_realdir/`basename \"$ac_ii\"`"
- fi
-
-
- if test "$ext_shared" = "yes"; then
- LDFLAGS="-L$ai_p $LDFLAGS"
- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
- else
-
-
-
- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
- eval "LIBPATH$unique=set"
-
- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
- LDFLAGS="$LDFLAGS -L$ai_p"
- PHP_RPATHS="$PHP_RPATHS $ai_p"
-
- fi
-
-
- fi
-
- fi
-
- ;;
- esac
- done
-
- echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6
-echo "configure:78337: checking for add_history in -lhistory" >&5
-ac_lib_var=`echo history'_'add_history | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lhistory $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 78345 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char add_history();
-
-int main() {
-add_history()
-; return 0; }
-EOF
-if { (eval echo configure:78356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-
- LDFLAGS=$save_old_LDFLAGS
- ext_shared=$save_ext_shared
-
-
-
- if test "$ext_shared" = "yes"; then
- READLINE_SHARED_LIBADD="-lhistory $READLINE_SHARED_LIBADD"
- if test -n "$READLINE_DIR/$PHP_LIBDIR"; then
-
- if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
- if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
- ai_p=$READLINE_DIR/$PHP_LIBDIR
- else
-
- ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
- ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`"
- fi
-
-
- if test "$ext_shared" = "yes"; then
- READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD"
- test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD"
- else
-
-
-
- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
- eval "LIBPATH$unique=set"
-
- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
- LDFLAGS="$LDFLAGS -L$ai_p"
- PHP_RPATHS="$PHP_RPATHS $ai_p"
-
- fi
-
-
- fi
-
- fi
-
- fi
- else
-
-
- if test -n "$READLINE_DIR/$PHP_LIBDIR"; then
-
- if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
-
- if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
- ai_p=$READLINE_DIR/$PHP_LIBDIR
- else
-
- ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
-
- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
- ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`"
- fi
-
-
-
-
-
- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
-
- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
- eval "LIBPATH$unique=set"
-
- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
- LDFLAGS="$LDFLAGS -L$ai_p"
- PHP_RPATHS="$PHP_RPATHS $ai_p"
-
- fi
-
-
-
- fi
-
- fi
-
-
- case history in
- c|c_r|pthread*) ;;
- *)
- LIBS="-lhistory $LIBS"
- ;;
- esac
-
-
-
-
- fi
-
-
-
-
-else
- echo "$ac_t""no" 1>&6
-
- LDFLAGS=$save_old_LDFLAGS
- ext_shared=$save_ext_shared
- unset ac_cv_lib_history_add_history
-
- { echo "configure: error: history library required by readline not found" 1>&2; exit 1; }
-
-
-fi
-
-
cat >> confdefs.h <<\EOF
#define HAVE_LIBREADLINE 1
EOF
@@ -78531,7 +78256,7 @@ elif test "$PHP_LIBEDIT" != "no"; then
echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:78535: checking for tgetent in -lncurses" >&5
+echo "configure:78260: checking for tgetent in -lncurses" >&5
ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -78539,7 +78264,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lncurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 78543 "configure"
+#line 78268 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -78550,7 +78275,7 @@ int main() {
tgetent()
; return 0; }
EOF
-if { (eval echo configure:78554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:78279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -78594,7 +78319,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:78598: checking for tgetent in -ltermcap" >&5
+echo "configure:78323: checking for tgetent in -ltermcap" >&5
ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -78602,7 +78327,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 78606 "configure"
+#line 78331 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -78613,7 +78338,7 @@ int main() {
tgetent()
; return 0; }
EOF
-if { (eval echo configure:78617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:78342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -78759,7 +78484,7 @@ fi
done
echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
-echo "configure:78763: checking for readline in -ledit" >&5
+echo "configure:78488: checking for readline in -ledit" >&5
ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -78767,7 +78492,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ledit $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 78771 "configure"
+#line 78496 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -78778,7 +78503,7 @@ int main() {
readline()
; return 0; }
EOF
-if { (eval echo configure:78782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:78507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -78919,12 +78644,12 @@ if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then
for ac_func in rl_completion_matches
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:78923: checking for $ac_func" >&5
+echo "configure:78648: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 78928 "configure"
+#line 78653 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -78947,7 +78672,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:78951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:78676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -79155,8 +78880,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" = "cli"; then
PHP_READLINE_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/readline in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -79199,9 +78925,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC readline"
- else
-
+ EXT_STATIC="$EXT_STATIC readline"
+ ;;
+ *)
+
case ext/readline in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -79244,7 +78971,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC readline"
fi
@@ -79270,7 +78998,7 @@ fi
php_with_recode=no
echo $ac_n "checking for recode support""... $ac_c" 1>&6
-echo "configure:79274: checking for recode support" >&5
+echo "configure:79002: checking for recode support" >&5
# Check whether --with-recode or --without-recode was given.
if test "${with_recode+set}" = set; then
withval="$with_recode"
@@ -79437,7 +79165,7 @@ if test "$PHP_RECODE" != "no"; then
done
echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6
-echo "configure:79441: checking for recode_format_table in -lrecode" >&5
+echo "configure:79169: checking for recode_format_table in -lrecode" >&5
ac_lib_var=`echo recode'_'recode_format_table | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -79445,7 +79173,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lrecode $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 79449 "configure"
+#line 79177 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -79456,7 +79184,7 @@ int main() {
recode_format_table()
; return 0; }
EOF
-if { (eval echo configure:79460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:79188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -79586,7 +79314,7 @@ else
LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB"
LIBS="$LIBS -lrecode"
cat > conftest.$ac_ext <<EOF
-#line 79590 "configure"
+#line 79318 "configure"
#include "confdefs.h"
char *program_name;
@@ -79597,7 +79325,7 @@ recode_format_table();
; return 0; }
EOF
-if { (eval echo configure:79601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:79329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
@@ -79760,17 +79488,17 @@ EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:79764: checking for $ac_hdr" >&5
+echo "configure:79492: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 79769 "configure"
+#line 79497 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:79774: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:79502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -79980,8 +79708,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_RECODE_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/recode in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -80024,9 +79753,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC recode"
- else
-
+ EXT_STATIC="$EXT_STATIC recode"
+ ;;
+ *)
+
case ext/recode in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -80069,7 +79799,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC recode"
fi
@@ -80276,8 +80007,9 @@ EOF
if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then
PHP_REFLECTION_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/reflection in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -80320,9 +80052,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC reflection"
- else
-
+ EXT_STATIC="$EXT_STATIC reflection"
+ ;;
+ *)
+
case ext/reflection in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -80365,7 +80098,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC reflection"
fi
@@ -80387,7 +80121,7 @@ EOF
php_enable_session=yes
echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6
-echo "configure:80391: checking whether to enable PHP sessions" >&5
+echo "configure:80125: checking whether to enable PHP sessions" >&5
# Check whether --enable-session or --disable-session was given.
if test "${enable_session+set}" = set; then
enableval="$enable_session"
@@ -80434,7 +80168,7 @@ echo "$ac_t""$ext_output" 1>&6
php_with_mm=no
echo $ac_n "checking for mm support""... $ac_c" 1>&6
-echo "configure:80438: checking for mm support" >&5
+echo "configure:80172: checking for mm support" >&5
# Check whether --with-mm or --without-mm was given.
if test "${with_mm+set}" = set; then
withval="$with_mm"
@@ -80459,7 +80193,7 @@ echo "$ac_t""$ext_output" 1>&6
if test "$PHP_SESSION" != "no"; then
echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6
-echo "configure:80463: checking whether pwrite works" >&5
+echo "configure:80197: checking whether pwrite works" >&5
if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -80471,7 +80205,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 80475 "configure"
+#line 80209 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -80492,7 +80226,7 @@ else
EOF
-if { (eval echo configure:80496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:80230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_pwrite=yes
@@ -80517,7 +80251,7 @@ fi
else
cat > conftest.$ac_ext <<EOF
-#line 80521 "configure"
+#line 80255 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -80538,7 +80272,7 @@ ssize_t pwrite(int, void *, size_t, off64_t);
EOF
-if { (eval echo configure:80542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:80276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_pwrite=yes
@@ -80579,7 +80313,7 @@ EOF
echo $ac_n "checking whether pread works""... $ac_c" 1>&6
-echo "configure:80583: checking whether pread works" >&5
+echo "configure:80317: checking whether pread works" >&5
if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -80592,7 +80326,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 80596 "configure"
+#line 80330 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -80612,7 +80346,7 @@ else
}
EOF
-if { (eval echo configure:80616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:80350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_pread=yes
@@ -80639,7 +80373,7 @@ fi
else
cat > conftest.$ac_ext <<EOF
-#line 80643 "configure"
+#line 80377 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -80659,7 +80393,7 @@ ssize_t pread(int, void *, size_t, off64_t);
}
EOF
-if { (eval echo configure:80663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:80397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_pread=yes
@@ -80883,8 +80617,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_SESSION_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/session in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -80927,9 +80662,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC session"
- else
-
+ EXT_STATIC="$EXT_STATIC session"
+ ;;
+ *)
+
case ext/session in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -80972,7 +80708,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC session"
fi
@@ -81182,7 +80919,7 @@ fi
php_enable_shmop=no
echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6
-echo "configure:81186: checking whether to enable shmop support" >&5
+echo "configure:80923: checking whether to enable shmop support" >&5
# Check whether --enable-shmop or --disable-shmop was given.
if test "${enable_shmop+set}" = set; then
enableval="$enable_shmop"
@@ -81414,8 +81151,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_SHMOP_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/shmop in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -81458,9 +81196,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC shmop"
- else
-
+ EXT_STATIC="$EXT_STATIC shmop"
+ ;;
+ *)
+
case ext/shmop in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -81503,7 +81242,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC shmop"
fi
@@ -81526,7 +81266,7 @@ fi
php_enable_simplexml=yes
echo $ac_n "checking whether to enable SimpleXML support""... $ac_c" 1>&6
-echo "configure:81530: checking whether to enable SimpleXML support" >&5
+echo "configure:81270: checking whether to enable SimpleXML support" >&5
# Check whether --enable-simplexml or --disable-simplexml was given.
if test "${enable_simplexml+set}" = set; then
enableval="$enable_simplexml"
@@ -81574,7 +81314,7 @@ if test -z "$PHP_LIBXML_DIR"; then
php_with_libxml_dir=no
echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
-echo "configure:81578: checking libxml2 install dir" >&5
+echo "configure:81318: checking libxml2 install dir" >&5
# Check whether --with-libxml-dir or --without-libxml-dir was given.
if test "${with_libxml_dir+set}" = set; then
withval="$with_libxml_dir"
@@ -81605,7 +81345,7 @@ if test "$PHP_SIMPLEXML" != "no"; then
echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
-echo "configure:81609: checking for xml2-config path" >&5
+echo "configure:81349: checking for xml2-config path" >&5
if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -81763,7 +81503,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
-echo "configure:81767: checking whether libxml build works" >&5
+echo "configure:81507: checking whether libxml build works" >&5
if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -81779,7 +81519,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 81783 "configure"
+#line 81523 "configure"
#include "confdefs.h"
@@ -81790,7 +81530,7 @@ else
}
EOF
-if { (eval echo configure:81794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:81534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -82013,8 +81753,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_SIMPLEXML_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/simplexml in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -82057,9 +81798,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC simplexml"
- else
-
+ EXT_STATIC="$EXT_STATIC simplexml"
+ ;;
+ *)
+
case ext/simplexml in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -82102,7 +81844,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC simplexml"
fi
@@ -82175,7 +81918,7 @@ fi
php_with_snmp=no
echo $ac_n "checking for SNMP support""... $ac_c" 1>&6
-echo "configure:82179: checking for SNMP support" >&5
+echo "configure:81922: checking for SNMP support" >&5
# Check whether --with-snmp or --without-snmp was given.
if test "${with_snmp+set}" = set; then
withval="$with_snmp"
@@ -82222,7 +81965,7 @@ echo "$ac_t""$ext_output" 1>&6
php_with_openssl_dir=no
echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6
-echo "configure:82226: checking OpenSSL dir for SNMP" >&5
+echo "configure:81969: checking OpenSSL dir for SNMP" >&5
# Check whether --with-openssl-dir or --without-openssl-dir was given.
if test "${with_openssl_dir+set}" = set; then
withval="$with_openssl_dir"
@@ -82248,7 +81991,7 @@ echo "$ac_t""$ext_output" 1>&6
php_enable_ucd_snmp_hack=no
echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6
-echo "configure:82252: checking whether to enable UCD SNMP hack" >&5
+echo "configure:81995: checking whether to enable UCD SNMP hack" >&5
# Check whether --enable-ucd-snmp-hack or --disable-ucd-snmp-hack was given.
if test "${enable_ucd_snmp_hack+set}" = set; then
enableval="$enable_ucd_snmp_hack"
@@ -82276,7 +82019,7 @@ if test "$PHP_SNMP" != "no"; 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
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:82280: checking for $ac_word" >&5
+echo "configure:82023: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SNMP_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -82477,17 +82220,17 @@ EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:82481: checking for $ac_hdr" >&5
+echo "configure:82224: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 82486 "configure"
+#line 82229 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:82491: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:82234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -82515,9 +82258,9 @@ done
if test "$ac_cv_header_default_store_h" = "yes"; then
echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6
-echo "configure:82519: checking for OpenSSL support in SNMP libraries" >&5
+echo "configure:82262: checking for OpenSSL support in SNMP libraries" >&5
cat > conftest.$ac_ext <<EOF
-#line 82521 "configure"
+#line 82264 "configure"
#include "confdefs.h"
#include <ucd-snmp-config.h>
@@ -82572,7 +82315,7 @@ rm -f conftest*
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:82576: checking for $ac_word" >&5
+echo "configure:82319: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -82777,9 +82520,9 @@ fi
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$OPENSSL_INCDIR
echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
-echo "configure:82781: checking for OpenSSL version" >&5
+echo "configure:82524: checking for OpenSSL version" >&5
cat > conftest.$ac_ext <<EOF
-#line 82783 "configure"
+#line 82526 "configure"
#include "confdefs.h"
#include <openssl/opensslv.h>
@@ -82934,7 +82677,7 @@ rm -f conftest*
done
echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
-echo "configure:82938: checking for CRYPTO_free in -lcrypto" >&5
+echo "configure:82681: checking for CRYPTO_free in -lcrypto" >&5
ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -82942,7 +82685,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 82946 "configure"
+#line 82689 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -82953,7 +82696,7 @@ int main() {
CRYPTO_free()
; return 0; }
EOF
-if { (eval echo configure:82957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:82700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -83110,7 +82853,7 @@ fi
done
echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
-echo "configure:83114: checking for SSL_CTX_set_ssl_version in -lssl" >&5
+echo "configure:82857: checking for SSL_CTX_set_ssl_version in -lssl" >&5
ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -83118,7 +82861,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 83122 "configure"
+#line 82865 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -83129,7 +82872,7 @@ int main() {
SSL_CTX_set_ssl_version()
; return 0; }
EOF
-if { (eval echo configure:83133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:82876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -83242,7 +82985,7 @@ else
fi
echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6
-echo "configure:83246: checking for kstat_read in -lkstat" >&5
+echo "configure:82989: checking for kstat_read in -lkstat" >&5
ac_lib_var=`echo kstat'_'kstat_read | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -83250,7 +82993,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lkstat $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 83254 "configure"
+#line 82997 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -83261,7 +83004,7 @@ int main() {
kstat_read()
; return 0; }
EOF
-if { (eval echo configure:83265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:83008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -83532,7 +83275,7 @@ fi
done
echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6
-echo "configure:83536: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5
+echo "configure:83279: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5
ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -83540,7 +83283,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$SNMP_LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 83544 "configure"
+#line 83287 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -83551,7 +83294,7 @@ int main() {
snmp_parse_oid()
; return 0; }
EOF
-if { (eval echo configure:83555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:83298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -83685,7 +83428,7 @@ fi
done
echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6
-echo "configure:83689: checking for init_snmp in -l$SNMP_LIBNAME" >&5
+echo "configure:83432: checking for init_snmp in -l$SNMP_LIBNAME" >&5
ac_lib_var=`echo $SNMP_LIBNAME'_'init_snmp | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -83693,7 +83436,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$SNMP_LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 83697 "configure"
+#line 83440 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -83704,7 +83447,7 @@ int main() {
init_snmp()
; return 0; }
EOF
-if { (eval echo configure:83708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:83451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -83933,8 +83676,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_SNMP_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/snmp in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -83977,9 +83721,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC snmp"
- else
-
+ EXT_STATIC="$EXT_STATIC snmp"
+ ;;
+ *)
+
case ext/snmp in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -84022,7 +83767,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC snmp"
fi
@@ -84048,7 +83794,7 @@ fi
php_enable_soap=no
echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6
-echo "configure:84052: checking whether to enable SOAP support" >&5
+echo "configure:83798: checking whether to enable SOAP support" >&5
# Check whether --enable-soap or --disable-soap was given.
if test "${enable_soap+set}" = set; then
enableval="$enable_soap"
@@ -84096,7 +83842,7 @@ if test -z "$PHP_LIBXML_DIR"; then
php_with_libxml_dir=no
echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
-echo "configure:84100: checking libxml2 install dir" >&5
+echo "configure:83846: checking libxml2 install dir" >&5
# Check whether --with-libxml-dir or --without-libxml-dir was given.
if test "${with_libxml_dir+set}" = set; then
withval="$with_libxml_dir"
@@ -84127,7 +83873,7 @@ if test "$PHP_SOAP" != "no"; then
echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
-echo "configure:84131: checking for xml2-config path" >&5
+echo "configure:83877: checking for xml2-config path" >&5
if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -84285,7 +84031,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
-echo "configure:84289: checking whether libxml build works" >&5
+echo "configure:84035: checking whether libxml build works" >&5
if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -84301,7 +84047,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 84305 "configure"
+#line 84051 "configure"
#include "confdefs.h"
@@ -84312,7 +84058,7 @@ else
}
EOF
-if { (eval echo configure:84316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:84062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -84535,8 +84281,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_SOAP_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/soap in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -84579,9 +84326,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC soap"
- else
-
+ EXT_STATIC="$EXT_STATIC soap"
+ ;;
+ *)
+
case ext/soap in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -84624,7 +84372,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC soap"
fi
@@ -84659,7 +84408,7 @@ fi
php_enable_sockets=no
echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6
-echo "configure:84663: checking whether to enable sockets support" >&5
+echo "configure:84412: checking whether to enable sockets support" >&5
# Check whether --enable-sockets or --disable-sockets was given.
if test "${enable_sockets+set}" = set; then
enableval="$enable_sockets"
@@ -84704,13 +84453,13 @@ echo "$ac_t""$ext_output" 1>&6
if test "$PHP_SOCKETS" != "no"; then
echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6
-echo "configure:84708: checking for struct cmsghdr" >&5
+echo "configure:84457: checking for struct cmsghdr" >&5
if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 84714 "configure"
+#line 84463 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -84719,7 +84468,7 @@ int main() {
struct cmsghdr s; s
; return 0; }
EOF
-if { (eval echo configure:84723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:84472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cmsghdr=yes
else
@@ -84744,12 +84493,12 @@ EOF
for ac_func in hstrerror socketpair
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:84748: checking for $ac_func" >&5
+echo "configure:84497: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 84753 "configure"
+#line 84502 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -84772,7 +84521,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:84776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:84525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -84800,17 +84549,17 @@ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:84804: checking for $ac_hdr" >&5
+echo "configure:84553: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 84809 "configure"
+#line 84558 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:84814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:84563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -84837,7 +84586,7 @@ fi
done
cat > conftest.$ac_ext <<EOF
-#line 84841 "configure"
+#line 84590 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -84847,7 +84596,7 @@ int main() {
static struct msghdr tp; int n = (int) tp.msg_flags; return n
; return 0; }
EOF
-if { (eval echo configure:84851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:84600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -85049,8 +84798,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_SOCKETS_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/sockets in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -85093,9 +84843,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC sockets"
- else
-
+ EXT_STATIC="$EXT_STATIC sockets"
+ ;;
+ *)
+
case ext/sockets in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -85138,7 +84889,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC sockets"
fi
@@ -85158,7 +84910,7 @@ fi
echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6
-echo "configure:85162: checking whether zend_object_value is packed" >&5
+echo "configure:84914: checking whether zend_object_value is packed" >&5
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -85168,7 +84920,7 @@ echo "configure:85162: checking whether zend_object_value is packed" >&5
else
cat > conftest.$ac_ext <<EOF
-#line 85172 "configure"
+#line 84924 "configure"
#include "confdefs.h"
#include "Zend/zend_types.h"
@@ -85177,7 +84929,7 @@ int main(int argc, char **argv) {
}
EOF
-if { (eval echo configure:85181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:84933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_result=1
@@ -85388,8 +85140,9 @@ EOF
if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then
PHP_SPL_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/spl in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -85432,9 +85185,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC spl"
- else
-
+ EXT_STATIC="$EXT_STATIC spl"
+ ;;
+ *)
+
case ext/spl in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -85477,7 +85231,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC spl"
fi
@@ -85538,7 +85293,7 @@ but you've either not enabled pcre, or have disabled it.
php_with_sqlite=yes
echo $ac_n "checking for sqlite support""... $ac_c" 1>&6
-echo "configure:85542: checking for sqlite support" >&5
+echo "configure:85297: checking for sqlite support" >&5
# Check whether --with-sqlite or --without-sqlite was given.
if test "${with_sqlite+set}" = set; then
withval="$with_sqlite"
@@ -85585,7 +85340,7 @@ echo "$ac_t""$ext_output" 1>&6
php_enable_sqlite_utf8=no
echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6
-echo "configure:85589: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5
+echo "configure:85344: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5
# Check whether --enable-sqlite-utf8 or --disable-sqlite-utf8 was given.
if test "${enable_sqlite_utf8+set}" = set; then
enableval="$enable_sqlite_utf8"
@@ -85616,13 +85371,13 @@ if test "$PHP_SQLITE" != "no"; then
if test "$PHP_PDO" != "no"; then
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:85620: checking for PDO includes" >&5
+echo "configure:85375: checking for PDO includes" >&5
if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:85626: checking for PDO includes" >&5
+echo "configure:85381: checking for PDO includes" >&5
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -85656,7 +85411,7 @@ EOF
SQLITE_DIR=$PHP_SQLITE
else # search default path list
echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6
-echo "configure:85660: checking for sqlite files in default path" >&5
+echo "configure:85415: checking for sqlite files in default path" >&5
for i in $SEARCH_PATH ; do
if test -r $i/$SEARCH_FOR; then
SQLITE_DIR=$i
@@ -85768,7 +85523,7 @@ echo "configure:85660: checking for sqlite files in default path" >&5
done
echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6
-echo "configure:85772: checking for sqlite_open in -lsqlite" >&5
+echo "configure:85527: checking for sqlite_open in -lsqlite" >&5
ac_lib_var=`echo sqlite'_'sqlite_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -85776,7 +85531,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsqlite $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 85780 "configure"
+#line 85535 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -85787,7 +85542,7 @@ int main() {
sqlite_open()
; return 0; }
EOF
-if { (eval echo configure:85791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:85546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -85960,7 +85715,7 @@ fi
# Extract the first word of "lemon", so it can be a program name with args.
set dummy lemon; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:85964: checking for $ac_word" >&5
+echo "configure:85719: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LEMON'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -85988,7 +85743,7 @@ fi
if test "$LEMON"; then
echo $ac_n "checking for lemon version""... $ac_c" 1>&6
-echo "configure:85992: checking for lemon version" >&5
+echo "configure:85747: checking for lemon version" >&5
if eval "test \"`echo '$''{'php_cv_lemon_version'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -86219,8 +85974,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_SQLITE_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/sqlite in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -86263,9 +86019,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC sqlite"
- else
-
+ EXT_STATIC="$EXT_STATIC sqlite"
+ ;;
+ *)
+
case ext/sqlite in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -86308,7 +86065,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite"
fi
@@ -86398,7 +86156,7 @@ but you've either not enabled pdo, or have disabled it.
echo $ac_n "checking size of char *""... $ac_c" 1>&6
-echo "configure:86402: checking size of char *" >&5
+echo "configure:86160: checking size of char *" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -86406,7 +86164,7 @@ else
ac_cv_sizeof_char_p=4
else
cat > conftest.$ac_ext <<EOF
-#line 86410 "configure"
+#line 86168 "configure"
#include "confdefs.h"
#include <stdio.h>
int main()
@@ -86417,7 +86175,7 @@ int main()
return(0);
}
EOF
-if { (eval echo configure:86421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:86179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_char_p=`cat conftestval`
else
@@ -86479,12 +86237,12 @@ EOF
for ac_func in usleep nanosleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:86483: checking for $ac_func" >&5
+echo "configure:86241: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 86488 "configure"
+#line 86246 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -86507,7 +86265,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:86511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:86269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -86535,17 +86293,17 @@ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:86539: checking for $ac_hdr" >&5
+echo "configure:86297: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 86544 "configure"
+#line 86302 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:86549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:86307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -86576,7 +86334,7 @@ fi
echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6
-echo "configure:86580: checking whether flush should be called explicitly after a buffered io" >&5
+echo "configure:86338: checking whether flush should be called explicitly after a buffered io" >&5
if eval "test \"`echo '$''{'ac_cv_flush_io'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -86587,7 +86345,7 @@ if test "$cross_compiling" = yes; then
else
cat > conftest.$ac_ext <<EOF
-#line 86591 "configure"
+#line 86349 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -86625,7 +86383,7 @@ int main(int argc, char **argv)
}
EOF
-if { (eval echo configure:86629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:86387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_flush_io=no
@@ -86653,7 +86411,7 @@ fi
if test "$ac_cv_func_crypt" = "no"; then
echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:86657: checking for crypt in -lcrypt" >&5
+echo "configure:86415: checking for crypt in -lcrypt" >&5
ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -86661,7 +86419,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcrypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 86665 "configure"
+#line 86423 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -86672,7 +86430,7 @@ int main() {
crypt()
; return 0; }
EOF
-if { (eval echo configure:86676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:86434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -86701,7 +86459,7 @@ fi
fi
echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6
-echo "configure:86705: checking for standard DES crypt" >&5
+echo "configure:86463: checking for standard DES crypt" >&5
if eval "test \"`echo '$''{'ac_cv_crypt_des'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -86712,7 +86470,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 86716 "configure"
+#line 86474 "configure"
#include "confdefs.h"
#if HAVE_UNISTD_H
@@ -86731,7 +86489,7 @@ main() {
#endif
}
EOF
-if { (eval echo configure:86735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:86493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_crypt_des=yes
@@ -86752,7 +86510,7 @@ fi
echo "$ac_t""$ac_cv_crypt_des" 1>&6
echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6
-echo "configure:86756: checking for extended DES crypt" >&5
+echo "configure:86514: checking for extended DES crypt" >&5
if eval "test \"`echo '$''{'ac_cv_crypt_ext_des'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -86763,7 +86521,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 86767 "configure"
+#line 86525 "configure"
#include "confdefs.h"
#if HAVE_UNISTD_H
@@ -86782,7 +86540,7 @@ main() {
#endif
}
EOF
-if { (eval echo configure:86786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:86544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_crypt_ext_des=yes
@@ -86803,7 +86561,7 @@ fi
echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6
echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6
-echo "configure:86807: checking for MD5 crypt" >&5
+echo "configure:86565: checking for MD5 crypt" >&5
if eval "test \"`echo '$''{'ac_cv_crypt_md5'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -86814,7 +86572,7 @@ if test "$cross_compiling" = yes; then
else
cat > conftest.$ac_ext <<EOF
-#line 86818 "configure"
+#line 86576 "configure"
#include "confdefs.h"
#if HAVE_UNISTD_H
@@ -86842,7 +86600,7 @@ main() {
#endif
}
EOF
-if { (eval echo configure:86846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:86604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_crypt_md5=yes
@@ -86863,7 +86621,7 @@ fi
echo "$ac_t""$ac_cv_crypt_md5" 1>&6
echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6
-echo "configure:86867: checking for Blowfish crypt" >&5
+echo "configure:86625: checking for Blowfish crypt" >&5
if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -86874,7 +86632,7 @@ if test "$cross_compiling" = yes; then
else
cat > conftest.$ac_ext <<EOF
-#line 86878 "configure"
+#line 86636 "configure"
#include "confdefs.h"
#if HAVE_UNISTD_H
@@ -86899,7 +86657,7 @@ main() {
#endif
}
EOF
-if { (eval echo configure:86903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:86661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_crypt_blowfish=yes
@@ -87030,12 +86788,12 @@ fi
for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:87034: checking for $ac_func" >&5
+echo "configure:86792: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 87039 "configure"
+#line 86797 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -87058,7 +86816,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:87062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:86820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -87083,7 +86841,7 @@ fi
done
echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6
-echo "configure:87087: checking for working fnmatch" >&5
+echo "configure:86845: checking for working fnmatch" >&5
if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -87094,11 +86852,11 @@ if test "$cross_compiling" = yes; then
ac_cv_func_fnmatch_works=no
else
cat > conftest.$ac_ext <<EOF
-#line 87098 "configure"
+#line 86856 "configure"
#include "confdefs.h"
main() { exit (fnmatch ("a*", "abc", 0) != 0); }
EOF
-if { (eval echo configure:87102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:86860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_fnmatch_works=yes
else
@@ -87129,12 +86887,12 @@ else
for ac_func in fork CreateProcess
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:87133: checking for $ac_func" >&5
+echo "configure:86891: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 87138 "configure"
+#line 86896 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -87157,7 +86915,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:87161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:86919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -87189,7 +86947,7 @@ done
fi
echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6
-echo "configure:87193: checking if your OS can spawn processes with inherited handles" >&5
+echo "configure:86951: checking if your OS can spawn processes with inherited handles" >&5
if test "$php_can_support_proc_open" = "yes"; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
@@ -87213,12 +86971,12 @@ fi
unset found
echo $ac_n "checking for res_nmkquery""... $ac_c" 1>&6
-echo "configure:87217: checking for res_nmkquery" >&5
+echo "configure:86975: checking for res_nmkquery" >&5
if eval "test \"`echo '$''{'ac_cv_func_res_nmkquery'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 87222 "configure"
+#line 86980 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char res_nmkquery(); below. */
@@ -87241,7 +86999,7 @@ res_nmkquery();
; return 0; }
EOF
-if { (eval echo configure:87245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:87003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_res_nmkquery=yes"
else
@@ -87259,12 +87017,12 @@ if eval "test \"`echo '$ac_cv_func_'res_nmkquery`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_nmkquery""... $ac_c" 1>&6
-echo "configure:87263: checking for __res_nmkquery" >&5
+echo "configure:87021: checking for __res_nmkquery" >&5
if eval "test \"`echo '$''{'ac_cv_func___res_nmkquery'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 87268 "configure"
+#line 87026 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __res_nmkquery(); below. */
@@ -87287,7 +87045,7 @@ __res_nmkquery();
; return 0; }
EOF
-if { (eval echo configure:87291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:87049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___res_nmkquery=yes"
else
@@ -87325,7 +87083,7 @@ EOF
unset ac_cv_lib_resolv___res_nmkquery
unset found
echo $ac_n "checking for res_nmkquery in -lresolv""... $ac_c" 1>&6
-echo "configure:87329: checking for res_nmkquery in -lresolv" >&5
+echo "configure:87087: checking for res_nmkquery in -lresolv" >&5
ac_lib_var=`echo resolv'_'res_nmkquery | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -87333,7 +87091,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 87337 "configure"
+#line 87095 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -87344,7 +87102,7 @@ int main() {
res_nmkquery()
; return 0; }
EOF
-if { (eval echo configure:87348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:87106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -87364,7 +87122,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_nmkquery in -lresolv""... $ac_c" 1>&6
-echo "configure:87368: checking for __res_nmkquery in -lresolv" >&5
+echo "configure:87126: checking for __res_nmkquery in -lresolv" >&5
ac_lib_var=`echo resolv'_'__res_nmkquery | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -87372,7 +87130,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 87376 "configure"
+#line 87134 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -87383,7 +87141,7 @@ int main() {
__res_nmkquery()
; return 0; }
EOF
-if { (eval echo configure:87387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:87145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -87415,11 +87173,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 87419 "configure"
+#line 87177 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:87423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:87181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -87461,7 +87219,7 @@ EOF
unset ac_cv_lib_bind___res_nmkquery
unset found
echo $ac_n "checking for res_nmkquery in -lbind""... $ac_c" 1>&6
-echo "configure:87465: checking for res_nmkquery in -lbind" >&5
+echo "configure:87223: checking for res_nmkquery in -lbind" >&5
ac_lib_var=`echo bind'_'res_nmkquery | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -87469,7 +87227,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 87473 "configure"
+#line 87231 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -87480,7 +87238,7 @@ int main() {
res_nmkquery()
; return 0; }
EOF
-if { (eval echo configure:87484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:87242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -87500,7 +87258,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_nmkquery in -lbind""... $ac_c" 1>&6
-echo "configure:87504: checking for __res_nmkquery in -lbind" >&5
+echo "configure:87262: checking for __res_nmkquery in -lbind" >&5
ac_lib_var=`echo bind'_'__res_nmkquery | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -87508,7 +87266,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 87512 "configure"
+#line 87270 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -87519,7 +87277,7 @@ int main() {
__res_nmkquery()
; return 0; }
EOF
-if { (eval echo configure:87523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:87281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -87551,11 +87309,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 87555 "configure"
+#line 87313 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:87559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:87317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -87597,7 +87355,7 @@ EOF
unset ac_cv_lib_socket___res_nmkquery
unset found
echo $ac_n "checking for res_nmkquery in -lsocket""... $ac_c" 1>&6
-echo "configure:87601: checking for res_nmkquery in -lsocket" >&5
+echo "configure:87359: checking for res_nmkquery in -lsocket" >&5
ac_lib_var=`echo socket'_'res_nmkquery | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -87605,7 +87363,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 87609 "configure"
+#line 87367 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -87616,7 +87374,7 @@ int main() {
res_nmkquery()
; return 0; }
EOF
-if { (eval echo configure:87620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:87378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -87636,7 +87394,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_nmkquery in -lsocket""... $ac_c" 1>&6
-echo "configure:87640: checking for __res_nmkquery in -lsocket" >&5
+echo "configure:87398: checking for __res_nmkquery in -lsocket" >&5
ac_lib_var=`echo socket'_'__res_nmkquery | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -87644,7 +87402,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 87648 "configure"
+#line 87406 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -87655,7 +87413,7 @@ int main() {
__res_nmkquery()
; return 0; }
EOF
-if { (eval echo configure:87659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:87417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -87687,11 +87445,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 87691 "configure"
+#line 87449 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:87695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:87453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -87748,12 +87506,12 @@ EOF
unset found
echo $ac_n "checking for res_nsend""... $ac_c" 1>&6
-echo "configure:87752: checking for res_nsend" >&5
+echo "configure:87510: checking for res_nsend" >&5
if eval "test \"`echo '$''{'ac_cv_func_res_nsend'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 87757 "configure"
+#line 87515 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char res_nsend(); below. */
@@ -87776,7 +87534,7 @@ res_nsend();
; return 0; }
EOF
-if { (eval echo configure:87780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:87538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_res_nsend=yes"
else
@@ -87794,12 +87552,12 @@ if eval "test \"`echo '$ac_cv_func_'res_nsend`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_nsend""... $ac_c" 1>&6
-echo "configure:87798: checking for __res_nsend" >&5
+echo "configure:87556: checking for __res_nsend" >&5
if eval "test \"`echo '$''{'ac_cv_func___res_nsend'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 87803 "configure"
+#line 87561 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __res_nsend(); below. */
@@ -87822,7 +87580,7 @@ __res_nsend();
; return 0; }
EOF
-if { (eval echo configure:87826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:87584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___res_nsend=yes"
else
@@ -87860,7 +87618,7 @@ EOF
unset ac_cv_lib_resolv___res_nsend
unset found
echo $ac_n "checking for res_nsend in -lresolv""... $ac_c" 1>&6
-echo "configure:87864: checking for res_nsend in -lresolv" >&5
+echo "configure:87622: checking for res_nsend in -lresolv" >&5
ac_lib_var=`echo resolv'_'res_nsend | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -87868,7 +87626,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 87872 "configure"
+#line 87630 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -87879,7 +87637,7 @@ int main() {
res_nsend()
; return 0; }
EOF
-if { (eval echo configure:87883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:87641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -87899,7 +87657,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_nsend in -lresolv""... $ac_c" 1>&6
-echo "configure:87903: checking for __res_nsend in -lresolv" >&5
+echo "configure:87661: checking for __res_nsend in -lresolv" >&5
ac_lib_var=`echo resolv'_'__res_nsend | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -87907,7 +87665,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 87911 "configure"
+#line 87669 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -87918,7 +87676,7 @@ int main() {
__res_nsend()
; return 0; }
EOF
-if { (eval echo configure:87922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:87680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -87950,11 +87708,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 87954 "configure"
+#line 87712 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:87958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:87716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -87996,7 +87754,7 @@ EOF
unset ac_cv_lib_bind___res_nsend
unset found
echo $ac_n "checking for res_nsend in -lbind""... $ac_c" 1>&6
-echo "configure:88000: checking for res_nsend in -lbind" >&5
+echo "configure:87758: checking for res_nsend in -lbind" >&5
ac_lib_var=`echo bind'_'res_nsend | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -88004,7 +87762,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 88008 "configure"
+#line 87766 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -88015,7 +87773,7 @@ int main() {
res_nsend()
; return 0; }
EOF
-if { (eval echo configure:88019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:87777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -88035,7 +87793,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_nsend in -lbind""... $ac_c" 1>&6
-echo "configure:88039: checking for __res_nsend in -lbind" >&5
+echo "configure:87797: checking for __res_nsend in -lbind" >&5
ac_lib_var=`echo bind'_'__res_nsend | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -88043,7 +87801,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 88047 "configure"
+#line 87805 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -88054,7 +87812,7 @@ int main() {
__res_nsend()
; return 0; }
EOF
-if { (eval echo configure:88058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:87816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -88086,11 +87844,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 88090 "configure"
+#line 87848 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:88094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:87852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -88132,7 +87890,7 @@ EOF
unset ac_cv_lib_socket___res_nsend
unset found
echo $ac_n "checking for res_nsend in -lsocket""... $ac_c" 1>&6
-echo "configure:88136: checking for res_nsend in -lsocket" >&5
+echo "configure:87894: checking for res_nsend in -lsocket" >&5
ac_lib_var=`echo socket'_'res_nsend | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -88140,7 +87898,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 88144 "configure"
+#line 87902 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -88151,7 +87909,7 @@ int main() {
res_nsend()
; return 0; }
EOF
-if { (eval echo configure:88155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:87913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -88171,7 +87929,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_nsend in -lsocket""... $ac_c" 1>&6
-echo "configure:88175: checking for __res_nsend in -lsocket" >&5
+echo "configure:87933: checking for __res_nsend in -lsocket" >&5
ac_lib_var=`echo socket'_'__res_nsend | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -88179,7 +87937,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 88183 "configure"
+#line 87941 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -88190,7 +87948,7 @@ int main() {
__res_nsend()
; return 0; }
EOF
-if { (eval echo configure:88194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:87952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -88222,11 +87980,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 88226 "configure"
+#line 87984 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:88230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:87988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -88283,12 +88041,12 @@ EOF
unset found
echo $ac_n "checking for res_search""... $ac_c" 1>&6
-echo "configure:88287: checking for res_search" >&5
+echo "configure:88045: checking for res_search" >&5
if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 88292 "configure"
+#line 88050 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char res_search(); below. */
@@ -88311,7 +88069,7 @@ res_search();
; return 0; }
EOF
-if { (eval echo configure:88315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_res_search=yes"
else
@@ -88329,12 +88087,12 @@ if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_search""... $ac_c" 1>&6
-echo "configure:88333: checking for __res_search" >&5
+echo "configure:88091: checking for __res_search" >&5
if eval "test \"`echo '$''{'ac_cv_func___res_search'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 88338 "configure"
+#line 88096 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __res_search(); below. */
@@ -88357,7 +88115,7 @@ __res_search();
; return 0; }
EOF
-if { (eval echo configure:88361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___res_search=yes"
else
@@ -88395,7 +88153,7 @@ EOF
unset ac_cv_lib_resolv___res_search
unset found
echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6
-echo "configure:88399: checking for res_search in -lresolv" >&5
+echo "configure:88157: checking for res_search in -lresolv" >&5
ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -88403,7 +88161,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 88407 "configure"
+#line 88165 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -88414,7 +88172,7 @@ int main() {
res_search()
; return 0; }
EOF
-if { (eval echo configure:88418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -88434,7 +88192,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6
-echo "configure:88438: checking for __res_search in -lresolv" >&5
+echo "configure:88196: checking for __res_search in -lresolv" >&5
ac_lib_var=`echo resolv'_'__res_search | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -88442,7 +88200,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 88446 "configure"
+#line 88204 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -88453,7 +88211,7 @@ int main() {
__res_search()
; return 0; }
EOF
-if { (eval echo configure:88457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -88485,11 +88243,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 88489 "configure"
+#line 88247 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:88493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:88251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -88531,7 +88289,7 @@ EOF
unset ac_cv_lib_bind___res_search
unset found
echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6
-echo "configure:88535: checking for res_search in -lbind" >&5
+echo "configure:88293: checking for res_search in -lbind" >&5
ac_lib_var=`echo bind'_'res_search | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -88539,7 +88297,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 88543 "configure"
+#line 88301 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -88550,7 +88308,7 @@ int main() {
res_search()
; return 0; }
EOF
-if { (eval echo configure:88554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -88570,7 +88328,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6
-echo "configure:88574: checking for __res_search in -lbind" >&5
+echo "configure:88332: checking for __res_search in -lbind" >&5
ac_lib_var=`echo bind'_'__res_search | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -88578,7 +88336,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 88582 "configure"
+#line 88340 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -88589,7 +88347,7 @@ int main() {
__res_search()
; return 0; }
EOF
-if { (eval echo configure:88593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -88621,11 +88379,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 88625 "configure"
+#line 88383 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:88629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:88387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -88667,7 +88425,7 @@ EOF
unset ac_cv_lib_socket___res_search
unset found
echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6
-echo "configure:88671: checking for res_search in -lsocket" >&5
+echo "configure:88429: checking for res_search in -lsocket" >&5
ac_lib_var=`echo socket'_'res_search | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -88675,7 +88433,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 88679 "configure"
+#line 88437 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -88686,7 +88444,7 @@ int main() {
res_search()
; return 0; }
EOF
-if { (eval echo configure:88690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -88706,7 +88464,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6
-echo "configure:88710: checking for __res_search in -lsocket" >&5
+echo "configure:88468: checking for __res_search in -lsocket" >&5
ac_lib_var=`echo socket'_'__res_search | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -88714,7 +88472,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 88718 "configure"
+#line 88476 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -88725,7 +88483,7 @@ int main() {
__res_search()
; return 0; }
EOF
-if { (eval echo configure:88729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -88757,11 +88515,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 88761 "configure"
+#line 88519 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:88765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:88523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -88818,12 +88576,12 @@ EOF
unset found
echo $ac_n "checking for dn_expand""... $ac_c" 1>&6
-echo "configure:88822: checking for dn_expand" >&5
+echo "configure:88580: checking for dn_expand" >&5
if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 88827 "configure"
+#line 88585 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dn_expand(); below. */
@@ -88846,7 +88604,7 @@ dn_expand();
; return 0; }
EOF
-if { (eval echo configure:88850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dn_expand=yes"
else
@@ -88864,12 +88622,12 @@ if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6
-echo "configure:88868: checking for __dn_expand" >&5
+echo "configure:88626: checking for __dn_expand" >&5
if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 88873 "configure"
+#line 88631 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __dn_expand(); below. */
@@ -88892,7 +88650,7 @@ __dn_expand();
; return 0; }
EOF
-if { (eval echo configure:88896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___dn_expand=yes"
else
@@ -88930,7 +88688,7 @@ EOF
unset ac_cv_lib_resolv___dn_expand
unset found
echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
-echo "configure:88934: checking for dn_expand in -lresolv" >&5
+echo "configure:88692: checking for dn_expand in -lresolv" >&5
ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -88938,7 +88696,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 88942 "configure"
+#line 88700 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -88949,7 +88707,7 @@ int main() {
dn_expand()
; return 0; }
EOF
-if { (eval echo configure:88953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -88969,7 +88727,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6
-echo "configure:88973: checking for __dn_expand in -lresolv" >&5
+echo "configure:88731: checking for __dn_expand in -lresolv" >&5
ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -88977,7 +88735,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 88981 "configure"
+#line 88739 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -88988,7 +88746,7 @@ int main() {
__dn_expand()
; return 0; }
EOF
-if { (eval echo configure:88992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89020,11 +88778,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 89024 "configure"
+#line 88782 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:89028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:88786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -89066,7 +88824,7 @@ EOF
unset ac_cv_lib_bind___dn_expand
unset found
echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6
-echo "configure:89070: checking for dn_expand in -lbind" >&5
+echo "configure:88828: checking for dn_expand in -lbind" >&5
ac_lib_var=`echo bind'_'dn_expand | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89074,7 +88832,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89078 "configure"
+#line 88836 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89085,7 +88843,7 @@ int main() {
dn_expand()
; return 0; }
EOF
-if { (eval echo configure:89089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89105,7 +88863,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6
-echo "configure:89109: checking for __dn_expand in -lbind" >&5
+echo "configure:88867: checking for __dn_expand in -lbind" >&5
ac_lib_var=`echo bind'_'__dn_expand | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89113,7 +88871,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89117 "configure"
+#line 88875 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89124,7 +88882,7 @@ int main() {
__dn_expand()
; return 0; }
EOF
-if { (eval echo configure:89128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89156,11 +88914,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 89160 "configure"
+#line 88918 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:89164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:88922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -89202,7 +88960,7 @@ EOF
unset ac_cv_lib_socket___dn_expand
unset found
echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6
-echo "configure:89206: checking for dn_expand in -lsocket" >&5
+echo "configure:88964: checking for dn_expand in -lsocket" >&5
ac_lib_var=`echo socket'_'dn_expand | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89210,7 +88968,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89214 "configure"
+#line 88972 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89221,7 +88979,7 @@ int main() {
dn_expand()
; return 0; }
EOF
-if { (eval echo configure:89225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89241,7 +88999,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6
-echo "configure:89245: checking for __dn_expand in -lsocket" >&5
+echo "configure:89003: checking for __dn_expand in -lsocket" >&5
ac_lib_var=`echo socket'_'__dn_expand | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89249,7 +89007,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89253 "configure"
+#line 89011 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89260,7 +89018,7 @@ int main() {
__dn_expand()
; return 0; }
EOF
-if { (eval echo configure:89264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89292,11 +89050,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 89296 "configure"
+#line 89054 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:89300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:89058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -89353,12 +89111,12 @@ EOF
unset found
echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6
-echo "configure:89357: checking for dn_skipname" >&5
+echo "configure:89115: checking for dn_skipname" >&5
if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 89362 "configure"
+#line 89120 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dn_skipname(); below. */
@@ -89381,7 +89139,7 @@ dn_skipname();
; return 0; }
EOF
-if { (eval echo configure:89385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dn_skipname=yes"
else
@@ -89399,12 +89157,12 @@ if eval "test \"`echo '$ac_cv_func_'dn_skipname`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6
-echo "configure:89403: checking for __dn_skipname" >&5
+echo "configure:89161: checking for __dn_skipname" >&5
if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 89408 "configure"
+#line 89166 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __dn_skipname(); below. */
@@ -89427,7 +89185,7 @@ __dn_skipname();
; return 0; }
EOF
-if { (eval echo configure:89431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___dn_skipname=yes"
else
@@ -89465,7 +89223,7 @@ EOF
unset ac_cv_lib_resolv___dn_skipname
unset found
echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6
-echo "configure:89469: checking for dn_skipname in -lresolv" >&5
+echo "configure:89227: checking for dn_skipname in -lresolv" >&5
ac_lib_var=`echo resolv'_'dn_skipname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89473,7 +89231,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89477 "configure"
+#line 89235 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89484,7 +89242,7 @@ int main() {
dn_skipname()
; return 0; }
EOF
-if { (eval echo configure:89488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89504,7 +89262,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6
-echo "configure:89508: checking for __dn_skipname in -lresolv" >&5
+echo "configure:89266: checking for __dn_skipname in -lresolv" >&5
ac_lib_var=`echo resolv'_'__dn_skipname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89512,7 +89270,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89516 "configure"
+#line 89274 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89523,7 +89281,7 @@ int main() {
__dn_skipname()
; return 0; }
EOF
-if { (eval echo configure:89527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89555,11 +89313,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 89559 "configure"
+#line 89317 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:89563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:89321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -89601,7 +89359,7 @@ EOF
unset ac_cv_lib_bind___dn_skipname
unset found
echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6
-echo "configure:89605: checking for dn_skipname in -lbind" >&5
+echo "configure:89363: checking for dn_skipname in -lbind" >&5
ac_lib_var=`echo bind'_'dn_skipname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89609,7 +89367,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89613 "configure"
+#line 89371 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89620,7 +89378,7 @@ int main() {
dn_skipname()
; return 0; }
EOF
-if { (eval echo configure:89624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89640,7 +89398,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6
-echo "configure:89644: checking for __dn_skipname in -lbind" >&5
+echo "configure:89402: checking for __dn_skipname in -lbind" >&5
ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89648,7 +89406,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89652 "configure"
+#line 89410 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89659,7 +89417,7 @@ int main() {
__dn_skipname()
; return 0; }
EOF
-if { (eval echo configure:89663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89691,11 +89449,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 89695 "configure"
+#line 89453 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:89699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:89457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -89737,7 +89495,7 @@ EOF
unset ac_cv_lib_socket___dn_skipname
unset found
echo $ac_n "checking for dn_skipname in -lsocket""... $ac_c" 1>&6
-echo "configure:89741: checking for dn_skipname in -lsocket" >&5
+echo "configure:89499: checking for dn_skipname in -lsocket" >&5
ac_lib_var=`echo socket'_'dn_skipname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89745,7 +89503,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89749 "configure"
+#line 89507 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89756,7 +89514,7 @@ int main() {
dn_skipname()
; return 0; }
EOF
-if { (eval echo configure:89760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89776,7 +89534,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6
-echo "configure:89780: checking for __dn_skipname in -lsocket" >&5
+echo "configure:89538: checking for __dn_skipname in -lsocket" >&5
ac_lib_var=`echo socket'_'__dn_skipname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89784,7 +89542,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89788 "configure"
+#line 89546 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89795,7 +89553,7 @@ int main() {
__dn_skipname()
; return 0; }
EOF
-if { (eval echo configure:89799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89827,11 +89585,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 89831 "configure"
+#line 89589 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:89835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:89593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -89890,12 +89648,12 @@ EOF
unset found
echo $ac_n "checking for res_mkquery""... $ac_c" 1>&6
-echo "configure:89894: checking for res_mkquery" >&5
+echo "configure:89652: checking for res_mkquery" >&5
if eval "test \"`echo '$''{'ac_cv_func_res_mkquery'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 89899 "configure"
+#line 89657 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char res_mkquery(); below. */
@@ -89918,7 +89676,7 @@ res_mkquery();
; return 0; }
EOF
-if { (eval echo configure:89922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_res_mkquery=yes"
else
@@ -89936,12 +89694,12 @@ if eval "test \"`echo '$ac_cv_func_'res_mkquery`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_mkquery""... $ac_c" 1>&6
-echo "configure:89940: checking for __res_mkquery" >&5
+echo "configure:89698: checking for __res_mkquery" >&5
if eval "test \"`echo '$''{'ac_cv_func___res_mkquery'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 89945 "configure"
+#line 89703 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __res_mkquery(); below. */
@@ -89964,7 +89722,7 @@ __res_mkquery();
; return 0; }
EOF
-if { (eval echo configure:89968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___res_mkquery=yes"
else
@@ -90002,7 +89760,7 @@ EOF
unset ac_cv_lib_resolv___res_mkquery
unset found
echo $ac_n "checking for res_mkquery in -lresolv""... $ac_c" 1>&6
-echo "configure:90006: checking for res_mkquery in -lresolv" >&5
+echo "configure:89764: checking for res_mkquery in -lresolv" >&5
ac_lib_var=`echo resolv'_'res_mkquery | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90010,7 +89768,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90014 "configure"
+#line 89772 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90021,7 +89779,7 @@ int main() {
res_mkquery()
; return 0; }
EOF
-if { (eval echo configure:90025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90041,7 +89799,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_mkquery in -lresolv""... $ac_c" 1>&6
-echo "configure:90045: checking for __res_mkquery in -lresolv" >&5
+echo "configure:89803: checking for __res_mkquery in -lresolv" >&5
ac_lib_var=`echo resolv'_'__res_mkquery | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90049,7 +89807,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90053 "configure"
+#line 89811 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90060,7 +89818,7 @@ int main() {
__res_mkquery()
; return 0; }
EOF
-if { (eval echo configure:90064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90092,11 +89850,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 90096 "configure"
+#line 89854 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:90100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:89858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -90138,7 +89896,7 @@ EOF
unset ac_cv_lib_bind___res_mkquery
unset found
echo $ac_n "checking for res_mkquery in -lbind""... $ac_c" 1>&6
-echo "configure:90142: checking for res_mkquery in -lbind" >&5
+echo "configure:89900: checking for res_mkquery in -lbind" >&5
ac_lib_var=`echo bind'_'res_mkquery | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90146,7 +89904,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90150 "configure"
+#line 89908 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90157,7 +89915,7 @@ int main() {
res_mkquery()
; return 0; }
EOF
-if { (eval echo configure:90161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90177,7 +89935,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_mkquery in -lbind""... $ac_c" 1>&6
-echo "configure:90181: checking for __res_mkquery in -lbind" >&5
+echo "configure:89939: checking for __res_mkquery in -lbind" >&5
ac_lib_var=`echo bind'_'__res_mkquery | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90185,7 +89943,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90189 "configure"
+#line 89947 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90196,7 +89954,7 @@ int main() {
__res_mkquery()
; return 0; }
EOF
-if { (eval echo configure:90200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90228,11 +89986,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 90232 "configure"
+#line 89990 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:90236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:89994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -90274,7 +90032,7 @@ EOF
unset ac_cv_lib_socket___res_mkquery
unset found
echo $ac_n "checking for res_mkquery in -lsocket""... $ac_c" 1>&6
-echo "configure:90278: checking for res_mkquery in -lsocket" >&5
+echo "configure:90036: checking for res_mkquery in -lsocket" >&5
ac_lib_var=`echo socket'_'res_mkquery | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90282,7 +90040,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90286 "configure"
+#line 90044 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90293,7 +90051,7 @@ int main() {
res_mkquery()
; return 0; }
EOF
-if { (eval echo configure:90297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90313,7 +90071,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_mkquery in -lsocket""... $ac_c" 1>&6
-echo "configure:90317: checking for __res_mkquery in -lsocket" >&5
+echo "configure:90075: checking for __res_mkquery in -lsocket" >&5
ac_lib_var=`echo socket'_'__res_mkquery | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90321,7 +90079,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90325 "configure"
+#line 90083 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90332,7 +90090,7 @@ int main() {
__res_mkquery()
; return 0; }
EOF
-if { (eval echo configure:90336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90364,11 +90122,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 90368 "configure"
+#line 90126 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:90372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:90130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -90425,12 +90183,12 @@ EOF
unset found
echo $ac_n "checking for res_send""... $ac_c" 1>&6
-echo "configure:90429: checking for res_send" >&5
+echo "configure:90187: checking for res_send" >&5
if eval "test \"`echo '$''{'ac_cv_func_res_send'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 90434 "configure"
+#line 90192 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char res_send(); below. */
@@ -90453,7 +90211,7 @@ res_send();
; return 0; }
EOF
-if { (eval echo configure:90457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_res_send=yes"
else
@@ -90471,12 +90229,12 @@ if eval "test \"`echo '$ac_cv_func_'res_send`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_send""... $ac_c" 1>&6
-echo "configure:90475: checking for __res_send" >&5
+echo "configure:90233: checking for __res_send" >&5
if eval "test \"`echo '$''{'ac_cv_func___res_send'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 90480 "configure"
+#line 90238 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __res_send(); below. */
@@ -90499,7 +90257,7 @@ __res_send();
; return 0; }
EOF
-if { (eval echo configure:90503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___res_send=yes"
else
@@ -90537,7 +90295,7 @@ EOF
unset ac_cv_lib_resolv___res_send
unset found
echo $ac_n "checking for res_send in -lresolv""... $ac_c" 1>&6
-echo "configure:90541: checking for res_send in -lresolv" >&5
+echo "configure:90299: checking for res_send in -lresolv" >&5
ac_lib_var=`echo resolv'_'res_send | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90545,7 +90303,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90549 "configure"
+#line 90307 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90556,7 +90314,7 @@ int main() {
res_send()
; return 0; }
EOF
-if { (eval echo configure:90560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90576,7 +90334,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_send in -lresolv""... $ac_c" 1>&6
-echo "configure:90580: checking for __res_send in -lresolv" >&5
+echo "configure:90338: checking for __res_send in -lresolv" >&5
ac_lib_var=`echo resolv'_'__res_send | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90584,7 +90342,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90588 "configure"
+#line 90346 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90595,7 +90353,7 @@ int main() {
__res_send()
; return 0; }
EOF
-if { (eval echo configure:90599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90627,11 +90385,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 90631 "configure"
+#line 90389 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:90635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:90393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -90673,7 +90431,7 @@ EOF
unset ac_cv_lib_bind___res_send
unset found
echo $ac_n "checking for res_send in -lbind""... $ac_c" 1>&6
-echo "configure:90677: checking for res_send in -lbind" >&5
+echo "configure:90435: checking for res_send in -lbind" >&5
ac_lib_var=`echo bind'_'res_send | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90681,7 +90439,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90685 "configure"
+#line 90443 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90692,7 +90450,7 @@ int main() {
res_send()
; return 0; }
EOF
-if { (eval echo configure:90696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90712,7 +90470,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_send in -lbind""... $ac_c" 1>&6
-echo "configure:90716: checking for __res_send in -lbind" >&5
+echo "configure:90474: checking for __res_send in -lbind" >&5
ac_lib_var=`echo bind'_'__res_send | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90720,7 +90478,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90724 "configure"
+#line 90482 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90731,7 +90489,7 @@ int main() {
__res_send()
; return 0; }
EOF
-if { (eval echo configure:90735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90763,11 +90521,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 90767 "configure"
+#line 90525 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:90771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:90529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -90809,7 +90567,7 @@ EOF
unset ac_cv_lib_socket___res_send
unset found
echo $ac_n "checking for res_send in -lsocket""... $ac_c" 1>&6
-echo "configure:90813: checking for res_send in -lsocket" >&5
+echo "configure:90571: checking for res_send in -lsocket" >&5
ac_lib_var=`echo socket'_'res_send | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90817,7 +90575,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90821 "configure"
+#line 90579 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90828,7 +90586,7 @@ int main() {
res_send()
; return 0; }
EOF
-if { (eval echo configure:90832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90848,7 +90606,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_send in -lsocket""... $ac_c" 1>&6
-echo "configure:90852: checking for __res_send in -lsocket" >&5
+echo "configure:90610: checking for __res_send in -lsocket" >&5
ac_lib_var=`echo socket'_'__res_send | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90856,7 +90614,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90860 "configure"
+#line 90618 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90867,7 +90625,7 @@ int main() {
__res_send()
; return 0; }
EOF
-if { (eval echo configure:90871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90899,11 +90657,11 @@ fi
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 90903 "configure"
+#line 90661 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:90907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:90665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -90956,7 +90714,7 @@ EOF
echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6
-echo "configure:90960: checking whether atof() accepts NAN" >&5
+echo "configure:90718: checking whether atof() accepts NAN" >&5
if eval "test \"`echo '$''{'ac_cv_atof_accept_nan'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -90967,7 +90725,7 @@ if test "$cross_compiling" = yes; then
else
cat > conftest.$ac_ext <<EOF
-#line 90971 "configure"
+#line 90729 "configure"
#include "confdefs.h"
#include <math.h>
@@ -90987,7 +90745,7 @@ int main(int argc, char** argv)
}
EOF
-if { (eval echo configure:90991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:90749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_atof_accept_nan=yes
@@ -91014,7 +90772,7 @@ EOF
fi
echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6
-echo "configure:91018: checking whether atof() accepts INF" >&5
+echo "configure:90776: checking whether atof() accepts INF" >&5
if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -91025,7 +90783,7 @@ if test "$cross_compiling" = yes; then
else
cat > conftest.$ac_ext <<EOF
-#line 91029 "configure"
+#line 90787 "configure"
#include "confdefs.h"
#include <math.h>
@@ -91048,7 +90806,7 @@ int main(int argc, char** argv)
}
EOF
-if { (eval echo configure:91052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:90810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_atof_accept_inf=yes
@@ -91075,7 +90833,7 @@ EOF
fi
echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6
-echo "configure:91079: checking whether HUGE_VAL == INF" >&5
+echo "configure:90837: checking whether HUGE_VAL == INF" >&5
if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -91086,7 +90844,7 @@ if test "$cross_compiling" = yes; then
else
cat > conftest.$ac_ext <<EOF
-#line 91090 "configure"
+#line 90848 "configure"
#include "confdefs.h"
#include <math.h>
@@ -91109,7 +90867,7 @@ int main(int argc, char** argv)
}
EOF
-if { (eval echo configure:91113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:90871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_huge_val_inf=yes
@@ -91136,7 +90894,7 @@ EOF
fi
echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6
-echo "configure:91140: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
+echo "configure:90898: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -91147,7 +90905,7 @@ if test "$cross_compiling" = yes; then
else
cat > conftest.$ac_ext <<EOF
-#line 91151 "configure"
+#line 90909 "configure"
#include "confdefs.h"
#include <math.h>
@@ -91172,7 +90930,7 @@ int main(int argc, char** argv)
}
EOF
-if { (eval echo configure:91176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:90934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_huge_val_nan=yes
@@ -91199,13 +90957,13 @@ EOF
fi
echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6
-echo "configure:91203: checking whether strptime() declaration fails" >&5
+echo "configure:90961: checking whether strptime() declaration fails" >&5
if eval "test \"`echo '$''{'ac_cv_strptime_decl_fails'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 91209 "configure"
+#line 90967 "configure"
#include "confdefs.h"
#include <time.h>
@@ -91221,7 +90979,7 @@ int strptime(const char *s, const char *format, struct tm *tm);
; return 0; }
EOF
-if { (eval echo configure:91225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:90983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_strptime_decl_fails=no
@@ -91249,17 +91007,17 @@ for ac_hdr in wchar.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:91253: checking for $ac_hdr" >&5
+echo "configure:91011: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 91258 "configure"
+#line 91016 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:91263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:91021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -91288,12 +91046,12 @@ done
for ac_func in mblen
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:91292: checking for $ac_func" >&5
+echo "configure:91050: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 91297 "configure"
+#line 91055 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -91316,7 +91074,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:91320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:91078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -91343,12 +91101,12 @@ done
for ac_func in mbrlen mbsinit
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:91347: checking for $ac_func" >&5
+echo "configure:91105: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 91352 "configure"
+#line 91110 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -91371,7 +91129,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:91375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:91133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -91396,13 +91154,13 @@ fi
done
echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6
-echo "configure:91400: checking for mbstate_t" >&5
+echo "configure:91158: checking for mbstate_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 91406 "configure"
+#line 91164 "configure"
#include "confdefs.h"
#ifdef HAVE_WCHAR_H
@@ -91415,7 +91173,7 @@ int __tmp__() { mbstate_t a; }
; return 0; }
EOF
-if { (eval echo configure:91419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:91177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_mbstate_t=yes
@@ -91643,8 +91401,9 @@ EOF
if test "" != "shared" && test "" != "yes" && test "" = "cli"; then
PHP_STANDARD_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/standard in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -91697,9 +91456,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC standard"
- else
-
+ EXT_STATIC="$EXT_STATIC standard"
+ ;;
+ *)
+
case ext/standard in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -91752,7 +91512,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC standard"
fi
@@ -91799,7 +91560,7 @@ EOF
php_with_sybase_ct=no
echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6
-echo "configure:91803: checking for Sybase-CT support" >&5
+echo "configure:91564: checking for Sybase-CT support" >&5
# Check whether --with-sybase-ct or --without-sybase-ct was given.
if test "${with_sybase_ct+set}" = set; then
withval="$with_sybase_ct"
@@ -92036,8 +91797,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_SYBASE_CT_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/sybase_ct in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -92080,9 +91842,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC sybase_ct"
- else
-
+ EXT_STATIC="$EXT_STATIC sybase_ct"
+ ;;
+ *)
+
case ext/sybase_ct in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -92125,7 +91888,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct"
fi
@@ -92446,7 +92210,7 @@ EOF
done
echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
-echo "configure:92450: checking for netg_errstr in -ltcl" >&5
+echo "configure:92214: checking for netg_errstr in -ltcl" >&5
ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -92454,7 +92218,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ltcl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 92458 "configure"
+#line 92222 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -92465,7 +92229,7 @@ int main() {
netg_errstr()
; return 0; }
EOF
-if { (eval echo configure:92469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:92233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -92640,7 +92404,7 @@ fi
done
echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
-echo "configure:92644: checking for insck__getVdate in -linsck" >&5
+echo "configure:92408: checking for insck__getVdate in -linsck" >&5
ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -92648,7 +92412,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-linsck $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 92652 "configure"
+#line 92416 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -92659,7 +92423,7 @@ int main() {
insck__getVdate()
; return 0; }
EOF
-if { (eval echo configure:92663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:92427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -92807,7 +92571,7 @@ fi
done
echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
-echo "configure:92811: checking for bsd_tcp in -linsck" >&5
+echo "configure:92575: checking for bsd_tcp in -linsck" >&5
ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -92815,7 +92579,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-linsck $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 92819 "configure"
+#line 92583 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -92826,7 +92590,7 @@ int main() {
bsd_tcp()
; return 0; }
EOF
-if { (eval echo configure:92830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:92594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -92886,7 +92650,7 @@ fi
php_enable_sysvmsg=no
echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6
-echo "configure:92890: checking whether to enable System V IPC support" >&5
+echo "configure:92654: checking whether to enable System V IPC support" >&5
# Check whether --enable-sysvmsg or --disable-sysvmsg was given.
if test "${enable_sysvmsg+set}" = set; then
enableval="$enable_sysvmsg"
@@ -92932,17 +92696,17 @@ echo "$ac_t""$ext_output" 1>&6
if test "$PHP_SYSVMSG" != "no"; then
ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
-echo "configure:92936: checking for sys/msg.h" >&5
+echo "configure:92700: checking for sys/msg.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 92941 "configure"
+#line 92705 "configure"
#include "confdefs.h"
#include <sys/msg.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:92946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:92710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -93154,8 +92918,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_SYSVMSG_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/sysvmsg in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -93198,9 +92963,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC sysvmsg"
- else
-
+ EXT_STATIC="$EXT_STATIC sysvmsg"
+ ;;
+ *)
+
case ext/sysvmsg in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -93243,7 +93009,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg"
fi
@@ -93266,7 +93033,7 @@ fi
php_enable_sysvsem=no
echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6
-echo "configure:93270: checking whether to enable System V semaphore support" >&5
+echo "configure:93037: checking whether to enable System V semaphore support" >&5
# Check whether --enable-sysvsem or --disable-sysvsem was given.
if test "${enable_sysvsem+set}" = set; then
enableval="$enable_sysvsem"
@@ -93494,8 +93261,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_SYSVSEM_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/sysvsem in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -93538,9 +93306,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC sysvsem"
- else
-
+ EXT_STATIC="$EXT_STATIC sysvsem"
+ ;;
+ *)
+
case ext/sysvsem in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -93583,7 +93352,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem"
fi
@@ -93604,12 +93374,12 @@ EOF
EOF
echo $ac_n "checking for union semun""... $ac_c" 1>&6
-echo "configure:93608: checking for union semun" >&5
+echo "configure:93378: checking for union semun" >&5
if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 93613 "configure"
+#line 93383 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -93620,7 +93390,7 @@ int main() {
union semun x;
; return 0; }
EOF
-if { (eval echo configure:93624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:93394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
php_cv_semun=yes
@@ -93656,7 +93426,7 @@ fi
php_enable_sysvshm=no
echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6
-echo "configure:93660: checking whether to enable System V shared memory support" >&5
+echo "configure:93430: checking whether to enable System V shared memory support" >&5
# Check whether --enable-sysvshm or --disable-sysvshm was given.
if test "${enable_sysvshm+set}" = set; then
enableval="$enable_sysvshm"
@@ -93888,8 +93658,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_SYSVSHM_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/sysvshm in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -93932,9 +93703,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC sysvshm"
- else
-
+ EXT_STATIC="$EXT_STATIC sysvshm"
+ ;;
+ *)
+
case ext/sysvshm in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -93977,7 +93749,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm"
fi
@@ -94000,7 +93773,7 @@ fi
php_with_tidy=no
echo $ac_n "checking for TIDY support""... $ac_c" 1>&6
-echo "configure:94004: checking for TIDY support" >&5
+echo "configure:93777: checking for TIDY support" >&5
# Check whether --with-tidy or --without-tidy was given.
if test "${with_tidy+set}" = set; then
withval="$with_tidy"
@@ -94292,7 +94065,7 @@ if test "$PHP_TIDY" != "no"; then
done
echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6
-echo "configure:94296: checking for tidyOptGetDoc in -ltidy" >&5
+echo "configure:94069: checking for tidyOptGetDoc in -ltidy" >&5
ac_lib_var=`echo tidy'_'tidyOptGetDoc | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -94300,7 +94073,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ltidy $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 94304 "configure"
+#line 94077 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -94311,7 +94084,7 @@ int main() {
tidyOptGetDoc()
; return 0; }
EOF
-if { (eval echo configure:94315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:94088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -94532,8 +94305,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_TIDY_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/tidy in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -94576,9 +94350,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC tidy"
- else
-
+ EXT_STATIC="$EXT_STATIC tidy"
+ ;;
+ *)
+
case ext/tidy in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -94621,7 +94396,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC tidy"
fi
@@ -94652,7 +94428,7 @@ fi
php_enable_tokenizer=yes
echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6
-echo "configure:94656: checking whether to enable tokenizer support" >&5
+echo "configure:94432: checking whether to enable tokenizer support" >&5
# Check whether --enable-tokenizer or --disable-tokenizer was given.
if test "${enable_tokenizer+set}" = set; then
enableval="$enable_tokenizer"
@@ -94880,8 +94656,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_TOKENIZER_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/tokenizer in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -94924,9 +94701,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC tokenizer"
- else
-
+ EXT_STATIC="$EXT_STATIC tokenizer"
+ ;;
+ *)
+
case ext/tokenizer in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -94969,7 +94747,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer"
fi
@@ -94998,7 +94777,7 @@ fi
php_enable_wddx=no
echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6
-echo "configure:95002: checking whether to enable WDDX support" >&5
+echo "configure:94781: checking whether to enable WDDX support" >&5
# Check whether --enable-wddx or --disable-wddx was given.
if test "${enable_wddx+set}" = set; then
enableval="$enable_wddx"
@@ -95046,7 +94825,7 @@ if test -z "$PHP_LIBXML_DIR"; then
php_with_libxml_dir=no
echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
-echo "configure:95050: checking libxml2 install dir" >&5
+echo "configure:94829: checking libxml2 install dir" >&5
# Check whether --with-libxml-dir or --without-libxml-dir was given.
if test "${with_libxml_dir+set}" = set; then
withval="$with_libxml_dir"
@@ -95073,7 +94852,7 @@ fi
php_with_libexpat_dir=no
echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6
-echo "configure:95077: checking libexpat dir for WDDX" >&5
+echo "configure:94856: checking libexpat dir for WDDX" >&5
# Check whether --with-libexpat-dir or --without-libexpat-dir was given.
if test "${with_libexpat_dir+set}" = set; then
withval="$with_libexpat_dir"
@@ -95104,7 +94883,7 @@ if test "$PHP_WDDX" != "no"; then
echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
-echo "configure:95108: checking for xml2-config path" >&5
+echo "configure:94887: checking for xml2-config path" >&5
if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -95262,7 +95041,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
-echo "configure:95266: checking whether libxml build works" >&5
+echo "configure:95045: checking whether libxml build works" >&5
if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -95278,7 +95057,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 95282 "configure"
+#line 95061 "configure"
#include "confdefs.h"
@@ -95289,7 +95068,7 @@ else
}
EOF
-if { (eval echo configure:95293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:95072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -95719,8 +95498,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_WDDX_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/wddx in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -95763,9 +95543,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC wddx"
- else
-
+ EXT_STATIC="$EXT_STATIC wddx"
+ ;;
+ *)
+
case ext/wddx in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -95808,7 +95589,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC wddx"
fi
@@ -95853,7 +95635,7 @@ fi
php_enable_xml=yes
echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6
-echo "configure:95857: checking whether to enable XML support" >&5
+echo "configure:95639: checking whether to enable XML support" >&5
# Check whether --enable-xml or --disable-xml was given.
if test "${enable_xml+set}" = set; then
enableval="$enable_xml"
@@ -95901,7 +95683,7 @@ if test -z "$PHP_LIBXML_DIR"; then
php_with_libxml_dir=no
echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
-echo "configure:95905: checking libxml2 install dir" >&5
+echo "configure:95687: checking libxml2 install dir" >&5
# Check whether --with-libxml-dir or --without-libxml-dir was given.
if test "${with_libxml_dir+set}" = set; then
withval="$with_libxml_dir"
@@ -95928,7 +95710,7 @@ fi
php_with_libexpat_dir=no
echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6
-echo "configure:95932: checking libexpat install dir" >&5
+echo "configure:95714: checking libexpat install dir" >&5
# Check whether --with-libexpat-dir or --without-libexpat-dir was given.
if test "${with_libexpat_dir+set}" = set; then
withval="$with_libexpat_dir"
@@ -95960,7 +95742,7 @@ if test "$PHP_XML" != "no"; then
echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
-echo "configure:95964: checking for xml2-config path" >&5
+echo "configure:95746: checking for xml2-config path" >&5
if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -96118,7 +95900,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
-echo "configure:96122: checking whether libxml build works" >&5
+echo "configure:95904: checking whether libxml build works" >&5
if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -96134,7 +95916,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 96138 "configure"
+#line 95920 "configure"
#include "confdefs.h"
@@ -96145,7 +95927,7 @@ else
}
EOF
-if { (eval echo configure:96149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:95931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -96541,8 +96323,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_XML_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/xml in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -96585,9 +96368,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC xml"
- else
-
+ EXT_STATIC="$EXT_STATIC xml"
+ ;;
+ *)
+
case ext/xml in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -96630,7 +96414,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC xml"
fi
@@ -96678,7 +96463,7 @@ fi
php_enable_xmlreader=yes
echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6
-echo "configure:96682: checking whether to enable XMLReader support" >&5
+echo "configure:96467: checking whether to enable XMLReader support" >&5
# Check whether --enable-xmlreader or --disable-xmlreader was given.
if test "${enable_xmlreader+set}" = set; then
enableval="$enable_xmlreader"
@@ -96726,7 +96511,7 @@ if test -z "$PHP_LIBXML_DIR"; then
php_with_libxml_dir=no
echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
-echo "configure:96730: checking libxml2 install dir" >&5
+echo "configure:96515: checking libxml2 install dir" >&5
# Check whether --with-libxml-dir or --without-libxml-dir was given.
if test "${with_libxml_dir+set}" = set; then
withval="$with_libxml_dir"
@@ -96757,7 +96542,7 @@ if test "$PHP_XMLREADER" != "no"; then
echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
-echo "configure:96761: checking for xml2-config path" >&5
+echo "configure:96546: checking for xml2-config path" >&5
if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -96915,7 +96700,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
-echo "configure:96919: checking whether libxml build works" >&5
+echo "configure:96704: checking whether libxml build works" >&5
if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -96931,7 +96716,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 96935 "configure"
+#line 96720 "configure"
#include "confdefs.h"
@@ -96942,7 +96727,7 @@ else
}
EOF
-if { (eval echo configure:96946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:96731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -97165,8 +96950,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_XMLREADER_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/xmlreader in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -97209,9 +96995,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC xmlreader"
- else
-
+ EXT_STATIC="$EXT_STATIC xmlreader"
+ ;;
+ *)
+
case ext/xmlreader in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -97254,7 +97041,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader"
fi
@@ -97321,7 +97109,7 @@ fi
php_with_xmlrpc=no
echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6
-echo "configure:97325: checking for XMLRPC-EPI support" >&5
+echo "configure:97113: checking for XMLRPC-EPI support" >&5
# Check whether --with-xmlrpc or --without-xmlrpc was given.
if test "${with_xmlrpc+set}" = set; then
withval="$with_xmlrpc"
@@ -97369,7 +97157,7 @@ if test -z "$PHP_LIBXML_DIR"; then
php_with_libxml_dir=no
echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
-echo "configure:97373: checking libxml2 install dir" >&5
+echo "configure:97161: checking libxml2 install dir" >&5
# Check whether --with-libxml-dir or --without-libxml-dir was given.
if test "${with_libxml_dir+set}" = set; then
withval="$with_libxml_dir"
@@ -97396,7 +97184,7 @@ fi
php_with_libexpat_dir=no
echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6
-echo "configure:97400: checking libexpat dir for XMLRPC-EPI" >&5
+echo "configure:97188: checking libexpat dir for XMLRPC-EPI" >&5
# Check whether --with-libexpat-dir or --without-libexpat-dir was given.
if test "${with_libexpat_dir+set}" = set; then
withval="$with_libexpat_dir"
@@ -97422,7 +97210,7 @@ echo "$ac_t""$ext_output" 1>&6
php_with_iconv_dir=no
echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6
-echo "configure:97426: checking iconv dir for XMLRPC-EPI" >&5
+echo "configure:97214: checking iconv dir for XMLRPC-EPI" >&5
# Check whether --with-iconv-dir or --without-iconv-dir was given.
if test "${with_iconv_dir+set}" = set; then
withval="$with_iconv_dir"
@@ -97481,7 +97269,7 @@ EOF
echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
-echo "configure:97485: checking for xml2-config path" >&5
+echo "configure:97273: checking for xml2-config path" >&5
if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -97639,7 +97427,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
-echo "configure:97643: checking whether libxml build works" >&5
+echo "configure:97431: checking whether libxml build works" >&5
if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -97655,7 +97443,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 97659 "configure"
+#line 97447 "configure"
#include "confdefs.h"
@@ -97666,7 +97454,7 @@ else
}
EOF
-if { (eval echo configure:97670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:97458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -97906,15 +97694,17 @@ EOF
fi
fi
- if test "$PHP_ICONV_DIR" != "no"; then
- PHP_ICONV=$PHP_ICONV_DIR
- fi
-
- if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then
- PHP_ICONV=yes
- fi
+ if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then
+
+ if test "$PHP_ICONV_DIR" != "no"; then
+ PHP_ICONV=$PHP_ICONV_DIR
+ fi
+ if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then
+ PHP_ICONV=yes
+ fi
+
found_iconv=no
unset ICONV_DIR
@@ -97932,12 +97722,12 @@ EOF
if test "$PHP_ICONV" = "yes"; then
echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:97936: checking for iconv" >&5
+echo "configure:97726: checking for iconv" >&5
if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 97941 "configure"
+#line 97731 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char iconv(); below. */
@@ -97960,7 +97750,7 @@ iconv();
; return 0; }
EOF
-if { (eval echo configure:97964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:97754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_iconv=yes"
else
@@ -97981,12 +97771,12 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv""... $ac_c" 1>&6
-echo "configure:97985: checking for libiconv" >&5
+echo "configure:97775: checking for libiconv" >&5
if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 97990 "configure"
+#line 97780 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char libiconv(); below. */
@@ -98009,7 +97799,7 @@ libiconv();
; return 0; }
EOF
-if { (eval echo configure:98013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:97803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_libiconv=yes"
else
@@ -98165,7 +97955,7 @@ EOF
done
echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
-echo "configure:98169: checking for libiconv in -l$iconv_lib_name" >&5
+echo "configure:97959: checking for libiconv in -l$iconv_lib_name" >&5
ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -98173,7 +97963,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$iconv_lib_name $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 98177 "configure"
+#line 97967 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -98184,7 +97974,7 @@ int main() {
libiconv()
; return 0; }
EOF
-if { (eval echo configure:98188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:97978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -98318,7 +98108,7 @@ else
done
echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
-echo "configure:98322: checking for iconv in -l$iconv_lib_name" >&5
+echo "configure:98112: checking for iconv in -l$iconv_lib_name" >&5
ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -98326,7 +98116,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$iconv_lib_name $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 98330 "configure"
+#line 98120 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -98337,7 +98127,7 @@ int main() {
iconv()
; return 0; }
EOF
-if { (eval echo configure:98341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:98131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -98516,17 +98306,18 @@ EOF
fi
else
- { echo "configure: error: iconv not found, in order to build xmlrpc you need the iconv library" 1>&2; exit 1; }
-
+ { echo "configure: error: iconv not found, in order to build xmlrpc you need the iconv library" 1>&2; exit 1; }
+
fi
+ fi
fi
if test "$PHP_XMLRPC" = "yes"; then
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:98530: checking for $ac_word" >&5
+echo "configure:98321: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -98554,21 +98345,21 @@ else
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:98558: checking for inline" >&5
+echo "configure:98349: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 98565 "configure"
+#line 98356 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:98572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:98363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -98606,12 +98397,12 @@ EOF
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:98610: checking for ANSI C header files" >&5
+echo "configure:98401: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 98615 "configure"
+#line 98406 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -98619,7 +98410,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:98623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:98414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -98636,7 +98427,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 98640 "configure"
+#line 98431 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -98654,7 +98445,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 98658 "configure"
+#line 98449 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -98675,7 +98466,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 98679 "configure"
+#line 98470 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -98686,7 +98477,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:98690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:98481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -98713,17 +98504,17 @@ for ac_hdr in xmlparse.h xmltok.h stdlib.h strings.h string.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:98717: checking for $ac_hdr" >&5
+echo "configure:98508: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 98722 "configure"
+#line 98513 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:98727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:98518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -98755,7 +98546,7 @@ done
echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:98759: checking size of char" >&5
+echo "configure:98550: checking size of char" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -98763,7 +98554,7 @@ else
ac_cv_sizeof_char=1
else
cat > conftest.$ac_ext <<EOF
-#line 98767 "configure"
+#line 98558 "configure"
#include "confdefs.h"
#include <stdio.h>
int main()
@@ -98774,7 +98565,7 @@ int main()
return(0);
}
EOF
-if { (eval echo configure:98778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:98569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_char=`cat conftestval`
else
@@ -98795,7 +98586,7 @@ EOF
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:98799: checking size of int" >&5
+echo "configure:98590: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -98803,7 +98594,7 @@ else
ac_cv_sizeof_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 98807 "configure"
+#line 98598 "configure"
#include "confdefs.h"
#include <stdio.h>
int main()
@@ -98814,7 +98605,7 @@ int main()
return(0);
}
EOF
-if { (eval echo configure:98818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:98609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
@@ -98834,7 +98625,7 @@ EOF
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:98838: checking size of long" >&5
+echo "configure:98629: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -98842,7 +98633,7 @@ else
ac_cv_sizeof_long=4
else
cat > conftest.$ac_ext <<EOF
-#line 98846 "configure"
+#line 98637 "configure"
#include "confdefs.h"
#include <stdio.h>
int main()
@@ -98853,7 +98644,7 @@ int main()
return(0);
}
EOF
-if { (eval echo configure:98857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:98648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
@@ -98873,7 +98664,7 @@ EOF
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:98877: checking size of long long" >&5
+echo "configure:98668: checking size of long long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -98881,7 +98672,7 @@ else
ac_cv_sizeof_long_long=8
else
cat > conftest.$ac_ext <<EOF
-#line 98885 "configure"
+#line 98676 "configure"
#include "confdefs.h"
#include <stdio.h>
int main()
@@ -98892,7 +98683,7 @@ int main()
return(0);
}
EOF
-if { (eval echo configure:98896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:98687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_long=`cat conftestval`
else
@@ -98912,12 +98703,12 @@ EOF
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:98916: checking for size_t" >&5
+echo "configure:98707: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 98921 "configure"
+#line 98712 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -98945,12 +98736,12 @@ EOF
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:98949: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:98740: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 98954 "configure"
+#line 98745 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -98959,7 +98750,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:98963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:98754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -98980,12 +98771,12 @@ EOF
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:98984: checking for uid_t in sys/types.h" >&5
+echo "configure:98775: checking for uid_t in sys/types.h" >&5
if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 98989 "configure"
+#line 98780 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -99025,12 +98816,12 @@ for ac_func in \
memcpy memmove
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:99029: checking for $ac_func" >&5
+echo "configure:98820: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 99034 "configure"
+#line 98825 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -99053,7 +98844,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:99057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:98848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -99274,8 +99065,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_XMLRPC_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/xmlrpc in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -99323,9 +99115,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC xmlrpc"
- else
-
+ EXT_STATIC="$EXT_STATIC xmlrpc"
+ ;;
+ *)
+
case ext/xmlrpc in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -99373,7 +99166,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
fi
@@ -99404,7 +99198,7 @@ elif test "$PHP_XMLRPC" != "no"; then
XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi
else
echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6
-echo "configure:99408: checking for XMLRPC-EPI in default path" >&5
+echo "configure:99202: checking for XMLRPC-EPI in default path" >&5
for i in /usr/local /usr; do
if test -r $i/include/xmlrpc.h; then
XMLRPC_DIR=$i/include
@@ -99731,8 +99525,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_XMLRPC_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/xmlrpc in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -99775,9 +99570,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC xmlrpc"
- else
-
+ EXT_STATIC="$EXT_STATIC xmlrpc"
+ ;;
+ *)
+
case ext/xmlrpc in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -99820,7 +99616,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
fi
@@ -99844,7 +99641,7 @@ fi
php_enable_xmlwriter=yes
echo $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6
-echo "configure:99848: checking whether to enable XMLWriter support" >&5
+echo "configure:99645: checking whether to enable XMLWriter support" >&5
# Check whether --enable-xmlwriter or --disable-xmlwriter was given.
if test "${enable_xmlwriter+set}" = set; then
enableval="$enable_xmlwriter"
@@ -99892,7 +99689,7 @@ if test -z "$PHP_LIBXML_DIR"; then
php_with_libxml_dir=no
echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
-echo "configure:99896: checking libxml2 install dir" >&5
+echo "configure:99693: checking libxml2 install dir" >&5
# Check whether --with-libxml-dir or --without-libxml-dir was given.
if test "${with_libxml_dir+set}" = set; then
withval="$with_libxml_dir"
@@ -99923,7 +99720,7 @@ if test "$PHP_XMLWRITER" != "no"; then
echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
-echo "configure:99927: checking for xml2-config path" >&5
+echo "configure:99724: checking for xml2-config path" >&5
if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -100081,7 +99878,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
-echo "configure:100085: checking whether libxml build works" >&5
+echo "configure:99882: checking whether libxml build works" >&5
if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -100097,7 +99894,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 100101 "configure"
+#line 99898 "configure"
#include "confdefs.h"
@@ -100108,7 +99905,7 @@ else
}
EOF
-if { (eval echo configure:100112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:99909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -100331,8 +100128,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_XMLWRITER_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/xmlwriter in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -100375,9 +100173,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC xmlwriter"
- else
-
+ EXT_STATIC="$EXT_STATIC xmlwriter"
+ ;;
+ *)
+
case ext/xmlwriter in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -100420,7 +100219,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC xmlwriter"
fi
@@ -100455,7 +100255,7 @@ fi
php_with_xsl=no
echo $ac_n "checking for XSL support""... $ac_c" 1>&6
-echo "configure:100459: checking for XSL support" >&5
+echo "configure:100259: checking for XSL support" >&5
# Check whether --with-xsl or --without-xsl was given.
if test "${with_xsl+set}" = set; then
withval="$with_xsl"
@@ -100658,7 +100458,7 @@ if test "$PHP_XSL" != "no"; then
echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6
-echo "configure:100662: checking for EXSLT support" >&5
+echo "configure:100462: checking for EXSLT support" >&5
for i in $PHP_XSL /usr/local /usr; do
if test -r "$i/include/libexslt/exslt.h"; then
PHP_XSL_EXSL_DIR=$i
@@ -100997,8 +100797,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_XSL_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/xsl in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -101041,9 +100842,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC xsl"
- else
-
+ EXT_STATIC="$EXT_STATIC xsl"
+ ;;
+ *)
+
case ext/xsl in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -101086,7 +100888,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC xsl"
fi
@@ -101131,7 +100934,7 @@ fi
php_enable_zip=no
echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6
-echo "configure:101135: checking for zip archive read/writesupport" >&5
+echo "configure:100938: checking for zip archive read/writesupport" >&5
# Check whether --enable-zip or --disable-zip was given.
if test "${enable_zip+set}" = set; then
enableval="$enable_zip"
@@ -101179,7 +100982,7 @@ if test -z "$PHP_ZLIB_DIR"; then
php_with_zlib_dir=no
echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
-echo "configure:101183: checking for the location of libz" >&5
+echo "configure:100986: checking for the location of libz" >&5
# Check whether --with-zlib-dir or --without-zlib-dir was given.
if test "${with_zlib_dir+set}" = set; then
withval="$with_zlib_dir"
@@ -101206,7 +101009,7 @@ fi
php_with_pcre_dir=no
echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6
-echo "configure:101210: checking pcre install prefix" >&5
+echo "configure:101013: checking pcre install prefix" >&5
# Check whether --with-pcre-dir or --without-pcre-dir was given.
if test "${with_pcre_dir+set}" = set; then
withval="$with_pcre_dir"
@@ -101253,7 +101056,7 @@ if test "$PHP_ZIP" != "no"; then
fi
echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6
-echo "configure:101257: checking for the location of zlib" >&5
+echo "configure:101060: checking for the location of zlib" >&5
if test "$PHP_ZLIB_DIR" = "no"; then
{ echo "configure: error: zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located" 1>&2; exit 1; }
else
@@ -101391,7 +101194,7 @@ echo "configure:101257: checking for the location of zlib" >&5
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=$INCLUDES
cat > conftest.$ac_ext <<EOF
-#line 101395 "configure"
+#line 101198 "configure"
#include "confdefs.h"
#include <main/php_config.h>
@@ -101410,7 +101213,7 @@ else
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 101414 "configure"
+#line 101217 "configure"
#include "confdefs.h"
#include <main/php_config.h>
@@ -101647,8 +101450,9 @@ EOF
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_ZIP_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/zip in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -101691,9 +101495,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC zip"
- else
-
+ EXT_STATIC="$EXT_STATIC zip"
+ ;;
+ *)
+
case ext/zip in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -101736,7 +101541,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC zip"
fi
@@ -101775,7 +101581,7 @@ fi
php_enable_mysqlnd_threading=no
echo $ac_n "checking whether to enable threaded fetch in mysqlnd""... $ac_c" 1>&6
-echo "configure:101779: checking whether to enable threaded fetch in mysqlnd" >&5
+echo "configure:101585: checking whether to enable threaded fetch in mysqlnd" >&5
# Check whether --enable-mysqlnd_threading or --disable-mysqlnd_threading was given.
if test "${enable_mysqlnd_threading+set}" = set; then
enableval="$enable_mysqlnd_threading"
@@ -101988,8 +101794,9 @@ EOF
if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then
PHP_MYSQLND_SHARED=no
- if test "$PHP_SAPI" = "cgi"; then
-
+ case "$PHP_SAPI" in
+ cgi|embed)
+
case ext/mysqlnd in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -102032,9 +101839,10 @@ EOF
done
- EXT_STATIC="$EXT_STATIC mysqlnd"
- else
-
+ EXT_STATIC="$EXT_STATIC mysqlnd"
+ ;;
+ *)
+
case ext/mysqlnd in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -102077,7 +101885,8 @@ EOF
done
- fi
+ ;;
+ esac
EXT_CLI_STATIC="$EXT_CLI_STATIC mysqlnd"
fi
@@ -102151,7 +101960,7 @@ EOF
for php_typename in int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t; do
echo $ac_n "checking whether $php_typename exists""... $ac_c" 1>&6
-echo "configure:102155: checking whether $php_typename exists" >&5
+echo "configure:101964: checking whether $php_typename exists" >&5
php_cache_value=php_cv_sizeof_$php_typename
if eval "test \"`echo '$''{'php_cv_sizeof_$php_typename'+set}'`\" = set"; then
@@ -102168,7 +101977,7 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 102172 "configure"
+#line 101981 "configure"
#include "confdefs.h"
#include <stdio.h>
#if STDC_HEADERS
@@ -102198,7 +102007,7 @@ int main()
}
EOF
-if { (eval echo configure:102202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:102011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
eval $php_cache_value=`cat conftestval`
@@ -102338,7 +102147,7 @@ if test "$PHP_RECODE" != "no"; then
done
echo $ac_n "checking for hash_insert in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
-echo "configure:102342: checking for hash_insert in -l$MYSQL_LIBNAME" >&5
+echo "configure:102151: checking for hash_insert in -l$MYSQL_LIBNAME" >&5
ac_lib_var=`echo $MYSQL_LIBNAME'_'hash_insert | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -102346,7 +102155,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$MYSQL_LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 102350 "configure"
+#line 102159 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -102357,7 +102166,7 @@ int main() {
hash_insert()
; return 0; }
EOF
-if { (eval echo configure:102361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:102170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -102459,7 +102268,7 @@ fi
php_with_pear=DEFAULT
echo $ac_n "checking whether to install PEAR""... $ac_c" 1>&6
-echo "configure:102463: checking whether to install PEAR" >&5
+echo "configure:102272: checking whether to install PEAR" >&5
# Check whether --with-pear or --without-pear was given.
if test "${with_pear+set}" = set; then
withval="$with_pear"
@@ -102564,7 +102373,7 @@ fi
bison_version=none
if test "$YACC"; then
echo $ac_n "checking for bison version""... $ac_c" 1>&6
-echo "configure:102568: checking for bison version" >&5
+echo "configure:102377: checking for bison version" >&5
if eval "test \"`echo '$''{'php_cv_bison_version'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -102620,17 +102429,17 @@ dlfcn.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:102624: checking for $ac_hdr" >&5
+echo "configure:102433: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 102629 "configure"
+#line 102438 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:102634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:102443: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -102667,17 +102476,17 @@ mach-o/dyld.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:102671: checking for $ac_hdr" >&5
+echo "configure:102480: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 102676 "configure"
+#line 102485 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:102681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:102490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -102707,12 +102516,12 @@ done
esac
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:102711: checking for size_t" >&5
+echo "configure:102520: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 102716 "configure"
+#line 102525 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -102740,12 +102549,12 @@ EOF
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:102744: checking return type of signal handlers" >&5
+echo "configure:102553: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 102749 "configure"
+#line 102558 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -102762,7 +102571,7 @@ int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:102766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:102575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -102786,12 +102595,12 @@ EOF
echo $ac_n "checking for uint""... $ac_c" 1>&6
-echo "configure:102790: checking for uint" >&5
+echo "configure:102599: checking for uint" >&5
if eval "test \"`echo '$''{'ac_cv_type_uint'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 102795 "configure"
+#line 102604 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -102819,12 +102628,12 @@ EOF
fi
echo $ac_n "checking for ulong""... $ac_c" 1>&6
-echo "configure:102823: checking for ulong" >&5
+echo "configure:102632: checking for ulong" >&5
if eval "test \"`echo '$''{'ac_cv_type_ulong'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 102828 "configure"
+#line 102637 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -102854,9 +102663,9 @@ fi
echo $ac_n "checking for int32_t""... $ac_c" 1>&6
-echo "configure:102858: checking for int32_t" >&5
+echo "configure:102667: checking for int32_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 102860 "configure"
+#line 102669 "configure"
#include "confdefs.h"
#if HAVE_SYS_TYPES_H
@@ -102875,7 +102684,7 @@ if (sizeof (int32_t))
; return 0; }
EOF
-if { (eval echo configure:102879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:102688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<EOF
@@ -102894,9 +102703,9 @@ fi
rm -f conftest*
echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
-echo "configure:102898: checking for uint32_t" >&5
+echo "configure:102707: checking for uint32_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 102900 "configure"
+#line 102709 "configure"
#include "confdefs.h"
#if HAVE_SYS_TYPES_H
@@ -102915,7 +102724,7 @@ if (sizeof (uint32_t))
; return 0; }
EOF
-if { (eval echo configure:102919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:102728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<EOF
@@ -102934,12 +102743,12 @@ fi
rm -f conftest*
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:102938: checking for vprintf" >&5
+echo "configure:102747: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 102943 "configure"
+#line 102752 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
@@ -102962,7 +102771,7 @@ vprintf();
; return 0; }
EOF
-if { (eval echo configure:102966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:102775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@@ -102986,12 +102795,12 @@ fi
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:102990: checking for _doprnt" >&5
+echo "configure:102799: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 102995 "configure"
+#line 102804 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
@@ -103014,7 +102823,7 @@ _doprnt();
; return 0; }
EOF
-if { (eval echo configure:103018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:102827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@@ -103039,7 +102848,7 @@ fi
fi
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:103043: checking for 8-bit clean memcmp" >&5
+echo "configure:102852: checking for 8-bit clean memcmp" >&5
if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -103047,7 +102856,7 @@ else
ac_cv_func_memcmp_clean=no
else
cat > conftest.$ac_ext <<EOF
-#line 103051 "configure"
+#line 102860 "configure"
#include "confdefs.h"
main()
@@ -103057,7 +102866,7 @@ main()
}
EOF
-if { (eval echo configure:103061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:102870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_memcmp_clean=yes
else
@@ -103077,19 +102886,19 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:103081: checking for working alloca.h" >&5
+echo "configure:102890: checking for working alloca.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 103086 "configure"
+#line 102895 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:103093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:102902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -103110,12 +102919,12 @@ EOF
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:103114: checking for alloca" >&5
+echo "configure:102923: checking for alloca" >&5
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 103119 "configure"
+#line 102928 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -103143,7 +102952,7 @@ int main() {
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:103147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:102956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
@@ -103175,12 +102984,12 @@ EOF
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:103179: checking whether alloca needs Cray hooks" >&5
+echo "configure:102988: checking whether alloca needs Cray hooks" >&5
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 103184 "configure"
+#line 102993 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -103205,12 +103014,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:103209: checking for $ac_func" >&5
+echo "configure:103018: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 103214 "configure"
+#line 103023 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -103233,7 +103042,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:103237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:103046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -103260,7 +103069,7 @@ done
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:103264: checking stack direction for C alloca" >&5
+echo "configure:103073: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -103268,7 +103077,7 @@ else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 103272 "configure"
+#line 103081 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -103287,7 +103096,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:103291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:103100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_stack_direction=1
else
@@ -103311,12 +103120,12 @@ fi
for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:103315: checking for $ac_func" >&5
+echo "configure:103124: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 103320 "configure"
+#line 103129 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -103339,7 +103148,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:103343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:103152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -103365,7 +103174,7 @@ done
echo $ac_n "checking whether sprintf is broken""... $ac_c" 1>&6
-echo "configure:103369: checking whether sprintf is broken" >&5
+echo "configure:103178: checking whether sprintf is broken" >&5
if eval "test \"`echo '$''{'ac_cv_broken_sprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -103376,11 +103185,11 @@ else
else
cat > conftest.$ac_ext <<EOF
-#line 103380 "configure"
+#line 103189 "configure"
#include "confdefs.h"
main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }
EOF
-if { (eval echo configure:103384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:103193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_broken_sprintf=no
@@ -103414,12 +103223,12 @@ EOF
for ac_func in finite isfinite isinf isnan
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:103418: checking for $ac_func" >&5
+echo "configure:103227: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 103423 "configure"
+#line 103232 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -103442,7 +103251,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:103446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:103255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -103469,13 +103278,13 @@ done
echo $ac_n "checking whether fp_except is defined""... $ac_c" 1>&6
-echo "configure:103473: checking whether fp_except is defined" >&5
+echo "configure:103282: checking whether fp_except is defined" >&5
if eval "test \"`echo '$''{'ac_cv_type_fp_except'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 103479 "configure"
+#line 103288 "configure"
#include "confdefs.h"
#include <floatingpoint.h>
@@ -103486,7 +103295,7 @@ fp_except x = (fp_except) 0;
; return 0; }
EOF
-if { (eval echo configure:103490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:103299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_fp_except=yes
@@ -103513,9 +103322,9 @@ EOF
echo $ac_n "checking for usable _FPU_SETCW""... $ac_c" 1>&6
-echo "configure:103517: checking for usable _FPU_SETCW" >&5
+echo "configure:103326: checking for usable _FPU_SETCW" >&5
cat > conftest.$ac_ext <<EOF
-#line 103519 "configure"
+#line 103328 "configure"
#include "confdefs.h"
#include <fpu_control.h>
@@ -103535,7 +103344,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:103539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:103348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cfp_have__fpu_setcw=yes
else
@@ -103556,9 +103365,9 @@ EOF
fi
echo $ac_n "checking for usable fpsetprec""... $ac_c" 1>&6
-echo "configure:103560: checking for usable fpsetprec" >&5
+echo "configure:103369: checking for usable fpsetprec" >&5
cat > conftest.$ac_ext <<EOF
-#line 103562 "configure"
+#line 103371 "configure"
#include "confdefs.h"
#include <machine/ieeefp.h>
@@ -103577,7 +103386,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:103581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:103390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cfp_have_fpsetprec=yes
else
@@ -103598,9 +103407,9 @@ EOF
fi
echo $ac_n "checking for usable _controlfp""... $ac_c" 1>&6
-echo "configure:103602: checking for usable _controlfp" >&5
+echo "configure:103411: checking for usable _controlfp" >&5
cat > conftest.$ac_ext <<EOF
-#line 103604 "configure"
+#line 103413 "configure"
#include "confdefs.h"
#include <float.h>
@@ -103619,7 +103428,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:103623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:103432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cfp_have__controlfp=yes
else
@@ -103640,9 +103449,9 @@ EOF
fi
echo $ac_n "checking for usable _controlfp_s""... $ac_c" 1>&6
-echo "configure:103644: checking for usable _controlfp_s" >&5
+echo "configure:103453: checking for usable _controlfp_s" >&5
cat > conftest.$ac_ext <<EOF
-#line 103646 "configure"
+#line 103455 "configure"
#include "confdefs.h"
#include <float.h>
@@ -103662,7 +103471,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:103666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:103475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cfp_have__controlfp_s=yes
else
@@ -103683,9 +103492,9 @@ EOF
fi
echo $ac_n "checking whether FPU control word can be manipulated by inline assembler""... $ac_c" 1>&6
-echo "configure:103687: checking whether FPU control word can be manipulated by inline assembler" >&5
+echo "configure:103496: checking whether FPU control word can be manipulated by inline assembler" >&5
cat > conftest.$ac_ext <<EOF
-#line 103689 "configure"
+#line 103498 "configure"
#include "confdefs.h"
/* nothing */
@@ -103707,7 +103516,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:103711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:103520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cfp_have_fpu_inline_asm_x86=yes
else
@@ -103727,23 +103536,77 @@ EOF
echo "$ac_t""no" 1>&6
fi
+
+echo $ac_n "checking whether double cast to long preserves least significant bits""... $ac_c" 1>&6
+echo "configure:103542: checking whether double cast to long preserves least significant bits" >&5
+
+if test "$cross_compiling" = yes; then
+
+ echo "$ac_t""no" 1>&6
+
+else
+ cat > conftest.$ac_ext <<EOF
+#line 103550 "configure"
+#include "confdefs.h"
+
+#include <limits.h>
+
+int main()
+{
+ if (sizeof(long) == 4) {
+ double d = (double) LONG_MIN * LONG_MIN + 2e9;
+
+ if ((long) d == 2e9 && (long) -d == -2e9) {
+ exit(0);
+ }
+ } else if (sizeof(long) == 8) {
+ double correct = 18e18 - ((double) LONG_MIN * -2); /* Subtract ULONG_MAX + 1 */
+
+ if ((long) 18e18 == correct) { /* On 64-bit, only check between LONG_MAX and ULONG_MAX */
+ exit(0);
+ }
+ }
+ exit(1);
+}
+
+EOF
+if { (eval echo configure:103574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+
+ cat >> confdefs.h <<\EOF
+#define ZEND_DVAL_TO_LVAL_CAST_OK 1
+EOF
+
+ echo "$ac_t""yes" 1>&6
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+
+ echo "$ac_t""no" 1>&6
+
+fi
+rm -fr conftest*
+fi
+
for ac_hdr in dlfcn.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:103737: checking for $ac_hdr" >&5
+echo "configure:103600: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 103742 "configure"
+#line 103605 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:103747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:103610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -103771,14 +103634,14 @@ done
echo $ac_n "checking whether dlsym() requires a leading underscore in symbol names""... $ac_c" 1>&6
-echo "configure:103775: checking whether dlsym() requires a leading underscore in symbol names" >&5
+echo "configure:103638: checking whether dlsym() requires a leading underscore in symbol names" >&5
if test "$cross_compiling" = yes; then :
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 103782 "configure"
+#line 103645 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -103839,7 +103702,7 @@ int main ()
exit (status);
}
EOF
- if { (eval echo configure:103843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ if { (eval echo configure:103706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -103922,23 +103785,23 @@ fi
echo $ac_n "checking virtual machine dispatch method""... $ac_c" 1>&6
-echo "configure:103926: checking virtual machine dispatch method" >&5
+echo "configure:103789: checking virtual machine dispatch method" >&5
echo "$ac_t""$PHP_ZEND_VM" 1>&6
echo $ac_n "checking whether to enable thread-safety""... $ac_c" 1>&6
-echo "configure:103930: checking whether to enable thread-safety" >&5
+echo "configure:103793: checking whether to enable thread-safety" >&5
echo "$ac_t""$ZEND_MAINTAINER_ZTS" 1>&6
echo $ac_n "checking whether to enable inline optimization for GCC""... $ac_c" 1>&6
-echo "configure:103934: checking whether to enable inline optimization for GCC" >&5
+echo "configure:103797: checking whether to enable inline optimization for GCC" >&5
echo "$ac_t""$ZEND_INLINE_OPTIMIZATION" 1>&6
echo $ac_n "checking whether to enable Zend debugging""... $ac_c" 1>&6
-echo "configure:103938: checking whether to enable Zend debugging" >&5
+echo "configure:103801: checking whether to enable Zend debugging" >&5
echo "$ac_t""$ZEND_DEBUG" 1>&6
echo $ac_n "checking whether to enable Zend multibyte""... $ac_c" 1>&6
-echo "configure:103942: checking whether to enable Zend multibyte" >&5
+echo "configure:103805: checking whether to enable Zend multibyte" >&5
echo "$ac_t""$ZEND_MULTIBYTE" 1>&6
case $PHP_ZEND_VM in
@@ -104011,21 +103874,21 @@ fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:104015: checking for inline" >&5
+echo "configure:103878: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 104022 "configure"
+#line 103885 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:104029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:103892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -104054,7 +103917,7 @@ esac
echo $ac_n "checking target system is Darwin""... $ac_c" 1>&6
-echo "configure:104058: checking target system is Darwin" >&5
+echo "configure:103921: checking target system is Darwin" >&5
if echo "$target" | grep "darwin" > /dev/null; then
cat >> confdefs.h <<\EOF
#define DARWIN 1
@@ -104066,7 +103929,7 @@ else
fi
echo $ac_n "checking for MM alignment and log values""... $ac_c" 1>&6
-echo "configure:104070: checking for MM alignment and log values" >&5
+echo "configure:103933: checking for MM alignment and log values" >&5
if test "$cross_compiling" = yes; then
@@ -104074,7 +103937,7 @@ if test "$cross_compiling" = yes; then
else
cat > conftest.$ac_ext <<EOF
-#line 104078 "configure"
+#line 103941 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -104110,7 +103973,7 @@ int main()
}
EOF
-if { (eval echo configure:104114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:103977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1`
@@ -104135,7 +103998,7 @@ fi
echo "$ac_t""done" 1>&6
echo $ac_n "checking for memory allocation using mmap(MAP_ANON)""... $ac_c" 1>&6
-echo "configure:104139: checking for memory allocation using mmap(MAP_ANON)" >&5
+echo "configure:104002: checking for memory allocation using mmap(MAP_ANON)" >&5
if test "$cross_compiling" = yes; then
@@ -104143,7 +104006,7 @@ if test "$cross_compiling" = yes; then
else
cat > conftest.$ac_ext <<EOF
-#line 104147 "configure"
+#line 104010 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -104179,7 +104042,7 @@ int main()
}
EOF
-if { (eval echo configure:104183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:104046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cat >> confdefs.h <<\EOF
@@ -104201,7 +104064,7 @@ fi
echo $ac_n "checking for memory allocation using mmap("/dev/zero")""... $ac_c" 1>&6
-echo "configure:104205: checking for memory allocation using mmap("/dev/zero")" >&5
+echo "configure:104068: checking for memory allocation using mmap("/dev/zero")" >&5
if test "$cross_compiling" = yes; then
@@ -104209,7 +104072,7 @@ if test "$cross_compiling" = yes; then
else
cat > conftest.$ac_ext <<EOF
-#line 104213 "configure"
+#line 104076 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -104255,7 +104118,7 @@ int main()
}
EOF
-if { (eval echo configure:104259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:104122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cat >> confdefs.h <<\EOF
@@ -104279,12 +104142,12 @@ fi
for ac_func in mremap
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:104283: checking for $ac_func" >&5
+echo "configure:104146: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 104288 "configure"
+#line 104151 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -104307,7 +104170,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:104311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:104174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -104374,17 +104237,17 @@ for ac_hdr in stdarg.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:104378: checking for $ac_hdr" >&5
+echo "configure:104241: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 104383 "configure"
+#line 104246 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:104388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:104251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -104461,7 +104324,7 @@ if test "$TSRM_PTH" != "no"; then
echo $ac_n "checking for GNU Pth""... $ac_c" 1>&6
-echo "configure:104465: checking for GNU Pth" >&5
+echo "configure:104328: checking for GNU Pth" >&5
PTH_PREFIX="`$TSRM_PTH --prefix`"
if test -z "$PTH_PREFIX"; then
echo "$ac_t""Please check your Pth installation" 1>&6
@@ -104491,17 +104354,17 @@ elif test "$TSRM_ST" != "no"; then
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:104495: checking for $ac_hdr" >&5
+echo "configure:104358: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 104500 "configure"
+#line 104363 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:104505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:104368: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -104531,7 +104394,7 @@ done
LIBS="$LIBS -lst"
echo $ac_n "checking for SGI's State Threads""... $ac_c" 1>&6
-echo "configure:104535: checking for SGI's State Threads" >&5
+echo "configure:104398: checking for SGI's State Threads" >&5
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
#define TSRM_ST 1
@@ -104570,7 +104433,7 @@ if test "$cross_compiling" = yes; then
else
cat > conftest.$ac_ext <<EOF
-#line 104574 "configure"
+#line 104437 "configure"
#include "confdefs.h"
#include <pthread.h>
@@ -104588,7 +104451,7 @@ int main() {
return pthread_create(&thd, NULL, thread_routine, &data);
}
EOF
-if { (eval echo configure:104592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:104455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
pthreads_working=yes
@@ -104608,7 +104471,7 @@ fi
CFLAGS=$save_CFLAGS
echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6
-echo "configure:104612: checking for pthreads_cflags" >&5
+echo "configure:104475: checking for pthreads_cflags" >&5
if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -104630,7 +104493,7 @@ if test "$cross_compiling" = yes; then
else
cat > conftest.$ac_ext <<EOF
-#line 104634 "configure"
+#line 104497 "configure"
#include "confdefs.h"
#include <pthread.h>
@@ -104648,7 +104511,7 @@ int main() {
return pthread_create(&thd, NULL, thread_routine, &data);
}
EOF
-if { (eval echo configure:104652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:104515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
pthreads_working=yes
@@ -104678,7 +104541,7 @@ fi
echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6
echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6
-echo "configure:104682: checking for pthreads_lib" >&5
+echo "configure:104545: checking for pthreads_lib" >&5
if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -104700,7 +104563,7 @@ if test "$cross_compiling" = yes; then
else
cat > conftest.$ac_ext <<EOF
-#line 104704 "configure"
+#line 104567 "configure"
#include "confdefs.h"
#include <pthread.h>
@@ -104718,7 +104581,7 @@ int main() {
return pthread_create(&thd, NULL, thread_routine, &data);
}
EOF
-if { (eval echo configure:104722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:104585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
pthreads_working=yes
@@ -104769,7 +104632,7 @@ EOF
echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6
-echo "configure:104773: checking for POSIX threads" >&5
+echo "configure:104636: checking for POSIX threads" >&5
echo "$ac_t""yes" 1>&6
fi
@@ -105290,15 +105153,7 @@ if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
CPPFLAGS="$CPPFLAGS -DTHREAD=1"
fi
-if test "$PHP_DEBUG" = "1" && test "$PHP_THREAD_SAFETY" = "yes"; then
- ZEND_EXT_TYPE="zend_extension_debug_ts"
-elif test "$PHP_DEBUG" = "1"; then
- ZEND_EXT_TYPE="zend_extension_debug"
-elif test "$PHP_THREAD_SAFETY" = "yes"; then
- ZEND_EXT_TYPE="zend_extension_ts"
-else
- ZEND_EXT_TYPE="zend_extension"
-fi
+ZEND_EXT_TYPE="zend_extension"
PHP_VAR_SUBST="$PHP_VAR_SUBST ZEND_EXT_TYPE"
@@ -105396,7 +105251,7 @@ fi
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:105400: checking build system type" >&5
+echo "configure:105255: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@@ -105425,7 +105280,7 @@ ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6
-echo "configure:105429: checking for ld used by $CC" >&5
+echo "configure:105284: checking for ld used by $CC" >&5
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -105455,10 +105310,10 @@ echo "configure:105429: checking for ld used by $CC" >&5
esac
elif test "$with_gnu_ld" = yes; then
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:105459: checking for GNU ld" >&5
+echo "configure:105314: checking for GNU ld" >&5
else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:105462: checking for non-GNU ld" >&5
+echo "configure:105317: checking for non-GNU ld" >&5
fi
if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -105497,7 +105352,7 @@ else
fi
test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:105501: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:105356: checking if the linker ($LD) is GNU ld" >&5
if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -105517,7 +105372,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:105521: checking for $LD option to reload object files" >&5
+echo "configure:105376: checking for $LD option to reload object files" >&5
if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -105542,7 +105397,7 @@ case $host_os in
esac
echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:105546: checking for BSD-compatible nm" >&5
+echo "configure:105401: checking for BSD-compatible nm" >&5
if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -105588,7 +105443,7 @@ echo "$ac_t""$lt_cv_path_NM" 1>&6
NM="$lt_cv_path_NM"
echo $ac_n "checking how to recognise dependent libraries""... $ac_c" 1>&6
-echo "configure:105592: checking how to recognise dependent libraries" >&5
+echo "configure:105447: checking how to recognise dependent libraries" >&5
if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -105766,13 +105621,13 @@ deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:105770: checking for object suffix" >&5
+echo "configure:105625: checking for object suffix" >&5
if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
rm -f conftest*
echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:105776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:105631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
for ac_file in conftest.*; do
case $ac_file in
*.c) ;;
@@ -105792,7 +105647,7 @@ ac_objext=$ac_cv_objext
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:105796: checking for executable suffix" >&5
+echo "configure:105651: checking for executable suffix" >&5
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -105802,7 +105657,7 @@ else
rm -f conftest*
echo 'int main () { return 0; }' > conftest.$ac_ext
ac_cv_exeext=
- if { (eval echo configure:105806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ if { (eval echo configure:105661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do
case $file in
*.c | *.o | *.obj) ;;
@@ -105845,7 +105700,7 @@ case $host in
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
- if { (eval echo configure:105849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:105704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
@@ -105859,8 +105714,8 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 105863 "configure"' > conftest.$ac_ext
- if { (eval echo configure:105864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ echo '#line 105718 "configure"' > conftest.$ac_ext
+ if { (eval echo configure:105719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
@@ -105893,7 +105748,7 @@ ia64-*-hpux*)
x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
- if { (eval echo configure:105897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:105752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -105937,7 +105792,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:105941: checking whether the C compiler needs -belf" >&5
+echo "configure:105796: checking whether the C compiler needs -belf" >&5
if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -105950,14 +105805,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
-#line 105954 "configure"
+#line 105809 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:105961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:105816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
lt_cv_cc_needs_belf=yes
else
@@ -105994,7 +105849,7 @@ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
(test "X$CXX" != "Xg++"))) ; then
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:105998: checking how to run the C++ preprocessor" >&5
+echo "configure:105853: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -106007,12 +105862,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
-#line 106011 "configure"
+#line 105866 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:106016: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:105871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -106043,7 +105898,7 @@ fi
# find the maximum length of command line arguments
echo $ac_n "checking the maximum length of command line arguments""... $ac_c" 1>&6
-echo "configure:106047: checking the maximum length of command line arguments" >&5
+echo "configure:105902: checking the maximum length of command line arguments" >&5
if eval "test \"`echo '$''{'lt_cv_sys_max_cmd_len'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -106144,7 +105999,7 @@ fi
# Check for command to grab the raw symbol name followed by C symbol from nm.
echo $ac_n "checking command to parse $NM output from $compiler object""... $ac_c" 1>&6
-echo "configure:106148: checking command to parse $NM output from $compiler object" >&5
+echo "configure:106003: checking command to parse $NM output from $compiler object" >&5
if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -106239,10 +106094,10 @@ void nm_test_func(){}
int main(){nm_test_var='a';nm_test_func();return(0);}
EOF
- if { (eval echo configure:106243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:106098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { (eval echo configure:106246: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
+ if { (eval echo configure:106101: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -106293,7 +106148,7 @@ EOF
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
- if { (eval echo configure:106297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ if { (eval echo configure:106152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
@@ -106333,7 +106188,7 @@ else
fi
echo $ac_n "checking for objdir""... $ac_c" 1>&6
-echo "configure:106337: checking for objdir" >&5
+echo "configure:106192: checking for objdir" >&5
if eval "test \"`echo '$''{'lt_cv_objdir'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -106399,7 +106254,7 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
# 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
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:106403: checking for $ac_word" >&5
+echo "configure:106258: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -106431,7 +106286,7 @@ if test -n "$ac_tool_prefix"; then
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:106435: checking for $ac_word" >&5
+echo "configure:106290: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -106466,7 +106321,7 @@ fi
# 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
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:106470: checking for $ac_word" >&5
+echo "configure:106325: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -106498,7 +106353,7 @@ if test -n "$ac_tool_prefix"; then
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:106502: checking for $ac_word" >&5
+echo "configure:106357: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -106533,7 +106388,7 @@ fi
# 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
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:106537: checking for $ac_word" >&5
+echo "configure:106392: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -106565,7 +106420,7 @@ if test -n "$ac_tool_prefix"; then
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:106569: checking for $ac_word" >&5
+echo "configure:106424: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -106651,7 +106506,7 @@ case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:106655: checking for ${ac_tool_prefix}file" >&5
+echo "configure:106510: checking for ${ac_tool_prefix}file" >&5
if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -106711,7 +106566,7 @@ fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:106715: checking for file" >&5
+echo "configure:106570: checking for file" >&5
if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -106870,7 +106725,7 @@ fi
# Check to make sure the static flag actually works.
#
echo $ac_n "checking if $compiler static flag $lt_prog_compiler_static works""... $ac_c" 1>&6
-echo "configure:106874: checking if $compiler static flag $lt_prog_compiler_static works" >&5
+echo "configure:106729: checking if $compiler static flag $lt_prog_compiler_static works" >&5
if eval "test \"`echo '$''{'lt_prog_compiler_static_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -106920,7 +106775,7 @@ if test "$GCC" = yes; then
echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
-echo "configure:106924: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo "configure:106779: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
if eval "test \"`echo '$''{'lt_cv_prog_compiler_rtti_exceptions'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -106937,11 +106792,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"configure:106941: $lt_compile\"" >&5)
+ (eval echo "\"configure:106796: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "configure:106945: \$? = $ac_status" >&5
+ echo "configure:106800: \$? = $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.
@@ -106970,7 +106825,7 @@ lt_prog_compiler_pic=
lt_prog_compiler_static=
echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
-echo "configure:106974: checking for $compiler option to produce PIC" >&5
+echo "configure:106829: checking for $compiler option to produce PIC" >&5
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
@@ -107189,7 +107044,7 @@ echo "$ac_t""$lt_prog_compiler_pic" 1>&6
if test -n "$lt_prog_compiler_pic"; then
echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic works""... $ac_c" 1>&6
-echo "configure:107193: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+echo "configure:107048: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
if eval "test \"`echo '$''{'lt_prog_compiler_pic_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -107206,11 +107061,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"configure:107210: $lt_compile\"" >&5)
+ (eval echo "\"configure:107065: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "configure:107214: \$? = $ac_status" >&5
+ echo "configure:107069: \$? = $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.
@@ -107248,7 +107103,7 @@ case $host_os in
esac
echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
-echo "configure:107252: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo "configure:107107: checking if $compiler supports -c -o file.$ac_objext" >&5
if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -107268,11 +107123,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"configure:107272: $lt_compile\"" >&5)
+ (eval echo "\"configure:107127: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "configure:107276: \$? = $ac_status" >&5
+ echo "configure:107131: \$? = $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
@@ -107302,7 +107157,7 @@ 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
echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
-echo "configure:107306: checking if we can lock with hard links" >&5
+echo "configure:107161: checking if we can lock with hard links" >&5
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -107319,7 +107174,7 @@ else
fi
echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
-echo "configure:107323: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo "configure:107178: checking whether the $compiler linker ($LD) supports shared libraries" >&5
runpath_var=
allow_undefined_flag=
@@ -107672,12 +107527,12 @@ EOF
# Determine the default libpath from the value encoded in an empty executable.
cat > conftest.$ac_ext <<EOF
-#line 107676 "configure"
+#line 107531 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:107681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:107536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -107703,12 +107558,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# Determine the default libpath from the value encoded in an empty executable.
cat > conftest.$ac_ext <<EOF
-#line 107707 "configure"
+#line 107562 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:107712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:107567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -108180,11 +108035,11 @@ x|xyes)
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
-echo "configure:108184: checking whether -lc should be explicitly linked in" >&5
+echo "configure:108039: checking whether -lc should be explicitly linked in" >&5
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { (eval echo configure:108188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
+ if { (eval echo configure:108043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
@@ -108197,7 +108052,7 @@ echo "configure:108184: checking whether -lc should be explicitly linked in" >&5
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
- if { (eval echo configure:108201: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
+ if { (eval echo configure:108056: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
then
archive_cmds_need_lc=no
else
@@ -108216,7 +108071,7 @@ echo "configure:108184: checking whether -lc should be explicitly linked in" >&5
esac
echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
-echo "configure:108220: checking dynamic linker characteristics" >&5
+echo "configure:108075: checking dynamic linker characteristics" >&5
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -108590,8 +108445,8 @@ linux*)
libsuff=
case $host_cpu in
x86_64*|s390x*|powerpc64*)
- echo '#line 108594 "configure"' > conftest.$ac_ext
- if { (eval echo configure:108595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ echo '#line 108449 "configure"' > conftest.$ac_ext
+ if { (eval echo configure:108450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case `/usr/bin/file conftest.$ac_objext` in
*64-bit*)
libsuff=64
@@ -108790,7 +108645,7 @@ echo "$ac_t""$dynamic_linker" 1>&6
test "$dynamic_linker" = no && can_build_shared=no
echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
-echo "configure:108794: checking how to hardcode library paths into programs" >&5
+echo "configure:108649: checking how to hardcode library paths into programs" >&5
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
test -n "$runpath_var" || \
@@ -108828,7 +108683,7 @@ fi
striplib=
old_striplib=
echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
-echo "configure:108832: checking whether stripping libraries is possible" >&5
+echo "configure:108687: checking whether stripping libraries is possible" >&5
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"
@@ -108878,7 +108733,7 @@ else
darwin*)
# if libdl is installed we need to link against it
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:108882: checking for dlopen in -ldl" >&5
+echo "configure:108737: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -108886,7 +108741,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 108890 "configure"
+#line 108745 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -108897,7 +108752,7 @@ int main() {
dlopen()
; return 0; }
EOF
-if { (eval echo configure:108901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:108756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -108926,12 +108781,12 @@ fi
*)
echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "configure:108930: checking for shl_load" >&5
+echo "configure:108785: checking for shl_load" >&5
if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 108935 "configure"
+#line 108790 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shl_load(); below. */
@@ -108954,7 +108809,7 @@ shl_load();
; return 0; }
EOF
-if { (eval echo configure:108958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:108813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shl_load=yes"
else
@@ -108972,7 +108827,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:108976: checking for shl_load in -ldld" >&5
+echo "configure:108831: checking for shl_load in -ldld" >&5
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -108980,7 +108835,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 108984 "configure"
+#line 108839 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -108991,7 +108846,7 @@ int main() {
shl_load()
; return 0; }
EOF
-if { (eval echo configure:108995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:108850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -109010,12 +108865,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:109014: checking for dlopen" >&5
+echo "configure:108869: checking for dlopen" >&5
if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 109019 "configure"
+#line 108874 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen(); below. */
@@ -109038,7 +108893,7 @@ dlopen();
; return 0; }
EOF
-if { (eval echo configure:109042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:108897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dlopen=yes"
else
@@ -109056,7 +108911,7 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:109060: checking for dlopen in -ldl" >&5
+echo "configure:108915: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -109064,7 +108919,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 109068 "configure"
+#line 108923 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -109075,7 +108930,7 @@ int main() {
dlopen()
; return 0; }
EOF
-if { (eval echo configure:109079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:108934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -109094,7 +108949,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-echo "configure:109098: checking for dlopen in -lsvld" >&5
+echo "configure:108953: checking for dlopen in -lsvld" >&5
ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -109102,7 +108957,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsvld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 109106 "configure"
+#line 108961 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -109113,7 +108968,7 @@ int main() {
dlopen()
; return 0; }
EOF
-if { (eval echo configure:109117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:108972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -109132,7 +108987,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-echo "configure:109136: checking for dld_link in -ldld" >&5
+echo "configure:108991: checking for dld_link in -ldld" >&5
ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -109140,7 +108995,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 109144 "configure"
+#line 108999 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -109151,7 +109006,7 @@ int main() {
dld_link()
; return 0; }
EOF
-if { (eval echo configure:109155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:109010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -109207,7 +109062,7 @@ fi
LIBS="$lt_cv_dlopen_libs $LIBS"
echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "configure:109211: checking whether a program can dlopen itself" >&5
+echo "configure:109066: checking whether a program can dlopen itself" >&5
if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -109217,7 +109072,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 109221 "configure"
+#line 109076 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -109278,7 +109133,7 @@ int main ()
exit (status);
}
EOF
- if { (eval echo configure:109282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ if { (eval echo configure:109137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -109301,7 +109156,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6
if test "x$lt_cv_dlopen_self" = xyes; then
LDFLAGS="$LDFLAGS $link_static_flag"
echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-echo "configure:109305: checking whether a statically linked program can dlopen itself" >&5
+echo "configure:109160: checking whether a statically linked program can dlopen itself" >&5
if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -109311,7 +109166,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 109315 "configure"
+#line 109170 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -109372,7 +109227,7 @@ int main ()
exit (status);
}
EOF
- if { (eval echo configure:109376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ if { (eval echo configure:109231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -109413,11 +109268,11 @@ fi
# Report which librarie types wil actually be built
echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
-echo "configure:109417: checking if libtool supports shared libraries" >&5
+echo "configure:109272: checking if libtool supports shared libraries" >&5
echo "$ac_t""$can_build_shared" 1>&6
echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
-echo "configure:109421: checking whether to build shared libraries" >&5
+echo "configure:109276: checking whether to build shared libraries" >&5
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
@@ -109440,7 +109295,7 @@ esac
echo "$ac_t""$enable_shared" 1>&6
echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
-echo "configure:109444: checking whether to build static libraries" >&5
+echo "configure:109299: checking whether to build static libraries" >&5
# Make sure either enable_shared or enable_static is yes.
test "$enable_shared" = yes || enable_static=yes
echo "$ac_t""$enable_static" 1>&6
@@ -110109,7 +109964,7 @@ ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6
-echo "configure:110113: checking for ld used by $CC" >&5
+echo "configure:109968: checking for ld used by $CC" >&5
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -110139,10 +109994,10 @@ echo "configure:110113: checking for ld used by $CC" >&5
esac
elif test "$with_gnu_ld" = yes; then
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:110143: checking for GNU ld" >&5
+echo "configure:109998: checking for GNU ld" >&5
else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:110146: checking for non-GNU ld" >&5
+echo "configure:110001: checking for non-GNU ld" >&5
fi
if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -110181,7 +110036,7 @@ else
fi
test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:110185: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:110040: checking if the linker ($LD) is GNU ld" >&5
if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -110247,7 +110102,7 @@ fi
# PORTME: fill in a description of your system's C++ link characteristics
echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
-echo "configure:110251: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo "configure:110106: checking whether the $compiler linker ($LD) supports shared libraries" >&5
ld_shlibs_CXX=yes
case $host_os in
aix3*)
@@ -110343,12 +110198,12 @@ case $host_os in
# Determine the default libpath from the value encoded in an empty executable.
cat > conftest.$ac_ext <<EOF
-#line 110347 "configure"
+#line 110202 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:110352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:110207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -110375,12 +110230,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# Determine the default libpath from the value encoded in an empty executable.
cat > conftest.$ac_ext <<EOF
-#line 110379 "configure"
+#line 110234 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:110384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:110239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -111087,7 +110942,7 @@ private:
};
EOF
-if { (eval echo configure:111091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:110946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
@@ -111197,7 +111052,7 @@ lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
-echo "configure:111201: checking for $compiler option to produce PIC" >&5
+echo "configure:111056: checking for $compiler option to produce PIC" >&5
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
@@ -111478,7 +111333,7 @@ echo "$ac_t""$lt_prog_compiler_pic_CXX" 1>&6
if test -n "$lt_prog_compiler_pic_CXX"; then
echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works""... $ac_c" 1>&6
-echo "configure:111482: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+echo "configure:111337: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
if eval "test \"`echo '$''{'lt_prog_compiler_pic_works_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -111495,11 +111350,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"configure:111499: $lt_compile\"" >&5)
+ (eval echo "\"configure:111354: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "configure:111503: \$? = $ac_status" >&5
+ echo "configure:111358: \$? = $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.
@@ -111537,7 +111392,7 @@ case $host_os in
esac
echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
-echo "configure:111541: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo "configure:111396: checking if $compiler supports -c -o file.$ac_objext" >&5
if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -111557,11 +111412,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"configure:111561: $lt_compile\"" >&5)
+ (eval echo "\"configure:111416: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "configure:111565: \$? = $ac_status" >&5
+ echo "configure:111420: \$? = $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
@@ -111591,7 +111446,7 @@ 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
echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
-echo "configure:111595: checking if we can lock with hard links" >&5
+echo "configure:111450: checking if we can lock with hard links" >&5
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -111608,7 +111463,7 @@ else
fi
echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
-echo "configure:111612: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo "configure:111467: checking whether the $compiler linker ($LD) supports shared libraries" >&5
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -111658,11 +111513,11 @@ x|xyes)
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
-echo "configure:111662: checking whether -lc should be explicitly linked in" >&5
+echo "configure:111517: checking whether -lc should be explicitly linked in" >&5
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { (eval echo configure:111666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
+ if { (eval echo configure:111521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
@@ -111675,7 +111530,7 @@ echo "configure:111662: checking whether -lc should be explicitly linked in" >&5
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
allow_undefined_flag_CXX=
- if { (eval echo configure:111679: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
+ if { (eval echo configure:111534: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
then
archive_cmds_need_lc_CXX=no
else
@@ -111694,7 +111549,7 @@ echo "configure:111662: checking whether -lc should be explicitly linked in" >&5
esac
echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
-echo "configure:111698: checking dynamic linker characteristics" >&5
+echo "configure:111553: checking dynamic linker characteristics" >&5
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -112068,8 +111923,8 @@ linux*)
libsuff=
case $host_cpu in
x86_64*|s390x*|powerpc64*)
- echo '#line 112072 "configure"' > conftest.$ac_ext
- if { (eval echo configure:112073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ echo '#line 111927 "configure"' > conftest.$ac_ext
+ if { (eval echo configure:111928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case `/usr/bin/file conftest.$ac_objext` in
*64-bit*)
libsuff=64
@@ -112268,7 +112123,7 @@ echo "$ac_t""$dynamic_linker" 1>&6
test "$dynamic_linker" = no && can_build_shared=no
echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
-echo "configure:112272: checking how to hardcode library paths into programs" >&5
+echo "configure:112127: checking how to hardcode library paths into programs" >&5
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
test -n "$runpath_var_CXX" || \
@@ -112306,7 +112161,7 @@ fi
striplib=
old_striplib=
echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
-echo "configure:112310: checking whether stripping libraries is possible" >&5
+echo "configure:112165: checking whether stripping libraries is possible" >&5
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"
@@ -112356,7 +112211,7 @@ else
darwin*)
# if libdl is installed we need to link against it
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:112360: checking for dlopen in -ldl" >&5
+echo "configure:112215: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -112364,7 +112219,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 112368 "configure"
+#line 112223 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
@@ -112378,7 +112233,7 @@ int main() {
dlopen()
; return 0; }
EOF
-if { (eval echo configure:112382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:112237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -112407,12 +112262,12 @@ fi
*)
echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "configure:112411: checking for shl_load" >&5
+echo "configure:112266: checking for shl_load" >&5
if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 112416 "configure"
+#line 112271 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shl_load(); below. */
@@ -112438,7 +112293,7 @@ shl_load();
; return 0; }
EOF
-if { (eval echo configure:112442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:112297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shl_load=yes"
else
@@ -112456,7 +112311,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:112460: checking for shl_load in -ldld" >&5
+echo "configure:112315: checking for shl_load in -ldld" >&5
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -112464,7 +112319,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 112468 "configure"
+#line 112323 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
@@ -112478,7 +112333,7 @@ int main() {
shl_load()
; return 0; }
EOF
-if { (eval echo configure:112482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:112337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -112497,12 +112352,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:112501: checking for dlopen" >&5
+echo "configure:112356: checking for dlopen" >&5
if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 112506 "configure"
+#line 112361 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen(); below. */
@@ -112528,7 +112383,7 @@ dlopen();
; return 0; }
EOF
-if { (eval echo configure:112532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:112387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dlopen=yes"
else
@@ -112546,7 +112401,7 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:112550: checking for dlopen in -ldl" >&5
+echo "configure:112405: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -112554,7 +112409,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 112558 "configure"
+#line 112413 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
@@ -112568,7 +112423,7 @@ int main() {
dlopen()
; return 0; }
EOF
-if { (eval echo configure:112572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:112427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -112587,7 +112442,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-echo "configure:112591: checking for dlopen in -lsvld" >&5
+echo "configure:112446: checking for dlopen in -lsvld" >&5
ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -112595,7 +112450,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsvld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 112599 "configure"
+#line 112454 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
@@ -112609,7 +112464,7 @@ int main() {
dlopen()
; return 0; }
EOF
-if { (eval echo configure:112613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:112468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -112628,7 +112483,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-echo "configure:112632: checking for dld_link in -ldld" >&5
+echo "configure:112487: checking for dld_link in -ldld" >&5
ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -112636,7 +112491,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 112640 "configure"
+#line 112495 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
@@ -112650,7 +112505,7 @@ int main() {
dld_link()
; return 0; }
EOF
-if { (eval echo configure:112654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:112509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -112706,7 +112561,7 @@ fi
LIBS="$lt_cv_dlopen_libs $LIBS"
echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "configure:112710: checking whether a program can dlopen itself" >&5
+echo "configure:112565: checking whether a program can dlopen itself" >&5
if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -112716,7 +112571,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 112720 "configure"
+#line 112575 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -112777,7 +112632,7 @@ int main ()
exit (status);
}
EOF
- if { (eval echo configure:112781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ if { (eval echo configure:112636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -112800,7 +112655,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6
if test "x$lt_cv_dlopen_self" = xyes; then
LDFLAGS="$LDFLAGS $link_static_flag"
echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-echo "configure:112804: checking whether a statically linked program can dlopen itself" >&5
+echo "configure:112659: checking whether a statically linked program can dlopen itself" >&5
if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -112810,7 +112665,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 112814 "configure"
+#line 112669 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -112871,7 +112726,7 @@ int main ()
exit (status);
}
EOF
- if { (eval echo configure:112875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ if { (eval echo configure:112730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
diff --git a/configure.in b/configure.in
index d38b7ae..4186446 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.77.2.47 2009/03/23 20:33:21 johannes Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.77.2.55 2009/06/18 21:01:03 johannes Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h)
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=3
PHP_RELEASE_VERSION=0
-PHP_EXTRA_VERSION="RC1"
+PHP_EXTRA_VERSION="RC4"
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
@@ -728,7 +728,7 @@ if test "$PHP_GCOV" = "yes"; then
AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
fi
- ltp_version_list="1.5 1.6"
+ ltp_version_list="1.5 1.6 1.7"
AC_CHECK_PROG(LTP, lcov, lcov)
AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)
@@ -1332,15 +1332,7 @@ if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
CPPFLAGS="$CPPFLAGS -DTHREAD=1"
fi
-if test "$PHP_DEBUG" = "1" && test "$PHP_THREAD_SAFETY" = "yes"; then
- ZEND_EXT_TYPE="zend_extension_debug_ts"
-elif test "$PHP_DEBUG" = "1"; then
- ZEND_EXT_TYPE="zend_extension_debug"
-elif test "$PHP_THREAD_SAFETY" = "yes"; then
- ZEND_EXT_TYPE="zend_extension_ts"
-else
- ZEND_EXT_TYPE="zend_extension"
-fi
+ZEND_EXT_TYPE="zend_extension"
PHP_SUBST(ZEND_EXT_TYPE)
dnl
diff --git a/ext/bcmath/libbcmath/src/bcmath.h b/ext/bcmath/libbcmath/src/bcmath.h
index ce68f0d..3d7c478 100644
--- a/ext/bcmath/libbcmath/src/bcmath.h
+++ b/ext/bcmath/libbcmath/src/bcmath.h
@@ -53,7 +53,7 @@ typedef struct bc_struct
} bc_struct;
#ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include "config.h"
#endif
#include "php.h"
diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c
index ed58e69..e7832a8 100644
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: bz2.c,v 1.14.2.3.2.12.2.11 2008/12/31 11:15:35 sebastian Exp $ */
+/* $Id: bz2.c,v 1.14.2.3.2.12.2.12 2009/05/15 17:28:08 kalle Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -495,7 +495,7 @@ static PHP_FUNCTION(bzcompress)
+ .01 x length of data + 600 which is the largest size the results of the compression
could possibly be, at least that's what the libbz2 docs say (thanks to jeremy at nirvani.net
for pointing this out). */
- dest_len = source_len + (0.01 * source_len) + 600;
+ dest_len = (unsigned int) (source_len + (0.01 * source_len) + 600);
/* Allocate the destination buffer */
dest = emalloc(dest_len + 1);
@@ -559,15 +559,15 @@ static PHP_FUNCTION(bzdecompress)
/* compression is better then 2:1, need to allocate more memory */
bzs.avail_out = source_len;
size = (bzs.total_out_hi32 * (unsigned int) -1) + bzs.total_out_lo32;
- dest = safe_erealloc(dest, 1, bzs.avail_out+1, size );
+ dest = safe_erealloc(dest, 1, bzs.avail_out+1, (size_t) size );
bzs.next_out = dest + size;
}
if (error == BZ_STREAM_END || error == BZ_OK) {
size = (bzs.total_out_hi32 * (unsigned int) -1) + bzs.total_out_lo32;
- dest = safe_erealloc(dest, 1, size, 1);
+ dest = safe_erealloc(dest, 1, (size_t) size, 1);
dest[size] = '\0';
- RETVAL_STRINGL(dest, size, 0);
+ RETVAL_STRINGL(dest, (int) size, 0);
} else { /* real error */
efree(dest);
RETVAL_LONG(error);
diff --git a/ext/bz2/config.w32 b/ext/bz2/config.w32
index 2df7940..598ae18 100644
--- a/ext/bz2/config.w32
+++ b/ext/bz2/config.w32
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.4 2004/07/20 05:26:33 pollita Exp $
+// $Id: config.w32,v 1.4.6.1 2009/06/10 15:44:51 pajoye Exp $
// vim:ft=javascript
ARG_WITH("bz2", "BZip2", "no");
if (PHP_BZ2 != "no") {
- if (CHECK_LIB("libbz2.lib", "bz2", PHP_BZ2) &&
+ if (CHECK_LIB("libbz2_a.lib;libbz2.lib", "bz2", PHP_BZ2) &&
CHECK_HEADER_ADD_INCLUDE("bzlib.h", "CFLAGS_BZ2")) {
EXTENSION("bz2", "bz2.c bz2_filter.c");
AC_DEFINE('HAVE_BZ2', 1, 'Have BZ2 library');
diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c
index fe76709..464b422 100644
--- a/ext/com_dotnet/com_handlers.c
+++ b/ext/com_dotnet/com_handlers.c
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_handlers.c,v 1.30.2.5.2.6.2.5 2008/12/31 11:15:35 sebastian Exp $ */
+/* $Id: com_handlers.c,v 1.30.2.5.2.6.2.6 2009/05/19 17:38:29 kalle Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -434,7 +434,7 @@ static union _zend_function *com_constructor_get(zval *object TSRMLS_DC)
}
}
-static zend_class_entry *com_class_entry_get(zval *object TSRMLS_DC)
+static zend_class_entry *com_class_entry_get(const zval *object TSRMLS_DC)
{
php_com_dotnet_object *obj;
obj = CDNO_FETCH(object);
@@ -442,7 +442,7 @@ static zend_class_entry *com_class_entry_get(zval *object TSRMLS_DC)
return obj->ce;
}
-static int com_class_name_get(zval *object, char **class_name, zend_uint *class_name_len, int parent TSRMLS_DC)
+static int com_class_name_get(const zval *object, char **class_name, zend_uint *class_name_len, int parent TSRMLS_DC)
{
php_com_dotnet_object *obj;
obj = CDNO_FETCH(object);
diff --git a/ext/com_dotnet/com_iterator.c b/ext/com_dotnet/com_iterator.c
index b87ddad..155eeb6 100644
--- a/ext/com_dotnet/com_iterator.c
+++ b/ext/com_dotnet/com_iterator.c
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_iterator.c,v 1.9.2.2.2.2.2.2 2008/12/31 11:15:35 sebastian Exp $ */
+/* $Id: com_iterator.c,v 1.9.2.2.2.2.2.3 2009/05/19 17:38:29 kalle Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -111,7 +111,7 @@ static int com_iter_move_forwards(zend_object_iterator *iter TSRMLS_DC)
}
} else {
/* safe array */
- if (I->key >= I->sa_max) {
+ if (I->key >= (ULONG) I->sa_max) {
I->key = (ulong)-1;
return FAILURE;
}
diff --git a/ext/com_dotnet/com_persist.c b/ext/com_dotnet/com_persist.c
index 4c541bd..728de4b 100755
--- a/ext/com_dotnet/com_persist.c
+++ b/ext/com_dotnet/com_persist.c
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_persist.c,v 1.5.2.3.2.2.2.3 2008/12/31 11:15:35 sebastian Exp $ */
+/* $Id: com_persist.c,v 1.5.2.3.2.2.2.4 2009/05/19 17:38:29 kalle Exp $ */
/* Infrastructure for working with persistent COM objects.
* Implements: IStream* wrapper for PHP streams.
@@ -157,7 +157,7 @@ static HRESULT STDMETHODCALLTYPE stm_seek(IStream *This, LARGE_INTEGER dlibMove,
return STG_E_INVALIDFUNCTION;
}
- offset = dlibMove.QuadPart;
+ offset = (off_t) dlibMove.QuadPart;
ret = php_stream_seek(stm->stream, offset, whence);
diff --git a/ext/com_dotnet/com_saproxy.c b/ext/com_dotnet/com_saproxy.c
index ae55f3a..d51e067 100644
--- a/ext/com_dotnet/com_saproxy.c
+++ b/ext/com_dotnet/com_saproxy.c
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_saproxy.c,v 1.15.2.2.2.3.2.4 2008/12/31 11:15:35 sebastian Exp $ */
+/* $Id: com_saproxy.c,v 1.15.2.2.2.3.2.5 2009/05/19 17:38:29 kalle Exp $ */
/* This module implements a SafeArray proxy which is used internally
* by the engine when resolving multi-dimensional array accesses on
@@ -92,10 +92,9 @@ static zval *saproxy_read_dimension(zval *object, zval *offset, int type TSRMLS_
{
php_com_saproxy *proxy = SA_FETCH(object);
zval *return_value;
- UINT dims;
+ UINT dims, i;
SAFEARRAY *sa;
LONG ubound, lbound;
- int i;
HRESULT res;
MAKE_STD_ZVAL(return_value);
@@ -110,7 +109,7 @@ static zval *saproxy_read_dimension(zval *object, zval *offset, int type TSRMLS_
args = safe_emalloc(proxy->dimensions + 1, sizeof(zval *), 0);
- for (i = 1; i < proxy->dimensions; i++) {
+ for (i = 1; i < (UINT) proxy->dimensions; i++) {
args[i-1] = proxy->indices[i];
}
args[i-1] = offset;
@@ -145,7 +144,7 @@ static zval *saproxy_read_dimension(zval *object, zval *offset, int type TSRMLS_
sa = V_ARRAY(&proxy->obj->v);
dims = SafeArrayGetDim(sa);
- if (proxy->dimensions >= dims) {
+ if ((UINT) proxy->dimensions >= dims) {
/* too many dimensions */
php_com_throw_exception(E_INVALIDARG, "too many dimensions!" TSRMLS_CC);
return return_value;
@@ -212,8 +211,7 @@ static zval *saproxy_read_dimension(zval *object, zval *offset, int type TSRMLS_
static void saproxy_write_dimension(zval *object, zval *offset, zval *value TSRMLS_DC)
{
php_com_saproxy *proxy = SA_FETCH(object);
- UINT dims;
- int i;
+ UINT dims, i;
HRESULT res;
VARIANT v;
@@ -223,7 +221,7 @@ static void saproxy_write_dimension(zval *object, zval *offset, zval *value TSRM
* the final value */
zval **args = safe_emalloc(proxy->dimensions + 2, sizeof(zval *), 0);
- for (i = 1; i < proxy->dimensions; i++) {
+ for (i = 1; i < (UINT) proxy->dimensions; i++) {
args[i-1] = proxy->indices[i];
}
args[i-1] = offset;
@@ -340,12 +338,12 @@ static union _zend_function *saproxy_constructor_get(zval *object TSRMLS_DC)
return NULL;
}
-static zend_class_entry *saproxy_class_entry_get(zval *object TSRMLS_DC)
+static zend_class_entry *saproxy_class_entry_get(const zval *object TSRMLS_DC)
{
return php_com_saproxy_class_entry;
}
-static int saproxy_class_name_get(zval *object, char **class_name, zend_uint *class_name_len, int parent TSRMLS_DC)
+static int saproxy_class_name_get(const zval *object, char **class_name, zend_uint *class_name_len, int parent TSRMLS_DC)
{
*class_name = estrndup(php_com_saproxy_class_entry->name, php_com_saproxy_class_entry->name_length);
*class_name_len = php_com_saproxy_class_entry->name_length;
diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
index fd1c221..65f52fb 100644
--- a/ext/curl/config.m4
+++ b/ext/curl/config.m4
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.28.2.3.2.7.2.1 2008/11/07 21:14:46 felipe Exp $
+dnl $Id: config.m4,v 1.28.2.3.2.7.2.4 2009/05/18 10:32:04 pajoye Exp $
dnl
PHP_ARG_WITH(curl, for cURL support,
@@ -48,75 +48,80 @@ if test "$PHP_CURL" != "no"; then
else
AC_MSG_ERROR(cURL version 7.10.5 or later is required to compile php with cURL support)
fi
+
+ PHP_ADD_INCLUDE($CURL_DIR/include)
+ PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, CURL_SHARED_LIBADD)
AC_MSG_CHECKING([for SSL support in libcurl])
CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
if test "$CURL_SSL" = "SSL"; then
- AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support])
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support])
- save_CFLAGS="$CFLAGS"
- CFLAGS="`$CURL_CONFIG --cflags`"
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="`$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="`$CURL_CONFIG --cflags`"
- AC_PROG_CPP
- AC_MSG_CHECKING([for openssl support in libcurl])
- AC_TRY_RUN([
- #include <curl/curl.h>
- int main(int argc, char *argv[]) {
- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
- if (data && data->ssl_version && *data->ssl_version) {
- const char *ptr = data->ssl_version;
- while(*ptr == ' ') ++ptr;
- return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
- }
- return 1;
- }
- ],[
- AC_MSG_RESULT([yes])
- AC_CHECK_HEADERS([openssl/crypto.h], [
- AC_DEFINE([HAVE_CURL_OPENSSL], [1], [Have cURL with OpenSSL support])
+ AC_PROG_CPP
+ AC_MSG_CHECKING([for openssl support in libcurl])
+ AC_TRY_RUN([
+#include <curl/curl.h>
+
+int main(int argc, char *argv[])
+{
+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+
+ if (data && data->ssl_version && *data->ssl_version) {
+ const char *ptr = data->ssl_version;
+
+ while(*ptr == ' ') ++ptr;
+ return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
+ }
+ return 1;
+}
+ ],[
+ AC_MSG_RESULT([yes])
+ AC_CHECK_HEADERS([openssl/crypto.h], [
+ AC_DEFINE([HAVE_CURL_OPENSSL], [1], [Have cURL with OpenSSL support])
+ ])
+ ], [
+ AC_MSG_RESULT([no])
+ ], [
+ AC_MSG_RESULT([no])
])
- ], [
- AC_MSG_RESULT([no])
- ], [
- AC_MSG_RESULT([no])
- ])
- AC_MSG_CHECKING([for gnutls support in libcurl])
- AC_TRY_RUN([
- #include <curl/curl.h>
- int main(int argc, char *argv[]) {
- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
- if (data && data->ssl_version && *data->ssl_version) {
- const char *ptr = data->ssl_version;
- while(*ptr == ' ') ++ptr;
- return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
- }
- return 1;
- }
- ], [
- AC_MSG_RESULT([yes])
- AC_CHECK_HEADER([gcrypt.h], [
- AC_DEFINE([HAVE_CURL_GNUTLS], [1], [Have cURL with GnuTLS support])
+ AC_MSG_CHECKING([for gnutls support in libcurl])
+ AC_TRY_RUN([
+#include <curl/curl.h>
+
+int main(int argc, char *argv[])
+{
+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+
+ if (data && data->ssl_version && *data->ssl_version) {
+ const char *ptr = data->ssl_version;
+
+ while(*ptr == ' ') ++ptr;
+ return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
+ }
+ return 1;
+}
+], [
+ AC_MSG_RESULT([yes])
+ AC_CHECK_HEADER([gcrypt.h], [
+ AC_DEFINE([HAVE_CURL_GNUTLS], [1], [Have cURL with GnuTLS support])
+ ])
+ ], [
+ AC_MSG_RESULT([no])
+ ], [
+ AC_MSG_RESULT([no])
])
- ], [
- AC_MSG_RESULT([no])
- ], [
- AC_MSG_RESULT([no])
- ])
- CFLAGS="$save_CFLAGS"
- LDFLAGS="$save_LDFLAGS"
+ CFLAGS="$save_CFLAGS"
else
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
fi
- PHP_ADD_INCLUDE($CURL_DIR/include)
- PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
- PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, CURL_SHARED_LIBADD)
-
PHP_CHECK_LIBRARY(curl,curl_easy_perform,
[
AC_DEFINE(HAVE_CURL,1,[ ])
diff --git a/ext/curl/config.w32 b/ext/curl/config.w32
index 02fc35c..64ad917 100644
--- a/ext/curl/config.w32
+++ b/ext/curl/config.w32
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.3.4.1.2.2.2.4 2009/01/25 16:21:03 pajoye Exp $
+// $Id: config.w32,v 1.3.4.1.2.2.2.6 2009/04/24 09:25:25 pajoye Exp $
// vim:ft=javascript
ARG_WITH("curl", "cURL support", "no");
@@ -10,8 +10,8 @@ if (PHP_CURL != "no") {
CHECK_LIB("libeay32.lib", "curl", PHP_CURL)
&& CHECK_LIB("winmm.lib", "curl", PHP_CURL)
&& CHECK_LIB("wldap32.lib", "curl", PHP_CURL)
- && (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib", "zip", PHP_ZIP) || CHECK_LIB("zlib.lib", "zip", PHP_ZIP))) ||
- (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "zip", PHP_ZIP)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
+ && (((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)))
) {
EXTENSION("curl", "interface.c multi.c streams.c", true);
AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index cba6b8f..320fa3e 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.27.2.32 2009/03/16 15:08:56 felipe Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.57 2009/06/15 12:37:37 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -147,6 +147,7 @@ static struct gcry_thread_cbs php_curl_gnutls_tsl = {
#endif
/* }}} */
+static void _php_curl_close_ex(php_curl *ch TSRMLS_DC);
static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC);
#define SAVE_CURL_ERROR(__handle, __err) (__handle)->err.no = (int) __err;
@@ -157,36 +158,51 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC);
#define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v);
#if defined(PHP_WIN32) || defined(__GNUC__)
- #define php_curl_ret(__ret) RETVAL_FALSE; return __ret;
+# define php_curl_ret(__ret) RETVAL_FALSE; return __ret;
#else
- #define php_curl_ret(__ret) RETVAL_FALSE; return;
-#endif
-
-#define PHP_CURL_CHECK_OPEN_BASEDIR(str, len, __ret) \
- if (((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) && \
- strncasecmp(str, "file:", sizeof("file:") - 1) == 0) \
- { \
- php_url *tmp_url; \
- \
- if (!(tmp_url = php_url_parse_ex(str, len))) { \
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid URL '%s'", str); \
- php_curl_ret(__ret); \
- } \
- \
- if (tmp_url->host || !php_memnstr(str, tmp_url->path, strlen(tmp_url->path), str + len)) { \
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "URL '%s' contains unencoded control characters", str); \
- php_url_free(tmp_url); \
- php_curl_ret(__ret); \
- } \
- \
- if (tmp_url->query || tmp_url->fragment || php_check_open_basedir(tmp_url->path TSRMLS_CC) || \
- (PG(safe_mode) && !php_checkuid(tmp_url->path, "rb+", CHECKUID_CHECK_MODE_PARAM)) \
- ) { \
- php_url_free(tmp_url); \
- php_curl_ret(__ret); \
- } \
- php_url_free(tmp_url); \
+# define php_curl_ret(__ret) RETVAL_FALSE; return;
+#endif
+
+static int php_curl_option_url(php_curl *ch, const char *url, const int len) /* {{{ */
+{
+ CURLcode error = CURLE_OK;
+#if LIBCURL_VERSION_NUM < 0x071100
+ char *copystr = NULL;
+#endif
+ TSRMLS_FETCH();
+
+ /* Disable file:// if open_basedir or safe_mode are used */
+ if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) {
+#if LIBCURL_VERSION_NUM >= 0x071304
+ error = curl_easy_setopt(ch->cp, CURLOPT_PROTOCOLS, CURLPROTO_ALL & ~CURLPROTO_FILE);
+#else
+ php_url *uri;
+
+ if (!(uri = php_url_parse_ex(url, len))) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid URL '%s'", url);
+ return 0;
+ }
+
+ if (!strncasecmp("file", uri->scheme, sizeof("file"))) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Protocol 'file' disabled in cURL");
+ php_url_free(uri);
+ return 0;
+ }
+ php_url_free(uri);
+#endif
}
+ /* Strings passed to libcurl as 'char *' arguments, are copied by the library... NOTE: before 7.17.0 strings were not copied. */
+#if LIBCURL_VERSION_NUM >= 0x071100
+ error = curl_easy_setopt(ch->cp, CURLOPT_URL, url);
+#else
+ copystr = estrndup(url, len);
+ error = curl_easy_setopt(ch->cp, CURLOPT_URL, copystr);
+ zend_llist_add_element(&ch->to_free.str, ©str);
+#endif
+
+ return (error == CURLE_OK ? 1 : 0);
+}
+/* }}} */
/* {{{ arginfo */
ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_version, 0, 0, 0)
@@ -209,7 +225,7 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_curl_setopt_array, 0)
ZEND_ARG_INFO(0, ch)
- ZEND_ARG_INFO(0, options)/* ARRAY_INFO(0, options, 0) */
+ ZEND_ARG_ARRAY_INFO(0, options, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_curl_exec, 0)
@@ -262,13 +278,12 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_multi_info_read, 0, 0, 1)
ZEND_ARG_INFO(0, mh)
- ZEND_ARG_INFO(0, msgs_in_queue)
+ ZEND_ARG_INFO(1, msgs_in_queue)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_close, 0)
ZEND_ARG_INFO(0, mh)
ZEND_END_ARG_INFO()
-
/* }}} */
/* {{{ curl_functions[]
@@ -333,7 +348,7 @@ PHP_MINFO_FUNCTION(curl)
php_info_print_table_row(2, "Age", str);
/* To update on each new cURL release using src/main.c in cURL sources */
- if(d->features) {
+ if (d->features) {
struct feat {
const char *name;
int bitmask;
@@ -441,9 +456,19 @@ PHP_MINFO_FUNCTION(curl)
PHP_MINIT_FUNCTION(curl)
{
le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL, "curl", module_number);
- le_curl_multi_handle = zend_register_list_destructors_ex(_php_curl_multi_close, NULL, "curl", module_number);
-
+ le_curl_multi_handle = zend_register_list_destructors_ex(_php_curl_multi_close, NULL, "curl_multi", module_number);
+
+ /* See http://curl.haxx.se/lxr/source/docs/libcurl/symbols-in-versions
+ or curl src/docs/libcurl/symbols-in-versions for a (almost) complete list
+ of options and which version they were introduced */
+
/* Constants for curl_setopt() */
+#if LIBCURL_VERSION_NUM > 0x070a07 /* CURLOPT_IPRESOLVE is available since curl 7.10.8 */
+ REGISTER_CURL_CONSTANT(CURLOPT_IPRESOLVE);
+ REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_WHATEVER);
+ REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V4);
+ REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V6);
+#endif
REGISTER_CURL_CONSTANT(CURLOPT_DNS_USE_GLOBAL_CACHE);
REGISTER_CURL_CONSTANT(CURLOPT_DNS_CACHE_TIMEOUT);
REGISTER_CURL_CONSTANT(CURLOPT_PORT);
@@ -457,6 +482,7 @@ PHP_MINIT_FUNCTION(curl)
REGISTER_CURL_CONSTANT(CURLOPT_HEADER);
REGISTER_CURL_CONSTANT(CURLOPT_HTTPHEADER);
REGISTER_CURL_CONSTANT(CURLOPT_NOPROGRESS);
+ REGISTER_CURL_CONSTANT(CURLOPT_PROGRESSFUNCTION);
REGISTER_CURL_CONSTANT(CURLOPT_NOBODY);
REGISTER_CURL_CONSTANT(CURLOPT_FAILONERROR);
REGISTER_CURL_CONSTANT(CURLOPT_UPLOAD);
@@ -510,7 +536,7 @@ PHP_MINIT_FUNCTION(curl)
REGISTER_CURL_CONSTANT(CURLOPT_FILETIME);
REGISTER_CURL_CONSTANT(CURLOPT_WRITEFUNCTION);
REGISTER_CURL_CONSTANT(CURLOPT_READFUNCTION);
-#if CURLOPT_PASSWDFUNCTION != 0
+#if CURLOPT_PASSWDFUNCTION != 0
REGISTER_CURL_CONSTANT(CURLOPT_PASSWDFUNCTION);
#endif
REGISTER_CURL_CONSTANT(CURLOPT_HEADERFUNCTION);
@@ -556,14 +582,14 @@ PHP_MINIT_FUNCTION(curl)
REGISTER_CURL_CONSTANT(CURL_TIMECOND_LASTMOD);
#if LIBCURL_VERSION_NUM > 0x070a05 /* CURLOPT_HTTPAUTH is available since curl 7.10.6 */
- REGISTER_CURL_CONSTANT(CURLOPT_HTTPAUTH);
- /* http authentication options */
- REGISTER_CURL_CONSTANT(CURLAUTH_BASIC);
- REGISTER_CURL_CONSTANT(CURLAUTH_DIGEST);
- REGISTER_CURL_CONSTANT(CURLAUTH_GSSNEGOTIATE);
- REGISTER_CURL_CONSTANT(CURLAUTH_NTLM);
- REGISTER_CURL_CONSTANT(CURLAUTH_ANY);
- REGISTER_CURL_CONSTANT(CURLAUTH_ANYSAFE);
+ REGISTER_CURL_CONSTANT(CURLOPT_HTTPAUTH);
+ /* http authentication options */
+ REGISTER_CURL_CONSTANT(CURLAUTH_BASIC);
+ REGISTER_CURL_CONSTANT(CURLAUTH_DIGEST);
+ REGISTER_CURL_CONSTANT(CURLAUTH_GSSNEGOTIATE);
+ REGISTER_CURL_CONSTANT(CURLAUTH_NTLM);
+ REGISTER_CURL_CONSTANT(CURLAUTH_ANY);
+ REGISTER_CURL_CONSTANT(CURLAUTH_ANYSAFE);
#endif
#if LIBCURL_VERSION_NUM > 0x070a06 /* CURLOPT_PROXYAUTH & CURLOPT_FTP_CREATE_MISSING_DIRS are available since curl 7.10.7 */
@@ -609,7 +635,7 @@ PHP_MINIT_FUNCTION(curl)
REGISTER_CURL_CONSTANT(CURL_VERSION_KERBEROS4);
REGISTER_CURL_CONSTANT(CURL_VERSION_SSL);
REGISTER_CURL_CONSTANT(CURL_VERSION_LIBZ);
-
+
/* version constants */
REGISTER_CURL_CONSTANT(CURLVERSION_NOW);
@@ -684,6 +710,7 @@ PHP_MINIT_FUNCTION(curl)
REGISTER_CURL_CONSTANT(CURLE_FTP_SSL_FAILED);
#endif
REGISTER_CURL_CONSTANT(CURLPROXY_HTTP);
+ REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS4);
REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS5);
REGISTER_CURL_CONSTANT(CURL_NETRC_OPTIONAL);
@@ -693,7 +720,7 @@ PHP_MINIT_FUNCTION(curl)
REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_NONE);
REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_1_0);
REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_1_1);
-
+
REGISTER_CURL_CONSTANT(CURLM_CALL_MULTI_PERFORM);
REGISTER_CURL_CONSTANT(CURLM_OK);
REGISTER_CURL_CONSTANT(CURLM_BAD_HANDLE);
@@ -752,16 +779,23 @@ PHP_MINIT_FUNCTION(curl)
REGISTER_CURL_CONSTANT(CURLPROTO_ALL);
#endif
+#if LIBCURL_VERSION_NUM >= 0x070f01
+ REGISTER_CURL_CONSTANT(CURLOPT_FTP_FILEMETHOD);
+ REGISTER_CURL_CONSTANT(CURLFTPMETHOD_MULTICWD);
+ REGISTER_CURL_CONSTANT(CURLFTPMETHOD_NOCWD);
+ REGISTER_CURL_CONSTANT(CURLFTPMETHOD_SINGLECWD);
+#endif
+
#ifdef PHP_CURL_NEED_OPENSSL_TSL
if (!CRYPTO_get_id_callback()) {
int i, c = CRYPTO_num_locks();
-
+
php_curl_openssl_tsl = malloc(c * sizeof(MUTEX_T));
-
+
for (i = 0; i < c; ++i) {
php_curl_openssl_tsl[i] = tsrm_mutex_alloc();
}
-
+
CRYPTO_set_id_callback(php_curl_ssl_id);
CRYPTO_set_locking_callback(php_curl_ssl_lock);
}
@@ -769,7 +803,7 @@ PHP_MINIT_FUNCTION(curl)
#ifdef PHP_CURL_NEED_GNUTLS_TSL
gcry_control(GCRYCTL_SET_THREAD_CBS, &php_curl_gnutls_tsl);
#endif
-
+
if (curl_global_init(CURL_GLOBAL_SSL) != CURLE_OK) {
return FAILURE;
}
@@ -791,7 +825,7 @@ PHP_MINIT_FUNCTION(curl)
php_register_url_stream_wrapper("ldap", &php_curl_wrapper TSRMLS_CC);
# endif
#endif
-
+
return SUCCESS;
}
/* }}} */
@@ -810,14 +844,14 @@ PHP_MSHUTDOWN_FUNCTION(curl)
#ifdef PHP_CURL_NEED_OPENSSL_TSL
if (php_curl_openssl_tsl) {
int i, c = CRYPTO_num_locks();
-
+
CRYPTO_set_id_callback(NULL);
CRYPTO_set_locking_callback(NULL);
-
+
for (i = 0; i < c; ++i) {
tsrm_mutex_free(php_curl_openssl_tsl[i]);
}
-
+
free(php_curl_openssl_tsl);
php_curl_openssl_tsl = NULL;
}
@@ -839,7 +873,7 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
fprintf(stderr, "curl_write() called\n");
fprintf(stderr, "data = %s, size = %d, nmemb = %d, ctx = %x\n", data, size, nmemb, ctx);
#endif
-
+
switch (t->method) {
case PHP_CURL_STDOUT:
PHPWRITE(data, length);
@@ -863,7 +897,7 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
ZVAL_RESOURCE(handle, ch->id);
zend_list_addref(ch->id);
argv[0] = &handle;
-
+
MAKE_STD_ZVAL(zdata);
ZVAL_STRINGL(zdata, data, length, 1);
argv[1] = &zdata;
@@ -902,6 +936,83 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
}
/* }}} */
+/* {{{ curl_progress
+ */
+static size_t curl_progress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow)
+{
+ php_curl *ch = (php_curl *) clientp;
+ php_curl_progress *t = ch->handlers->progress;
+ int length = -1;
+ size_t rval = 0;
+
+#if PHP_CURL_DEBUG
+ fprintf(stderr, "curl_progress() called\n");
+ fprintf(stderr, "clientp = %x, dltotal = %f, dlnow = %f, ultotal = %f, ulnow = %f\n", clientp, dltotal, dlnow, ultotal, ulnow);
+#endif
+
+ switch (t->method) {
+ case PHP_CURL_USER: {
+ zval **argv[4];
+ zval *zdltotal = NULL;
+ zval *zdlnow = NULL;
+ zval *zultotal = NULL;
+ zval *zulnow = NULL;
+ zval *retval_ptr;
+ int error;
+ zend_fcall_info fci;
+ TSRMLS_FETCH_FROM_CTX(ch->thread_ctx);
+
+ MAKE_STD_ZVAL(zdltotal);
+ MAKE_STD_ZVAL(zdlnow);
+ MAKE_STD_ZVAL(zultotal);
+ MAKE_STD_ZVAL(zulnow);
+
+ ZVAL_LONG(zdltotal, (long) dltotal);
+ ZVAL_LONG(zdlnow, (long) dlnow);
+ ZVAL_LONG(zultotal, (long) ultotal);
+ ZVAL_LONG(zulnow, (long) ulnow);
+
+ argv[0] = &zdltotal;
+ argv[1] = &zdlnow;
+ argv[2] = &zultotal;
+ argv[3] = &zulnow;
+
+ fci.size = sizeof(fci);
+ fci.function_table = EG(function_table);
+ fci.function_name = t->func_name;
+ fci.object_ptr = NULL;
+ fci.retval_ptr_ptr = &retval_ptr;
+ fci.param_count = 4;
+ fci.params = argv;
+ fci.no_separation = 0;
+ fci.symbol_table = NULL;
+
+ ch->in_callback = 1;
+ error = zend_call_function(&fci, &t->fci_cache TSRMLS_CC);
+ ch->in_callback = 0;
+ if (error == FAILURE) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot call the CURLOPT_PROGRESSFUNCTION");
+ length = -1;
+ } else if (retval_ptr) {
+ if (Z_TYPE_P(retval_ptr) != IS_LONG) {
+ convert_to_long_ex(&retval_ptr);
+ }
+ if (0 != Z_LVAL_P(retval_ptr)) {
+ rval = 1;
+ }
+ zval_ptr_dtor(&retval_ptr);
+ }
+ zval_ptr_dtor(argv[0]);
+ zval_ptr_dtor(argv[1]);
+ zval_ptr_dtor(argv[2]);
+ zval_ptr_dtor(argv[3]);
+ break;
+ }
+ }
+ return rval;
+}
+/* }}} */
+
/* {{{ curl_read
*/
static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
@@ -954,13 +1065,13 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
error = zend_call_function(&fci, &t->fci_cache TSRMLS_CC);
ch->in_callback = 0;
if (error == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot call the CURLOPT_READFUNCTION");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot call the CURLOPT_READFUNCTION");
#if LIBCURL_VERSION_NUM >= 0x070c01 /* 7.12.1 */
length = CURL_READFUNC_ABORT;
#endif
} else if (retval_ptr) {
if (Z_TYPE_P(retval_ptr) == IS_STRING) {
- length = MIN(size * nmemb, Z_STRLEN_P(retval_ptr));
+ length = MIN((int) (size * nmemb), Z_STRLEN_P(retval_ptr));
memcpy(data, Z_STRVAL_P(retval_ptr), length);
}
zval_ptr_dtor(&retval_ptr);
@@ -985,7 +1096,7 @@ static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx
php_curl_write *t = ch->handlers->write_header;
size_t length = size * nmemb;
TSRMLS_FETCH_FROM_CTX(ch->thread_ctx);
-
+
switch (t->method) {
case PHP_CURL_STDOUT:
/* Handle special case write when we're returning the entire transfer
@@ -1061,7 +1172,7 @@ static int curl_debug(CURL *cp, curl_infotype type, char *buf, size_t buf_len, v
if (type == CURLINFO_HEADER_OUT) {
if (ch->header.str_len) {
- efree(ch->header.str);
+ efree(ch->header.str);
}
if (buf_len > 0) {
ch->header.str = estrndup(buf, buf_len);
@@ -1107,7 +1218,7 @@ static size_t curl_passwd(void *ctx, char *prompt, char *buf, int buflen)
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "User handler '%s' did not return a string", Z_STRVAL_P(func));
}
-
+
zval_ptr_dtor(&argv[0]);
zval_ptr_dtor(&argv[1]);
zval_ptr_dtor(&argv[2]);
@@ -1124,7 +1235,7 @@ static size_t curl_passwd(void *ctx, char *prompt, char *buf, int buflen)
static void curl_free_string(void **string)
{
efree(*string);
-}
+}
/* }}} */
#endif
@@ -1149,7 +1260,7 @@ static void curl_free_slist(void **slist)
PHP_FUNCTION(curl_version)
{
curl_version_info_data *d;
- long uversion = CURLVERSION_NOW;
+ long uversion = CURLVERSION_NOW;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &uversion) == FAILURE) {
return;
@@ -1179,7 +1290,8 @@ PHP_FUNCTION(curl_version)
array_init(protocol_list);
while (*p != NULL) {
- add_next_index_string(protocol_list, *p++, 1);
+ add_next_index_string(protocol_list, *p, 1);
+ p++;
}
CAAZ("protocols", protocol_list);
}
@@ -1195,12 +1307,13 @@ static void alloc_curl_handle(php_curl **ch)
(*ch)->handlers->write = ecalloc(1, sizeof(php_curl_write));
(*ch)->handlers->write_header = ecalloc(1, sizeof(php_curl_write));
(*ch)->handlers->read = ecalloc(1, sizeof(php_curl_read));
+ (*ch)->handlers->progress = ecalloc(1, sizeof(php_curl_progress));
(*ch)->in_callback = 0;
(*ch)->header.str_len = 0;
-
+
memset(&(*ch)->err, 0, sizeof((*ch)->err));
-
+
#if LIBCURL_VERSION_NUM < 0x071101
zend_llist_init(&(*ch)->to_free.str, sizeof(char *), (llist_dtor_func_t) curl_free_string, 0);
#endif
@@ -1213,19 +1326,15 @@ static void alloc_curl_handle(php_curl **ch)
Initialize a cURL session */
PHP_FUNCTION(curl_init)
{
- php_curl *ch;
- CURL *cp;
- char *url = NULL;
- int url_len = 0;
+ php_curl *ch;
+ CURL *cp;
+ char *url = NULL;
+ int url_len = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &url, &url_len) == FAILURE) {
return;
}
- if (url) {
- PHP_CURL_CHECK_OPEN_BASEDIR(url, url_len, (void) NULL);
- }
-
cp = curl_easy_init();
if (!cp) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize a new cURL handle");
@@ -1236,7 +1345,7 @@ PHP_FUNCTION(curl_init)
TSRMLS_SET_CTX(ch->thread_ctx);
ch->cp = cp;
-
+
ch->handlers->write->method = PHP_CURL_STDOUT;
ch->handlers->write->type = PHP_CURL_ASCII;
ch->handlers->read->method = PHP_CURL_DIRECT;
@@ -1261,15 +1370,10 @@ PHP_FUNCTION(curl_init)
#endif
if (url) {
-#if LIBCURL_VERSION_NUM >= 0x071100
- curl_easy_setopt(ch->cp, CURLOPT_URL, url);
-#else
- char *urlcopy;
-
- urlcopy = estrndup(url, url_len);
- curl_easy_setopt(ch->cp, CURLOPT_URL, urlcopy);
- zend_llist_add_element(&ch->to_free.str, &urlcopy);
-#endif
+ if (!php_curl_option_url(ch, url, url_len)) {
+ _php_curl_close_ex(ch TSRMLS_CC);
+ RETURN_FALSE;
+ }
}
ZEND_REGISTER_RESOURCE(return_value, ch, le_curl);
@@ -1281,14 +1385,14 @@ PHP_FUNCTION(curl_init)
Copy a cURL handle along with all of it's preferences */
PHP_FUNCTION(curl_copy_handle)
{
- zval *zid;
- CURL *cp;
- php_curl *ch;
- php_curl *dupch;
+ CURL *cp;
+ zval *zid;
+ php_curl *ch, *dupch;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zid) == FAILURE) {
return;
}
+
ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
cp = curl_easy_duphandle(ch->cp);
@@ -1429,7 +1533,20 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
case CURLOPT_REDIR_PROTOCOLS:
case CURLOPT_PROTOCOLS:
#endif
+#if LIBCURL_VERSION_NUM > 0x070a07 /* CURLOPT_IPRESOLVE is available since curl 7.10.8 */
+ case CURLOPT_IPRESOLVE:
+#endif
+#if LIBCURL_VERSION_NUM >= 0x070f01
+ case CURLOPT_FTP_FILEMETHOD:
+#endif
convert_to_long_ex(zvalue);
+#if LIBCURL_VERSION_NUM >= 0x71304
+ if (((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) && (Z_LVAL_PP(zvalue) & CURLPROTO_FILE)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLPROTO_FILE cannot be activated when in safe_mode or an open_basedir is set");
+ RETVAL_FALSE;
+ return 1;
+ }
+#endif
error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue));
break;
case CURLOPT_FOLLOWLOCATION:
@@ -1455,50 +1572,58 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
case CURLOPT_COOKIE:
case CURLOPT_REFERER:
case CURLOPT_INTERFACE:
- case CURLOPT_KRB4LEVEL:
+ case CURLOPT_KRB4LEVEL:
case CURLOPT_EGDSOCKET:
- case CURLOPT_CAINFO:
+ case CURLOPT_CAINFO:
case CURLOPT_CAPATH:
- case CURLOPT_SSL_CIPHER_LIST:
+ case CURLOPT_SSL_CIPHER_LIST:
case CURLOPT_SSLKEY:
- case CURLOPT_SSLKEYTYPE:
- case CURLOPT_SSLKEYPASSWD:
- case CURLOPT_SSLENGINE:
+ case CURLOPT_SSLKEYTYPE:
+ case CURLOPT_SSLKEYPASSWD:
+ case CURLOPT_SSLENGINE:
case CURLOPT_SSLENGINE_DEFAULT:
case CURLOPT_SSLCERTTYPE:
case CURLOPT_ENCODING:
#if LIBCURL_VERSION_NUM >= 0x071300
case CURLOPT_SSH_PUBLIC_KEYFILE:
- case CURLOPT_SSH_PRIVATE_KEYFILE:
+ case CURLOPT_SSH_PRIVATE_KEYFILE:
#endif
{
#if LIBCURL_VERSION_NUM < 0x071100
char *copystr = NULL;
#endif
-
- convert_to_string_ex(zvalue);
- if (option == CURLOPT_URL
+ convert_to_string_ex(zvalue);
#if LIBCURL_VERSION_NUM >= 0x071300
- || option == CURLOPT_SSH_PUBLIC_KEYFILE || option == CURLOPT_SSH_PRIVATE_KEYFILE
-#endif
+ if (
+ option == CURLOPT_SSH_PUBLIC_KEYFILE || option == CURLOPT_SSH_PRIVATE_KEYFILE
+
) {
- PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue), 1);
+ if (php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(zvalue), "rb+", CHECKUID_CHECK_MODE_PARAM))) {
+ RETVAL_FALSE;
+ return 1;
+ }
}
-
+#endif
+ if (option == CURLOPT_URL) {
+ if (!php_curl_option_url(ch, Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue))) {
+ RETVAL_FALSE;
+ return 1;
+ }
+ } else {
#if LIBCURL_VERSION_NUM >= 0x071100
- /* Strings passed to libcurl as ’char *’ arguments, are copied by the library... NOTE: before 7.17.0 strings were not copied. */
- error = curl_easy_setopt(ch->cp, option, Z_STRVAL_PP(zvalue));
+ /* Strings passed to libcurl as ’char *’ arguments, are copied by the library... NOTE: before 7.17.0 strings were not copied. */
+ error = curl_easy_setopt(ch->cp, option, Z_STRVAL_PP(zvalue));
#else
- copystr = estrndup(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue));
- error = curl_easy_setopt(ch->cp, option, copystr);
- zend_llist_add_element(&ch->to_free.str, ©str);
+ copystr = estrndup(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue));
+ error = curl_easy_setopt(ch->cp, option, copystr);
+ zend_llist_add_element(&ch->to_free.str, ©str);
#endif
-
+ }
break;
}
case CURLOPT_FILE:
- case CURLOPT_INFILE:
+ case CURLOPT_INFILE:
case CURLOPT_WRITEHEADER:
case CURLOPT_STDERR: {
FILE *fp = NULL;
@@ -1524,18 +1649,46 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
error = CURLE_OK;
switch (option) {
case CURLOPT_FILE:
- ch->handlers->write->fp = fp;
- ch->handlers->write->method = PHP_CURL_FILE;
+ if (((php_stream *) what)->mode[0] != 'r') {
+ zend_list_addref(Z_LVAL_PP(zvalue));
+ ch->handlers->write->fp = fp;
+ ch->handlers->write->method = PHP_CURL_FILE;
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "the provided file handle is not writable");
+ RETVAL_FALSE;
+ return 1;
+ }
break;
case CURLOPT_WRITEHEADER:
- ch->handlers->write_header->fp = fp;
- ch->handlers->write_header->method = PHP_CURL_FILE;
+ if (((php_stream *) what)->mode[0] != 'r') {
+ zend_list_addref(Z_LVAL_PP(zvalue));
+ ch->handlers->write_header->fp = fp;
+ ch->handlers->write_header->method = PHP_CURL_FILE;
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "the provided file handle is not writable");
+ RETVAL_FALSE;
+ return 1;
+ }
break;
case CURLOPT_INFILE:
zend_list_addref(Z_LVAL_PP(zvalue));
ch->handlers->read->fp = fp;
ch->handlers->read->fd = Z_LVAL_PP(zvalue);
break;
+ case CURLOPT_STDERR:
+ if (((php_stream *) what)->mode[0] != 'r') {
+ if (ch->handlers->std_err) {
+ zval_ptr_dtor(&ch->handlers->std_err);
+ }
+ zval_add_ref(zvalue);
+ ch->handlers->std_err = *zvalue;
+ zend_list_addref(Z_LVAL_PP(zvalue));
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "the provided file handle is not writable");
+ RETVAL_FALSE;
+ return 1;
+ }
+ /* break omitted intentionally */
default:
error = curl_easy_setopt(ch->cp, option, fp);
break;
@@ -1553,7 +1706,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
}
break;
case CURLOPT_BINARYTRANSFER:
- convert_to_long_ex(zvalue);
+ convert_to_long_ex(zvalue);
if (Z_LVAL_PP(zvalue)) {
ch->handlers->write->type = PHP_CURL_BINARY;
@@ -1579,6 +1732,17 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
ch->handlers->read->func_name = *zvalue;
ch->handlers->read->method = PHP_CURL_USER;
break;
+ case CURLOPT_PROGRESSFUNCTION:
+ curl_easy_setopt(ch->cp, CURLOPT_PROGRESSFUNCTION, curl_progress);
+ curl_easy_setopt(ch->cp, CURLOPT_PROGRESSDATA, ch);
+ if (ch->handlers->progress->func_name) {
+ zval_ptr_dtor(&ch->handlers->progress->func_name);
+ ch->handlers->progress->fci_cache = empty_fcall_info_cache;
+ }
+ zval_add_ref(zvalue);
+ ch->handlers->progress->func_name = *zvalue;
+ ch->handlers->progress->method = PHP_CURL_USER;
+ break;
case CURLOPT_HEADERFUNCTION:
if (ch->handlers->write_header->func_name) {
zval_ptr_dtor(&ch->handlers->write_header->func_name);
@@ -1611,8 +1775,8 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
uint string_key_len;
postfields = HASH_OF(*zvalue);
- if (! postfields) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't get HashTable in CURLOPT_POSTFIELDS");
+ if (!postfields) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't get HashTable in CURLOPT_POSTFIELDS");
RETVAL_FALSE;
return 1;
}
@@ -1626,7 +1790,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
convert_to_string_ex(current);
zend_hash_get_current_key_ex(postfields, &string_key, &string_key_len, &num_key, 0, NULL);
-
+
postval = Z_STRVAL_PP(current);
/* The arguments after _NAMELENGTH and _CONTENTSLENGTH
@@ -1648,7 +1812,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
return 1;
}
if (type) {
- error = curl_formadd(&first, &last,
+ error = curl_formadd(&first, &last,
CURLFORM_COPYNAME, string_key,
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
CURLFORM_FILE, postval,
@@ -1656,7 +1820,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
CURLFORM_END);
*type = ';';
} else {
- error = curl_formadd(&first, &last,
+ error = curl_formadd(&first, &last,
CURLFORM_COPYNAME, string_key,
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
CURLFORM_FILE, postval,
@@ -1664,10 +1828,10 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
}
} else {
- error = curl_formadd(&first, &last,
+ error = curl_formadd(&first, &last,
CURLFORM_COPYNAME, string_key,
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
- CURLFORM_COPYCONTENTS, postval,
+ CURLFORM_COPYCONTENTS, postval,
CURLFORM_CONTENTSLENGTH, (long)Z_STRLEN_PP(current),
CURLFORM_END);
}
@@ -1700,7 +1864,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
#endif
}
break;
- case CURLOPT_HTTPHEADER:
+ case CURLOPT_HTTPHEADER:
case CURLOPT_QUOTE:
case CURLOPT_HTTP200ALIASES:
case CURLOPT_POSTQUOTE: {
@@ -1724,7 +1888,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
slist = curl_slist_append(slist, Z_STRVAL_PP(current));
if (!slist) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not build curl_slist");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not build curl_slist");
RETVAL_FALSE;
return 1;
}
@@ -1790,17 +1954,17 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
Set an option for a cURL transfer */
PHP_FUNCTION(curl_setopt)
{
- zval *zid, **zvalue;
- long zoption;
- php_curl *ch;
+ zval *zid, **zvalue;
+ long options;
+ php_curl *ch;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlZ", &zid, &zoption, &zvalue) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlZ", &zid, &options, &zvalue) == FAILURE) {
return;
}
ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
- if (!_php_curl_setopt(ch, zoption, zvalue, return_value TSRMLS_CC)) {
+ if (!_php_curl_setopt(ch, options, zvalue, return_value TSRMLS_CC)) {
RETURN_TRUE;
} else {
RETURN_FALSE;
@@ -1814,24 +1978,24 @@ PHP_FUNCTION(curl_setopt_array)
{
zval *zid, *arr, **entry;
php_curl *ch;
- long option;
+ ulong option;
HashPosition pos;
- char *string_key;
- uint str_key_len;
+ char *string_key;
+ uint str_key_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "za", &zid, &arr) == FAILURE) {
- RETURN_FALSE;
+ return;
}
ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(arr), &pos);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(arr), (void **)&entry, &pos) == SUCCESS) {
- if (zend_hash_get_current_key_ex(Z_ARRVAL_P(arr), &string_key, &str_key_len, &option, 0, &pos) == HASH_KEY_IS_STRING) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array keys must be CURLOPT constants or equivalent integer values");
+ if (zend_hash_get_current_key_ex(Z_ARRVAL_P(arr), &string_key, &str_key_len, &option, 0, &pos) != HASH_KEY_IS_LONG) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array keys must be CURLOPT constants or equivalent integer values");
RETURN_FALSE;
}
- if (_php_curl_setopt(ch, option, entry, return_value TSRMLS_CC)) {
+ if (_php_curl_setopt(ch, (long) option, entry, return_value TSRMLS_CC)) {
RETURN_FALSE;
}
zend_hash_move_forward_ex(Z_ARRVAL_P(arr), &pos);
@@ -1840,7 +2004,7 @@ PHP_FUNCTION(curl_setopt_array)
}
/* }}} */
-/* {{{ _php_curl_cleanup_handle(ch)
+/* {{{ _php_curl_cleanup_handle(ch)
Cleanup an execution phase */
void _php_curl_cleanup_handle(php_curl *ch)
{
@@ -1861,9 +2025,9 @@ void _php_curl_cleanup_handle(php_curl *ch)
Perform a cURL session */
PHP_FUNCTION(curl_exec)
{
- zval *zid;
- php_curl *ch;
- CURLcode error;
+ CURLcode error;
+ zval *zid;
+ php_curl *ch;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zid) == FAILURE) {
return;
@@ -1872,7 +2036,7 @@ PHP_FUNCTION(curl_exec)
ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
_php_curl_cleanup_handle(ch);
-
+
error = curl_easy_perform(ch->cp);
SAVE_CURL_ERROR(ch, error);
/* CURLE_PARTIAL_FILE is returned by HEAD requests */
@@ -1883,14 +2047,11 @@ PHP_FUNCTION(curl_exec)
RETURN_FALSE;
}
- ch->uses++;
-
if (ch->handlers->write->method == PHP_CURL_RETURN && ch->handlers->write->buf.len > 0) {
- --ch->uses;
smart_str_0(&ch->handlers->write->buf);
RETURN_STRINGL(ch->handlers->write->buf.c, ch->handlers->write->buf.len, 1);
}
- --ch->uses;
+
if (ch->handlers->write->method == PHP_CURL_RETURN) {
RETURN_EMPTY_STRING();
} else {
@@ -1903,18 +2064,17 @@ PHP_FUNCTION(curl_exec)
Get information regarding a specific transfer */
PHP_FUNCTION(curl_getinfo)
{
- zval *zid;
- php_curl *ch;
- int argc = ZEND_NUM_ARGS();
- long option = 0;
+ zval *zid;
+ php_curl *ch;
+ long option = 0;
- if (zend_parse_parameters(argc TSRMLS_CC, "r|l", &zid, &option) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &zid, &option) == FAILURE) {
return;
}
ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
- if (argc < 2) {
+ if (ZEND_NUM_ARGS() < 2) {
char *s_code;
long l_code;
double d_code;
@@ -1928,7 +2088,7 @@ PHP_FUNCTION(curl_getinfo)
if (s_code != NULL) {
CAAS("content_type", s_code);
} else {
- zval *retnull;
+ zval *retnull;
MAKE_STD_ZVAL(retnull);
ZVAL_NULL(retnull);
CAAZ("content_type", retnull);
@@ -1994,22 +2154,22 @@ PHP_FUNCTION(curl_getinfo)
} else {
switch (option) {
case CURLINFO_PRIVATE:
- case CURLINFO_EFFECTIVE_URL:
+ case CURLINFO_EFFECTIVE_URL:
case CURLINFO_CONTENT_TYPE: {
- char *s_code = NULL;
+ char *s_code = NULL;
- if (curl_easy_getinfo(ch->cp, option, &s_code) == CURLE_OK && s_code) {
- RETURN_STRING(s_code, 1);
- } else {
- RETURN_FALSE;
- }
+ if (curl_easy_getinfo(ch->cp, option, &s_code) == CURLE_OK && s_code) {
+ RETURN_STRING(s_code, 1);
+ } else {
+ RETURN_FALSE;
+ }
break;
}
- case CURLINFO_HTTP_CODE:
- case CURLINFO_HEADER_SIZE:
- case CURLINFO_REQUEST_SIZE:
- case CURLINFO_FILETIME:
- case CURLINFO_SSL_VERIFYRESULT:
+ case CURLINFO_HTTP_CODE:
+ case CURLINFO_HEADER_SIZE:
+ case CURLINFO_REQUEST_SIZE:
+ case CURLINFO_FILETIME:
+ case CURLINFO_SSL_VERIFYRESULT:
case CURLINFO_REDIRECT_COUNT: {
long code = 0;
@@ -2020,16 +2180,16 @@ PHP_FUNCTION(curl_getinfo)
}
break;
}
- case CURLINFO_TOTAL_TIME:
- case CURLINFO_NAMELOOKUP_TIME:
+ case CURLINFO_TOTAL_TIME:
+ case CURLINFO_NAMELOOKUP_TIME:
case CURLINFO_CONNECT_TIME:
- case CURLINFO_PRETRANSFER_TIME:
- case CURLINFO_SIZE_UPLOAD:
+ case CURLINFO_PRETRANSFER_TIME:
+ case CURLINFO_SIZE_UPLOAD:
case CURLINFO_SIZE_DOWNLOAD:
- case CURLINFO_SPEED_DOWNLOAD:
- case CURLINFO_SPEED_UPLOAD:
+ case CURLINFO_SPEED_DOWNLOAD:
+ case CURLINFO_SPEED_UPLOAD:
case CURLINFO_CONTENT_LENGTH_DOWNLOAD:
- case CURLINFO_CONTENT_LENGTH_UPLOAD:
+ case CURLINFO_CONTENT_LENGTH_UPLOAD:
case CURLINFO_STARTTRANSFER_TIME:
case CURLINFO_REDIRECT_TIME: {
double code = 0.0;
@@ -2056,9 +2216,9 @@ PHP_FUNCTION(curl_getinfo)
Return a string contain the last error for the current session */
PHP_FUNCTION(curl_error)
{
- zval *zid;
- php_curl *ch;
-
+ zval *zid;
+ php_curl *ch;
+
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zid) == FAILURE) {
return;
}
@@ -2074,8 +2234,8 @@ PHP_FUNCTION(curl_error)
Return an integer containing the last error number */
PHP_FUNCTION(curl_errno)
{
- zval *zid;
- php_curl *ch;
+ zval *zid;
+ php_curl *ch;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zid) == FAILURE) {
return;
@@ -2091,8 +2251,8 @@ PHP_FUNCTION(curl_errno)
Close a cURL session */
PHP_FUNCTION(curl_close)
{
- zval *zid;
- php_curl *ch;
+ zval *zid;
+ php_curl *ch;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zid) == FAILURE) {
return;
@@ -2104,8 +2264,8 @@ PHP_FUNCTION(curl_close)
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to close cURL handle from a callback");
return;
}
-
- if (ch->uses) {
+
+ if (ch->uses) {
ch->uses--;
} else {
zend_list_delete(Z_LVAL_P(zid));
@@ -2115,14 +2275,17 @@ PHP_FUNCTION(curl_close)
/* {{{ _php_curl_close()
List destructor for curl handles */
-static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+static void _php_curl_close_ex(php_curl *ch TSRMLS_DC)
{
- php_curl *ch = (php_curl *) rsrc->ptr;
-
#if PHP_CURL_DEBUG
fprintf(stderr, "DTOR CALLED, ch = %x\n", ch);
#endif
-
+
+ /* Prevent crash inside cURL if passed file has already been closed */
+ if (ch->handlers->std_err && Z_REFCOUNT_P(ch->handlers->std_err) <= 0) {
+ curl_easy_setopt(ch->cp, CURLOPT_STDERR, stderr);
+ }
+
curl_easy_cleanup(ch->cp);
#if LIBCURL_VERSION_NUM < 0x071101
zend_llist_clean(&ch->to_free.str);
@@ -2142,19 +2305,35 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC)
if (ch->handlers->write_header->func_name) {
zval_ptr_dtor(&ch->handlers->write_header->func_name);
}
+ if (ch->handlers->progress->func_name) {
+ zval_ptr_dtor(&ch->handlers->progress->func_name);
+ }
if (ch->handlers->passwd) {
zval_ptr_dtor(&ch->handlers->passwd);
}
+ if (ch->handlers->std_err) {
+ zval_ptr_dtor(&ch->handlers->std_err);
+ }
if (ch->header.str_len > 0) {
efree(ch->header.str);
}
-
+
efree(ch->handlers->write);
efree(ch->handlers->write_header);
efree(ch->handlers->read);
+ efree(ch->handlers->progress);
efree(ch->handlers);
efree(ch);
-}
+}
+/* }}} */
+
+/* {{{ _php_curl_close()
+ List destructor for curl handles */
+static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+{
+ php_curl *ch = (php_curl *) rsrc->ptr;
+ _php_curl_close_ex(ch TSRMLS_CC);
+}
/* }}} */
#endif /* HAVE_CURL */
diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h
index c46d62e..7e6283c 100644
--- a/ext/curl/php_curl.h
+++ b/ext/curl/php_curl.h
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_curl.h,v 1.44.2.2.2.2.2.3 2008/12/31 11:15:35 sebastian Exp $ */
+/* $Id: php_curl.h,v 1.44.2.2.2.2.2.6 2009/05/27 22:35:26 pajoye Exp $ */
#ifndef _PHP_CURL_H
#define _PHP_CURL_H
@@ -97,10 +97,18 @@ typedef struct {
} php_curl_read;
typedef struct {
+ zval *func_name;
+ zend_fcall_info_cache fci_cache;
+ int method;
+} php_curl_progress;
+
+typedef struct {
php_curl_write *write;
php_curl_write *write_header;
php_curl_read *read;
zval *passwd;
+ zval *std_err;
+ php_curl_progress *progress;
} php_curl_handlers;
struct _php_curl_error {
diff --git a/ext/curl/streams.c b/ext/curl/streams.c
index 4dd6630..14d183d 100644
--- a/ext/curl/streams.c
+++ b/ext/curl/streams.c
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.14.2.2.2.11.2.4 2009/02/23 15:58:19 iliaa Exp $ */
+/* $Id: streams.c,v 1.14.2.2.2.11.2.6 2009/05/19 18:08:57 kalle Exp $ */
/* This file implements cURL based wrappers.
* NOTE: If you are implementing your own streams that are intended to
@@ -48,6 +48,7 @@
#include "ext/standard/php_smart_str.h"
#include "ext/standard/info.h"
#include "ext/standard/file.h"
+#include "ext/standard/php_string.h"
#include "php_curl.h"
static size_t on_data_available(char *data, size_t size, size_t nmemb, void *ctx)
@@ -131,7 +132,7 @@ static int on_progress_avail(php_stream *stream, double dltotal, double dlnow, d
/* our notification system only works in a single direction; we should detect which
* direction is important and use the correct values in this call */
- php_stream_notify_progress(stream->context, dlnow, dltotal);
+ php_stream_notify_progress(stream->context, (size_t) dlnow, (size_t) dltotal);
return 0;
}
@@ -263,6 +264,7 @@ php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char *filename,
php_stream *stream;
php_curl_stream *curlstream;
zval *tmp, **ctx_opt = NULL;
+ struct curl_slist *slist = NULL;
curlstream = emalloc(sizeof(php_curl_stream));
memset(curlstream, 0, sizeof(php_curl_stream));
@@ -311,6 +313,15 @@ php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char *filename,
/* TODO: read cookies and options from context */
if (context && !strncasecmp(filename, "http", sizeof("http")-1)) {
+ /* Protocol version */
+ if (SUCCESS == php_stream_context_get_option(context, "http", "protocol_version", &ctx_opt) && Z_TYPE_PP(ctx_opt) == IS_DOUBLE) {
+ if (Z_DVAL_PP(ctx_opt) == 1.1) {
+ curl_easy_setopt(curlstream->curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+ } else {
+ curl_easy_setopt(curlstream->curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+ }
+ }
+
if (SUCCESS == php_stream_context_get_option(context, "http", "curl_verify_ssl_host", &ctx_opt) && Z_TYPE_PP(ctx_opt) == IS_BOOL && Z_LVAL_PP(ctx_opt) == 1) {
curl_easy_setopt(curlstream->curl, CURLOPT_SSL_VERIFYHOST, 1);
} else {
@@ -326,20 +337,34 @@ php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char *filename,
if (SUCCESS == php_stream_context_get_option(context, "http", "user_agent", &ctx_opt) && Z_TYPE_PP(ctx_opt) == IS_STRING) {
curl_easy_setopt(curlstream->curl, CURLOPT_USERAGENT, Z_STRVAL_PP(ctx_opt));
}
- if (SUCCESS == php_stream_context_get_option(context, "http", "header", &ctx_opt) && Z_TYPE_PP(ctx_opt) == IS_ARRAY) {
- HashPosition pos;
- zval **header = NULL;
- struct curl_slist *hl = NULL;
+ if (SUCCESS == php_stream_context_get_option(context, "http", "header", &ctx_opt)) {
+ if (Z_TYPE_PP(ctx_opt) == IS_ARRAY) {
+ HashPosition pos;
+ zval **header = NULL;
- for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(ctx_opt), &pos);
- SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(ctx_opt), (void *)&header, &pos);
- zend_hash_move_forward_ex(Z_ARRVAL_PP(ctx_opt), &pos)) {
- if (Z_TYPE_PP(header) == IS_STRING) {
- hl = curl_slist_append(hl, Z_STRVAL_PP(header));
+ for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(ctx_opt), &pos);
+ SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(ctx_opt), (void *)&header, &pos);
+ zend_hash_move_forward_ex(Z_ARRVAL_PP(ctx_opt), &pos)
+ ) {
+ if (Z_TYPE_PP(header) == IS_STRING) {
+ slist = curl_slist_append(slist, Z_STRVAL_PP(header));
+ }
+ }
+ } else if (Z_TYPE_PP(ctx_opt) == IS_STRING && Z_STRLEN_PP(ctx_opt)) {
+ char *p, *token, *trimmed, *copy_ctx_opt;
+
+ copy_ctx_opt = php_trim(Z_STRVAL_PP(ctx_opt), Z_STRLEN_PP(ctx_opt), NULL, 0, NULL, 3 TSRMLS_CC);
+ p = php_strtok_r(copy_ctx_opt, "\r\n", &token);
+ while (p) {
+ trimmed = php_trim(p, strlen(p), NULL, 0, NULL, 3 TSRMLS_CC);
+ slist = curl_slist_append(slist, trimmed);
+ efree(trimmed);
+ p = php_strtok_r(NULL, "\r\n", &token);
}
+ efree(copy_ctx_opt);
}
- if (hl) {
- curl_easy_setopt(curlstream->curl, CURLOPT_HTTPHEADER, hl);
+ if (slist) {
+ curl_easy_setopt(curlstream->curl, CURLOPT_HTTPHEADER, slist);
}
}
if (SUCCESS == php_stream_context_get_option(context, "http", "method", &ctx_opt) && Z_TYPE_PP(ctx_opt) == IS_STRING) {
@@ -472,7 +497,9 @@ php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char *filename,
return NULL;
}
}
-
+ if (slist) {
+ curl_slist_free_all(slist);
+ }
return stream;
}
diff --git a/ext/curl/tests/bug45161.phpt b/ext/curl/tests/bug45161.phpt
index eab1fd4..9fdc7a7 100644
--- a/ext/curl/tests/bug45161.phpt
+++ b/ext/curl/tests/bug45161.phpt
@@ -1,5 +1,21 @@
--TEST--
Bug #45161 (Reusing a curl handle leaks memory)
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+ exit("skip not for Windows");
+}
+if (!extension_loaded("curl")) {
+ exit("skip curl extension not loaded");
+}
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) {
+ exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
+}
+$curl_version = curl_version();
+if ($curl_version['version_number'] < 0x071100) {
+ exit("skip: test works only with curl >= 7.17.0");
+}
+?>
--FILE--
<?php
diff --git a/ext/curl/tests/bug46711.phpt b/ext/curl/tests/bug46711.phpt
index 3f728c8..8eef556 100644
--- a/ext/curl/tests/bug46711.phpt
+++ b/ext/curl/tests/bug46711.phpt
@@ -1,8 +1,13 @@
--TEST--
-#46711 (lost memory when foreach is used for values passed to curl_setopt())
---SKIP--
-<?php
-if (!extension_loaded('curl')) die('skip need curl to work');
+Bug #46711 (lost memory when foreach is used for values passed to curl_setopt())
+--SKIPIF--
+<?php
+if (!extension_loaded("curl")) {
+ exit("skip curl extension not loaded");
+}
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) {
+ exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
+}
?>
--FILE--
<?php
diff --git a/ext/curl/tests/bug46739.phpt b/ext/curl/tests/bug46739.phpt
index 06a84ea..52bfbc8 100644
--- a/ext/curl/tests/bug46739.phpt
+++ b/ext/curl/tests/bug46739.phpt
@@ -1,5 +1,14 @@
--TEST--
Bug #46739 (array returned by curl_getinfo should contain content_type key)
+--SKIPIF--
+<?php
+if (!extension_loaded("curl")) {
+ exit("skip curl extension not loaded");
+}
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) {
+ exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
+}
+?>
--FILE--
<?php
$ch = curl_init('http://127.0.0.1:9/');
diff --git a/ext/curl/tests/bug48203.phpt b/ext/curl/tests/bug48203.phpt
new file mode 100644
index 0000000..84fcf83
--- /dev/null
+++ b/ext/curl/tests/bug48203.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Bug #48203 (Crash when CURLOPT_STDERR is set to regular file)
+--SKIPIF--
+<?php
+if (!extension_loaded("curl")) {
+ exit("skip curl extension not loaded");
+}
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) {
+ exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
+}
+?>
+--FILE--
+<?php
+
+$fp = fopen(dirname(__FILE__) . '/bug48203.tmp', 'w');
+
+$ch = curl_init();
+
+curl_setopt($ch, CURLOPT_VERBOSE, 1);
+curl_setopt($ch, CURLOPT_STDERR, $fp);
+curl_setopt($ch, CURLOPT_URL, "");
+
+fclose($fp); // <-- premature close of $fp caused a crash!
+
+curl_exec($ch);
+
+echo "Ok\n";
+
+?>
+--CLEAN--
+<?php @unlink(dirname(__FILE__) . '/bug48203.tmp'); ?>
+--EXPECT--
+Ok
diff --git a/ext/curl/tests/bug48514.phpt b/ext/curl/tests/bug48514.phpt
new file mode 100644
index 0000000..0ea2575
--- /dev/null
+++ b/ext/curl/tests/bug48514.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Bug #48514 (cURL extension uses same resource name for simple and multi APIs)
+--SKIPIF--
+<?php
+
+if (!extension_loaded('curl')) {
+ exit("skip curl extension not loaded");
+}
+
+?>
+--FILE--
+<?php
+
+$ch1 = curl_init();
+var_dump($ch1);
+var_dump(get_resource_type($ch1));
+
+$ch2 = curl_multi_init();
+var_dump($ch2);
+var_dump(get_resource_type($ch2));
+
+?>
+--EXPECTF--
+resource(%d) of type (curl)
+%string|unicode%(4) "curl"
+resource(%d) of type (curl_multi)
+%string|unicode%(10) "curl_multi"
diff --git a/ext/curl/tests/curl_001.phpt b/ext/curl/tests/curl_001.phpt
deleted file mode 100644
index 35dca3d..0000000
--- a/ext/curl/tests/curl_001.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-Test curl_exec() function with basic functionality
---CREDITS--
-Sebastian Deutsch <sebastian.deutsch at 9elements.com>
---SKIPIF--
-<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?>
---FILE--
-<?php
-/* Prototype : bool curl_exec(resource ch)
- * Description: Perform a cURL session
- * Source code: ext/curl/interface.c
- * Alias to functions:
- */
-
- $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
-
- // start testing
- echo "*** Testing curl_exec() : basic functionality ***\n";
-
- $url = "{$host}/get.php?test=get";
- $ch = curl_init();
-
- ob_start(); // start output buffering
- curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
- $ok = curl_exec($ch);
- curl_close($ch);
- $curl_content = ob_get_contents();
- ob_end_clean();
-
- if($ok) {
- var_dump( $curl_content );
- } else {
- echo "curl_exec returned false";
- }
-?>
-===DONE===
---EXPECTF--
-*** Testing curl_exec() : basic functionality ***
-string(25) "Hello World!
-Hello World!"
-===DONE===
diff --git a/ext/curl/tests/curl_002.phpt b/ext/curl/tests/curl_002.phpt
deleted file mode 100644
index ed885ca..0000000
--- a/ext/curl/tests/curl_002.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-Test curl_opt() function with CURLOPT_RETURNTRANSFER parameter set to 1
---CREDITS--
-Sebastian Deutsch <sebastian.deutsch at 9elements.com>
---SKIPIF--
-<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?>
---FILE--
-<?php
-/* Prototype : bool curl_setopt(resource ch, int option, mixed value)
- * Description: Set an option for a cURL transfer
- * Source code: ext/curl/interface.c
- * Alias to functions:
- */
-
- $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
-
- // start testing
- echo '*** Testing curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); ***' . "\n";
-
- $url = "{$host}/get.php?test=get";
- $ch = curl_init();
-
- ob_start(); // start output buffering
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
- curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-
- $curl_content = curl_exec($ch);
- curl_close($ch);
-
- var_dump( $curl_content );
-?>
-===DONE===
---EXPECTF--
-*** Testing curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); ***
-string(25) "Hello World!
-Hello World!"
-===DONE===
diff --git a/ext/curl/tests/curl_003.phpt b/ext/curl/tests/curl_003.phpt
deleted file mode 100644
index e64ab9b..0000000
--- a/ext/curl/tests/curl_003.phpt
+++ /dev/null
@@ -1,52 +0,0 @@
---TEST--
-Test curl_opt() function with POST parameters
---CREDITS--
-Sebastian Deutsch <sebastian.deutsch at 9elements.com>
---SKIPIF--
-<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?>
---FILE--
-<?php
-/* Prototype : bool curl_setopt(resource ch, int option, mixed value)
- * Description: Set an option for a cURL transfer
- * Source code: ext/curl/interface.c
- * Alias to functions:
- */
-
- $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
-
- // start testing
- echo '*** Testing curl sending through GET an POST ***' . "\n";
-
- $url = "{$host}/get.php?test=getpost&get_param=Hello%20World";
- $ch = curl_init();
-
- ob_start(); // start output buffering
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
- curl_setopt($ch, CURLOPT_POST, 1);
- curl_setopt($ch, CURLOPT_POSTFIELDS, "Hello=World&Foo=Bar&Person=John%20Doe");
- curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-
- $curl_content = curl_exec($ch);
- curl_close($ch);
-
- var_dump( $curl_content );
-?>
-===DONE===
---EXPECTF--
-*** Testing curl sending through GET an POST ***
-string(208) "array(2) {
- ["test"]=>
- string(7) "getpost"
- ["get_param"]=>
- string(11) "Hello World"
-}
-array(3) {
- ["Hello"]=>
- string(5) "World"
- ["Foo"]=>
- string(3) "Bar"
- ["Person"]=>
- string(8) "John Doe"
-}
-"
-===DONE===
diff --git a/ext/curl/tests/curl_004.phpt b/ext/curl/tests/curl_004.phpt
deleted file mode 100644
index fbbb5bd..0000000
--- a/ext/curl/tests/curl_004.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-Test curl_opt() function with setting referer
---CREDITS--
-Sebastian Deutsch <sebastian.deutsch at 9elements.com>
---SKIPIF--
-<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?>
---FILE--
-<?php
-/* Prototype : bool curl_setopt(resource ch, int option, mixed value)
- * Description: Set an option for a cURL transfer
- * Source code: ext/curl/interface.c
- * Alias to functions:
- */
-
- $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
-
- // start testing
- echo '*** Testing curl setting referer ***' . "\n";
-
- $url = "{$host}/get.php?test=referer";
- $ch = curl_init();
-
- ob_start(); // start output buffering
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
- curl_setopt($ch, CURLOPT_REFERER, 'http://www.refer.er');
- curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-
- $curl_content = curl_exec($ch);
- curl_close($ch);
-
- var_dump( $curl_content );
-?>
-===DONE===
---EXPECTF--
-*** Testing curl setting referer ***
-string(19) "http://www.refer.er"
-===DONE===
diff --git a/ext/curl/tests/curl_005.phpt b/ext/curl/tests/curl_005.phpt
deleted file mode 100644
index 1fd8e2d..0000000
--- a/ext/curl/tests/curl_005.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-Test curl_opt() function with user agent
---CREDITS--
-Sebastian Deutsch <sebastian.deutsch at 9elements.com>
---SKIPIF--
-<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?>
---FILE--
-<?php
-/* Prototype : bool curl_setopt(resource ch, int option, mixed value)
- * Description: Set an option for a cURL transfer
- * Source code: ext/curl/interface.c
- * Alias to functions:
- */
-
- $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
-
- // start testing
- echo '*** Testing curl with user agent ***' . "\n";
-
- $url = "{$host}/get.php?test=useragent";
- $ch = curl_init();
-
- ob_start(); // start output buffering
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
- curl_setopt($ch, CURLOPT_USERAGENT, 'cURL phpt');
- curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-
- $curl_content = curl_exec($ch);
- curl_close($ch);
-
- var_dump( $curl_content );
-?>
-===DONE===
---EXPECTF--
-*** Testing curl with user agent ***
-string(9) "cURL phpt"
-===DONE===
diff --git a/ext/curl/tests/curl_006.phpt b/ext/curl/tests/curl_006.phpt
deleted file mode 100755
index 95b6331..0000000
--- a/ext/curl/tests/curl_006.phpt
+++ /dev/null
@@ -1,35 +0,0 @@
---TEST--
-Test curl_opt() function with CURLOPT_WRITEFUNCTION parameter set to a closure
---SKIPIF--
-<?php if (!extension_loaded("curl") || false === getenv(b'PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?>
---FILE--
-<?php
-/* Prototype : bool curl_setopt(resource ch, int option, mixed value)
- * Description: Set an option for a cURL transfer
- * Source code: ext/curl/interface.c
- * Alias to functions:
- */
-
- $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
-
- // start testing
- echo '*** Testing curl_setopt($ch, CURLOPT_WRITEFUNCTION, <closure>); ***' . "\n";
-
- $url = "{$host}/get.php?test=get";
- $ch = curl_init();
-
- ob_start(); // start output buffering
- curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
- curl_setopt($ch, CURLOPT_WRITEFUNCTION, function ($ch, $data) {
- echo 'Data: '.$data;
- return strlen ($data);
- });
-
- curl_exec($ch);
- curl_close($ch);
-?>
-===DONE===
---EXPECTF--
-*** Testing curl_setopt($ch, CURLOPT_WRITEFUNCTION, <closure>); ***
-Data: Hello World!
-Hello World!===DONE===
diff --git a/ext/curl/tests/curl_basic_001.phpt b/ext/curl/tests/curl_basic_001.phpt
new file mode 100644
index 0000000..fa362b3
--- /dev/null
+++ b/ext/curl/tests/curl_basic_001.phpt
@@ -0,0 +1,45 @@
+--TEST--
+Test curl_exec() function with basic functionality
+--CREDITS--
+Sebastian Deutsch <sebastian.deutsch at 9elements.com>
+TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf at durcommefaire.net>
+--SKIPIF--
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
+?>
+--FILE--
+<?php
+/* Prototype : bool curl_exec(resource ch)
+ * Description: Perform a cURL session
+ * Source code: ext/curl/interface.c
+ * Alias to functions:
+ */
+
+ $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+
+ // start testing
+ echo "*** Testing curl_exec() : basic functionality ***\n";
+
+ $url = "{$host}/get.php?test=get";
+ $ch = curl_init();
+
+ ob_start(); // start output buffering
+ curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
+ $ok = curl_exec($ch);
+ curl_close($ch);
+ $curl_content = ob_get_contents();
+ ob_end_clean();
+
+ if($ok) {
+ var_dump( $curl_content );
+ } else {
+ echo "curl_exec returned false";
+ }
+?>
+===DONE===
+--EXPECTF--
+*** Testing curl_exec() : basic functionality ***
+string(25) "Hello World!
+Hello World!"
+===DONE===
diff --git a/ext/curl/tests/curl_basic_002.phpt b/ext/curl/tests/curl_basic_002.phpt
new file mode 100644
index 0000000..e46f323
--- /dev/null
+++ b/ext/curl/tests/curl_basic_002.phpt
@@ -0,0 +1,41 @@
+--TEST--
+Test curl_opt() function with CURLOPT_RETURNTRANSFER parameter set to 1
+--CREDITS--
+Sebastian Deutsch <sebastian.deutsch at 9elements.com>
+TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf at durcommefaire.net>
+--SKIPIF--
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
+?>
+--FILE--
+<?php
+/* Prototype : bool curl_setopt(resource ch, int option, mixed value)
+ * Description: Set an option for a cURL transfer
+ * Source code: ext/curl/interface.c
+ * Alias to functions:
+ */
+
+ $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+
+ // start testing
+ echo '*** Testing curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); ***' . "\n";
+
+ $url = "{$host}/get.php?test=get";
+ $ch = curl_init();
+
+ ob_start(); // start output buffering
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
+
+ $curl_content = curl_exec($ch);
+ curl_close($ch);
+
+ var_dump( $curl_content );
+?>
+===DONE===
+--EXPECTF--
+*** Testing curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); ***
+string(25) "Hello World!
+Hello World!"
+===DONE===
diff --git a/ext/curl/tests/curl_basic_003.phpt b/ext/curl/tests/curl_basic_003.phpt
new file mode 100644
index 0000000..eb2aecd
--- /dev/null
+++ b/ext/curl/tests/curl_basic_003.phpt
@@ -0,0 +1,56 @@
+--TEST--
+Test curl_opt() function with POST parameters
+--CREDITS--
+Sebastian Deutsch <sebastian.deutsch at 9elements.com>
+TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf at durcommefaire.net>
+--SKIPIF--
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
+?>
+--FILE--
+<?php
+/* Prototype : bool curl_setopt(resource ch, int option, mixed value)
+ * Description: Set an option for a cURL transfer
+ * Source code: ext/curl/interface.c
+ * Alias to functions:
+ */
+
+ $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+
+ // start testing
+ echo '*** Testing curl sending through GET an POST ***' . "\n";
+
+ $url = "{$host}/get.php?test=getpost&get_param=Hello%20World";
+ $ch = curl_init();
+
+ ob_start(); // start output buffering
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_POST, 1);
+ curl_setopt($ch, CURLOPT_POSTFIELDS, "Hello=World&Foo=Bar&Person=John%20Doe");
+ curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
+
+ $curl_content = curl_exec($ch);
+ curl_close($ch);
+
+ var_dump( $curl_content );
+?>
+===DONE===
+--EXPECTF--
+*** Testing curl sending through GET an POST ***
+string(208) "array(2) {
+ ["test"]=>
+ string(7) "getpost"
+ ["get_param"]=>
+ string(11) "Hello World"
+}
+array(3) {
+ ["Hello"]=>
+ string(5) "World"
+ ["Foo"]=>
+ string(3) "Bar"
+ ["Person"]=>
+ string(8) "John Doe"
+}
+"
+===DONE===
diff --git a/ext/curl/tests/curl_basic_004.phpt b/ext/curl/tests/curl_basic_004.phpt
new file mode 100644
index 0000000..ea2eeca
--- /dev/null
+++ b/ext/curl/tests/curl_basic_004.phpt
@@ -0,0 +1,41 @@
+--TEST--
+Test curl_opt() function with setting referer
+--CREDITS--
+Sebastian Deutsch <sebastian.deutsch at 9elements.com>
+TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf at durcommefaire.net>
+--SKIPIF--
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
+?>
+--FILE--
+<?php
+/* Prototype : bool curl_setopt(resource ch, int option, mixed value)
+ * Description: Set an option for a cURL transfer
+ * Source code: ext/curl/interface.c
+ * Alias to functions:
+ */
+
+ $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+
+ // start testing
+ echo '*** Testing curl setting referer ***' . "\n";
+
+ $url = "{$host}/get.php?test=referer";
+ $ch = curl_init();
+
+ ob_start(); // start output buffering
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_REFERER, 'http://www.refer.er');
+ curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
+
+ $curl_content = curl_exec($ch);
+ curl_close($ch);
+
+ var_dump( $curl_content );
+?>
+===DONE===
+--EXPECTF--
+*** Testing curl setting referer ***
+string(19) "http://www.refer.er"
+===DONE===
diff --git a/ext/curl/tests/curl_basic_005.phpt b/ext/curl/tests/curl_basic_005.phpt
new file mode 100644
index 0000000..9285c10
--- /dev/null
+++ b/ext/curl/tests/curl_basic_005.phpt
@@ -0,0 +1,41 @@
+--TEST--
+Test curl_opt() function with user agent
+--CREDITS--
+Sebastian Deutsch <sebastian.deutsch at 9elements.com>
+TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf at durcommefaire.net>
+--SKIPIF--
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
+?>
+--FILE--
+<?php
+/* Prototype : bool curl_setopt(resource ch, int option, mixed value)
+ * Description: Set an option for a cURL transfer
+ * Source code: ext/curl/interface.c
+ * Alias to functions:
+ */
+
+ $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+
+ // start testing
+ echo '*** Testing curl with user agent ***' . "\n";
+
+ $url = "{$host}/get.php?test=useragent";
+ $ch = curl_init();
+
+ ob_start(); // start output buffering
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_USERAGENT, 'cURL phpt');
+ curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
+
+ $curl_content = curl_exec($ch);
+ curl_close($ch);
+
+ var_dump( $curl_content );
+?>
+===DONE===
+--EXPECTF--
+*** Testing curl with user agent ***
+string(9) "cURL phpt"
+===DONE===
diff --git a/ext/curl/tests/curl_basic_006.phpt b/ext/curl/tests/curl_basic_006.phpt
new file mode 100755
index 0000000..5f1a4f4
--- /dev/null
+++ b/ext/curl/tests/curl_basic_006.phpt
@@ -0,0 +1,41 @@
+--TEST--
+Test curl_opt() function with CURLOPT_WRITEFUNCTION parameter set to a closure
+--CREDITS--
+?
+TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf at durcommefaire.net>
+--SKIPIF--
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
+?>
+--FILE--
+<?php
+/* Prototype : bool curl_setopt(resource ch, int option, mixed value)
+ * Description: Set an option for a cURL transfer
+ * Source code: ext/curl/interface.c
+ * Alias to functions:
+ */
+
+ $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+
+ // start testing
+ echo '*** Testing curl_setopt($ch, CURLOPT_WRITEFUNCTION, <closure>); ***' . "\n";
+
+ $url = "{$host}/get.php?test=get";
+ $ch = curl_init();
+
+ ob_start(); // start output buffering
+ curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
+ curl_setopt($ch, CURLOPT_WRITEFUNCTION, function ($ch, $data) {
+ echo 'Data: '.$data;
+ return strlen ($data);
+ });
+
+ curl_exec($ch);
+ curl_close($ch);
+?>
+===DONE===
+--EXPECTF--
+*** Testing curl_setopt($ch, CURLOPT_WRITEFUNCTION, <closure>); ***
+Data: Hello World!
+Hello World!===DONE===
diff --git a/ext/curl/tests/curl_basic_007.phpt b/ext/curl/tests/curl_basic_007.phpt
new file mode 100755
index 0000000..b7eba4b
--- /dev/null
+++ b/ext/curl/tests/curl_basic_007.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Test curl_error() & curl_errno() function without url
+--CREDITS--
+TestFest 2009 - AFUP - Perrick Penet <perrick at noparking.net>
+--SKIPIF--
+<?php if (!extension_loaded("curl")) print "skip"; ?>
+--FILE--
+<?php
+
+//In January 2008 , level 7.18.0 of the curl lib, many of the messages changed.
+//The final crlf was removed. This test is coded to work with or without the crlf.
+
+$ch = curl_init();
+
+curl_exec($ch);
+var_dump(curl_error($ch));
+var_dump(curl_errno($ch));
+curl_close($ch);
+
+
+?>
+--EXPECTF--
+%string|unicode%(%d) "No URL set!%w"
+int(3)
diff --git a/ext/curl/tests/curl_basic_008.phpt b/ext/curl/tests/curl_basic_008.phpt
new file mode 100755
index 0000000..32de4d0
--- /dev/null
+++ b/ext/curl/tests/curl_basic_008.phpt
@@ -0,0 +1,23 @@
+--TEST--
+Test curl_error() & curl_errno() function with problematic host
+--CREDITS--
+TestFest 2009 - AFUP - Perrick Penet <perrick at noparking.net>
+--SKIPIF--
+<?php if (!extension_loaded("curl")) print "skip"; ?>
+--FILE--
+<?php
+
+$url = "http://www.".uniqid().".".uniqid();
+$ch = curl_init();
+curl_setopt($ch, CURLOPT_URL, $url);
+
+curl_exec($ch);
+var_dump(curl_error($ch));
+var_dump(curl_errno($ch));
+curl_close($ch);
+
+
+?>
+--EXPECTF--
+%unicode|string%(%d) "%r(Couldn't resolve host|Could not resolve host:)%r %Swww.%s"
+int(6)
diff --git a/ext/curl/tests/curl_basic_009.phpt b/ext/curl/tests/curl_basic_009.phpt
new file mode 100644
index 0000000..529e590
--- /dev/null
+++ b/ext/curl/tests/curl_basic_009.phpt
@@ -0,0 +1,23 @@
+--TEST--
+Test curl_error() & curl_errno() function with problematic protocol
+--CREDITS--
+TestFest 2009 - AFUP - Perrick Penet <perrick at noparking.net>
+--SKIPIF--
+<?php if (!extension_loaded("curl")) print "skip"; ?>
+--FILE--
+<?php
+
+$url = uniqid()."://www.".uniqid().".".uniqid();
+$ch = curl_init();
+curl_setopt($ch, CURLOPT_URL, $url);
+
+curl_exec($ch);
+var_dump(curl_error($ch));
+var_dump(curl_errno($ch));
+curl_close($ch);
+
+
+?>
+--EXPECTF--
+%unicode|string%(%d) "%Srotocol%s"
+int(1)
diff --git a/ext/curl/tests/curl_basic_010.phpt b/ext/curl/tests/curl_basic_010.phpt
new file mode 100644
index 0000000..9a595b3
--- /dev/null
+++ b/ext/curl/tests/curl_basic_010.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Test curl_error() & curl_errno() function with problematic proxy
+--CREDITS--
+TestFest 2009 - AFUP - Perrick Penet <perrick at noparking.net>
+--SKIPIF--
+<?php if (!extension_loaded("curl")) print "skip"; ?>
+--FILE--
+<?php
+
+$url = "http://www.example.org";
+$ch = curl_init();
+curl_setopt($ch, CURLOPT_PROXY, uniqid().":".uniqid());
+curl_setopt($ch, CURLOPT_URL, $url);
+
+curl_exec($ch);
+var_dump(curl_error($ch));
+var_dump(curl_errno($ch));
+curl_close($ch);
+
+
+?>
+--EXPECTF--
+%unicode|string%(%d) "%r(Couldn't resolve proxy|Could not resolve proxy:)%r %s"
+int(5)
diff --git a/ext/curl/tests/curl_basic_011.phpt b/ext/curl/tests/curl_basic_011.phpt
new file mode 100644
index 0000000..dfdc8f9
--- /dev/null
+++ b/ext/curl/tests/curl_basic_011.phpt
@@ -0,0 +1,38 @@
+--TEST--
+Test curl_opt() function with COOKIE
+--CREDITS--
+TestFest 2009 - AFUP - Xavier Gorse <xgorse at elao.com>
+--SKIPIF--
+<?php if (!extension_loaded("curl") || false === getenv(b'PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?>
+--FILE--
+<?php
+/* Prototype : bool curl_setopt(resource ch, int option, mixed value)
+ * Description: Set an option for a cURL transfer
+ * Source code: ext/curl/interface.c
+ * Alias to functions:
+ */
+
+ $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+
+ // start testing
+ echo '*** Testing curl with cookie ***' . "\n";
+
+ $url = "{$host}/get.php?test=cookie";
+ $ch = curl_init();
+
+ ob_start(); // start output buffering
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_COOKIE, 'foo=bar');
+ curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
+
+ $curl_content = curl_exec($ch);
+ curl_close($ch);
+
+ var_dump( $curl_content );
+?>
+===DONE===
+--EXPECTF--
+*** Testing curl with cookie ***
+string(3) "bar"
+===DONE===
+
\ No newline at end of file
diff --git a/ext/curl/tests/curl_basic_012.phpt b/ext/curl/tests/curl_basic_012.phpt
new file mode 100644
index 0000000..e4706fa
--- /dev/null
+++ b/ext/curl/tests/curl_basic_012.phpt
@@ -0,0 +1,38 @@
+--TEST--
+Test curl_opt() function with CURLOPT_HTTP_VERSION/CURL_HTTP_VERSION_1_0
+--CREDITS--
+TestFest 2009 - AFUP - Xavier Gorse <xgorse at elao.com>
+--SKIPIF--
+<?php if (!extension_loaded("curl") || false === getenv(b'PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?>
+--FILE--
+<?php
+/* Prototype : bool curl_setopt(resource ch, int option, mixed value)
+ * Description: Set an option for a cURL transfer
+ * Source code: ext/curl/interface.c
+ * Alias to functions:
+ */
+
+ $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+
+ // start testing
+ echo '*** Testing curl with HTTP/1.0 ***' . "\n";
+
+ $url = "{$host}/get.php?test=httpversion";
+ $ch = curl_init();
+
+ ob_start(); // start output buffering
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+ curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
+
+ $curl_content = curl_exec($ch);
+ curl_close($ch);
+
+ var_dump( $curl_content );
+?>
+===DONE===
+--EXPECTF--
+*** Testing curl with HTTP/1.0 ***
+string(8) "HTTP/1.0"
+===DONE===
+
\ No newline at end of file
diff --git a/ext/curl/tests/curl_basic_013.phpt b/ext/curl/tests/curl_basic_013.phpt
new file mode 100644
index 0000000..c49d187
--- /dev/null
+++ b/ext/curl/tests/curl_basic_013.phpt
@@ -0,0 +1,38 @@
+--TEST--
+Test curl_opt() function with CURLOPT_HTTP_VERSION/CURL_HTTP_VERSION_1_1
+--CREDITS--
+TestFest 2009 - AFUP - Xavier Gorse <xgorse at elao.com>
+--SKIPIF--
+<?php if (!extension_loaded("curl") || false === getenv(b'PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?>
+--FILE--
+<?php
+/* Prototype : bool curl_setopt(resource ch, int option, mixed value)
+ * Description: Set an option for a cURL transfer
+ * Source code: ext/curl/interface.c
+ * Alias to functions:
+ */
+
+ $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+
+ // start testing
+ echo '*** Testing curl with HTTP/1.1 ***' . "\n";
+
+ $url = "{$host}/get.php?test=httpversion";
+ $ch = curl_init();
+
+ ob_start(); // start output buffering
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+ curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
+
+ $curl_content = curl_exec($ch);
+ curl_close($ch);
+
+ var_dump( $curl_content );
+?>
+===DONE===
+--EXPECTF--
+*** Testing curl with HTTP/1.1 ***
+string(8) "HTTP/1.1"
+===DONE===
+
\ No newline at end of file
diff --git a/ext/curl/tests/curl_basic_014.phpt b/ext/curl/tests/curl_basic_014.phpt
new file mode 100644
index 0000000..4037970
--- /dev/null
+++ b/ext/curl/tests/curl_basic_014.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test curl_init() function with basic functionality
+--CREDITS--
+Jean-Marc Fontaine <jmf at durcommefaire.net>
+--SKIPIF--
+<?php if (!extension_loaded("curl")) exit("skip curl extension not loaded"); ?>
+--FILE--
+<?php
+ $ch = curl_init();
+ var_dump($ch);
+?>
+===DONE===
+--EXPECTF--
+resource(%d) of type (curl)
+===DONE===
diff --git a/ext/curl/tests/curl_basic_015.phpt b/ext/curl/tests/curl_basic_015.phpt
new file mode 100644
index 0000000..e8e43e5
--- /dev/null
+++ b/ext/curl/tests/curl_basic_015.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Test curl_init() function with $url parameter defined
+--CREDITS--
+Jean-Marc Fontaine <jmf at durcommefaire.net>
+--SKIPIF--
+<?php if (!extension_loaded("curl")) exit("skip curl extension not loaded"); ?>
+--FILE--
+<?php
+ $url = 'http://www.example.com/';
+ $ch = curl_init($url);
+ var_dump($url == curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
+?>
+===DONE===
+--EXPECTF--
+bool(true)
+===DONE===
diff --git a/ext/curl/tests/curl_basic_016.phpt b/ext/curl/tests/curl_basic_016.phpt
new file mode 100644
index 0000000..5c947eb
--- /dev/null
+++ b/ext/curl/tests/curl_basic_016.phpt
@@ -0,0 +1,57 @@
+--TEST--
+Test curl_getinfo() function with basic functionality
+--CREDITS--
+Jean-Marc Fontaine <jmf at durcommefaire.net>
+--SKIPIF--
+<?php if (!extension_loaded("curl")) exit("skip curl extension not loaded"); ?>
+--FILE--
+<?php
+ $ch = curl_init();
+ $info = curl_getinfo($ch);
+ var_dump($info);
+?>
+===DONE===
+--EXPECTF--
+array(20) {
+ [%u|b%"url"]=>
+ string(0) ""
+ ["content_type"]=>
+ NULL
+ ["http_code"]=>
+ int(0)
+ ["header_size"]=>
+ int(0)
+ ["request_size"]=>
+ int(0)
+ ["filetime"]=>
+ int(0)
+ ["ssl_verify_result"]=>
+ int(0)
+ ["redirect_count"]=>
+ int(0)
+ ["total_time"]=>
+ float(0)
+ ["namelookup_time"]=>
+ float(0)
+ ["connect_time"]=>
+ float(0)
+ ["pretransfer_time"]=>
+ float(0)
+ ["size_upload"]=>
+ float(0)
+ ["size_download"]=>
+ float(0)
+ ["speed_download"]=>
+ float(0)
+ ["speed_upload"]=>
+ float(0)
+ ["download_content_length"]=>
+ float(%f)
+ ["upload_content_length"]=>
+ float(%f)
+ ["starttransfer_time"]=>
+ float(0)
+ ["redirect_time"]=>
+ float(0)
+}
+===DONE===
diff --git a/ext/curl/tests/curl_basic_017.phpt b/ext/curl/tests/curl_basic_017.phpt
new file mode 100644
index 0000000..09247b2
--- /dev/null
+++ b/ext/curl/tests/curl_basic_017.phpt
@@ -0,0 +1,69 @@
+--TEST--
+Test curl_multi_exec() function with basic functionality
+--CREDITS--
+TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix at gmail.com>
+--SKIPIF--
+<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?>
+--FILE--
+<?php
+/* Prototype : bool curl_multi_exec(resource ch)
+ * Description: Perform a cURL session
+ * Source code: ext/curl/multi.c
+ * Alias to functions:
+ */
+
+ $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+
+ // start testing
+ echo "*** Testing curl_exec() : basic functionality ***\n";
+
+ $url = "{$host}/get.php?test=get";
+ $chs = array(
+ 0 => curl_init(),
+ 1 => curl_init(),
+ 2 => curl_init(),
+ );
+
+ ob_start(); // start output buffering
+
+ curl_setopt($chs[0], CURLOPT_URL, $url); //set the url we want to use
+ curl_setopt($chs[1], CURLOPT_URL, $url); //set the url we want to use
+ curl_setopt($chs[2], CURLOPT_URL, $url); //set the url we want to use
+
+ $mh = curl_multi_init();
+
+ // add handlers
+ curl_multi_add_handle($mh, $chs[0]);
+ curl_multi_add_handle($mh, $chs[1]);
+ curl_multi_add_handle($mh, $chs[2]);
+
+ $running=null;
+ //execute the handles
+ $state = null;
+ do {
+ $state = curl_multi_exec($mh, $running);
+ } while ($running > 0);
+
+ //close the handles
+ curl_multi_remove_handle($mh, $chs[0]);
+ curl_multi_remove_handle($mh, $chs[1]);
+ curl_multi_remove_handle($mh, $chs[2]);
+ curl_multi_close($mh);
+
+ $curl_content = ob_get_contents();
+ ob_end_clean();
+
+ if($state === CURLM_OK) {
+ var_dump( $curl_content );
+ } else {
+ echo "curl_exec returned false";
+ }
+?>
+===DONE===
+--EXPECTF--
+*** Testing curl_exec() : basic functionality ***
+string(75) "Hello World!
+Hello World!Hello World!
+Hello World!Hello World!
+Hello World!"
+===DONE===
diff --git a/ext/curl/tests/curl_basic_018.phpt b/ext/curl/tests/curl_basic_018.phpt
new file mode 100644
index 0000000..7cffb89
--- /dev/null
+++ b/ext/curl/tests/curl_basic_018.phpt
@@ -0,0 +1,72 @@
+--TEST--
+Test curl_setopt() with curl_multi function with basic functionality
+--CREDITS--
+TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix at gmail.com>
+--SKIPIF--
+<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?>
+--FILE--
+<?php
+/* Prototype : bool curl_setopt(resource ch, int option, mixed value)
+ * Description: Set an option for a cURL transfer
+ * Source code: ext/curl/interface.c
+ * Alias to functions:
+ */
+
+ $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+
+ // start testing
+ echo "*** Testing curl_exec() : basic functionality ***\n";
+
+ $url = "{$host}/get.php?test=get";
+ $chs = array(
+ 0 => curl_init(),
+ 1 => curl_init(),
+ 2 => curl_init(),
+ );
+
+ ob_start(); // start output buffering
+
+ $options = array(
+ CURLOPT_RETURNTRANSFER => 1,
+ CURLOPT_URL => $url,
+ );
+
+ curl_setopt_array($chs[0], $options); //set the options
+ curl_setopt_array($chs[1], $options); //set the options
+ curl_setopt_array($chs[2], $options); //set the options
+
+ $mh = curl_multi_init();
+
+ // add handlers
+ curl_multi_add_handle($mh, $chs[0]);
+ curl_multi_add_handle($mh, $chs[1]);
+ curl_multi_add_handle($mh, $chs[2]);
+
+ $running=null;
+ //execute the handles
+ do {
+ curl_multi_exec($mh, $running);
+ } while ($running > 0);
+
+ $curl_content = '';
+ $curl_content .= curl_multi_getcontent($chs[0]);
+ $curl_content .= curl_multi_getcontent($chs[1]);
+ $curl_content .= curl_multi_getcontent($chs[2]);
+
+ //close the handles
+ curl_multi_remove_handle($mh, $chs[0]);
+ curl_multi_remove_handle($mh, $chs[1]);
+ curl_multi_remove_handle($mh, $chs[2]);
+ curl_multi_close($mh);
+
+ var_dump( $curl_content );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing curl_exec() : basic functionality ***
+%unicode|string%(75) "Hello World!
+Hello World!Hello World!
+Hello World!Hello World!
+Hello World!"
+===DONE===
diff --git a/ext/curl/tests/curl_basic_019.phpt b/ext/curl/tests/curl_basic_019.phpt
new file mode 100644
index 0000000..ab605a8
--- /dev/null
+++ b/ext/curl/tests/curl_basic_019.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Test curl_getinfo() function with CURLINFO_EFFECTIVE_URL parameter
+--CREDITS--
+Jean-Marc Fontaine <jmf at durcommefaire.net>
+--SKIPIF--
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
+?>
+--FILE--
+<?php
+ $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+
+ $url = "{$host}/get.php?test=";
+ $ch = curl_init();
+
+ curl_setopt($ch, CURLOPT_URL, $url);
+ curl_exec($ch);
+ $info = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
+ var_dump($url == $info);
+
+ curl_close($ch);
+?>
+===DONE===
+--EXPECTF--
+Hello World!
+Hello World!bool(true)
+===DONE===
diff --git a/ext/curl/tests/curl_basic_020.phpt b/ext/curl/tests/curl_basic_020.phpt
new file mode 100644
index 0000000..d622053
--- /dev/null
+++ b/ext/curl/tests/curl_basic_020.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Test curl_getinfo() function with CURLINFO_HTTP_CODE parameter
+--CREDITS--
+Jean-Marc Fontaine <jmf at durcommefaire.net>
+--SKIPIF--
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
+?>
+--FILE--
+<?php
+ $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+
+ $url = "{$host}/get.php?test=";
+ $ch = curl_init();
+ curl_setopt($ch, CURLOPT_URL, $url);
+ curl_exec($ch);
+ var_dump(curl_getinfo($ch, CURLINFO_HTTP_CODE));
+ curl_close($ch);
+?>
+===DONE===
+--EXPECTF--
+Hello World!
+Hello World!int(200)
+===DONE===
diff --git a/ext/curl/tests/curl_basic_021.phpt b/ext/curl/tests/curl_basic_021.phpt
new file mode 100644
index 0000000..3b4798d
--- /dev/null
+++ b/ext/curl/tests/curl_basic_021.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Test curl_getinfo() function with CURLINFO_CONTENT_TYPE parameter
+--CREDITS--
+Jean-Marc Fontaine <jmf at durcommefaire.net>
+--SKIPIF--
+<?php
+if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
+?>
+--FILE--
+<?php
+ $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+ $url = "{$host}/get.php?test=contenttype";
+
+ $ch = curl_init();
+ curl_setopt($ch, CURLOPT_URL, $url);
+ curl_exec($ch);
+ var_dump(curl_getinfo($ch, CURLINFO_CONTENT_TYPE));
+ curl_close($ch);
+?>
+===DONE===
+--EXPECTF--
+%unicode|string%(24) "text/plain;charset=utf-8"
+===DONE===
diff --git a/ext/curl/tests/responder/get.php b/ext/curl/tests/responder/get.php
index a6d5374..26dd519 100644
--- a/ext/curl/tests/responder/get.php
+++ b/ext/curl/tests/responder/get.php
@@ -1,18 +1,30 @@
-<?php
- switch($_GET['test']) {
- case 'getpost':
- var_dump($_GET);
- var_dump($_POST);
- break;
- case 'referer':
- echo $_SERVER['HTTP_REFERER'];
- break;
- case 'useragent':
- echo $_SERVER['HTTP_USER_AGENT'];
- break;
- default:
- echo "Hello World!\n";
- echo "Hello World!";
- break;
- }
-?>
\ No newline at end of file
+<?php
+ switch($_GET['test']) {
+ case 'getpost':
+ var_dump($_GET);
+ var_dump($_POST);
+ break;
+ case 'referer':
+ echo $_SERVER['HTTP_REFERER'];
+ break;
+ case 'useragent':
+ echo $_SERVER['HTTP_USER_AGENT'];
+ break;
+ case 'httpversion':
+ echo $_SERVER['SERVER_PROTOCOL'];
+ break;
+ case 'cookie':
+ echo $_COOKIE['foo'];
+ break;
+ case 'encoding':
+ echo $_SERVER['HTTP_ACCEPT_ENCODING'];
+ break;
+ case 'contenttype':
+ header('Content-Type: text/plain;charset=utf-8');
+ break;
+ default:
+ echo "Hello World!\n";
+ echo "Hello World!";
+ break;
+ }
+?>
diff --git a/ext/date/config.m4 b/ext/date/config.m4
deleted file mode 100644
index d13cd25..0000000
--- a/ext/date/config.m4
+++ /dev/null
@@ -1,25 +0,0 @@
-dnl $Id: config.m4,v 1.10.2.2.4.1 2008/04/25 12:35:40 derick Exp $
-dnl config.m4 for date extension
-
-sinclude(ext/date/lib/timelib.m4)
-sinclude(lib/timelib.m4)
-
-PHP_DATE_CFLAGS="-I at ext_builddir@/lib"
-timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
- lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
-
-PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS)
-
-PHP_ADD_BUILD_DIR([$ext_builddir/lib], 1)
-PHP_ADD_INCLUDE([$ext_builddir/lib])
-PHP_ADD_INCLUDE([$ext_srcdir/lib])
-
-PHP_INSTALL_HEADERS([ext/date], [php_date.h lib/timelib.h lib/timelib_structs.h lib/timelib_config.h])
-
-cat > $ext_builddir/lib/timelib_config.h <<EOF
-#ifdef PHP_WIN32
-# include "config.w32.h"
-#else
-# include <php_config.h>
-#endif
-EOF
diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
new file mode 100644
index 0000000..e93c148
--- /dev/null
+++ b/ext/date/config0.m4
@@ -0,0 +1,25 @@
+dnl $Id: config0.m4,v 1.1.2.2 2009/05/13 18:48:20 jani Exp $
+dnl config.m4 for date extension
+
+sinclude(ext/date/lib/timelib.m4)
+sinclude(lib/timelib.m4)
+
+PHP_DATE_CFLAGS="-I at ext_builddir@/lib"
+timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
+ lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
+
+PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS)
+
+PHP_ADD_BUILD_DIR([$ext_builddir/lib], 1)
+PHP_ADD_INCLUDE([$ext_builddir/lib])
+PHP_ADD_INCLUDE([$ext_srcdir/lib])
+
+PHP_INSTALL_HEADERS([ext/date], [php_date.h lib/timelib.h lib/timelib_structs.h lib/timelib_config.h])
+
+cat > $ext_builddir/lib/timelib_config.h <<EOF
+#ifdef PHP_WIN32
+# include "config.w32.h"
+#else
+# include <php_config.h>
+#endif
+EOF
diff --git a/ext/date/lib/parse_iso_intervals.c b/ext/date/lib/parse_iso_intervals.c
index 2bab417..b2d536d 100644
--- a/ext/date/lib/parse_iso_intervals.c
+++ b/ext/date/lib/parse_iso_intervals.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sat Aug 2 12:46:48 2008 */
+/* Generated by re2c 0.13.5 on Tue May 5 09:42:15 2009 */
#line 1 "ext/date/lib/parse_iso_intervals.re"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: parse_iso_intervals.c,v 1.1.2.6 2008/08/02 13:50:52 derick Exp $ */
+/* $Id: parse_iso_intervals.c,v 1.1.2.7 2009/05/05 07:45:18 derick Exp $ */
#include "timelib.h"
@@ -270,6 +270,11 @@ static long timelib_get_zone(char **ptr, int *dst, timelib_time *t, int *tz_not_
} \
}
+/* date parser's scan function too large for VC6 - VC7.x
+ drop the optimization solves the problem */
+#ifdef PHP_WIN32
+#pragma optimize( "", off )
+#endif
static int scan(Scanner *s)
{
uchar *cursor = s->cur;
@@ -278,11 +283,11 @@ static int scan(Scanner *s)
std:
s->tok = cursor;
s->len = 0;
-#line 306 "ext/date/lib/parse_iso_intervals.re"
+#line 311 "ext/date/lib/parse_iso_intervals.re"
-#line 286 "ext/date/lib/parse_iso_intervals.c"
+#line 291 "ext/date/lib/parse_iso_intervals.c"
{
YYCTYPE yych;
unsigned int yyaccept = 0;
@@ -352,12 +357,12 @@ std:
if (yych <= '9') goto yy98;
yy3:
YYDEBUG(3, *YYCURSOR);
-#line 419 "ext/date/lib/parse_iso_intervals.re"
+#line 424 "ext/date/lib/parse_iso_intervals.re"
{
add_error(s, "Unexpected character");
goto std;
}
-#line 361 "ext/date/lib/parse_iso_intervals.c"
+#line 366 "ext/date/lib/parse_iso_intervals.c"
yy4:
YYDEBUG(4, *YYCURSOR);
yyaccept = 0;
@@ -374,7 +379,7 @@ yy5:
if (yych == 'T') goto yy14;
yy6:
YYDEBUG(6, *YYCURSOR);
-#line 346 "ext/date/lib/parse_iso_intervals.re"
+#line 351 "ext/date/lib/parse_iso_intervals.re"
{
timelib_sll nr;
int in_time = 0;
@@ -391,7 +396,7 @@ yy6:
break;
}
- nr = timelib_get_unsigned_nr((char **) &ptr, 4);
+ nr = timelib_get_unsigned_nr((char **) &ptr, 9);
switch (*ptr) {
case 'Y': s->period->y = nr; break;
case 'W': s->period->d = nr * 7; break;
@@ -415,26 +420,26 @@ yy6:
TIMELIB_DEINIT;
return TIMELIB_PERIOD;
}
-#line 419 "ext/date/lib/parse_iso_intervals.c"
+#line 424 "ext/date/lib/parse_iso_intervals.c"
yy7:
YYDEBUG(7, *YYCURSOR);
++YYCURSOR;
YYDEBUG(8, *YYCURSOR);
-#line 408 "ext/date/lib/parse_iso_intervals.re"
+#line 413 "ext/date/lib/parse_iso_intervals.re"
{
goto std;
}
-#line 428 "ext/date/lib/parse_iso_intervals.c"
+#line 433 "ext/date/lib/parse_iso_intervals.c"
yy9:
YYDEBUG(9, *YYCURSOR);
++YYCURSOR;
YYDEBUG(10, *YYCURSOR);
-#line 413 "ext/date/lib/parse_iso_intervals.re"
+#line 418 "ext/date/lib/parse_iso_intervals.re"
{
s->pos = cursor; s->line++;
goto std;
}
-#line 438 "ext/date/lib/parse_iso_intervals.c"
+#line 443 "ext/date/lib/parse_iso_intervals.c"
yy11:
YYDEBUG(11, *YYCURSOR);
yych = *++YYCURSOR;
@@ -764,7 +769,7 @@ yy51:
YYDEBUG(57, *YYCURSOR);
++YYCURSOR;
YYDEBUG(58, *YYCURSOR);
-#line 388 "ext/date/lib/parse_iso_intervals.re"
+#line 393 "ext/date/lib/parse_iso_intervals.re"
{
DEBUG_OUTPUT("combinedrep");
TIMELIB_INIT;
@@ -783,7 +788,7 @@ yy51:
TIMELIB_DEINIT;
return TIMELIB_PERIOD;
}
-#line 787 "ext/date/lib/parse_iso_intervals.c"
+#line 792 "ext/date/lib/parse_iso_intervals.c"
yy59:
YYDEBUG(59, *YYCURSOR);
yych = *++YYCURSOR;
@@ -912,7 +917,7 @@ yy83:
YYDEBUG(83, *YYCURSOR);
++YYCURSOR;
YYDEBUG(84, *YYCURSOR);
-#line 322 "ext/date/lib/parse_iso_intervals.re"
+#line 327 "ext/date/lib/parse_iso_intervals.re"
{
timelib_time *current;
@@ -935,7 +940,7 @@ yy83:
TIMELIB_DEINIT;
return TIMELIB_ISO_DATE;
}
-#line 939 "ext/date/lib/parse_iso_intervals.c"
+#line 944 "ext/date/lib/parse_iso_intervals.c"
yy85:
YYDEBUG(85, *YYCURSOR);
yych = *++YYCURSOR;
@@ -1013,7 +1018,7 @@ yy98:
if (yych <= '9') goto yy98;
yy100:
YYDEBUG(100, *YYCURSOR);
-#line 311 "ext/date/lib/parse_iso_intervals.re"
+#line 316 "ext/date/lib/parse_iso_intervals.re"
{
DEBUG_OUTPUT("recurrences");
TIMELIB_INIT;
@@ -1023,11 +1028,14 @@ yy100:
s->have_recurrences = 1;
return TIMELIB_PERIOD;
}
-#line 1027 "ext/date/lib/parse_iso_intervals.c"
+#line 1032 "ext/date/lib/parse_iso_intervals.c"
}
-#line 423 "ext/date/lib/parse_iso_intervals.re"
+#line 428 "ext/date/lib/parse_iso_intervals.re"
}
+#ifdef PHP_WIN32
+#pragma optimize( "", on )
+#endif
#define YYMAXFILL 20
diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
index 88a10e8..daad423 100644
--- a/ext/date/lib/parse_tz.c
+++ b/ext/date/lib/parse_tz.c
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: parse_tz.c,v 1.20.2.6.2.13.2.5 2008/12/31 11:15:35 sebastian Exp $ */
+/* $Id: parse_tz.c,v 1.20.2.6.2.13.2.6 2009/04/25 16:33:41 nlopess Exp $ */
#include "timelib.h"
@@ -49,7 +49,7 @@
#define timelib_conv_int(l) ((l & 0x000000ff) << 24) + ((l & 0x0000ff00) << 8) + ((l & 0x00ff0000) >> 8) + ((l & 0xff000000) >> 24)
#endif
-static void read_preamble(char **tzf, timelib_tzinfo *tz)
+static void read_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
{
/* skip ID */
*tzf += 4;
@@ -67,7 +67,7 @@ static void read_preamble(char **tzf, timelib_tzinfo *tz)
*tzf += 13;
}
-static void read_header(char **tzf, timelib_tzinfo *tz)
+static void read_header(const unsigned char **tzf, timelib_tzinfo *tz)
{
uint32_t buffer[6];
@@ -81,7 +81,7 @@ static void read_header(char **tzf, timelib_tzinfo *tz)
*tzf += sizeof(buffer);
}
-static void read_transistions(char **tzf, timelib_tzinfo *tz)
+static void read_transistions(const unsigned char **tzf, timelib_tzinfo *tz)
{
int32_t *buffer = NULL;
uint32_t i;
@@ -110,7 +110,7 @@ static void read_transistions(char **tzf, timelib_tzinfo *tz)
tz->trans_idx = cbuffer;
}
-static void read_types(char **tzf, timelib_tzinfo *tz)
+static void read_types(const unsigned char **tzf, timelib_tzinfo *tz)
{
unsigned char *buffer;
int32_t *leap_buffer;
@@ -191,7 +191,7 @@ static void read_types(char **tzf, timelib_tzinfo *tz)
}
}
-static void read_location(char **tzf, timelib_tzinfo *tz)
+static void read_location(const unsigned char **tzf, timelib_tzinfo *tz)
{
uint32_t buffer[3];
uint32_t comments_len;
@@ -317,11 +317,11 @@ timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb)
if (seek_to_tz_position(&tzf, timezone, tzdb)) {
tmp = timelib_tzinfo_ctor(timezone);
- read_preamble((char**) &tzf, tmp);
- read_header((char**) &tzf, tmp);
- read_transistions((char**) &tzf, tmp);
- read_types((char**) &tzf, tmp);
- read_location((char**) &tzf, tmp);
+ read_preamble(&tzf, tmp);
+ read_header(&tzf, tmp);
+ read_transistions(&tzf, tmp);
+ read_types(&tzf, tmp);
+ read_location(&tzf, tmp);
} else {
tmp = NULL;
}
diff --git a/ext/date/lib/timelib_structs.h b/ext/date/lib/timelib_structs.h
index 100a8de..4d356e0 100644
--- a/ext/date/lib/timelib_structs.h
+++ b/ext/date/lib/timelib_structs.h
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: timelib_structs.h,v 1.13.2.6.2.3.2.8 2008/12/31 11:15:35 sebastian Exp $ */
+/* $Id: timelib_structs.h,v 1.13.2.6.2.3.2.11 2009/06/15 15:08:12 pajoye Exp $ */
#ifndef __TIMELIB_STRUCTS_H__
#define __TIMELIB_STRUCTS_H__
@@ -33,19 +33,25 @@
#include <stdint.h>
#endif
-#ifndef HAVE_INT32_T
-# if SIZEOF_INT == 4
+#ifdef PHP_WIN32
+/* TODO: Remove these hacks/defs once we have the int definitions in main/
+ rathen than in each 2nd extension and win32/ */
+# include "win32/php_stdint.h"
+#else
+# ifndef HAVE_INT32_T
+# if SIZEOF_INT == 4
typedef int int32_t;
-# elif SIZEOF_LONG == 4
+# elif SIZEOF_LONG == 4
typedef long int int32_t;
+# endif
# endif
-#endif
-#ifndef HAVE_UINT32_T
-# if SIZEOF_INT == 4
+# ifndef HAVE_UINT32_T
+# if SIZEOF_INT == 4
typedef unsigned int uint32_t;
-# elif SIZEOF_LONG == 4
+# elif SIZEOF_LONG == 4
typedef unsigned long int uint32_t;
+# endif
# endif
#endif
@@ -62,25 +68,15 @@ typedef unsigned long int uint32_t;
#endif
#if defined(_MSC_VER)
-typedef unsigned __int64 timelib_ull;
-typedef __int64 timelib_sll;
+typedef uint64_t timelib_ull;
+typedef int64_t timelib_sll;
+# define TIMELIB_LL_CONST(n) n ## i64
#else
typedef unsigned long long timelib_ull;
typedef signed long long timelib_sll;
+# define TIMELIB_LL_CONST(n) n ## ll
#endif
-#if defined(_MSC_VER)
-#define int32_t __int32
-#define uint32_t unsigned __int32
-#endif
-
-#if defined(_MSC_VER)
-#define TIMELIB_LL_CONST(n) n ## i64
-#else
-#define TIMELIB_LL_CONST(n) n ## ll
-#endif
-
-
typedef struct ttinfo
{
int32_t offset;
@@ -216,6 +212,9 @@ typedef struct _timelib_tzdb {
#define SECS_PER_DAY 86400
#define DAYS_PER_YEAR 365
#define DAYS_PER_LYEAR 366
+/* 400*365 days + 97 leap days */
+#define DAYS_PER_LYEAR_PERIOD 146097
+#define YEARS_PER_LYEAR_PERIOD 400
#define timelib_is_leap(y) ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0))
diff --git a/ext/date/lib/timezonedb.h b/ext/date/lib/timezonedb.h
index d9cbaef..5ba53c1 100644
--- a/ext/date/lib/timezonedb.h
+++ b/ext/date/lib/timezonedb.h
@@ -14,43 +14,43 @@ const timelib_tzdb_index_entry timezonedb_idx_builtin[560] = {
{ "Africa/Bujumbura" , 0x000571 },
{ "Africa/Cairo" , 0x0005B5 },
{ "Africa/Casablanca" , 0x00097C },
- { "Africa/Ceuta" , 0x000A4E },
- { "Africa/Conakry" , 0x000D55 },
- { "Africa/Dakar" , 0x000DC0 },
- { "Africa/Dar_es_Salaam" , 0x000E26 },
- { "Africa/Djibouti" , 0x000E93 },
- { "Africa/Douala" , 0x000EE8 },
- { "Africa/El_Aaiun" , 0x000F3D },
- { "Africa/Freetown" , 0x000FA3 },
- { "Africa/Gaborone" , 0x0010B2 },
- { "Africa/Harare" , 0x00110D },
- { "Africa/Johannesburg" , 0x001162 },
- { "Africa/Kampala" , 0x0011D0 },
- { "Africa/Khartoum" , 0x00124F },
- { "Africa/Kigali" , 0x001362 },
- { "Africa/Kinshasa" , 0x0013B7 },
- { "Africa/Lagos" , 0x001412 },
- { "Africa/Libreville" , 0x001467 },
- { "Africa/Lome" , 0x0014BC },
- { "Africa/Luanda" , 0x001500 },
- { "Africa/Lubumbashi" , 0x001555 },
- { "Africa/Lusaka" , 0x0015B0 },
- { "Africa/Malabo" , 0x001605 },
- { "Africa/Maputo" , 0x00166B },
- { "Africa/Maseru" , 0x0016C0 },
- { "Africa/Mbabane" , 0x001728 },
- { "Africa/Mogadishu" , 0x00177E },
- { "Africa/Monrovia" , 0x0017D9 },
- { "Africa/Nairobi" , 0x00183F },
- { "Africa/Ndjamena" , 0x0018BE },
- { "Africa/Niamey" , 0x00192A },
- { "Africa/Nouakchott" , 0x00199D },
- { "Africa/Ouagadougou" , 0x001A08 },
- { "Africa/Porto-Novo" , 0x001A5D },
- { "Africa/Sao_Tome" , 0x001AC3 },
- { "Africa/Timbuktu" , 0x001B18 },
- { "Africa/Tripoli" , 0x001B83 },
- { "Africa/Tunis" , 0x001C7D },
+ { "Africa/Ceuta" , 0x000A58 },
+ { "Africa/Conakry" , 0x000D5F },
+ { "Africa/Dakar" , 0x000DCA },
+ { "Africa/Dar_es_Salaam" , 0x000E30 },
+ { "Africa/Djibouti" , 0x000E9D },
+ { "Africa/Douala" , 0x000EF2 },
+ { "Africa/El_Aaiun" , 0x000F47 },
+ { "Africa/Freetown" , 0x000FAD },
+ { "Africa/Gaborone" , 0x0010BC },
+ { "Africa/Harare" , 0x001117 },
+ { "Africa/Johannesburg" , 0x00116C },
+ { "Africa/Kampala" , 0x0011DA },
+ { "Africa/Khartoum" , 0x001259 },
+ { "Africa/Kigali" , 0x00136C },
+ { "Africa/Kinshasa" , 0x0013C1 },
+ { "Africa/Lagos" , 0x00141C },
+ { "Africa/Libreville" , 0x001471 },
+ { "Africa/Lome" , 0x0014C6 },
+ { "Africa/Luanda" , 0x00150A },
+ { "Africa/Lubumbashi" , 0x00155F },
+ { "Africa/Lusaka" , 0x0015BA },
+ { "Africa/Malabo" , 0x00160F },
+ { "Africa/Maputo" , 0x001675 },
+ { "Africa/Maseru" , 0x0016CA },
+ { "Africa/Mbabane" , 0x001732 },
+ { "Africa/Mogadishu" , 0x001788 },
+ { "Africa/Monrovia" , 0x0017E3 },
+ { "Africa/Nairobi" , 0x001849 },
+ { "Africa/Ndjamena" , 0x0018C8 },
+ { "Africa/Niamey" , 0x001934 },
+ { "Africa/Nouakchott" , 0x0019A7 },
+ { "Africa/Ouagadougou" , 0x001A12 },
+ { "Africa/Porto-Novo" , 0x001A67 },
+ { "Africa/Sao_Tome" , 0x001ACD },
+ { "Africa/Timbuktu" , 0x001B22 },
+ { "Africa/Tripoli" , 0x001B8D },
+ { "Africa/Tunis" , 0x001C87 },
{ "Africa/Windhoek" , 0x001EB1 },
{ "America/Adak" , 0x0020F8 },
{ "America/Anchorage" , 0x00246E },
@@ -68,500 +68,500 @@ const timelib_tzdb_index_entry timezonedb_idx_builtin[560] = {
{ "America/Argentina/Salta" , 0x0039FD },
{ "America/Argentina/San_Juan" , 0x003BA9 },
{ "America/Argentina/San_Luis" , 0x003D61 },
- { "America/Argentina/Tucuman" , 0x003F13 },
- { "America/Argentina/Ushuaia" , 0x0041EC },
- { "America/Aruba" , 0x0043A7 },
- { "America/Asuncion" , 0x00440D },
- { "America/Atikokan" , 0x0046F2 },
- { "America/Atka" , 0x0047C8 },
- { "America/Bahia" , 0x004B2E },
- { "America/Barbados" , 0x004CB7 },
- { "America/Belem" , 0x004D51 },
- { "America/Belize" , 0x004E4C },
- { "America/Blanc-Sablon" , 0x004FC8 },
- { "America/Boa_Vista" , 0x00507C },
- { "America/Bogota" , 0x005185 },
- { "America/Boise" , 0x0051F1 },
- { "America/Buenos_Aires" , 0x005588 },
- { "America/Cambridge_Bay" , 0x00583E },
- { "America/Campo_Grande" , 0x005B66 },
- { "America/Cancun" , 0x005E55 },
- { "America/Caracas" , 0x006097 },
- { "America/Catamarca" , 0x0060FE },
- { "America/Cayenne" , 0x0062A4 },
- { "America/Cayman" , 0x006306 },
- { "America/Chicago" , 0x00635B },
- { "America/Chihuahua" , 0x006872 },
- { "America/Coral_Harbour" , 0x006AC1 },
- { "America/Cordoba" , 0x006B53 },
- { "America/Costa_Rica" , 0x006E16 },
- { "America/Cuiaba" , 0x006EA0 },
- { "America/Curacao" , 0x00717E },
- { "America/Danmarkshavn" , 0x0071E4 },
- { "America/Dawson" , 0x007328 },
- { "America/Dawson_Creek" , 0x007645 },
- { "America/Denver" , 0x00781F },
- { "America/Detroit" , 0x007BA5 },
- { "America/Dominica" , 0x007F04 },
- { "America/Edmonton" , 0x007F59 },
- { "America/Eirunepe" , 0x008311 },
- { "America/El_Salvador" , 0x008424 },
- { "America/Ensenada" , 0x008499 },
- { "America/Fort_Wayne" , 0x008940 },
- { "America/Fortaleza" , 0x008802 },
- { "America/Glace_Bay" , 0x008BAA },
- { "America/Godthab" , 0x008F21 },
- { "America/Goose_Bay" , 0x0091E5 },
- { "America/Grand_Turk" , 0x0096A2 },
- { "America/Grenada" , 0x009951 },
- { "America/Guadeloupe" , 0x0099A6 },
- { "America/Guatemala" , 0x0099FB },
- { "America/Guayaquil" , 0x009A84 },
- { "America/Guyana" , 0x009AE1 },
- { "America/Halifax" , 0x009B62 },
- { "America/Havana" , 0x00A078 },
- { "America/Hermosillo" , 0x00A3EB },
- { "America/Indiana/Indianapolis" , 0x00A4C9 },
- { "America/Indiana/Knox" , 0x00A75A },
- { "America/Indiana/Marengo" , 0x00AAF1 },
- { "America/Indiana/Petersburg" , 0x00AD97 },
- { "America/Indiana/Tell_City" , 0x00B2E4 },
- { "America/Indiana/Vevay" , 0x00B57D },
- { "America/Indiana/Vincennes" , 0x00B7B8 },
- { "America/Indiana/Winamac" , 0x00BA6C },
- { "America/Indianapolis" , 0x00B07A },
- { "America/Inuvik" , 0x00BD25 },
- { "America/Iqaluit" , 0x00C01C },
- { "America/Jamaica" , 0x00C33E },
- { "America/Jujuy" , 0x00C403 },
- { "America/Juneau" , 0x00C5AD },
- { "America/Kentucky/Louisville" , 0x00C92B },
- { "America/Kentucky/Monticello" , 0x00CD49 },
- { "America/Knox_IN" , 0x00D0CE },
- { "America/La_Paz" , 0x00D43F },
- { "America/Lima" , 0x00D4A6 },
- { "America/Los_Angeles" , 0x00D54E },
- { "America/Louisville" , 0x00D95F },
- { "America/Maceio" , 0x00DD54 },
- { "America/Managua" , 0x00DE8E },
- { "America/Manaus" , 0x00DF41 },
- { "America/Marigot" , 0x00E043 },
- { "America/Martinique" , 0x00E098 },
- { "America/Mazatlan" , 0x00E104 },
- { "America/Mendoza" , 0x00E371 },
- { "America/Menominee" , 0x00E525 },
- { "America/Merida" , 0x00E8A6 },
- { "America/Mexico_City" , 0x00EAE1 },
- { "America/Miquelon" , 0x00ED5C },
- { "America/Moncton" , 0x00EFCE },
- { "America/Monterrey" , 0x00F465 },
- { "America/Montevideo" , 0x00F6AC },
- { "America/Montreal" , 0x00F9BE },
- { "America/Montserrat" , 0x00FED4 },
- { "America/Nassau" , 0x00FF29 },
- { "America/New_York" , 0x01026E },
- { "America/Nipigon" , 0x010779 },
- { "America/Nome" , 0x010ACA },
- { "America/Noronha" , 0x010E48 },
- { "America/North_Dakota/Center" , 0x010F78 },
- { "America/North_Dakota/New_Salem" , 0x01130C },
- { "America/Panama" , 0x0116B5 },
- { "America/Pangnirtung" , 0x01170A },
- { "America/Paramaribo" , 0x011A40 },
- { "America/Phoenix" , 0x011AD2 },
- { "America/Port-au-Prince" , 0x011B80 },
- { "America/Port_of_Spain" , 0x011D9B },
- { "America/Porto_Acre" , 0x011C9C },
- { "America/Porto_Velho" , 0x011DF0 },
- { "America/Puerto_Rico" , 0x011EE6 },
- { "America/Rainy_River" , 0x011F51 },
- { "America/Rankin_Inlet" , 0x012289 },
- { "America/Recife" , 0x01256F },
- { "America/Regina" , 0x012699 },
- { "America/Resolute" , 0x012857 },
- { "America/Rio_Branco" , 0x012B50 },
- { "America/Rosario" , 0x012C53 },
- { "America/Santarem" , 0x012F16 },
- { "America/Santiago" , 0x01301B },
- { "America/Santo_Domingo" , 0x0133C4 },
- { "America/Sao_Paulo" , 0x01348A },
- { "America/Scoresbysund" , 0x013799 },
- { "America/Shiprock" , 0x013A87 },
- { "America/St_Barthelemy" , 0x013E16 },
- { "America/St_Johns" , 0x013E6B },
- { "America/St_Kitts" , 0x0143BE },
- { "America/St_Lucia" , 0x014413 },
- { "America/St_Thomas" , 0x014468 },
- { "America/St_Vincent" , 0x0144BD },
- { "America/Swift_Current" , 0x014512 },
- { "America/Tegucigalpa" , 0x014633 },
- { "America/Thule" , 0x0146B2 },
- { "America/Thunder_Bay" , 0x0148F9 },
- { "America/Tijuana" , 0x014C42 },
- { "America/Toronto" , 0x014FB7 },
- { "America/Tortola" , 0x0154CE },
- { "America/Vancouver" , 0x015523 },
- { "America/Virgin" , 0x015960 },
- { "America/Whitehorse" , 0x0159B5 },
- { "America/Winnipeg" , 0x015CD2 },
- { "America/Yakutat" , 0x016112 },
- { "America/Yellowknife" , 0x01647D },
- { "Antarctica/Casey" , 0x01678D },
- { "Antarctica/Davis" , 0x016801 },
- { "Antarctica/DumontDUrville" , 0x01687E },
- { "Antarctica/Mawson" , 0x016910 },
- { "Antarctica/McMurdo" , 0x01697F },
- { "Antarctica/Palmer" , 0x016C81 },
- { "Antarctica/Rothera" , 0x016F9D },
- { "Antarctica/South_Pole" , 0x017013 },
- { "Antarctica/Syowa" , 0x01731B },
- { "Antarctica/Vostok" , 0x017389 },
- { "Arctic/Longyearbyen" , 0x0173FE },
- { "Asia/Aden" , 0x017730 },
- { "Asia/Almaty" , 0x017785 },
- { "Asia/Amman" , 0x017904 },
- { "Asia/Anadyr" , 0x017BC4 },
- { "Asia/Aqtau" , 0x017EB2 },
- { "Asia/Aqtobe" , 0x0180B1 },
- { "Asia/Ashgabat" , 0x018269 },
- { "Asia/Ashkhabad" , 0x018386 },
- { "Asia/Baghdad" , 0x0184A3 },
- { "Asia/Bahrain" , 0x018618 },
- { "Asia/Baku" , 0x01867E },
- { "Asia/Bangkok" , 0x018966 },
- { "Asia/Beirut" , 0x0189BB },
- { "Asia/Bishkek" , 0x018CC8 },
- { "Asia/Brunei" , 0x018E74 },
- { "Asia/Calcutta" , 0x018ED6 },
- { "Asia/Choibalsan" , 0x018F4F },
- { "Asia/Chongqing" , 0x0190C8 },
- { "Asia/Chungking" , 0x0191B7 },
- { "Asia/Colombo" , 0x019266 },
- { "Asia/Dacca" , 0x019302 },
- { "Asia/Damascus" , 0x019391 },
- { "Asia/Dhaka" , 0x0196E1 },
- { "Asia/Dili" , 0x019770 },
- { "Asia/Dubai" , 0x0197F9 },
- { "Asia/Dushanbe" , 0x01984E },
- { "Asia/Gaza" , 0x019951 },
- { "Asia/Harbin" , 0x019C9A },
- { "Asia/Ho_Chi_Minh" , 0x019D81 },
- { "Asia/Hong_Kong" , 0x019DF9 },
- { "Asia/Hovd" , 0x019FAF },
- { "Asia/Irkutsk" , 0x01A127 },
- { "Asia/Istanbul" , 0x01A40E },
- { "Asia/Jakarta" , 0x01A7FB },
- { "Asia/Jayapura" , 0x01A8A5 },
- { "Asia/Jerusalem" , 0x01A929 },
- { "Asia/Kabul" , 0x01AC58 },
- { "Asia/Kamchatka" , 0x01ACA9 },
- { "Asia/Karachi" , 0x01AF8E },
- { "Asia/Kashgar" , 0x01B039 },
- { "Asia/Kathmandu" , 0x01B10A },
- { "Asia/Katmandu" , 0x01B170 },
- { "Asia/Kolkata" , 0x01B1D6 },
- { "Asia/Krasnoyarsk" , 0x01B24F },
- { "Asia/Kuala_Lumpur" , 0x01B538 },
- { "Asia/Kuching" , 0x01B5F5 },
- { "Asia/Kuwait" , 0x01B6E3 },
- { "Asia/Macao" , 0x01B738 },
- { "Asia/Macau" , 0x01B873 },
- { "Asia/Magadan" , 0x01B9AE },
- { "Asia/Makassar" , 0x01BC91 },
- { "Asia/Manila" , 0x01BD4A },
- { "Asia/Muscat" , 0x01BDCF },
- { "Asia/Nicosia" , 0x01BE24 },
- { "Asia/Novosibirsk" , 0x01C10C },
- { "Asia/Omsk" , 0x01C400 },
- { "Asia/Oral" , 0x01C6E8 },
- { "Asia/Phnom_Penh" , 0x01C8B8 },
- { "Asia/Pontianak" , 0x01C930 },
- { "Asia/Pyongyang" , 0x01C9F1 },
- { "Asia/Qatar" , 0x01CA5E },
- { "Asia/Qyzylorda" , 0x01CAC4 },
- { "Asia/Rangoon" , 0x01CC9A },
- { "Asia/Riyadh" , 0x01CD12 },
- { "Asia/Saigon" , 0x01CD67 },
- { "Asia/Sakhalin" , 0x01CDDF },
- { "Asia/Samarkand" , 0x01D0DF },
- { "Asia/Seoul" , 0x01D215 },
- { "Asia/Shanghai" , 0x01D2B9 },
- { "Asia/Singapore" , 0x01D399 },
- { "Asia/Taipei" , 0x01D450 },
- { "Asia/Tashkent" , 0x01D568 },
- { "Asia/Tbilisi" , 0x01D699 },
- { "Asia/Tehran" , 0x01D853 },
- { "Asia/Tel_Aviv" , 0x01DAC1 },
- { "Asia/Thimbu" , 0x01DDF0 },
- { "Asia/Thimphu" , 0x01DE56 },
- { "Asia/Tokyo" , 0x01DEBC },
- { "Asia/Ujung_Pandang" , 0x01DF45 },
- { "Asia/Ulaanbaatar" , 0x01DFC1 },
- { "Asia/Ulan_Bator" , 0x01E11C },
- { "Asia/Urumqi" , 0x01E269 },
- { "Asia/Vientiane" , 0x01E330 },
- { "Asia/Vladivostok" , 0x01E3A8 },
- { "Asia/Yakutsk" , 0x01E695 },
- { "Asia/Yekaterinburg" , 0x01E97B },
- { "Asia/Yerevan" , 0x01EC87 },
- { "Atlantic/Azores" , 0x01EF8B },
- { "Atlantic/Bermuda" , 0x01F48E },
- { "Atlantic/Canary" , 0x01F76F },
- { "Atlantic/Cape_Verde" , 0x01FA45 },
- { "Atlantic/Faeroe" , 0x01FABE },
- { "Atlantic/Faroe" , 0x01FD62 },
- { "Atlantic/Jan_Mayen" , 0x020006 },
- { "Atlantic/Madeira" , 0x020338 },
- { "Atlantic/Reykjavik" , 0x020841 },
- { "Atlantic/South_Georgia" , 0x0209FA },
- { "Atlantic/St_Helena" , 0x020D12 },
- { "Atlantic/Stanley" , 0x020A3E },
- { "Australia/ACT" , 0x020D67 },
- { "Australia/Adelaide" , 0x021084 },
- { "Australia/Brisbane" , 0x0213B0 },
- { "Australia/Broken_Hill" , 0x021477 },
- { "Australia/Canberra" , 0x0217B5 },
- { "Australia/Currie" , 0x021AD2 },
- { "Australia/Darwin" , 0x021E05 },
- { "Australia/Eucla" , 0x021E8B },
- { "Australia/Hobart" , 0x021F60 },
- { "Australia/LHI" , 0x0222BE },
- { "Australia/Lindeman" , 0x022559 },
- { "Australia/Lord_Howe" , 0x02263A },
- { "Australia/Melbourne" , 0x0228E5 },
- { "Australia/North" , 0x022C0A },
- { "Australia/NSW" , 0x022C7E },
- { "Australia/Perth" , 0x022F9B },
- { "Australia/Queensland" , 0x023073 },
- { "Australia/South" , 0x02311F },
- { "Australia/Sydney" , 0x02343C },
- { "Australia/Tasmania" , 0x023779 },
- { "Australia/Victoria" , 0x023ABE },
- { "Australia/West" , 0x023DDB },
- { "Australia/Yancowinna" , 0x023E91 },
- { "Brazil/Acre" , 0x0241B3 },
- { "Brazil/DeNoronha" , 0x0242B2 },
- { "Brazil/East" , 0x0243D2 },
- { "Brazil/West" , 0x0246AF },
- { "Canada/Atlantic" , 0x0247A7 },
- { "Canada/Central" , 0x024C8F },
- { "Canada/East-Saskatchewan" , 0x025599 },
- { "Canada/Eastern" , 0x0250A9 },
- { "Canada/Mountain" , 0x025722 },
- { "Canada/Newfoundland" , 0x025A98 },
- { "Canada/Pacific" , 0x025FC3 },
- { "Canada/Saskatchewan" , 0x0263DC },
- { "Canada/Yukon" , 0x026565 },
- { "CET" , 0x026868 },
- { "Chile/Continental" , 0x026B71 },
- { "Chile/EasterIsland" , 0x026F0C },
- { "CST6CDT" , 0x02724E },
- { "Cuba" , 0x02759F },
- { "EET" , 0x027912 },
- { "Egypt" , 0x027BC5 },
- { "Eire" , 0x027F8C },
- { "EST" , 0x02849D },
- { "EST5EDT" , 0x0284E1 },
- { "Etc/GMT" , 0x028832 },
- { "Etc/GMT+0" , 0x0288FE },
- { "Etc/GMT+1" , 0x028988 },
- { "Etc/GMT+10" , 0x028A15 },
- { "Etc/GMT+11" , 0x028AA3 },
- { "Etc/GMT+12" , 0x028B31 },
- { "Etc/GMT+2" , 0x028C4C },
- { "Etc/GMT+3" , 0x028CD8 },
- { "Etc/GMT+4" , 0x028D64 },
- { "Etc/GMT+5" , 0x028DF0 },
- { "Etc/GMT+6" , 0x028E7C },
- { "Etc/GMT+7" , 0x028F08 },
- { "Etc/GMT+8" , 0x028F94 },
- { "Etc/GMT+9" , 0x029020 },
- { "Etc/GMT-0" , 0x0288BA },
- { "Etc/GMT-1" , 0x028942 },
- { "Etc/GMT-10" , 0x0289CE },
- { "Etc/GMT-11" , 0x028A5C },
- { "Etc/GMT-12" , 0x028AEA },
- { "Etc/GMT-13" , 0x028B78 },
- { "Etc/GMT-14" , 0x028BBF },
- { "Etc/GMT-2" , 0x028C06 },
- { "Etc/GMT-3" , 0x028C92 },
- { "Etc/GMT-4" , 0x028D1E },
- { "Etc/GMT-5" , 0x028DAA },
- { "Etc/GMT-6" , 0x028E36 },
- { "Etc/GMT-7" , 0x028EC2 },
- { "Etc/GMT-8" , 0x028F4E },
- { "Etc/GMT-9" , 0x028FDA },
- { "Etc/GMT0" , 0x028876 },
- { "Etc/Greenwich" , 0x029066 },
- { "Etc/UCT" , 0x0290AA },
- { "Etc/Universal" , 0x0290EE },
- { "Etc/UTC" , 0x029132 },
- { "Etc/Zulu" , 0x029176 },
- { "Europe/Amsterdam" , 0x0291BA },
- { "Europe/Andorra" , 0x0295F8 },
- { "Europe/Athens" , 0x029874 },
- { "Europe/Belfast" , 0x029BB7 },
- { "Europe/Belgrade" , 0x02A0EE },
- { "Europe/Berlin" , 0x02A3B7 },
- { "Europe/Bratislava" , 0x02A70D },
- { "Europe/Brussels" , 0x02AA3F },
- { "Europe/Bucharest" , 0x02AE76 },
- { "Europe/Budapest" , 0x02B1A0 },
- { "Europe/Chisinau" , 0x02B513 },
- { "Europe/Copenhagen" , 0x02B8A1 },
- { "Europe/Dublin" , 0x02BBAB },
- { "Europe/Gibraltar" , 0x02C0BC },
- { "Europe/Guernsey" , 0x02C513 },
- { "Europe/Helsinki" , 0x02CA4A },
- { "Europe/Isle_of_Man" , 0x02CD00 },
- { "Europe/Istanbul" , 0x02D237 },
- { "Europe/Jersey" , 0x02D624 },
- { "Europe/Kaliningrad" , 0x02DB5B },
- { "Europe/Kiev" , 0x02DEBE },
- { "Europe/Lisbon" , 0x02E1D5 },
- { "Europe/Ljubljana" , 0x02E6D9 },
- { "Europe/London" , 0x02E9A2 },
- { "Europe/Luxembourg" , 0x02EED9 },
- { "Europe/Madrid" , 0x02F32F },
- { "Europe/Malta" , 0x02F6F5 },
- { "Europe/Mariehamn" , 0x02FAAE },
- { "Europe/Minsk" , 0x02FD64 },
- { "Europe/Monaco" , 0x03006F },
- { "Europe/Moscow" , 0x0304AA },
- { "Europe/Nicosia" , 0x0307FC },
- { "Europe/Oslo" , 0x030AE4 },
- { "Europe/Paris" , 0x030E16 },
- { "Europe/Podgorica" , 0x03125C },
- { "Europe/Prague" , 0x031525 },
- { "Europe/Riga" , 0x031857 },
- { "Europe/Rome" , 0x031B9C },
- { "Europe/Samara" , 0x031F5F },
- { "Europe/San_Marino" , 0x03228B },
- { "Europe/Sarajevo" , 0x03264E },
- { "Europe/Simferopol" , 0x032917 },
- { "Europe/Skopje" , 0x032C42 },
- { "Europe/Sofia" , 0x032F0B },
- { "Europe/Stockholm" , 0x033213 },
- { "Europe/Tallinn" , 0x0334C2 },
- { "Europe/Tirane" , 0x0337FC },
- { "Europe/Tiraspol" , 0x033B02 },
- { "Europe/Uzhgorod" , 0x033E90 },
- { "Europe/Vaduz" , 0x0341A7 },
- { "Europe/Vatican" , 0x03443A },
- { "Europe/Vienna" , 0x0347FD },
- { "Europe/Vilnius" , 0x034B2A },
- { "Europe/Volgograd" , 0x034E69 },
- { "Europe/Warsaw" , 0x035172 },
- { "Europe/Zagreb" , 0x035553 },
- { "Europe/Zaporozhye" , 0x03581C },
- { "Europe/Zurich" , 0x035B5D },
- { "Factory" , 0x035E0C },
- { "GB" , 0x035E7D },
- { "GB-Eire" , 0x0363B4 },
- { "GMT" , 0x0368EB },
- { "GMT+0" , 0x0369B7 },
- { "GMT-0" , 0x036973 },
- { "GMT0" , 0x03692F },
- { "Greenwich" , 0x0369FB },
- { "Hongkong" , 0x036A3F },
- { "HST" , 0x036BF5 },
- { "Iceland" , 0x036C39 },
- { "Indian/Antananarivo" , 0x036DF2 },
- { "Indian/Chagos" , 0x036E66 },
- { "Indian/Christmas" , 0x036EC8 },
- { "Indian/Cocos" , 0x036F0C },
- { "Indian/Comoro" , 0x036F50 },
- { "Indian/Kerguelen" , 0x036FA5 },
- { "Indian/Mahe" , 0x036FFA },
- { "Indian/Maldives" , 0x03704F },
- { "Indian/Mauritius" , 0x0370A4 },
- { "Indian/Mayotte" , 0x037247 },
- { "Indian/Reunion" , 0x03729C },
- { "Iran" , 0x0372F1 },
- { "Israel" , 0x03755F },
- { "Jamaica" , 0x03788E },
- { "Japan" , 0x037953 },
- { "Kwajalein" , 0x0379DC },
- { "Libya" , 0x037A3F },
- { "MET" , 0x037B39 },
- { "Mexico/BajaNorte" , 0x037E42 },
- { "Mexico/BajaSur" , 0x0381AB },
- { "Mexico/General" , 0x0383F0 },
- { "MST" , 0x03864E },
- { "MST7MDT" , 0x038692 },
- { "Navajo" , 0x0389E3 },
- { "NZ" , 0x038D5C },
- { "NZ-CHAT" , 0x0390DA },
- { "Pacific/Apia" , 0x0393C2 },
- { "Pacific/Auckland" , 0x039429 },
- { "Pacific/Chatham" , 0x0397B5 },
- { "Pacific/Easter" , 0x039AAC },
- { "Pacific/Efate" , 0x039E0A },
- { "Pacific/Enderbury" , 0x039ED0 },
- { "Pacific/Fakaofo" , 0x039F3E },
- { "Pacific/Fiji" , 0x039F82 },
- { "Pacific/Funafuti" , 0x039FF8 },
- { "Pacific/Galapagos" , 0x03A03C },
- { "Pacific/Gambier" , 0x03A0B4 },
- { "Pacific/Guadalcanal" , 0x03A119 },
- { "Pacific/Guam" , 0x03A16E },
- { "Pacific/Honolulu" , 0x03A1C4 },
- { "Pacific/Johnston" , 0x03A258 },
- { "Pacific/Kiritimati" , 0x03A2AA },
- { "Pacific/Kosrae" , 0x03A315 },
- { "Pacific/Kwajalein" , 0x03A372 },
- { "Pacific/Majuro" , 0x03A3DE },
- { "Pacific/Marquesas" , 0x03A43D },
- { "Pacific/Midway" , 0x03A4A4 },
- { "Pacific/Nauru" , 0x03A52E },
- { "Pacific/Niue" , 0x03A5A6 },
- { "Pacific/Norfolk" , 0x03A604 },
- { "Pacific/Noumea" , 0x03A659 },
- { "Pacific/Pago_Pago" , 0x03A6E9 },
- { "Pacific/Palau" , 0x03A772 },
- { "Pacific/Pitcairn" , 0x03A7B6 },
- { "Pacific/Ponape" , 0x03A80B },
- { "Pacific/Port_Moresby" , 0x03A860 },
- { "Pacific/Rarotonga" , 0x03A8A4 },
- { "Pacific/Saipan" , 0x03A980 },
- { "Pacific/Samoa" , 0x03A9E3 },
- { "Pacific/Tahiti" , 0x03AA6C },
- { "Pacific/Tarawa" , 0x03AAD1 },
- { "Pacific/Tongatapu" , 0x03AB25 },
- { "Pacific/Truk" , 0x03ABB1 },
- { "Pacific/Wake" , 0x03AC0A },
- { "Pacific/Wallis" , 0x03AC5A },
- { "Pacific/Yap" , 0x03AC9E },
- { "Poland" , 0x03ACE3 },
- { "Portugal" , 0x03B0C4 },
- { "PRC" , 0x03B5C0 },
- { "PST8PDT" , 0x03B671 },
- { "ROC" , 0x03B9C2 },
- { "ROK" , 0x03BADA },
- { "Singapore" , 0x03BB7E },
- { "Turkey" , 0x03BC35 },
- { "UCT" , 0x03C022 },
- { "Universal" , 0x03C066 },
- { "US/Alaska" , 0x03C0AA },
- { "US/Aleutian" , 0x03C413 },
- { "US/Arizona" , 0x03C779 },
- { "US/Central" , 0x03C807 },
- { "US/East-Indiana" , 0x03D211 },
- { "US/Eastern" , 0x03CD12 },
- { "US/Hawaii" , 0x03D47B },
- { "US/Indiana-Starke" , 0x03D509 },
- { "US/Michigan" , 0x03D87A },
- { "US/Mountain" , 0x03DBB1 },
- { "US/Pacific" , 0x03DF2A },
- { "US/Pacific-New" , 0x03E32F },
- { "US/Samoa" , 0x03E734 },
- { "UTC" , 0x03E7BD },
- { "W-SU" , 0x03EAB4 },
- { "WET" , 0x03E801 },
- { "Zulu" , 0x03EDEF },
+ { "America/Argentina/Tucuman" , 0x004035 },
+ { "America/Argentina/Ushuaia" , 0x00430E },
+ { "America/Aruba" , 0x0044C9 },
+ { "America/Asuncion" , 0x00452F },
+ { "America/Atikokan" , 0x004814 },
+ { "America/Atka" , 0x0048EA },
+ { "America/Bahia" , 0x004C50 },
+ { "America/Barbados" , 0x004DD9 },
+ { "America/Belem" , 0x004E73 },
+ { "America/Belize" , 0x004F6E },
+ { "America/Blanc-Sablon" , 0x0050EA },
+ { "America/Boa_Vista" , 0x00519E },
+ { "America/Bogota" , 0x0052A7 },
+ { "America/Boise" , 0x005313 },
+ { "America/Buenos_Aires" , 0x0056AA },
+ { "America/Cambridge_Bay" , 0x005960 },
+ { "America/Campo_Grande" , 0x005C88 },
+ { "America/Cancun" , 0x005F77 },
+ { "America/Caracas" , 0x0061B9 },
+ { "America/Catamarca" , 0x006220 },
+ { "America/Cayenne" , 0x0063C6 },
+ { "America/Cayman" , 0x006428 },
+ { "America/Chicago" , 0x00647D },
+ { "America/Chihuahua" , 0x006994 },
+ { "America/Coral_Harbour" , 0x006BE3 },
+ { "America/Cordoba" , 0x006C75 },
+ { "America/Costa_Rica" , 0x006F38 },
+ { "America/Cuiaba" , 0x006FC2 },
+ { "America/Curacao" , 0x0072A0 },
+ { "America/Danmarkshavn" , 0x007306 },
+ { "America/Dawson" , 0x00744A },
+ { "America/Dawson_Creek" , 0x007767 },
+ { "America/Denver" , 0x007941 },
+ { "America/Detroit" , 0x007CC7 },
+ { "America/Dominica" , 0x008026 },
+ { "America/Edmonton" , 0x00807B },
+ { "America/Eirunepe" , 0x008433 },
+ { "America/El_Salvador" , 0x008546 },
+ { "America/Ensenada" , 0x0085BB },
+ { "America/Fort_Wayne" , 0x008A62 },
+ { "America/Fortaleza" , 0x008924 },
+ { "America/Glace_Bay" , 0x008CCC },
+ { "America/Godthab" , 0x009043 },
+ { "America/Goose_Bay" , 0x009307 },
+ { "America/Grand_Turk" , 0x0097C4 },
+ { "America/Grenada" , 0x009A73 },
+ { "America/Guadeloupe" , 0x009AC8 },
+ { "America/Guatemala" , 0x009B1D },
+ { "America/Guayaquil" , 0x009BA6 },
+ { "America/Guyana" , 0x009C03 },
+ { "America/Halifax" , 0x009C84 },
+ { "America/Havana" , 0x00A19A },
+ { "America/Hermosillo" , 0x00A50D },
+ { "America/Indiana/Indianapolis" , 0x00A5EB },
+ { "America/Indiana/Knox" , 0x00A87C },
+ { "America/Indiana/Marengo" , 0x00AC13 },
+ { "America/Indiana/Petersburg" , 0x00AEB9 },
+ { "America/Indiana/Tell_City" , 0x00B406 },
+ { "America/Indiana/Vevay" , 0x00B69F },
+ { "America/Indiana/Vincennes" , 0x00B8DA },
+ { "America/Indiana/Winamac" , 0x00BB8E },
+ { "America/Indianapolis" , 0x00B19C },
+ { "America/Inuvik" , 0x00BE47 },
+ { "America/Iqaluit" , 0x00C13E },
+ { "America/Jamaica" , 0x00C460 },
+ { "America/Jujuy" , 0x00C525 },
+ { "America/Juneau" , 0x00C6CF },
+ { "America/Kentucky/Louisville" , 0x00CA4D },
+ { "America/Kentucky/Monticello" , 0x00CE6B },
+ { "America/Knox_IN" , 0x00D1F0 },
+ { "America/La_Paz" , 0x00D561 },
+ { "America/Lima" , 0x00D5C8 },
+ { "America/Los_Angeles" , 0x00D670 },
+ { "America/Louisville" , 0x00DA81 },
+ { "America/Maceio" , 0x00DE76 },
+ { "America/Managua" , 0x00DFB0 },
+ { "America/Manaus" , 0x00E063 },
+ { "America/Marigot" , 0x00E165 },
+ { "America/Martinique" , 0x00E1BA },
+ { "America/Mazatlan" , 0x00E226 },
+ { "America/Mendoza" , 0x00E493 },
+ { "America/Menominee" , 0x00E647 },
+ { "America/Merida" , 0x00E9C8 },
+ { "America/Mexico_City" , 0x00EC03 },
+ { "America/Miquelon" , 0x00EE7E },
+ { "America/Moncton" , 0x00F0F0 },
+ { "America/Monterrey" , 0x00F587 },
+ { "America/Montevideo" , 0x00F7CE },
+ { "America/Montreal" , 0x00FAE0 },
+ { "America/Montserrat" , 0x00FFF6 },
+ { "America/Nassau" , 0x01004B },
+ { "America/New_York" , 0x010390 },
+ { "America/Nipigon" , 0x01089B },
+ { "America/Nome" , 0x010BEC },
+ { "America/Noronha" , 0x010F6A },
+ { "America/North_Dakota/Center" , 0x01109A },
+ { "America/North_Dakota/New_Salem" , 0x01142E },
+ { "America/Panama" , 0x0117D7 },
+ { "America/Pangnirtung" , 0x01182C },
+ { "America/Paramaribo" , 0x011B62 },
+ { "America/Phoenix" , 0x011BF4 },
+ { "America/Port-au-Prince" , 0x011CA2 },
+ { "America/Port_of_Spain" , 0x011EBD },
+ { "America/Porto_Acre" , 0x011DBE },
+ { "America/Porto_Velho" , 0x011F12 },
+ { "America/Puerto_Rico" , 0x012008 },
+ { "America/Rainy_River" , 0x012073 },
+ { "America/Rankin_Inlet" , 0x0123AB },
+ { "America/Recife" , 0x012691 },
+ { "America/Regina" , 0x0127BB },
+ { "America/Resolute" , 0x012979 },
+ { "America/Rio_Branco" , 0x012C72 },
+ { "America/Rosario" , 0x012D75 },
+ { "America/Santarem" , 0x013038 },
+ { "America/Santiago" , 0x01313D },
+ { "America/Santo_Domingo" , 0x0134E6 },
+ { "America/Sao_Paulo" , 0x0135AC },
+ { "America/Scoresbysund" , 0x0138BB },
+ { "America/Shiprock" , 0x013BA9 },
+ { "America/St_Barthelemy" , 0x013F38 },
+ { "America/St_Johns" , 0x013F8D },
+ { "America/St_Kitts" , 0x0144E0 },
+ { "America/St_Lucia" , 0x014535 },
+ { "America/St_Thomas" , 0x01458A },
+ { "America/St_Vincent" , 0x0145DF },
+ { "America/Swift_Current" , 0x014634 },
+ { "America/Tegucigalpa" , 0x014755 },
+ { "America/Thule" , 0x0147D4 },
+ { "America/Thunder_Bay" , 0x014A1B },
+ { "America/Tijuana" , 0x014D64 },
+ { "America/Toronto" , 0x0150D9 },
+ { "America/Tortola" , 0x0155F0 },
+ { "America/Vancouver" , 0x015645 },
+ { "America/Virgin" , 0x015A82 },
+ { "America/Whitehorse" , 0x015AD7 },
+ { "America/Winnipeg" , 0x015DF4 },
+ { "America/Yakutat" , 0x016234 },
+ { "America/Yellowknife" , 0x01659F },
+ { "Antarctica/Casey" , 0x0168AF },
+ { "Antarctica/Davis" , 0x016923 },
+ { "Antarctica/DumontDUrville" , 0x0169A0 },
+ { "Antarctica/Mawson" , 0x016A32 },
+ { "Antarctica/McMurdo" , 0x016AA1 },
+ { "Antarctica/Palmer" , 0x016DA3 },
+ { "Antarctica/Rothera" , 0x0170BF },
+ { "Antarctica/South_Pole" , 0x017135 },
+ { "Antarctica/Syowa" , 0x01743D },
+ { "Antarctica/Vostok" , 0x0174AB },
+ { "Arctic/Longyearbyen" , 0x017520 },
+ { "Asia/Aden" , 0x017852 },
+ { "Asia/Almaty" , 0x0178A7 },
+ { "Asia/Amman" , 0x017A26 },
+ { "Asia/Anadyr" , 0x017CE6 },
+ { "Asia/Aqtau" , 0x017FD4 },
+ { "Asia/Aqtobe" , 0x0181D3 },
+ { "Asia/Ashgabat" , 0x01838B },
+ { "Asia/Ashkhabad" , 0x0184A8 },
+ { "Asia/Baghdad" , 0x0185C5 },
+ { "Asia/Bahrain" , 0x01873A },
+ { "Asia/Baku" , 0x0187A0 },
+ { "Asia/Bangkok" , 0x018A88 },
+ { "Asia/Beirut" , 0x018ADD },
+ { "Asia/Bishkek" , 0x018DEA },
+ { "Asia/Brunei" , 0x018F96 },
+ { "Asia/Calcutta" , 0x018FF8 },
+ { "Asia/Choibalsan" , 0x019071 },
+ { "Asia/Chongqing" , 0x0191EA },
+ { "Asia/Chungking" , 0x0192D9 },
+ { "Asia/Colombo" , 0x019388 },
+ { "Asia/Dacca" , 0x019424 },
+ { "Asia/Damascus" , 0x0194C5 },
+ { "Asia/Dhaka" , 0x019815 },
+ { "Asia/Dili" , 0x0198B6 },
+ { "Asia/Dubai" , 0x01993F },
+ { "Asia/Dushanbe" , 0x019994 },
+ { "Asia/Gaza" , 0x019A97 },
+ { "Asia/Harbin" , 0x019DE0 },
+ { "Asia/Ho_Chi_Minh" , 0x019EC7 },
+ { "Asia/Hong_Kong" , 0x019F3F },
+ { "Asia/Hovd" , 0x01A0F5 },
+ { "Asia/Irkutsk" , 0x01A26D },
+ { "Asia/Istanbul" , 0x01A554 },
+ { "Asia/Jakarta" , 0x01A941 },
+ { "Asia/Jayapura" , 0x01A9EB },
+ { "Asia/Jerusalem" , 0x01AA6F },
+ { "Asia/Kabul" , 0x01AD9E },
+ { "Asia/Kamchatka" , 0x01ADEF },
+ { "Asia/Karachi" , 0x01B0D4 },
+ { "Asia/Kashgar" , 0x01B189 },
+ { "Asia/Kathmandu" , 0x01B25A },
+ { "Asia/Katmandu" , 0x01B2C0 },
+ { "Asia/Kolkata" , 0x01B326 },
+ { "Asia/Krasnoyarsk" , 0x01B39F },
+ { "Asia/Kuala_Lumpur" , 0x01B688 },
+ { "Asia/Kuching" , 0x01B745 },
+ { "Asia/Kuwait" , 0x01B833 },
+ { "Asia/Macao" , 0x01B888 },
+ { "Asia/Macau" , 0x01B9C3 },
+ { "Asia/Magadan" , 0x01BAFE },
+ { "Asia/Makassar" , 0x01BDE1 },
+ { "Asia/Manila" , 0x01BE9A },
+ { "Asia/Muscat" , 0x01BF1F },
+ { "Asia/Nicosia" , 0x01BF74 },
+ { "Asia/Novosibirsk" , 0x01C25C },
+ { "Asia/Omsk" , 0x01C550 },
+ { "Asia/Oral" , 0x01C838 },
+ { "Asia/Phnom_Penh" , 0x01CA08 },
+ { "Asia/Pontianak" , 0x01CA80 },
+ { "Asia/Pyongyang" , 0x01CB41 },
+ { "Asia/Qatar" , 0x01CBAE },
+ { "Asia/Qyzylorda" , 0x01CC14 },
+ { "Asia/Rangoon" , 0x01CDEA },
+ { "Asia/Riyadh" , 0x01CE62 },
+ { "Asia/Saigon" , 0x01CEB7 },
+ { "Asia/Sakhalin" , 0x01CF2F },
+ { "Asia/Samarkand" , 0x01D22F },
+ { "Asia/Seoul" , 0x01D365 },
+ { "Asia/Shanghai" , 0x01D409 },
+ { "Asia/Singapore" , 0x01D4E9 },
+ { "Asia/Taipei" , 0x01D5A0 },
+ { "Asia/Tashkent" , 0x01D6B8 },
+ { "Asia/Tbilisi" , 0x01D7E9 },
+ { "Asia/Tehran" , 0x01D9A3 },
+ { "Asia/Tel_Aviv" , 0x01DC11 },
+ { "Asia/Thimbu" , 0x01DF40 },
+ { "Asia/Thimphu" , 0x01DFA6 },
+ { "Asia/Tokyo" , 0x01E00C },
+ { "Asia/Ujung_Pandang" , 0x01E095 },
+ { "Asia/Ulaanbaatar" , 0x01E111 },
+ { "Asia/Ulan_Bator" , 0x01E26C },
+ { "Asia/Urumqi" , 0x01E3B9 },
+ { "Asia/Vientiane" , 0x01E480 },
+ { "Asia/Vladivostok" , 0x01E4F8 },
+ { "Asia/Yakutsk" , 0x01E7E5 },
+ { "Asia/Yekaterinburg" , 0x01EACB },
+ { "Asia/Yerevan" , 0x01EDD7 },
+ { "Atlantic/Azores" , 0x01F0DB },
+ { "Atlantic/Bermuda" , 0x01F5DE },
+ { "Atlantic/Canary" , 0x01F8BF },
+ { "Atlantic/Cape_Verde" , 0x01FB95 },
+ { "Atlantic/Faeroe" , 0x01FC0E },
+ { "Atlantic/Faroe" , 0x01FEB2 },
+ { "Atlantic/Jan_Mayen" , 0x020156 },
+ { "Atlantic/Madeira" , 0x020488 },
+ { "Atlantic/Reykjavik" , 0x020991 },
+ { "Atlantic/South_Georgia" , 0x020B4A },
+ { "Atlantic/St_Helena" , 0x020E62 },
+ { "Atlantic/Stanley" , 0x020B8E },
+ { "Australia/ACT" , 0x020EB7 },
+ { "Australia/Adelaide" , 0x0211D4 },
+ { "Australia/Brisbane" , 0x021500 },
+ { "Australia/Broken_Hill" , 0x0215C7 },
+ { "Australia/Canberra" , 0x021905 },
+ { "Australia/Currie" , 0x021C22 },
+ { "Australia/Darwin" , 0x021F55 },
+ { "Australia/Eucla" , 0x021FDB },
+ { "Australia/Hobart" , 0x0220B0 },
+ { "Australia/LHI" , 0x02240E },
+ { "Australia/Lindeman" , 0x0226A9 },
+ { "Australia/Lord_Howe" , 0x02278A },
+ { "Australia/Melbourne" , 0x022A35 },
+ { "Australia/North" , 0x022D5A },
+ { "Australia/NSW" , 0x022DCE },
+ { "Australia/Perth" , 0x0230EB },
+ { "Australia/Queensland" , 0x0231C3 },
+ { "Australia/South" , 0x02326F },
+ { "Australia/Sydney" , 0x02358C },
+ { "Australia/Tasmania" , 0x0238C9 },
+ { "Australia/Victoria" , 0x023C0E },
+ { "Australia/West" , 0x023F2B },
+ { "Australia/Yancowinna" , 0x023FE1 },
+ { "Brazil/Acre" , 0x024303 },
+ { "Brazil/DeNoronha" , 0x024402 },
+ { "Brazil/East" , 0x024522 },
+ { "Brazil/West" , 0x0247FF },
+ { "Canada/Atlantic" , 0x0248F7 },
+ { "Canada/Central" , 0x024DDF },
+ { "Canada/East-Saskatchewan" , 0x0256E9 },
+ { "Canada/Eastern" , 0x0251F9 },
+ { "Canada/Mountain" , 0x025872 },
+ { "Canada/Newfoundland" , 0x025BE8 },
+ { "Canada/Pacific" , 0x026113 },
+ { "Canada/Saskatchewan" , 0x02652C },
+ { "Canada/Yukon" , 0x0266B5 },
+ { "CET" , 0x0269B8 },
+ { "Chile/Continental" , 0x026CC1 },
+ { "Chile/EasterIsland" , 0x02705C },
+ { "CST6CDT" , 0x02739E },
+ { "Cuba" , 0x0276EF },
+ { "EET" , 0x027A62 },
+ { "Egypt" , 0x027D15 },
+ { "Eire" , 0x0280DC },
+ { "EST" , 0x0285ED },
+ { "EST5EDT" , 0x028631 },
+ { "Etc/GMT" , 0x028982 },
+ { "Etc/GMT+0" , 0x028A4E },
+ { "Etc/GMT+1" , 0x028AD8 },
+ { "Etc/GMT+10" , 0x028B65 },
+ { "Etc/GMT+11" , 0x028BF3 },
+ { "Etc/GMT+12" , 0x028C81 },
+ { "Etc/GMT+2" , 0x028D9C },
+ { "Etc/GMT+3" , 0x028E28 },
+ { "Etc/GMT+4" , 0x028EB4 },
+ { "Etc/GMT+5" , 0x028F40 },
+ { "Etc/GMT+6" , 0x028FCC },
+ { "Etc/GMT+7" , 0x029058 },
+ { "Etc/GMT+8" , 0x0290E4 },
+ { "Etc/GMT+9" , 0x029170 },
+ { "Etc/GMT-0" , 0x028A0A },
+ { "Etc/GMT-1" , 0x028A92 },
+ { "Etc/GMT-10" , 0x028B1E },
+ { "Etc/GMT-11" , 0x028BAC },
+ { "Etc/GMT-12" , 0x028C3A },
+ { "Etc/GMT-13" , 0x028CC8 },
+ { "Etc/GMT-14" , 0x028D0F },
+ { "Etc/GMT-2" , 0x028D56 },
+ { "Etc/GMT-3" , 0x028DE2 },
+ { "Etc/GMT-4" , 0x028E6E },
+ { "Etc/GMT-5" , 0x028EFA },
+ { "Etc/GMT-6" , 0x028F86 },
+ { "Etc/GMT-7" , 0x029012 },
+ { "Etc/GMT-8" , 0x02909E },
+ { "Etc/GMT-9" , 0x02912A },
+ { "Etc/GMT0" , 0x0289C6 },
+ { "Etc/Greenwich" , 0x0291B6 },
+ { "Etc/UCT" , 0x0291FA },
+ { "Etc/Universal" , 0x02923E },
+ { "Etc/UTC" , 0x029282 },
+ { "Etc/Zulu" , 0x0292C6 },
+ { "Europe/Amsterdam" , 0x02930A },
+ { "Europe/Andorra" , 0x029748 },
+ { "Europe/Athens" , 0x0299C4 },
+ { "Europe/Belfast" , 0x029D07 },
+ { "Europe/Belgrade" , 0x02A23E },
+ { "Europe/Berlin" , 0x02A507 },
+ { "Europe/Bratislava" , 0x02A85D },
+ { "Europe/Brussels" , 0x02AB8F },
+ { "Europe/Bucharest" , 0x02AFC6 },
+ { "Europe/Budapest" , 0x02B2F0 },
+ { "Europe/Chisinau" , 0x02B663 },
+ { "Europe/Copenhagen" , 0x02B9F1 },
+ { "Europe/Dublin" , 0x02BCFB },
+ { "Europe/Gibraltar" , 0x02C20C },
+ { "Europe/Guernsey" , 0x02C663 },
+ { "Europe/Helsinki" , 0x02CB9A },
+ { "Europe/Isle_of_Man" , 0x02CE50 },
+ { "Europe/Istanbul" , 0x02D387 },
+ { "Europe/Jersey" , 0x02D774 },
+ { "Europe/Kaliningrad" , 0x02DCAB },
+ { "Europe/Kiev" , 0x02E00E },
+ { "Europe/Lisbon" , 0x02E325 },
+ { "Europe/Ljubljana" , 0x02E829 },
+ { "Europe/London" , 0x02EAF2 },
+ { "Europe/Luxembourg" , 0x02F029 },
+ { "Europe/Madrid" , 0x02F47F },
+ { "Europe/Malta" , 0x02F845 },
+ { "Europe/Mariehamn" , 0x02FBFE },
+ { "Europe/Minsk" , 0x02FEB4 },
+ { "Europe/Monaco" , 0x0301BF },
+ { "Europe/Moscow" , 0x0305FA },
+ { "Europe/Nicosia" , 0x03094C },
+ { "Europe/Oslo" , 0x030C34 },
+ { "Europe/Paris" , 0x030F66 },
+ { "Europe/Podgorica" , 0x0313AC },
+ { "Europe/Prague" , 0x031675 },
+ { "Europe/Riga" , 0x0319A7 },
+ { "Europe/Rome" , 0x031CEC },
+ { "Europe/Samara" , 0x0320AF },
+ { "Europe/San_Marino" , 0x0323DB },
+ { "Europe/Sarajevo" , 0x03279E },
+ { "Europe/Simferopol" , 0x032A67 },
+ { "Europe/Skopje" , 0x032D92 },
+ { "Europe/Sofia" , 0x03305B },
+ { "Europe/Stockholm" , 0x033363 },
+ { "Europe/Tallinn" , 0x033612 },
+ { "Europe/Tirane" , 0x03394C },
+ { "Europe/Tiraspol" , 0x033C52 },
+ { "Europe/Uzhgorod" , 0x033FE0 },
+ { "Europe/Vaduz" , 0x0342F7 },
+ { "Europe/Vatican" , 0x03458A },
+ { "Europe/Vienna" , 0x03494D },
+ { "Europe/Vilnius" , 0x034C7A },
+ { "Europe/Volgograd" , 0x034FB9 },
+ { "Europe/Warsaw" , 0x0352C2 },
+ { "Europe/Zagreb" , 0x0356A3 },
+ { "Europe/Zaporozhye" , 0x03596C },
+ { "Europe/Zurich" , 0x035CAD },
+ { "Factory" , 0x035F5C },
+ { "GB" , 0x035FCD },
+ { "GB-Eire" , 0x036504 },
+ { "GMT" , 0x036A3B },
+ { "GMT+0" , 0x036B07 },
+ { "GMT-0" , 0x036AC3 },
+ { "GMT0" , 0x036A7F },
+ { "Greenwich" , 0x036B4B },
+ { "Hongkong" , 0x036B8F },
+ { "HST" , 0x036D45 },
+ { "Iceland" , 0x036D89 },
+ { "Indian/Antananarivo" , 0x036F42 },
+ { "Indian/Chagos" , 0x036FB6 },
+ { "Indian/Christmas" , 0x037018 },
+ { "Indian/Cocos" , 0x03705C },
+ { "Indian/Comoro" , 0x0370A0 },
+ { "Indian/Kerguelen" , 0x0370F5 },
+ { "Indian/Mahe" , 0x03714A },
+ { "Indian/Maldives" , 0x03719F },
+ { "Indian/Mauritius" , 0x0371F4 },
+ { "Indian/Mayotte" , 0x037397 },
+ { "Indian/Reunion" , 0x0373EC },
+ { "Iran" , 0x037441 },
+ { "Israel" , 0x0376AF },
+ { "Jamaica" , 0x0379DE },
+ { "Japan" , 0x037AA3 },
+ { "Kwajalein" , 0x037B2C },
+ { "Libya" , 0x037B8F },
+ { "MET" , 0x037C89 },
+ { "Mexico/BajaNorte" , 0x037F92 },
+ { "Mexico/BajaSur" , 0x0382FB },
+ { "Mexico/General" , 0x038540 },
+ { "MST" , 0x03879E },
+ { "MST7MDT" , 0x0387E2 },
+ { "Navajo" , 0x038B33 },
+ { "NZ" , 0x038EAC },
+ { "NZ-CHAT" , 0x03922A },
+ { "Pacific/Apia" , 0x039512 },
+ { "Pacific/Auckland" , 0x039579 },
+ { "Pacific/Chatham" , 0x039905 },
+ { "Pacific/Easter" , 0x039BFC },
+ { "Pacific/Efate" , 0x039F5A },
+ { "Pacific/Enderbury" , 0x03A020 },
+ { "Pacific/Fakaofo" , 0x03A08E },
+ { "Pacific/Fiji" , 0x03A0D2 },
+ { "Pacific/Funafuti" , 0x03A148 },
+ { "Pacific/Galapagos" , 0x03A18C },
+ { "Pacific/Gambier" , 0x03A204 },
+ { "Pacific/Guadalcanal" , 0x03A269 },
+ { "Pacific/Guam" , 0x03A2BE },
+ { "Pacific/Honolulu" , 0x03A314 },
+ { "Pacific/Johnston" , 0x03A3A8 },
+ { "Pacific/Kiritimati" , 0x03A3FA },
+ { "Pacific/Kosrae" , 0x03A465 },
+ { "Pacific/Kwajalein" , 0x03A4C2 },
+ { "Pacific/Majuro" , 0x03A52E },
+ { "Pacific/Marquesas" , 0x03A58D },
+ { "Pacific/Midway" , 0x03A5F4 },
+ { "Pacific/Nauru" , 0x03A67E },
+ { "Pacific/Niue" , 0x03A6F6 },
+ { "Pacific/Norfolk" , 0x03A754 },
+ { "Pacific/Noumea" , 0x03A7A9 },
+ { "Pacific/Pago_Pago" , 0x03A839 },
+ { "Pacific/Palau" , 0x03A8C2 },
+ { "Pacific/Pitcairn" , 0x03A906 },
+ { "Pacific/Ponape" , 0x03A95B },
+ { "Pacific/Port_Moresby" , 0x03A9B0 },
+ { "Pacific/Rarotonga" , 0x03A9F4 },
+ { "Pacific/Saipan" , 0x03AAD0 },
+ { "Pacific/Samoa" , 0x03AB33 },
+ { "Pacific/Tahiti" , 0x03ABBC },
+ { "Pacific/Tarawa" , 0x03AC21 },
+ { "Pacific/Tongatapu" , 0x03AC75 },
+ { "Pacific/Truk" , 0x03AD01 },
+ { "Pacific/Wake" , 0x03AD5A },
+ { "Pacific/Wallis" , 0x03ADAA },
+ { "Pacific/Yap" , 0x03ADEE },
+ { "Poland" , 0x03AE33 },
+ { "Portugal" , 0x03B214 },
+ { "PRC" , 0x03B710 },
+ { "PST8PDT" , 0x03B7C1 },
+ { "ROC" , 0x03BB12 },
+ { "ROK" , 0x03BC2A },
+ { "Singapore" , 0x03BCCE },
+ { "Turkey" , 0x03BD85 },
+ { "UCT" , 0x03C172 },
+ { "Universal" , 0x03C1B6 },
+ { "US/Alaska" , 0x03C1FA },
+ { "US/Aleutian" , 0x03C563 },
+ { "US/Arizona" , 0x03C8C9 },
+ { "US/Central" , 0x03C957 },
+ { "US/East-Indiana" , 0x03D361 },
+ { "US/Eastern" , 0x03CE62 },
+ { "US/Hawaii" , 0x03D5CB },
+ { "US/Indiana-Starke" , 0x03D659 },
+ { "US/Michigan" , 0x03D9CA },
+ { "US/Mountain" , 0x03DD01 },
+ { "US/Pacific" , 0x03E07A },
+ { "US/Pacific-New" , 0x03E47F },
+ { "US/Samoa" , 0x03E884 },
+ { "UTC" , 0x03E90D },
+ { "W-SU" , 0x03EC04 },
+ { "WET" , 0x03E951 },
+ { "Zulu" , 0x03EF3F },
};
/* This is a generated file, do not modify */
-const unsigned char timelib_timezone_db_data_builtin[257587] = {
+const unsigned char timelib_timezone_db_data_builtin[257923] = {
/* Africa/Abidjan */
@@ -569,8 +569,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x92, 0xE6, 0x92, 0x48,
0x01, 0xFF, 0xFF, 0xFC, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x91, 0x71, 0x12, 0x01, 0x0C, 0x9B,
+0x05, 0x00, 0x00, 0x00, 0x00,
/* Africa/Accra */
0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -582,16 +582,16 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xCC, 0x95, 0x80, 0x00, 0xCD, 0x35, 0x00, 0xD0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xFF, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x04,
0xB0, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x47, 0x48, 0x53,
-0x54, 0x00, 0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x54, 0x00, 0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x91, 0xCC, 0x38,
+0x01, 0x12, 0xFD, 0x22, 0x00, 0x00, 0x00, 0x00,
/* Africa/Addis_Ababa */
0x50, 0x48, 0x50, 0x31, 0x01, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0xC0, 0xAF, 0xF2, 0x98,
0x01, 0x00, 0x00, 0x24, 0x68, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x05, 0x41, 0x44, 0x4D,
-0x54, 0x00, 0x45, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x54, 0x00, 0x45, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x97, 0x1C, 0xE5, 0x01, 0x4D,
+0xB5, 0xB0, 0x00, 0x00, 0x00, 0x00,
/* Africa/Algiers */
0x50, 0x48, 0x50, 0x31, 0x01, 0x44, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -612,15 +612,15 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x50, 0x4D, 0x54, 0x00, 0x57,
0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54,
0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0xC1, 0x74, 0xBD, 0x01, 0x17, 0x4F, 0xE8, 0x00, 0x00, 0x00, 0x00,
/* Africa/Asmara */
0x50, 0x48, 0x50, 0x31, 0x01, 0x45, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0xC0, 0xAF, 0xF2, 0x98,
0x01, 0x00, 0x00, 0x24, 0x68, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x05, 0x41, 0x44, 0x4D,
-0x54, 0x00, 0x45, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x54, 0x00, 0x45, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xB9, 0xD5, 0x01, 0x4D,
+0xFD, 0x4D, 0x00, 0x00, 0x00, 0x00,
/* Africa/Asmera */
0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -637,15 +637,15 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xBC, 0x92, 0xB8, 0x80, 0xEE, 0x11, 0x87, 0x10, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xF8, 0x80, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x4C, 0x4D, 0x54,
0x00, 0x47, 0x4D, 0x54, 0x00, 0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x9C, 0xA1, 0xA8, 0x01, 0x06, 0x73, 0x80, 0x00, 0x00, 0x00, 0x00,
/* Africa/Bangui */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x92, 0xE6, 0x7D, 0x14,
0x01, 0x00, 0x00, 0x11, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8F, 0xFD, 0xFA, 0x01, 0x2F, 0x03,
+0x9D, 0x00, 0x00, 0x00, 0x00,
/* Africa/Banjul */
0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -654,8 +654,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xBE, 0x2A, 0x27, 0x9C, 0xF4, 0xB6, 0x36, 0x10, 0x01, 0x02, 0x03, 0xFF, 0xFF, 0xF0, 0x64, 0x00,
0x00, 0xFF, 0xFF, 0xF0, 0x64, 0x00, 0x04, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x00, 0x00, 0x00,
0x00, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x4D, 0x54, 0x00, 0x57, 0x41, 0x54, 0x00, 0x47,
-0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9D, 0xE0, 0xAA, 0x00,
+0xFB, 0x3C, 0x68, 0x00, 0x00, 0x00, 0x00,
/* Africa/Bissau */
0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -663,30 +663,30 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x91, 0xC4, 0x93, 0x1C,
0x09, 0x67, 0x61, 0x10, 0x01, 0x02, 0xFF, 0xFF, 0xF1, 0x64, 0x00, 0x00, 0xFF, 0xFF, 0xF1, 0xF0,
0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x41, 0x54, 0x00,
-0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0x69, 0x28, 0x00, 0xFC,
+0xA8, 0xFD, 0x00, 0x00, 0x00, 0x00,
/* Africa/Blantyre */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x82, 0x46, 0xC3, 0xB0,
0x01, 0x00, 0x00, 0x20, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x43, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x43, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0xA2, 0xDD, 0x01, 0x48, 0x10,
+0x60, 0x00, 0x00, 0x00, 0x00,
/* Africa/Brazzaville */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x92, 0xE6, 0x80, 0x2C,
0x01, 0x00, 0x00, 0x0E, 0x54, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0xA1, 0xEA, 0x01, 0x29, 0xFA,
+0x8D, 0x00, 0x00, 0x00, 0x00,
/* Africa/Bujumbura */
0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x1C, 0x20,
-0x00, 0x00, 0x43, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x43, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x85, 0x56, 0x1D, 0x01, 0x3F, 0x77, 0xDA,
0x00, 0x00, 0x00, 0x00,
/* Africa/Cairo */
@@ -722,21 +722,21 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x3F, 0x73, 0x57, 0x50, 0x40, 0x91, 0x7A, 0xE0, 0x41, 0x5C, 0x73, 0xD0, 0x42, 0x71, 0x5C, 0xE0,
0x43, 0x3C, 0x55, 0xD0, 0x44, 0x51, 0x3E, 0xE0, 0x45, 0x12, 0xFD, 0x50, 0x46, 0x31, 0x20, 0xE0,
0x46, 0xE0, 0x6A, 0x50, 0x48, 0x11, 0x02, 0xE0, 0x48, 0xB7, 0x11, 0xD0, 0x49, 0xF0, 0xE4, 0xE0,
-0x4A, 0x96, 0xF3, 0xD0, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0x76, 0xD5, 0xD0, 0x4D, 0xB9, 0xE3, 0x60,
-0x4E, 0x56, 0xB7, 0xD0, 0x4F, 0x99, 0xC5, 0x60, 0x50, 0x3F, 0xD4, 0x50, 0x51, 0x79, 0xA7, 0x60,
-0x52, 0x1F, 0xB6, 0x50, 0x53, 0x59, 0x89, 0x60, 0x53, 0xFF, 0x98, 0x50, 0x55, 0x39, 0x6B, 0x60,
-0x55, 0xDF, 0x7A, 0x50, 0x57, 0x22, 0x87, 0xE0, 0x57, 0xBF, 0x5C, 0x50, 0x59, 0x02, 0x69, 0xE0,
-0x59, 0xA8, 0x78, 0xD0, 0x5A, 0xE2, 0x4B, 0xE0, 0x5B, 0x88, 0x5A, 0xD0, 0x5C, 0xC2, 0x2D, 0xE0,
-0x5D, 0x68, 0x3C, 0xD0, 0x5E, 0xA2, 0x0F, 0xE0, 0x5F, 0x48, 0x1E, 0xD0, 0x60, 0x8B, 0x2C, 0x60,
-0x61, 0x28, 0x00, 0xD0, 0x62, 0x6B, 0x0E, 0x60, 0x63, 0x07, 0xE2, 0xD0, 0x64, 0x4A, 0xF0, 0x60,
-0x64, 0xF0, 0xFF, 0x50, 0x66, 0x2A, 0xD2, 0x60, 0x66, 0xD0, 0xE1, 0x50, 0x68, 0x0A, 0xB4, 0x60,
-0x68, 0xB0, 0xC3, 0x50, 0x69, 0xEA, 0x96, 0x60, 0x6A, 0x90, 0xA5, 0x50, 0x6B, 0xD3, 0xB2, 0xE0,
-0x6C, 0x70, 0x87, 0x50, 0x6D, 0xB3, 0x94, 0xE0, 0x6E, 0x59, 0xA3, 0xD0, 0x6F, 0x93, 0x76, 0xE0,
-0x70, 0x39, 0x85, 0xD0, 0x71, 0x73, 0x58, 0xE0, 0x72, 0x19, 0x67, 0xD0, 0x73, 0x53, 0x3A, 0xE0,
-0x73, 0xF9, 0x49, 0xD0, 0x75, 0x3C, 0x57, 0x60, 0x75, 0xD9, 0x2B, 0xD0, 0x77, 0x1C, 0x39, 0x60,
-0x77, 0xB9, 0x0D, 0xD0, 0x78, 0xFC, 0x1B, 0x60, 0x79, 0xA2, 0x2A, 0x50, 0x7A, 0xDB, 0xFD, 0x60,
-0x7B, 0x82, 0x0C, 0x50, 0x7C, 0xBB, 0xDF, 0x60, 0x7D, 0x61, 0xEE, 0x50, 0x7E, 0x9B, 0xC1, 0x60,
-0x7F, 0x41, 0xD0, 0x50, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
+0x4A, 0xBB, 0xDD, 0xD0, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0xA4, 0xFA, 0x50, 0x4D, 0xB9, 0xE3, 0x60,
+0x4E, 0x84, 0xDC, 0x50, 0x4F, 0x99, 0xC5, 0x60, 0x50, 0x64, 0xBE, 0x50, 0x51, 0x79, 0xA7, 0x60,
+0x52, 0x44, 0xA0, 0x50, 0x53, 0x59, 0x89, 0x60, 0x54, 0x24, 0x82, 0x50, 0x55, 0x39, 0x6B, 0x60,
+0x56, 0x04, 0x64, 0x50, 0x57, 0x22, 0x87, 0xE0, 0x57, 0xED, 0x80, 0xD0, 0x59, 0x02, 0x69, 0xE0,
+0x59, 0xCD, 0x62, 0xD0, 0x5A, 0xE2, 0x4B, 0xE0, 0x5B, 0xAD, 0x44, 0xD0, 0x5C, 0xC2, 0x2D, 0xE0,
+0x5D, 0x8D, 0x26, 0xD0, 0x5E, 0xA2, 0x0F, 0xE0, 0x5F, 0x6D, 0x08, 0xD0, 0x60, 0x8B, 0x2C, 0x60,
+0x61, 0x56, 0x25, 0x50, 0x62, 0x6B, 0x0E, 0x60, 0x63, 0x36, 0x07, 0x50, 0x64, 0x4A, 0xF0, 0x60,
+0x65, 0x15, 0xE9, 0x50, 0x66, 0x2A, 0xD2, 0x60, 0x66, 0xF5, 0xCB, 0x50, 0x68, 0x0A, 0xB4, 0x60,
+0x68, 0xD5, 0xAD, 0x50, 0x69, 0xEA, 0x96, 0x60, 0x6A, 0xB5, 0x8F, 0x50, 0x6B, 0xD3, 0xB2, 0xE0,
+0x6C, 0x9E, 0xAB, 0xD0, 0x6D, 0xB3, 0x94, 0xE0, 0x6E, 0x7E, 0x8D, 0xD0, 0x6F, 0x93, 0x76, 0xE0,
+0x70, 0x5E, 0x6F, 0xD0, 0x71, 0x73, 0x58, 0xE0, 0x72, 0x3E, 0x51, 0xD0, 0x73, 0x53, 0x3A, 0xE0,
+0x74, 0x1E, 0x33, 0xD0, 0x75, 0x3C, 0x57, 0x60, 0x76, 0x07, 0x50, 0x50, 0x77, 0x1C, 0x39, 0x60,
+0x77, 0xE7, 0x32, 0x50, 0x78, 0xFC, 0x1B, 0x60, 0x79, 0xC7, 0x14, 0x50, 0x7A, 0xDB, 0xFD, 0x60,
+0x7B, 0xA6, 0xF6, 0x50, 0x7C, 0xBB, 0xDF, 0x60, 0x7D, 0x86, 0xD8, 0x50, 0x7E, 0x9B, 0xC1, 0x60,
+0x7F, 0x66, 0xBA, 0x50, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
@@ -749,24 +749,24 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
0x02, 0x03, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x05, 0x00, 0x00,
0x2A, 0x30, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x05, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45,
-0x45, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x45, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB7, 0x2E, 0x88, 0x01,
+0x42, 0x57, 0x88, 0x00, 0x00, 0x00, 0x00,
/* Africa/Casablanca */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x11, 0x96, 0x51, 0xF9, 0x9C,
+0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x11, 0x96, 0x51, 0xF9, 0x9C,
0xC6, 0xFF, 0x14, 0x80, 0xC7, 0x58, 0xAC, 0x70, 0xC7, 0xD9, 0xED, 0x80, 0xD2, 0xA1, 0x32, 0xF0,
0xDB, 0x35, 0xA4, 0x00, 0xDB, 0xEE, 0x27, 0xF0, 0xFB, 0x25, 0x72, 0x40, 0xFB, 0xC2, 0xEF, 0x70,
0x08, 0x6B, 0x84, 0x80, 0x08, 0xC6, 0x6D, 0xF0, 0x0B, 0xE8, 0x0C, 0x00, 0x0C, 0x61, 0x47, 0xF0,
0x0D, 0xC9, 0x3F, 0x80, 0x0E, 0x8E, 0xF2, 0x70, 0x0F, 0xD3, 0x51, 0x80, 0x10, 0x27, 0xA3, 0x70,
0x1A, 0xB7, 0xA6, 0x00, 0x1E, 0x18, 0x6F, 0xF0, 0x48, 0x41, 0xE6, 0x80, 0x48, 0xBB, 0x22, 0x70,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x03, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xF8, 0xE4, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01,
-0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0D, 0x4C, 0x4D, 0x54,
-0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
-0x00, 0x00,
+0x4A, 0x23, 0x1A, 0x00, 0x4A, 0x8D, 0xD5, 0x70, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF,
+0xFF, 0xF8, 0xE4, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x09, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00,
+0x57, 0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xBC, 0xAC, 0xC8, 0x01, 0x08, 0xDD, 0xFD, 0x00, 0x00, 0x00, 0x00,
/* Africa/Ceuta */
0x50, 0x48, 0x50, 0x31, 0x01, 0x45, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -815,8 +815,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x09,
0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x09, 0x57, 0x45, 0x54, 0x00,
0x57, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0F, 0x43, 0x65, 0x75, 0x74, 0x61, 0x20, 0x26, 0x20,
+0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xC0, 0x15, 0x2D,
+0x01, 0x0B, 0x83, 0x12, 0x00, 0x00, 0x00, 0x0F, 0x43, 0x65, 0x75, 0x74, 0x61, 0x20, 0x26, 0x20,
0x4D, 0x65, 0x6C, 0x69, 0x6C, 0x6C, 0x61,
/* Africa/Conakry */
@@ -826,7 +826,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xBC, 0x92, 0xB8, 0x80, 0xED, 0x30, 0x16, 0x90, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xF3, 0x24, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x4C, 0x4D, 0x54,
0x00, 0x47, 0x4D, 0x54, 0x00, 0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x97, 0xD9, 0xB2, 0x00, 0xFF, 0xEA, 0x52, 0x00, 0x00, 0x00, 0x00,
/* Africa/Dakar */
0x50, 0x48, 0x50, 0x31, 0x01, 0x53, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -834,8 +834,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x92, 0xE6, 0x9E, 0xD8,
0xCA, 0x3B, 0x10, 0x90, 0x01, 0x02, 0xFF, 0xFF, 0xEF, 0xA8, 0x00, 0x00, 0xFF, 0xFF, 0xF1, 0xF0,
0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x41, 0x54, 0x00,
-0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9F, 0xB5, 0x6A, 0x00, 0xF9,
+0x61, 0x25, 0x00, 0x00, 0x00, 0x00,
/* Africa/Dar_es_Salaam */
0x50, 0x48, 0x50, 0x31, 0x01, 0x54, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -844,23 +844,23 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xD6, 0x9D, 0x7F, 0xD0, 0xEF, 0x12, 0x66, 0xE3, 0x01, 0x02, 0x01, 0x00, 0x00, 0x24, 0xD4, 0x00,
0x00, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x00, 0x00, 0x26, 0x9D, 0x00, 0x08, 0x4C, 0x4D, 0x54,
0x00, 0x45, 0x41, 0x54, 0x00, 0x42, 0x45, 0x41, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x81, 0x65, 0x00, 0x01, 0x4E, 0x99, 0x8D, 0x00, 0x00, 0x00, 0x00,
/* Africa/Djibouti */
0x50, 0x48, 0x50, 0x31, 0x01, 0x44, 0x4A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF3, 0xD2, 0x0C,
0x01, 0x00, 0x00, 0x28, 0x74, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x45, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x45, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0x07, 0x80, 0x01, 0x54, 0x7F,
+0xF8, 0x00, 0x00, 0x00, 0x00,
/* Africa/Douala */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x92, 0xE6, 0x85, 0x68,
0x01, 0x00, 0x00, 0x09, 0x18, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8F, 0x82, 0x48, 0x01, 0x21, 0x75,
+0x90, 0x00, 0x00, 0x00, 0x00,
/* Africa/El_Aaiun */
0x50, 0x48, 0x50, 0x31, 0x01, 0x45, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -868,8 +868,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xBC, 0x48, 0xF0, 0xE0,
0x0B, 0xD1, 0xB0, 0x90, 0x01, 0x02, 0xFF, 0xFF, 0xF3, 0xA0, 0x00, 0x00, 0xFF, 0xFF, 0xF1, 0xF0,
0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x41, 0x54, 0x00,
-0x57, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x57, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB2, 0xC1, 0xB8, 0x00, 0xFF,
+0x20, 0x7F, 0x00, 0x00, 0x00, 0x00,
/* Africa/Freetown */
0x50, 0x48, 0x50, 0x31, 0x01, 0x53, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -888,7 +888,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xF1, 0xF0, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D,
0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x46, 0x4D, 0x54, 0x00, 0x53, 0x4C, 0x53, 0x54, 0x00, 0x57,
0x41, 0x54, 0x00, 0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x96, 0x4C, 0x90, 0x00, 0xFF, 0x34, 0x08, 0x00, 0x00, 0x00, 0x00,
/* Africa/Gaborone */
0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -896,15 +896,15 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0xCE, 0x8E, 0x6E, 0x80,
0xCF, 0x7E, 0x51, 0x70, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30,
0x01, 0x04, 0x43, 0x41, 0x54, 0x00, 0x43, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x65, 0xB3, 0x28, 0x01, 0x3A, 0x34, 0x32, 0x00, 0x00, 0x00, 0x00,
/* Africa/Harare */
0x50, 0x48, 0x50, 0x31, 0x01, 0x5A, 0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x82, 0x46, 0xC7, 0x64,
0x01, 0x00, 0x00, 0x1D, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x43, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x43, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xA9, 0x25, 0x01, 0x42, 0x09,
+0x68, 0x00, 0x00, 0x00, 0x00,
/* Africa/Johannesburg */
0x50, 0x48, 0x50, 0x31, 0x01, 0x5A, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -913,7 +913,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xCC, 0xAE, 0x8C, 0x80, 0xCD, 0x9E, 0x6F, 0x70, 0xCE, 0x8E, 0x6E, 0x80, 0xCF, 0x7E, 0x51, 0x70,
0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x15, 0x18, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01,
0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x00, 0x53, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x62, 0x09, 0xA8, 0x01, 0x3D, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00,
/* Africa/Kampala */
0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -923,7 +923,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x1E, 0x64, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x00, 0x00, 0x23, 0x28,
0x00, 0x08, 0x00, 0x00, 0x26, 0x9D, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x41, 0x54, 0x00,
0x42, 0x45, 0x41, 0x54, 0x00, 0x42, 0x45, 0x41, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x89, 0xCF, 0xF2, 0x01, 0x44, 0x1F, 0x42, 0x00, 0x00, 0x00, 0x00,
/* Africa/Khartoum */
0x50, 0x48, 0x50, 0x31, 0x01, 0x53, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -942,7 +942,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x00, 0x00, 0x1E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30,
0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x0D, 0x4C, 0x4D,
0x54, 0x00, 0x43, 0x41, 0x53, 0x54, 0x00, 0x43, 0x41, 0x54, 0x00, 0x45, 0x41, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0x22, 0x00, 0x01, 0x44, 0x4C, 0xD5, 0x00,
0x00, 0x00, 0x00,
/* Africa/Kigali */
@@ -950,14 +950,14 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0xBE, 0xF1, 0x0E, 0x50,
0x01, 0x00, 0x00, 0x1C, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x43, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x43, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x40, 0xB8, 0x01, 0x40, 0x89,
+0x4A, 0x00, 0x00, 0x00, 0x00,
/* Africa/Kinshasa */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x0E, 0x10,
-0x00, 0x00, 0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x83, 0xAE, 0xF0, 0x01, 0x2A, 0x01, 0x10,
0x00, 0x00, 0x00, 0x17, 0x77, 0x65, 0x73, 0x74, 0x20, 0x44, 0x65, 0x6D, 0x2E, 0x20, 0x52, 0x65,
0x70, 0x2E, 0x20, 0x6F, 0x66, 0x20, 0x43, 0x6F, 0x6E, 0x67, 0x6F,
@@ -966,22 +966,22 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0xA1, 0x51, 0xF3, 0x50,
0x01, 0x00, 0x00, 0x03, 0x30, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x93, 0x2B, 0xC8, 0x01, 0x17, 0xD8,
+0xA0, 0x00, 0x00, 0x00, 0x00,
/* Africa/Libreville */
0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x92, 0xE6, 0x85, 0xA4,
0x01, 0x00, 0x00, 0x08, 0xDC, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0xE9, 0xFD, 0x01, 0x21, 0x13,
+0xE8, 0x00, 0x00, 0x00, 0x00,
/* Africa/Lome */
0x50, 0x48, 0x50, 0x31, 0x01, 0x54, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x92, 0xB0, 0x15, 0x01, 0x14, 0x83, 0xC2,
0x00, 0x00, 0x00, 0x00,
/* Africa/Luanda */
@@ -989,14 +989,14 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xC4, 0x78, 0x4C,
0x01, 0x00, 0x00, 0x0C, 0x34, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x04, 0x41, 0x4F, 0x54,
-0x00, 0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x57, 0xC0, 0x01, 0x26, 0xD9,
+0xC5, 0x00, 0x00, 0x00, 0x00,
/* Africa/Lubumbashi */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x1C, 0x20,
-0x00, 0x00, 0x43, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x43, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x79, 0x8F, 0xCA, 0x01, 0x3C, 0x91, 0xAA,
0x00, 0x00, 0x00, 0x17, 0x65, 0x61, 0x73, 0x74, 0x20, 0x44, 0x65, 0x6D, 0x2E, 0x20, 0x52, 0x65,
0x70, 0x2E, 0x20, 0x6F, 0x66, 0x20, 0x43, 0x6F, 0x6E, 0x67, 0x6F,
@@ -1005,8 +1005,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x82, 0x46, 0xC9, 0xFC,
0x01, 0x00, 0x00, 0x1A, 0x84, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x43, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x43, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x13, 0xA2, 0x01, 0x3D, 0xD0,
+0xAD, 0x00, 0x00, 0x00, 0x00,
/* Africa/Malabo */
0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1014,16 +1014,16 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x92, 0xE6, 0x86, 0x44,
0xF4, 0x9F, 0xBE, 0x80, 0x01, 0x02, 0x00, 0x00, 0x08, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x47, 0x4D, 0x54, 0x00,
-0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8F, 0x0D, 0x18, 0x01, 0x20,
+0x0F, 0x7D, 0x00, 0x00, 0x00, 0x00,
/* Africa/Maputo */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x82, 0x46, 0xC5, 0xF4,
0x01, 0x00, 0x00, 0x1E, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x43, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x43, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0xA8, 0x3A, 0x01, 0x44, 0x60,
+0x5D, 0x00, 0x00, 0x00, 0x00,
/* Africa/Maseru */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4C, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1031,16 +1031,16 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x09, 0x82, 0x46, 0xCA, 0xB8,
0xCE, 0x8E, 0x6E, 0x80, 0xCF, 0x7E, 0x51, 0x70, 0x01, 0x02, 0x01, 0x00, 0x00, 0x19, 0xC8, 0x00,
0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x04, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x53, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x53, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xCA, 0x6A,
+0x01, 0x3C, 0x9E, 0xB0, 0x00, 0x00, 0x00, 0x00,
/* Africa/Mbabane */
0x50, 0x48, 0x50, 0x31, 0x01, 0x53, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0x82, 0x46, 0xC7, 0x58,
0x01, 0x00, 0x00, 0x1D, 0x28, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x53, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x53, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x1D, 0x30, 0x01, 0x42,
+0x1C, 0xF0, 0x00, 0x00, 0x00, 0x00,
/* Africa/Mogadishu */
0x50, 0x48, 0x50, 0x31, 0x01, 0x53, 0x4F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1048,7 +1048,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0xB6, 0xA3, 0xCE, 0x50,
0xE7, 0x8C, 0x4A, 0xD8, 0x01, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x00, 0x00, 0x00, 0x23, 0x28,
0x00, 0x04, 0x45, 0x41, 0x54, 0x00, 0x42, 0x45, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x8C, 0x7B, 0x8A, 0x01, 0x57, 0xE1, 0xDA, 0x00, 0x00, 0x00, 0x00,
/* Africa/Monrovia */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4C, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1056,8 +1056,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xA0, 0x5F, 0x6C, 0x9C,
0x04, 0x61, 0xF6, 0xEE, 0x01, 0x02, 0xFF, 0xFF, 0xF5, 0xE4, 0x00, 0x00, 0xFF, 0xFF, 0xF5, 0x92,
0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x4D, 0x4D, 0x54, 0x00, 0x4C, 0x52, 0x54, 0x00,
-0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x92, 0xF1, 0x30, 0x01, 0x04,
+0x98, 0x3D, 0x00, 0x00, 0x00, 0x00,
/* Africa/Nairobi */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4B, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1067,7 +1067,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x22, 0x84, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x00, 0x00, 0x23, 0x28,
0x00, 0x08, 0x00, 0x00, 0x26, 0x9D, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x41, 0x54, 0x00,
0x42, 0x45, 0x41, 0x54, 0x00, 0x42, 0x45, 0x41, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x88, 0x3C, 0x4D, 0x01, 0x4A, 0xD6, 0x02, 0x00, 0x00, 0x00, 0x00,
/* Africa/Ndjamena */
0x50, 0x48, 0x50, 0x31, 0x01, 0x54, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1076,7 +1076,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x12, 0x66, 0x71, 0x70, 0x13, 0x26, 0xDE, 0x60, 0x01, 0x02, 0x01, 0x00, 0x00, 0x0E, 0x1C, 0x00,
0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x08, 0x4C, 0x4D, 0x54,
0x00, 0x57, 0x41, 0x54, 0x00, 0x57, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x9B, 0xD1, 0x52, 0x01, 0x29, 0x9F, 0x68, 0x00, 0x00, 0x00, 0x00,
/* Africa/Niamey */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4E, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1085,7 +1085,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xBC, 0x92, 0xC6, 0x90, 0xED, 0x30, 0x08, 0x80, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0xFC, 0x00,
0x00, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x0E,
0x10, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x41, 0x54, 0x00, 0x47, 0x4D, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9D, 0xF4, 0x32, 0x01, 0x15, 0xE3, 0x52, 0x00,
0x00, 0x00, 0x00,
/* Africa/Nouakchott */
@@ -1095,15 +1095,15 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xBC, 0x92, 0xB8, 0x80, 0xEE, 0xE5, 0xC8, 0x90, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xF1, 0x0C, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x4C, 0x4D, 0x54,
0x00, 0x47, 0x4D, 0x54, 0x00, 0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0xA4, 0xF2, 0x90, 0x00, 0xFD, 0x38, 0x37, 0x00, 0x00, 0x00, 0x00,
/* Africa/Ouagadougou */
0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x92, 0xE6, 0x8F, 0xEC,
0x01, 0xFF, 0xFF, 0xFE, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9C, 0x32, 0xFA, 0x01, 0x11, 0xEB,
+0xB2, 0x00, 0x00, 0x00, 0x00,
/* Africa/Porto-Novo */
0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x4A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1111,16 +1111,16 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x92, 0xE6, 0x8C, 0x0C,
0xBC, 0x92, 0xB8, 0x80, 0x01, 0x02, 0x00, 0x00, 0x02, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x47, 0x4D, 0x54, 0x00,
-0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x57, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x93, 0x38, 0xCD, 0x01, 0x16,
+0xA6, 0xA2, 0x00, 0x00, 0x00, 0x00,
/* Africa/Sao_Tome */
0x50, 0x48, 0x50, 0x31, 0x01, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x92, 0xE6, 0x97, 0x10,
0x01, 0xFF, 0xFF, 0xF7, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0xD6, 0x75, 0x01, 0x1C, 0xEE,
+0xB5, 0x00, 0x00, 0x00, 0x00,
/* Africa/Timbuktu */
0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1146,13 +1146,13 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x02, 0x01, 0x03, 0x00, 0x00, 0x0C,
0x5C, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x09, 0x00,
0x00, 0x1C, 0x20, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45,
-0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89,
-0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBB,
+0x87, 0xD0, 0x01, 0x26, 0xC6, 0x3D, 0x00, 0x00, 0x00, 0x00,
/* Africa/Tunis */
0x50, 0x48, 0x50, 0x31, 0x01, 0x54, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x5B, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0D, 0x91, 0x60, 0x50, 0x4F,
+0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0D, 0x91, 0x60, 0x50, 0x4F,
0xC6, 0x3A, 0x88, 0xE0, 0xC7, 0x58, 0x9E, 0x60, 0xC7, 0xDB, 0x22, 0xE0, 0xCA, 0xE2, 0x54, 0xE0,
0xCB, 0xAD, 0x69, 0xF0, 0xCC, 0xE7, 0x4B, 0x10, 0xCD, 0xA9, 0x17, 0x90, 0xCD, 0xC2, 0x16, 0x00,
0xCD, 0xCC, 0xB0, 0x10, 0xCE, 0xA2, 0x35, 0x00, 0xCF, 0x92, 0x34, 0x10, 0xD0, 0x89, 0xE3, 0xE0,
@@ -1161,31 +1161,30 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x24, 0x2C, 0x19, 0xF0, 0x25, 0x1C, 0x0A, 0xF0, 0x26, 0x3C, 0xC3, 0x70, 0x27, 0x05, 0x27, 0x70,
0x42, 0x74, 0x0D, 0xF0, 0x43, 0x3C, 0x80, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x45, 0x43, 0xFD, 0x10,
0x46, 0x05, 0xC9, 0x90, 0x47, 0x23, 0xDF, 0x10, 0x47, 0xEE, 0xE6, 0x10, 0x49, 0x03, 0xC1, 0x10,
-0x49, 0xCE, 0xC8, 0x10, 0x4A, 0xE3, 0xA3, 0x10, 0x4B, 0xAE, 0xAA, 0x10, 0x4C, 0xCC, 0xBF, 0x90,
-0x4D, 0x8E, 0x8C, 0x10, 0x4E, 0xAC, 0xA1, 0x90, 0x4F, 0x6E, 0x6E, 0x10, 0x50, 0x8C, 0x83, 0x90,
-0x51, 0x57, 0x8A, 0x90, 0x52, 0x6C, 0x65, 0x90, 0x53, 0x37, 0x6C, 0x90, 0x54, 0x4C, 0x47, 0x90,
-0x55, 0x17, 0x4E, 0x90, 0x56, 0x2C, 0x29, 0x90, 0x56, 0xF7, 0x30, 0x90, 0x58, 0x15, 0x46, 0x10,
-0x58, 0xD7, 0x12, 0x90, 0x59, 0xF5, 0x28, 0x10, 0x5A, 0xB6, 0xF4, 0x90, 0x5B, 0xD5, 0x0A, 0x10,
-0x5C, 0xA0, 0x11, 0x10, 0x5D, 0xB4, 0xEC, 0x10, 0x5E, 0x7F, 0xF3, 0x10, 0x5F, 0x94, 0xCE, 0x10,
-0x60, 0x5F, 0xD5, 0x10, 0x61, 0x7D, 0xEA, 0x90, 0x62, 0x3F, 0xB7, 0x10, 0x63, 0x5D, 0xCC, 0x90,
-0x64, 0x1F, 0x99, 0x10, 0x65, 0x3D, 0xAE, 0x90, 0x66, 0x08, 0xB5, 0x90, 0x67, 0x1D, 0x90, 0x90,
-0x67, 0xE8, 0x97, 0x90, 0x68, 0xFD, 0x72, 0x90, 0x69, 0xC8, 0x79, 0x90, 0x6A, 0xDD, 0x54, 0x90,
-0x6B, 0xA8, 0x5B, 0x90, 0x6C, 0xC6, 0x71, 0x10, 0x6D, 0x88, 0x3D, 0x90, 0x6E, 0xA6, 0x53, 0x10,
-0x6F, 0x68, 0x1F, 0x90, 0x70, 0x86, 0x35, 0x10, 0x71, 0x51, 0x3C, 0x10, 0x72, 0x66, 0x17, 0x10,
-0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90,
-0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90,
-0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90,
-0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x03, 0x01, 0x02, 0x01, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x4B, 0xAE, 0xAA, 0x10, 0x4C, 0xCC, 0xBF, 0x90, 0x4D, 0x8E, 0x8C, 0x10, 0x4E, 0xAC, 0xA1, 0x90,
+0x4F, 0x6E, 0x6E, 0x10, 0x50, 0x8C, 0x83, 0x90, 0x51, 0x57, 0x8A, 0x90, 0x52, 0x6C, 0x65, 0x90,
+0x53, 0x37, 0x6C, 0x90, 0x54, 0x4C, 0x47, 0x90, 0x55, 0x17, 0x4E, 0x90, 0x56, 0x2C, 0x29, 0x90,
+0x56, 0xF7, 0x30, 0x90, 0x58, 0x15, 0x46, 0x10, 0x58, 0xD7, 0x12, 0x90, 0x59, 0xF5, 0x28, 0x10,
+0x5A, 0xB6, 0xF4, 0x90, 0x5B, 0xD5, 0x0A, 0x10, 0x5C, 0xA0, 0x11, 0x10, 0x5D, 0xB4, 0xEC, 0x10,
+0x5E, 0x7F, 0xF3, 0x10, 0x5F, 0x94, 0xCE, 0x10, 0x60, 0x5F, 0xD5, 0x10, 0x61, 0x7D, 0xEA, 0x90,
+0x62, 0x3F, 0xB7, 0x10, 0x63, 0x5D, 0xCC, 0x90, 0x64, 0x1F, 0x99, 0x10, 0x65, 0x3D, 0xAE, 0x90,
+0x66, 0x08, 0xB5, 0x90, 0x67, 0x1D, 0x90, 0x90, 0x67, 0xE8, 0x97, 0x90, 0x68, 0xFD, 0x72, 0x90,
+0x69, 0xC8, 0x79, 0x90, 0x6A, 0xDD, 0x54, 0x90, 0x6B, 0xA8, 0x5B, 0x90, 0x6C, 0xC6, 0x71, 0x10,
+0x6D, 0x88, 0x3D, 0x90, 0x6E, 0xA6, 0x53, 0x10, 0x6F, 0x68, 0x1F, 0x90, 0x70, 0x86, 0x35, 0x10,
+0x71, 0x51, 0x3C, 0x10, 0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10,
+0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90,
+0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90,
+0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90,
+0x03, 0x01, 0x02, 0x01, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x01,
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x00, 0x00, 0x02, 0x31, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x04, 0x00,
-0x00, 0x0E, 0x10, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x01,
-0x04, 0x50, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x00, 0x01,
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
-0x00, 0x00, 0x00, 0x00,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x02, 0x31, 0x00, 0x00, 0x00,
+0x00, 0x1C, 0x20, 0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00,
+0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x04, 0x50, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00,
+0x43, 0x45, 0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1,
+0x7B, 0x40, 0x01, 0x22, 0x32, 0x5D, 0x00, 0x00, 0x00, 0x00,
/* Africa/Windhoek */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4E, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1223,8 +1222,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x1C, 0x20, 0x00, 0x05, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x0A,
0x00, 0x00, 0x1C, 0x20, 0x01, 0x0E, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x01, 0x53, 0x57, 0x41, 0x54,
0x00, 0x53, 0x41, 0x53, 0x54, 0x00, 0x43, 0x41, 0x54, 0x00, 0x57, 0x41, 0x53, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x9F, 0xDA, 0x01,
+0x2C, 0xC0, 0x30, 0x00, 0x00, 0x00, 0x00,
/* America/Adak */
0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1280,8 +1279,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x19, 0xFF, 0xFF, 0x73, 0x60, 0x00, 0x1E, 0x4E, 0x53, 0x54, 0x00, 0x4E, 0x57, 0x54, 0x00, 0x4E,
0x50, 0x54, 0x00, 0x42, 0x53, 0x54, 0x00, 0x42, 0x44, 0x54, 0x00, 0x41, 0x48, 0x53, 0x54, 0x00,
0x48, 0x41, 0x44, 0x54, 0x00, 0x48, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x10, 0x41, 0x6C, 0x65, 0x75, 0x74, 0x69, 0x61, 0x6E, 0x20, 0x49,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD8, 0x7D, 0xE0, 0x00, 0x07,
+0x1B, 0x8D, 0x00, 0x00, 0x00, 0x10, 0x41, 0x6C, 0x65, 0x75, 0x74, 0x69, 0x61, 0x6E, 0x20, 0x49,
0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73,
/* America/Anchorage */
@@ -1338,8 +1337,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x1C, 0xFF, 0xFF, 0x81, 0x70, 0x00, 0x21, 0x43, 0x41, 0x54, 0x00, 0x43, 0x41, 0x57, 0x54, 0x00,
0x43, 0x41, 0x50, 0x54, 0x00, 0x41, 0x48, 0x53, 0x54, 0x00, 0x41, 0x48, 0x44, 0x54, 0x00, 0x59,
0x53, 0x54, 0x00, 0x41, 0x4B, 0x44, 0x54, 0x00, 0x41, 0x4B, 0x53, 0x54, 0x00, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0B, 0x41, 0x6C, 0x61, 0x73, 0x6B, 0x61, 0x20,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE6, 0xBD,
+0x8D, 0x00, 0x30, 0xAD, 0x0B, 0x00, 0x00, 0x00, 0x0B, 0x41, 0x6C, 0x61, 0x73, 0x6B, 0x61, 0x20,
0x54, 0x69, 0x6D, 0x65,
/* America/Anguilla */
@@ -1347,8 +1346,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x35, 0x20,
0x01, 0xFF, 0xFF, 0xC4, 0xE0, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA5, 0x19, 0xA0, 0x00, 0xB2, 0xA1,
+0x2A, 0x00, 0x00, 0x00, 0x00,
/* America/Antigua */
0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1356,8 +1355,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x37, 0x33, 0xF0,
0xDC, 0x42, 0xDC, 0x50, 0x01, 0x02, 0xFF, 0xFF, 0xC6, 0x10, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0,
0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00,
-0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x58, 0x68, 0x00, 0xB6,
+0xCC, 0xE0, 0x00, 0x00, 0x00, 0x00,
/* America/Araguaina */
0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1380,7 +1379,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0xFF, 0xFF, 0xD2, 0xD0, 0x00, 0x00, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x04, 0xFF, 0xFF, 0xD5,
0xD0, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x52, 0x53, 0x54, 0x00, 0x42, 0x52, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0xF4, 0x00, 0x00, 0xC9, 0xB8, 0x9F, 0x00, 0x00,
0x00, 0x09, 0x54, 0x6F, 0x63, 0x61, 0x6E, 0x74, 0x69, 0x6E, 0x73,
/* America/Argentina/Buenos_Aires */
@@ -1426,8 +1425,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x03, 0x04, 0x03, 0x04, 0x03, 0xFF, 0xFF, 0xC3, 0xD0, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00,
0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xD5,
0xD0, 0x00, 0x04, 0x43, 0x4D, 0x54, 0x00, 0x41, 0x52, 0x54, 0x00, 0x41, 0x52, 0x53, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x15, 0x42, 0x75, 0x65, 0x6E, 0x6F, 0x73, 0x20, 0x41, 0x69, 0x72,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x5D, 0x60, 0x00, 0xBA,
+0xD8, 0x08, 0x00, 0x00, 0x00, 0x15, 0x42, 0x75, 0x65, 0x6E, 0x6F, 0x73, 0x20, 0x41, 0x69, 0x72,
0x65, 0x73, 0x20, 0x28, 0x42, 0x41, 0x2C, 0x20, 0x43, 0x46, 0x29,
/* America/Argentina/Catamarca */
@@ -1456,8 +1455,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xC7, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x08,
0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x0D, 0x43, 0x4D, 0x54, 0x00,
0x41, 0x52, 0x54, 0x00, 0x41, 0x52, 0x53, 0x54, 0x00, 0x57, 0x41, 0x52, 0x54, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x1B, 0x43, 0x61, 0x74, 0x61, 0x6D, 0x61, 0x72, 0x63, 0x61, 0x20,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x51, 0x0A, 0x00, 0xB0,
+0xAB, 0xDD, 0x00, 0x00, 0x00, 0x1B, 0x43, 0x61, 0x74, 0x61, 0x6D, 0x61, 0x72, 0x63, 0x61, 0x20,
0x28, 0x43, 0x54, 0x29, 0x2C, 0x20, 0x43, 0x68, 0x75, 0x62, 0x75, 0x74, 0x20, 0x28, 0x43, 0x48,
0x29,
@@ -1534,7 +1533,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xD5,
0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x0D, 0x43, 0x4D, 0x54, 0x00, 0x41, 0x52, 0x54,
0x00, 0x41, 0x52, 0x53, 0x54, 0x00, 0x57, 0x41, 0x52, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA3, 0x20, 0x00, 0xB1, 0x48, 0x1D, 0x00,
0x00, 0x00, 0x2F, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E,
0x73, 0x20, 0x28, 0x43, 0x42, 0x2C, 0x20, 0x43, 0x43, 0x2C, 0x20, 0x43, 0x4E, 0x2C, 0x20, 0x45,
0x52, 0x2C, 0x20, 0x46, 0x4D, 0x2C, 0x20, 0x4D, 0x4E, 0x2C, 0x20, 0x53, 0x45, 0x2C, 0x20, 0x53,
@@ -1566,8 +1565,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0,
0x00, 0x0D, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x12, 0x43, 0x4D, 0x54, 0x00, 0x41, 0x52, 0x54, 0x00,
0x41, 0x52, 0x53, 0x54, 0x00, 0x57, 0x41, 0x52, 0x54, 0x00, 0x57, 0x41, 0x52, 0x53, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89,
-0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0A, 0x4A, 0x75, 0x6A, 0x75, 0x79, 0x20,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64,
+0xFC, 0xDD, 0x00, 0xAF, 0xEF, 0x10, 0x00, 0x00, 0x00, 0x0A, 0x4A, 0x75, 0x6A, 0x75, 0x79, 0x20,
0x28, 0x4A, 0x59, 0x29,
/* America/Argentina/La_Rioja */
@@ -1597,7 +1596,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00,
0x0D, 0x43, 0x4D, 0x54, 0x00, 0x41, 0x52, 0x54, 0x00, 0x41, 0x52, 0x53, 0x54, 0x00, 0x57, 0x41,
0x52, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0D, 0x4C, 0x61, 0x20, 0x52, 0x69,
+0x5D, 0xBD, 0x65, 0x00, 0xAF, 0x3F, 0x48, 0x00, 0x00, 0x00, 0x0D, 0x4C, 0x61, 0x20, 0x52, 0x69,
0x6F, 0x6A, 0x61, 0x20, 0x28, 0x4C, 0x52, 0x29,
/* America/Argentina/Mendoza */
@@ -1627,7 +1626,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x0D, 0xFF, 0xFF, 0xD5, 0xD0,
0x01, 0x12, 0x43, 0x4D, 0x54, 0x00, 0x41, 0x52, 0x54, 0x00, 0x41, 0x52, 0x53, 0x54, 0x00, 0x57,
0x41, 0x52, 0x54, 0x00, 0x57, 0x41, 0x52, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x59, 0xD9, 0x4D, 0x00, 0xAC, 0x25, 0x02,
0x00, 0x00, 0x00, 0x0C, 0x4D, 0x65, 0x6E, 0x64, 0x6F, 0x7A, 0x61, 0x20, 0x28, 0x4D, 0x5A, 0x29,
@@ -1657,8 +1656,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xC7, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x08,
0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x0D, 0x43, 0x4D, 0x54, 0x00,
0x41, 0x52, 0x54, 0x00, 0x41, 0x52, 0x53, 0x54, 0x00, 0x57, 0x41, 0x52, 0x54, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x0F, 0x53, 0x61, 0x6E, 0x74, 0x61, 0x20, 0x43, 0x72, 0x75, 0x7A,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x79, 0xC5, 0x00, 0xA9,
+0xB4, 0x02, 0x00, 0x00, 0x00, 0x0F, 0x53, 0x61, 0x6E, 0x74, 0x61, 0x20, 0x43, 0x72, 0x75, 0x7A,
0x20, 0x28, 0x53, 0x43, 0x29,
/* America/Argentina/Salta */
@@ -1687,7 +1686,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0,
0x00, 0x0D, 0x43, 0x4D, 0x54, 0x00, 0x41, 0x52, 0x54, 0x00, 0x41, 0x52, 0x53, 0x54, 0x00, 0x57,
0x41, 0x52, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x10, 0x28, 0x53, 0x41, 0x2C,
+0x00, 0x65, 0xE7, 0x3D, 0x00, 0xB0, 0x1C, 0xA2, 0x00, 0x00, 0x00, 0x10, 0x28, 0x53, 0x41, 0x2C,
0x20, 0x4C, 0x50, 0x2C, 0x20, 0x4E, 0x51, 0x2C, 0x20, 0x52, 0x4E, 0x29,
/* America/Argentina/San_Juan */
@@ -1717,13 +1716,13 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00,
0x0D, 0x43, 0x4D, 0x54, 0x00, 0x41, 0x52, 0x54, 0x00, 0x41, 0x52, 0x53, 0x54, 0x00, 0x57, 0x41,
0x52, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0D, 0x53, 0x61, 0x6E, 0x20, 0x4A,
+0x5A, 0xD7, 0x35, 0x00, 0xAB, 0xAF, 0xD2, 0x00, 0x00, 0x00, 0x0D, 0x53, 0x61, 0x6E, 0x20, 0x4A,
0x75, 0x61, 0x6E, 0x20, 0x28, 0x53, 0x4A, 0x29,
/* America/Argentina/San_Luis */
0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x18, 0xA2, 0x92, 0x8F, 0x30,
+0x00, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x18, 0xA2, 0x92, 0x8F, 0x30,
0xB6, 0x7B, 0x52, 0x40, 0xB7, 0x1A, 0xC9, 0xB0, 0xB8, 0x1E, 0x8F, 0x40, 0xB8, 0xD4, 0x70, 0x30,
0xBA, 0x17, 0x7D, 0xC0, 0xBA, 0xB5, 0xA3, 0xB0, 0xBB, 0xF8, 0xB1, 0x40, 0xBC, 0x96, 0xD7, 0x30,
0xBD, 0xD9, 0xE4, 0xC0, 0xBE, 0x78, 0x0A, 0xB0, 0xBF, 0xBB, 0x18, 0x40, 0xC0, 0x5A, 0x8F, 0xB0,
@@ -1738,17 +1737,35 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x24, 0x10, 0x94, 0xA0, 0x25, 0x37, 0xF2, 0xB0, 0x25, 0xFD, 0xA5, 0xA0, 0x27, 0x19, 0x34, 0x40,
0x27, 0xCD, 0xC3, 0xB0, 0x28, 0x47, 0x1B, 0xC0, 0x37, 0xF6, 0xC6, 0xB0, 0x38, 0xBF, 0x2A, 0xB0,
0x40, 0xBA, 0x9F, 0xB0, 0x41, 0x03, 0x30, 0x40, 0x47, 0x77, 0x09, 0xB0, 0x47, 0x93, 0xFC, 0xA0,
+0x49, 0xBC, 0x6F, 0x30, 0x4A, 0xDA, 0x92, 0xC0, 0x4B, 0xA5, 0x8B, 0xB0, 0x4C, 0xBA, 0x74, 0xC0,
+0x4D, 0x85, 0x6D, 0xB0, 0x4E, 0x9A, 0x56, 0xC0, 0x4F, 0x65, 0x4F, 0xB0, 0x50, 0x83, 0x73, 0x40,
+0x51, 0x45, 0x31, 0xB0, 0x52, 0x63, 0x55, 0x40, 0x53, 0x25, 0x13, 0xB0, 0x54, 0x43, 0x37, 0x40,
+0x55, 0x04, 0xF5, 0xB0, 0x56, 0x23, 0x19, 0x40, 0x56, 0xEE, 0x12, 0x30, 0x58, 0x02, 0xFB, 0x40,
+0x58, 0xCD, 0xF4, 0x30, 0x59, 0xE2, 0xDD, 0x40, 0x5A, 0xAD, 0xD6, 0x30, 0x5B, 0xCB, 0xF9, 0xC0,
+0x5C, 0x8D, 0xB8, 0x30, 0x5D, 0xAB, 0xDB, 0xC0, 0x5E, 0x6D, 0x9A, 0x30, 0x5F, 0x8B, 0xBD, 0xC0,
+0x60, 0x56, 0xB6, 0xB0, 0x61, 0x6B, 0x9F, 0xC0, 0x62, 0x36, 0x98, 0xB0, 0x63, 0x4B, 0x81, 0xC0,
+0x64, 0x16, 0x7A, 0xB0, 0x65, 0x2B, 0x63, 0xC0, 0x65, 0xF6, 0x5C, 0xB0, 0x67, 0x14, 0x80, 0x40,
+0x67, 0xD6, 0x3E, 0xB0, 0x68, 0xF4, 0x62, 0x40, 0x69, 0xB6, 0x20, 0xB0, 0x6A, 0xD4, 0x44, 0x40,
+0x6B, 0x9F, 0x3D, 0x30, 0x6C, 0xB4, 0x26, 0x40, 0x6D, 0x7F, 0x1F, 0x30, 0x6E, 0x94, 0x08, 0x40,
+0x6F, 0x5F, 0x01, 0x30, 0x70, 0x7D, 0x24, 0xC0, 0x71, 0x3E, 0xE3, 0x30, 0x72, 0x5D, 0x06, 0xC0,
+0x73, 0x1E, 0xC5, 0x30, 0x74, 0x3C, 0xE8, 0xC0, 0x75, 0x07, 0xE1, 0xB0, 0x76, 0x1C, 0xCA, 0xC0,
+0x76, 0xE7, 0xC3, 0xB0, 0x77, 0xFC, 0xAC, 0xC0, 0x78, 0xC7, 0xA5, 0xB0, 0x79, 0xDC, 0x8E, 0xC0,
+0x7A, 0xA7, 0x87, 0xB0, 0x7B, 0xC5, 0xAB, 0x40, 0x7C, 0x87, 0x69, 0xB0, 0x7D, 0xA5, 0x8D, 0x40,
+0x7E, 0x67, 0x4B, 0xB0, 0x7F, 0x85, 0x6F, 0x40, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
-0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x05,
-0x06, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0xC3, 0xD0, 0x00, 0x00, 0xFF,
-0xFF, 0xC7, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x01,
-0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x0D, 0xFF, 0xFF, 0xD5,
-0xD0, 0x01, 0x12, 0x43, 0x4D, 0x54, 0x00, 0x41, 0x52, 0x54, 0x00, 0x41, 0x52, 0x53, 0x54, 0x00,
-0x57, 0x41, 0x52, 0x54, 0x00, 0x57, 0x41, 0x52, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x0D, 0x53, 0x61, 0x6E, 0x20, 0x4C, 0x75, 0x69, 0x73, 0x20, 0x28, 0x53,
-0x4C, 0x29,
+0x01, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x06, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x03,
+0x04, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05,
+0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05,
+0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05,
+0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0xFF, 0xFF, 0xC3, 0xD0, 0x00,
+0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x08, 0xFF, 0xFF, 0xE3,
+0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x0D, 0xFF,
+0xFF, 0xD5, 0xD0, 0x01, 0x12, 0x43, 0x4D, 0x54, 0x00, 0x41, 0x52, 0x54, 0x00, 0x41, 0x52, 0x53,
+0x54, 0x00, 0x57, 0x41, 0x52, 0x54, 0x00, 0x57, 0x41, 0x52, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57, 0x75, 0x52, 0x00,
+0xAE, 0x7B, 0xF8, 0x00, 0x00, 0x00, 0x0D, 0x53, 0x61, 0x6E, 0x20, 0x4C, 0x75, 0x69, 0x73, 0x20,
+0x28, 0x53, 0x4C, 0x29,
/* America/Argentina/Tucuman */
0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1795,7 +1812,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xC7,
0xC0, 0x00, 0x0D, 0x43, 0x4D, 0x54, 0x00, 0x41, 0x52, 0x54, 0x00, 0x41, 0x52, 0x53, 0x54, 0x00,
0x57, 0x41, 0x52, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0C, 0x54, 0x75, 0x63,
+0x00, 0x00, 0x62, 0xE7, 0x02, 0x00, 0xAF, 0xCE, 0x82, 0x00, 0x00, 0x00, 0x0C, 0x54, 0x75, 0x63,
0x75, 0x6D, 0x61, 0x6E, 0x20, 0x28, 0x54, 0x4D, 0x29,
/* America/Argentina/Ushuaia */
@@ -1824,8 +1841,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xC7, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x08,
0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x0D, 0x43, 0x4D, 0x54, 0x00,
0x41, 0x52, 0x54, 0x00, 0x41, 0x52, 0x53, 0x54, 0x00, 0x57, 0x41, 0x52, 0x54, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x15, 0x54, 0x69, 0x65, 0x72, 0x72, 0x61, 0x20, 0x64, 0x65, 0x6C,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x26, 0xFF, 0x00, 0xAB,
+0x5B, 0x30, 0x00, 0x00, 0x00, 0x15, 0x54, 0x69, 0x65, 0x72, 0x72, 0x61, 0x20, 0x64, 0x65, 0x6C,
0x20, 0x46, 0x75, 0x65, 0x67, 0x6F, 0x20, 0x28, 0x54, 0x46, 0x29,
/* America/Aruba */
@@ -1834,8 +1851,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x1E, 0x2F, 0x38,
0xF6, 0x98, 0xEC, 0x48, 0x01, 0x02, 0xFF, 0xFF, 0xBE, 0x48, 0x00, 0x00, 0xFF, 0xFF, 0xC0, 0xB8,
0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4E, 0x54, 0x00,
-0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9C, 0x67, 0x10, 0x00, 0xAA,
+0xD8, 0xFA, 0x00, 0x00, 0x00, 0x00,
/* America/Asuncion */
0x50, 0x48, 0x50, 0x31, 0x01, 0x50, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1883,8 +1900,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0xFF, 0xFF, 0xC9, 0xF0,
0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF,
0xD5, 0xD0, 0x01, 0x08, 0x41, 0x4D, 0x54, 0x00, 0x50, 0x59, 0x54, 0x00, 0x50, 0x59, 0x53, 0x54,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x96, 0xCA, 0x00, 0xBC, 0xB3,
+0x4A, 0x00, 0x00, 0x00, 0x00,
/* America/Atikokan */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1895,7 +1912,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0,
0x01, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x10, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
0x43, 0x57, 0x54, 0x00, 0x43, 0x50, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xD3, 0xBA, 0x95, 0x00, 0x88, 0xC0, 0x76, 0x00, 0x00,
0x00, 0x44, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x53, 0x74, 0x61, 0x6E, 0x64, 0x61,
0x72, 0x64, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x41, 0x74, 0x69, 0x6B, 0x6F, 0x6B,
0x61, 0x6E, 0x2C, 0x20, 0x4F, 0x6E, 0x74, 0x61, 0x72, 0x69, 0x6F, 0x20, 0x61, 0x6E, 0x64, 0x20,
@@ -1983,7 +2000,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0x02, 0xFF, 0xFF, 0xDB, 0xE4, 0x00, 0x00, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x04, 0xFF,
0xFF, 0xD5, 0xD0, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x52, 0x53, 0x54, 0x00, 0x42, 0x52,
-0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x84, 0xDD, 0x00, 0xD9, 0x76, 0x92,
0x00, 0x00, 0x00, 0x05, 0x42, 0x61, 0x68, 0x69, 0x61,
/* America/Barbados */
@@ -1995,8 +2012,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x14, 0x30, 0x3E, 0x50, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0xFF, 0xFF,
0xC8, 0x1C, 0x00, 0x00, 0xFF, 0xFF, 0xC8, 0x1C, 0x00, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x08,
0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x4D, 0x54, 0x00, 0x41, 0x44,
-0x54, 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89,
-0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x54, 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9D,
+0x51, 0x70, 0x00, 0xB9, 0x92, 0x82, 0x00, 0x00, 0x00, 0x00,
/* America/Belem */
0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2013,7 +2030,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xD2,
0x8C, 0x00, 0x00, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x09, 0x4C,
0x4D, 0x54, 0x00, 0x42, 0x52, 0x53, 0x54, 0x00, 0x42, 0x52, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0D, 0x41, 0x6D,
+0x00, 0x00, 0x00, 0x88, 0x7D, 0x68, 0x00, 0xCA, 0x27, 0x4D, 0x00, 0x00, 0x00, 0x0D, 0x41, 0x6D,
0x61, 0x70, 0x61, 0x2C, 0x20, 0x45, 0x20, 0x50, 0x61, 0x72, 0x61,
/* America/Belize */
@@ -2040,7 +2057,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xAD, 0x50, 0x00, 0x00, 0xFF, 0xFF, 0xB2, 0xA8, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00,
0x09, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x48, 0x44, 0x54, 0x00,
0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xA4, 0x08, 0x30, 0x00, 0x8C, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00,
/* America/Blanc-Sablon */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2050,7 +2067,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x01, 0x02, 0x03, 0x01, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00,
0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x0C, 0x41, 0x44, 0x54,
0x00, 0x41, 0x53, 0x54, 0x00, 0x41, 0x57, 0x54, 0x00, 0x41, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xD7, 0xC8, 0xE2, 0x00, 0xBB, 0xDC, 0x72, 0x00, 0x00, 0x00,
0x33, 0x41, 0x74, 0x6C, 0x61, 0x6E, 0x74, 0x69, 0x63, 0x20, 0x53, 0x74, 0x61, 0x6E, 0x64, 0x61,
0x72, 0x64, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x51, 0x75, 0x65, 0x62, 0x65, 0x63,
0x20, 0x2D, 0x20, 0x4C, 0x6F, 0x77, 0x65, 0x72, 0x20, 0x4E, 0x6F, 0x72, 0x74, 0x68, 0x20, 0x53,
@@ -2072,7 +2089,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0xFF, 0xFF, 0xC7, 0x20, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x04, 0xFF, 0xFF, 0xC7,
0xC0, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4D, 0x53, 0x54, 0x00, 0x41, 0x4D, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8D, 0xA0, 0x82, 0x00, 0xB8, 0x1F, 0x6A, 0x00, 0x00,
0x00, 0x07, 0x52, 0x6F, 0x72, 0x61, 0x69, 0x6D, 0x61,
/* America/Bogota */
@@ -2082,7 +2099,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x2A, 0x03, 0x73, 0x50, 0x2B, 0xBE, 0x5D, 0x40, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xBA, 0x8C, 0x00,
0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x09, 0x42, 0x4D, 0x54,
0x00, 0x43, 0x4F, 0x53, 0x54, 0x00, 0x43, 0x4F, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x90, 0x59, 0x20, 0x00, 0xA1, 0xDE, 0xCD, 0x00, 0x00, 0x00, 0x00,
/* America/Boise */
0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2139,7 +2156,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x14, 0x50, 0x44,
0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x4D, 0x53,
0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x29, 0x4D, 0x6F,
+0x00, 0x00, 0x00, 0xCB, 0xE0, 0xD1, 0x00, 0x61, 0xF7, 0x1A, 0x00, 0x00, 0x00, 0x29, 0x4D, 0x6F,
0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x73, 0x6F,
0x75, 0x74, 0x68, 0x20, 0x49, 0x64, 0x61, 0x68, 0x6F, 0x20, 0x26, 0x20, 0x65, 0x61, 0x73, 0x74,
0x20, 0x4F, 0x72, 0x65, 0x67, 0x6F, 0x6E,
@@ -2239,7 +2256,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x4D, 0x50, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x44, 0x54, 0x00, 0x4D, 0x44,
0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x1C, 0x4D, 0x6F, 0x75, 0x6E,
+0x00, 0xF2, 0xC9, 0xDC, 0x00, 0x72, 0x85, 0x7D, 0x00, 0x00, 0x00, 0x1C, 0x4D, 0x6F, 0x75, 0x6E,
0x74, 0x61, 0x69, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x77, 0x65, 0x73, 0x74,
0x20, 0x4E, 0x75, 0x6E, 0x61, 0x76, 0x75, 0x74,
@@ -2289,7 +2306,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xCC, 0xCC,
0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x09, 0x4C, 0x4D,
0x54, 0x00, 0x41, 0x4D, 0x53, 0x54, 0x00, 0x41, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x12, 0x4D, 0x61, 0x74,
+0x00, 0x00, 0x6B, 0x7F, 0x88, 0x00, 0xC1, 0x33, 0xA2, 0x00, 0x00, 0x00, 0x12, 0x4D, 0x61, 0x74,
0x6F, 0x20, 0x47, 0x72, 0x6F, 0x73, 0x73, 0x6F, 0x20, 0x64, 0x6F, 0x20, 0x53, 0x75, 0x6C,
/* America/Cancun */
@@ -2326,8 +2343,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xAE, 0xA8, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01,
0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0x4C, 0x4D, 0x54,
0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x1B, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x54,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA9, 0x7F, 0xED, 0x00,
+0x90, 0x9A, 0x3A, 0x00, 0x00, 0x00, 0x1B, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x54,
0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x51, 0x75, 0x69, 0x6E, 0x74, 0x61, 0x6E, 0x61, 0x20, 0x52,
0x6F, 0x6F,
@@ -2337,8 +2354,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x93, 0x1E, 0x2C, 0x3C,
0xF6, 0x98, 0xEC, 0x48, 0x47, 0x5B, 0x92, 0x70, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xC1, 0x44, 0x00,
0x00, 0xFF, 0xFF, 0xC0, 0xB8, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x43, 0x4D, 0x54,
-0x00, 0x56, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x56, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0x59, 0xD0, 0x00,
+0xAF, 0x5F, 0xD5, 0x00, 0x00, 0x00, 0x00,
/* America/Catamarca */
0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2375,7 +2392,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF4, 0x2B, 0x90,
0xFB, 0xC3, 0x35, 0xC0, 0x01, 0x02, 0xFF, 0xFF, 0xCE, 0xF0, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0,
0x00, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x47, 0x46, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0xDB, 0x55, 0x00, 0xC3, 0xD2, 0x35, 0x00, 0x00,
0x00, 0x00,
/* America/Cayman */
@@ -2383,8 +2400,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x0F, 0xB5, 0x00,
0x01, 0xFF, 0xFF, 0xB8, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 0x4B, 0x4D, 0x54,
-0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA6, 0xC7, 0x50, 0x00, 0x97, 0xA5,
+0x9D, 0x00, 0x00, 0x00, 0x00,
/* America/Chicago */
0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2467,7 +2484,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01,
0x10, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54,
0x00, 0x43, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0C, 0x43, 0x65, 0x6E, 0x74, 0x72,
+0xC9, 0x2F, 0xE8, 0x00, 0x8E, 0xE6, 0x08, 0x00, 0x00, 0x00, 0x0C, 0x43, 0x65, 0x6E, 0x74, 0x72,
0x61, 0x6C, 0x20, 0x54, 0x69, 0x6D, 0x65,
/* America/Chihuahua */
@@ -2505,8 +2522,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x9C, 0x8C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08,
0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00,
0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x19, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x54,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB5, 0x05, 0x25, 0x00, 0x71,
+0x0A, 0xCD, 0x00, 0x00, 0x00, 0x19, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x54,
0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x43, 0x68, 0x69, 0x68, 0x75, 0x61, 0x68, 0x75, 0x61,
/* America/Coral_Harbour */
@@ -2576,8 +2593,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x27, 0x97, 0xE0, 0x60, 0x28, 0x6E, 0xB6, 0xD0, 0x29, 0x77, 0xC2, 0x60, 0x29, 0xC2, 0xD9, 0xD0,
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xB1, 0x2C, 0x00, 0x00, 0xFF,
0xFF, 0xB9, 0xB0, 0x01, 0x05, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x09, 0x53, 0x4A, 0x4D, 0x54, 0x00,
-0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89,
-0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98,
+0x7C, 0x75, 0x00, 0x92, 0x9C, 0x8D, 0x00, 0x00, 0x00, 0x00,
/* America/Cuiaba */
0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2624,7 +2641,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0xFF, 0xFF, 0xCB, 0x6C, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x04, 0xFF, 0xFF,
0xC7, 0xC0, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4D, 0x53, 0x54, 0x00, 0x41, 0x4D, 0x54,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x54, 0xBD, 0x00, 0xBD, 0x56, 0x0D, 0x00,
0x00, 0x00, 0x0B, 0x4D, 0x61, 0x74, 0x6F, 0x20, 0x47, 0x72, 0x6F, 0x73, 0x73, 0x6F,
/* America/Curacao */
@@ -2633,8 +2650,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x1E, 0x2E, 0x20,
0xF6, 0x98, 0xEC, 0x48, 0x01, 0x02, 0xFF, 0xFF, 0xBF, 0x60, 0x00, 0x00, 0xFF, 0xFF, 0xC0, 0xB8,
0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4E, 0x54, 0x00,
-0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0xEB, 0x5D, 0x00, 0xA9,
+0x5F, 0x60, 0x00, 0x00, 0x00, 0x00,
/* America/Danmarkshavn */
0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2654,7 +2671,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF,
0xE3, 0xE0, 0x01, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x47,
0x54, 0x00, 0x57, 0x47, 0x53, 0x54, 0x00, 0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0xFE, 0x77, 0x3A, 0x00, 0xF8, 0x35, 0xAA, 0x00,
0x00, 0x00, 0x21, 0x65, 0x61, 0x73, 0x74, 0x20, 0x63, 0x6F, 0x61, 0x73, 0x74, 0x2C, 0x20, 0x6E,
0x6F, 0x72, 0x74, 0x68, 0x20, 0x6F, 0x66, 0x20, 0x53, 0x63, 0x6F, 0x72, 0x65, 0x73, 0x62, 0x79,
0x73, 0x75, 0x6E, 0x64,
@@ -2707,7 +2724,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x15, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x19, 0x59, 0x44, 0x54, 0x00,
0x59, 0x53, 0x54, 0x00, 0x59, 0x57, 0x54, 0x00, 0x59, 0x50, 0x54, 0x00, 0x59, 0x44, 0x44, 0x54,
0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xEB, 0x16, 0x4A, 0x00, 0x3F, 0x32, 0x62, 0x00,
0x00, 0x00, 0x1A, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20,
0x2D, 0x20, 0x6E, 0x6F, 0x72, 0x74, 0x68, 0x20, 0x59, 0x75, 0x6B, 0x6F, 0x6E,
@@ -2736,7 +2753,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0x8F, 0x80, 0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x10, 0x50, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50,
0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xE4, 0x86, 0x9A, 0x00, 0x5B, 0xE8, 0xA5, 0x00, 0x00, 0x00,
0x49, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x53, 0x74, 0x61, 0x6E, 0x64, 0x61,
0x72, 0x64, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x44, 0x61, 0x77, 0x73, 0x6F, 0x6E,
0x20, 0x43, 0x72, 0x65, 0x65, 0x6B, 0x20, 0x26, 0x20, 0x46, 0x6F, 0x72, 0x74, 0x20, 0x53, 0x61,
@@ -2798,8 +2815,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0xAB,
0xA0, 0x01, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF,
0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54,
-0x00, 0x4D, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0D, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69,
+0x00, 0x4D, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xC5, 0xF7,
+0x5C, 0x00, 0x75, 0x77, 0xF0, 0x00, 0x00, 0x00, 0x0D, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69,
0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65,
/* America/Detroit */
@@ -2853,8 +2870,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01,
0x10, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45,
0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x45, 0x50, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x28, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xC9, 0xEB, 0xF2, 0x00,
+0x94, 0x14, 0x87, 0x00, 0x00, 0x00, 0x28, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54,
0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x4D, 0x69, 0x63, 0x68, 0x69, 0x67, 0x61, 0x6E, 0x20, 0x2D,
0x20, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73,
@@ -2863,8 +2880,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF4, 0x34, 0x4C,
0x01, 0xFF, 0xFF, 0xC6, 0x70, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xAC, 0xD0, 0x00, 0xB6, 0x30,
+0xA0, 0x00, 0x00, 0x00, 0x00,
/* America/Edmonton */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2921,8 +2938,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x95, 0xA0, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x08,
0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00,
0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x42, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x54,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xDB, 0x0A, 0x38, 0x00, 0x66,
+0xF2, 0x2A, 0x00, 0x00, 0x00, 0x42, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x54,
0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x41, 0x6C, 0x62, 0x65, 0x72, 0x74, 0x61, 0x2C, 0x20, 0x65,
0x61, 0x73, 0x74, 0x20, 0x42, 0x72, 0x69, 0x74, 0x69, 0x73, 0x68, 0x20, 0x43, 0x6F, 0x6C, 0x75,
0x6D, 0x62, 0x69, 0x61, 0x20, 0x26, 0x20, 0x77, 0x65, 0x73, 0x74, 0x20, 0x53, 0x61, 0x73, 0x6B,
@@ -2944,8 +2961,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0xFF, 0xFF, 0xBE, 0x80,
0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x09, 0xFF, 0xFF,
0xC7, 0xC0, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x43, 0x53, 0x54, 0x00, 0x41, 0x43, 0x54,
-0x00, 0x41, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0A, 0x57, 0x20, 0x41, 0x6D, 0x61, 0x7A, 0x6F,
+0x00, 0x41, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x30,
+0xEA, 0x00, 0xAA, 0xB1, 0xEA, 0x00, 0x00, 0x00, 0x0A, 0x57, 0x20, 0x41, 0x6D, 0x61, 0x7A, 0x6F,
0x6E, 0x61, 0x73,
/* America/El_Salvador */
@@ -2955,8 +2972,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x20, 0x9A, 0xDC, 0xE0, 0x21, 0x5C, 0x9B, 0x50, 0x22, 0x7A, 0xBE, 0xE0, 0x23, 0x3C, 0x7D, 0x50,
0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xAC, 0x60, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x01,
0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43,
-0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x3B, 0xD0, 0x00, 0x8B, 0x29,
+0x00, 0x00, 0x00, 0x00, 0x00,
/* America/Ensenada */
0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -3033,7 +3050,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF,
0xFF, 0xDB, 0xE8, 0x00, 0x00, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x00,
0x09, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x52, 0x53, 0x54, 0x00, 0x42, 0x52, 0x54, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x1E,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0xD8, 0x52, 0x00, 0xD9, 0x70, 0x10, 0x00, 0x00, 0x00, 0x1E,
0x4E, 0x45, 0x20, 0x42, 0x72, 0x61, 0x7A, 0x69, 0x6C, 0x20, 0x28, 0x4D, 0x41, 0x2C, 0x20, 0x50,
0x49, 0x2C, 0x20, 0x43, 0x45, 0x2C, 0x20, 0x52, 0x4E, 0x2C, 0x20, 0x50, 0x42, 0x29,
@@ -3129,7 +3146,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xD5, 0xD0, 0x01, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x0C,
0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x44, 0x54, 0x00, 0x41, 0x53,
0x54, 0x00, 0x41, 0x57, 0x54, 0x00, 0x41, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x47,
+0x00, 0x00, 0x00, 0x01, 0x00, 0xCF, 0xD3, 0x1F, 0x00, 0xBA, 0x14, 0xB8, 0x00, 0x00, 0x00, 0x47,
0x41, 0x74, 0x6C, 0x61, 0x6E, 0x74, 0x69, 0x63, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20,
0x4E, 0x6F, 0x76, 0x61, 0x20, 0x53, 0x63, 0x6F, 0x74, 0x69, 0x61, 0x20, 0x2D, 0x20, 0x70, 0x6C,
0x61, 0x63, 0x65, 0x73, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x64, 0x69, 0x64, 0x20, 0x6E, 0x6F,
@@ -3179,8 +3196,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x03, 0x02, 0x03, 0x02, 0xFF, 0xFF, 0xCF, 0x80, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x00,
0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xE3,
0xE0, 0x01, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x47, 0x54, 0x00, 0x57, 0x47, 0x53, 0x54, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x0E, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74,
+0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0xEB, 0x43, 0xDD, 0x00, 0xC5,
+0xF5, 0x15, 0x00, 0x00, 0x00, 0x0E, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74,
0x69, 0x6F, 0x6E, 0x73,
/* America/Goose_Bay */
@@ -3256,7 +3273,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xC0, 0x00, 0x14, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x18, 0x4E, 0x53, 0x54, 0x00, 0x4E, 0x44, 0x54,
0x00, 0x4E, 0x50, 0x54, 0x00, 0x4E, 0x57, 0x54, 0x00, 0x41, 0x44, 0x54, 0x00, 0x41, 0x53, 0x54,
0x00, 0x41, 0x44, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDA, 0xB5, 0x95, 0x00, 0xB7, 0xBD, 0xC2,
0x00, 0x00, 0x00, 0x29, 0x41, 0x74, 0x6C, 0x61, 0x6E, 0x74, 0x69, 0x63, 0x20, 0x54, 0x69, 0x6D,
0x65, 0x20, 0x2D, 0x20, 0x4C, 0x61, 0x62, 0x72, 0x61, 0x64, 0x6F, 0x72, 0x20, 0x2D, 0x20, 0x6D,
0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73,
@@ -3304,23 +3321,23 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF,
0xFF, 0xB8, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00,
0x08, 0x4B, 0x4D, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0xAA, 0x15, 0xAA, 0x00, 0xA6, 0x86, 0x35, 0x00, 0x00, 0x00, 0x00,
/* America/Grenada */
0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF4, 0x34, 0x64,
0x01, 0xFF, 0xFF, 0xC6, 0x1C, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0xB7, 0x48, 0x00, 0xB6, 0xB9,
+0x58, 0x00, 0x00, 0x00, 0x00,
/* America/Guadeloupe */
0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xD5, 0xE1, 0xB0,
0x01, 0xFF, 0xFF, 0xC6, 0x50, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x19, 0x65, 0x00, 0xB6, 0x64,
+0xB5, 0x00, 0x00, 0x00, 0x00,
/* America/Guatemala */
0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -3330,16 +3347,16 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x27, 0xEA, 0xEE, 0xE0, 0x28, 0xC8, 0x5C, 0xD0, 0x44, 0x54, 0x52, 0x60, 0x45, 0x1F, 0x4B, 0x50,
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xAB, 0x24, 0x00, 0x00, 0xFF,
0xFF, 0xB9, 0xB0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43,
-0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9F, 0xA8,
+0x65, 0x00, 0x8A, 0x1E, 0x12, 0x00, 0x00, 0x00, 0x00,
/* America/Guayaquil */
0x50, 0x48, 0x50, 0x31, 0x01, 0x45, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0xB6, 0xA4, 0x42, 0x18,
0x01, 0xFF, 0xFF, 0xB6, 0x68, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 0x51, 0x4D, 0x54,
-0x00, 0x45, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x08, 0x6D, 0x61, 0x69, 0x6E, 0x6C, 0x61, 0x6E, 0x64,
+0x00, 0x45, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86, 0x88, 0x1A, 0x00, 0x9B, 0x62,
+0xA5, 0x00, 0x00, 0x00, 0x08, 0x6D, 0x61, 0x69, 0x6E, 0x6C, 0x61, 0x6E, 0x64,
/* America/Guyana */
0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -3349,7 +3366,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xFF, 0xC9, 0x78, 0x00, 0x00, 0xFF, 0xFF, 0xCB, 0x44, 0x00, 0x04, 0xFF, 0xFF, 0xCB, 0x44,
0x00, 0x09, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x09, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x09, 0x4C, 0x4D,
0x54, 0x00, 0x47, 0x42, 0x47, 0x54, 0x00, 0x47, 0x59, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x93, 0xB4, 0x80, 0x00, 0xBA, 0x69, 0x5A, 0x00, 0x00, 0x00,
0x00,
/* America/Halifax */
@@ -3430,8 +3447,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xFF, 0xC4, 0x60, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x04, 0xFF, 0xFF, 0xC7, 0xC0,
0x00, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x0C, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x10, 0x4C, 0x4D,
0x54, 0x00, 0x41, 0x44, 0x54, 0x00, 0x41, 0x53, 0x54, 0x00, 0x41, 0x57, 0x54, 0x00, 0x41, 0x50,
-0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x2E, 0x41, 0x74, 0x6C, 0x61, 0x6E, 0x74, 0x69, 0x63,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xCD, 0x75, 0xA8,
+0x00, 0xB3, 0x71, 0x80, 0x00, 0x00, 0x00, 0x2E, 0x41, 0x74, 0x6C, 0x61, 0x6E, 0x74, 0x69, 0x63,
0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x4E, 0x6F, 0x76, 0x61, 0x20, 0x53, 0x63, 0x6F,
0x74, 0x69, 0x61, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x70, 0x6C, 0x61, 0x63, 0x65, 0x73,
0x29, 0x2C, 0x20, 0x50, 0x45, 0x49,
@@ -3491,7 +3508,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x03, 0x04, 0x03, 0xFF, 0xFF, 0xB2, 0xC0, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF,
0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01,
0x04, 0x48, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAC, 0xA0, 0xB5, 0x00, 0x96, 0x18, 0x7A, 0x00,
0x00, 0x00, 0x00,
/* America/Hermosillo */
@@ -3506,7 +3523,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x0C, 0xFF,
0xFF, 0xAB, 0xA0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54,
0x00, 0x50, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x1F, 0x4D,
+0x00, 0x00, 0x00, 0x00, 0xB5, 0xAE, 0x6A, 0x00, 0x6C, 0x49, 0x5A, 0x00, 0x00, 0x00, 0x1F, 0x4D,
0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x53, 0x74, 0x61, 0x6E, 0x64, 0x61, 0x72, 0x64,
0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x53, 0x6F, 0x6E, 0x6F, 0x72, 0x61,
@@ -3548,8 +3565,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF,
0xB9, 0xB0, 0x00, 0x10, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x14, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53,
0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43, 0x50, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 0x44,
-0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x89,
-0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x27, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xC6,
+0x02, 0xC1, 0x00, 0x8F, 0xAC, 0x7D, 0x00, 0x00, 0x00, 0x27, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72,
0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x49, 0x6E, 0x64, 0x69, 0x61, 0x6E, 0x61,
0x20, 0x2D, 0x20, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E,
0x73,
@@ -3609,7 +3626,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01,
0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x10, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43,
0x57, 0x54, 0x00, 0x43, 0x50, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xC8, 0x57, 0x6F, 0x00, 0x90, 0x62, 0xE4, 0x00, 0x00, 0x00,
0x26, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20,
0x49, 0x6E, 0x64, 0x69, 0x61, 0x6E, 0x61, 0x20, 0x2D, 0x20, 0x53, 0x74, 0x61, 0x72, 0x6B, 0x65,
0x20, 0x43, 0x6F, 0x75, 0x6E, 0x74, 0x79,
@@ -3654,7 +3671,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x10, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x14, 0x43, 0x44,
0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43, 0x50, 0x54, 0x00, 0x45, 0x53,
0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x28, 0x45, 0x61,
+0x00, 0x00, 0x00, 0xC3, 0xE2, 0xB3, 0x00, 0x8F, 0xF5, 0x68, 0x00, 0x00, 0x00, 0x28, 0x45, 0x61,
0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x49, 0x6E, 0x64,
0x69, 0x61, 0x6E, 0x61, 0x20, 0x2D, 0x20, 0x43, 0x72, 0x61, 0x77, 0x66, 0x6F, 0x72, 0x64, 0x20,
0x43, 0x6F, 0x75, 0x6E, 0x74, 0x79,
@@ -3703,7 +3720,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x10, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x14, 0x43,
0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43, 0x50, 0x54, 0x00, 0x45,
0x53, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x24, 0x45,
+0x01, 0x00, 0x00, 0x00, 0xC4, 0x10, 0x2A, 0x00, 0x8E, 0x54, 0xF5, 0x00, 0x00, 0x00, 0x24, 0x45,
0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x49, 0x6E,
0x64, 0x69, 0x61, 0x6E, 0x61, 0x20, 0x2D, 0x20, 0x50, 0x69, 0x6B, 0x65, 0x20, 0x43, 0x6F, 0x75,
0x6E, 0x74, 0x79,
@@ -3788,7 +3805,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x10, 0xFF, 0xFF,
0xC7, 0xC0, 0x01, 0x14, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00,
0x43, 0x50, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xC3, 0x3D, 0xA9, 0x00, 0x90, 0x98, 0x2A,
0x00, 0x00, 0x00, 0x25, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x54, 0x69, 0x6D, 0x65,
0x20, 0x2D, 0x20, 0x49, 0x6E, 0x64, 0x69, 0x61, 0x6E, 0x61, 0x20, 0x2D, 0x20, 0x50, 0x65, 0x72,
0x72, 0x79, 0x20, 0x43, 0x6F, 0x75, 0x6E, 0x74, 0x79,
@@ -3826,7 +3843,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x10, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x14,
0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43, 0x50, 0x54, 0x00,
0x45, 0x53, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x2B,
+0x00, 0x01, 0x00, 0x00, 0x00, 0xC4, 0x74, 0x19, 0x00, 0x91, 0x0F, 0xA2, 0x00, 0x00, 0x00, 0x2B,
0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x49,
0x6E, 0x64, 0x69, 0x61, 0x6E, 0x61, 0x20, 0x2D, 0x20, 0x53, 0x77, 0x69, 0x74, 0x7A, 0x65, 0x72,
0x6C, 0x61, 0x6E, 0x64, 0x20, 0x43, 0x6F, 0x75, 0x6E, 0x74, 0x79,
@@ -3870,7 +3887,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x10, 0xFF, 0xFF,
0xC7, 0xC0, 0x01, 0x14, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00,
0x43, 0x50, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xC4, 0x58, 0x8A, 0x00, 0x8E, 0xB6, 0x9D,
0x00, 0x00, 0x00, 0x40, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65,
0x20, 0x2D, 0x20, 0x49, 0x6E, 0x64, 0x69, 0x61, 0x6E, 0x61, 0x20, 0x2D, 0x20, 0x44, 0x61, 0x76,
0x69, 0x65, 0x73, 0x73, 0x2C, 0x20, 0x44, 0x75, 0x62, 0x6F, 0x69, 0x73, 0x2C, 0x20, 0x4B, 0x6E,
@@ -3918,7 +3935,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x10, 0xFF, 0xFF, 0xC7, 0xC0,
0x01, 0x14, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43, 0x50,
0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xC7, 0xF7, 0xF2, 0x00, 0x90, 0x5A, 0x51, 0x00, 0x00,
0x00, 0x27, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D,
0x20, 0x49, 0x6E, 0x64, 0x69, 0x61, 0x6E, 0x61, 0x20, 0x2D, 0x20, 0x50, 0x75, 0x6C, 0x61, 0x73,
0x6B, 0x69, 0x20, 0x43, 0x6F, 0x75, 0x6E, 0x74, 0x79,
@@ -3968,7 +3985,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x09, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x0D, 0xFF, 0xFF, 0xAB, 0xA0,
0x01, 0x11, 0x7A, 0x7A, 0x7A, 0x00, 0x50, 0x44, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x4D,
0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x2A, 0x4D, 0x6F, 0x75,
+0x00, 0x00, 0xF1, 0x9F, 0x5C, 0x00, 0x48, 0xCF, 0x52, 0x00, 0x00, 0x00, 0x2A, 0x4D, 0x6F, 0x75,
0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x77, 0x65, 0x73,
0x74, 0x20, 0x4E, 0x6F, 0x72, 0x74, 0x68, 0x77, 0x65, 0x73, 0x74, 0x20, 0x54, 0x65, 0x72, 0x72,
0x69, 0x74, 0x6F, 0x72, 0x69, 0x65, 0x73,
@@ -4020,8 +4037,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xA0, 0x00, 0x19, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x1D, 0x7A, 0x7A, 0x7A, 0x00, 0x45, 0x50, 0x54,
0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 0x44, 0x44, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x45, 0x57,
0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x2C, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEA, 0x94, 0x15, 0x00, 0xAB,
+0x9C, 0x4A, 0x00, 0x00, 0x00, 0x2C, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69,
0x6D, 0x65, 0x20, 0x2D, 0x20, 0x65, 0x61, 0x73, 0x74, 0x20, 0x4E, 0x75, 0x6E, 0x61, 0x76, 0x75,
0x74, 0x20, 0x2D, 0x20, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F,
0x6E, 0x73,
@@ -4038,7 +4055,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
0x01, 0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xB8, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00,
0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0x4B, 0x4D, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45,
-0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
+0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xCB, 0x80, 0x00, 0x9F, 0xE9,
0x80, 0x00, 0x00, 0x00, 0x00,
/* America/Jujuy */
@@ -4124,7 +4141,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x1D, 0x50, 0x53, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x50, 0x44,
0x54, 0x00, 0x59, 0x53, 0x54, 0x00, 0x59, 0x44, 0x54, 0x00, 0x41, 0x4B, 0x44, 0x54, 0x00, 0x41,
0x4B, 0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x1E,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xE2, 0x4A, 0x72, 0x00, 0x46, 0xD4, 0xB4, 0x00, 0x00, 0x00, 0x1E,
0x41, 0x6C, 0x61, 0x73, 0x6B, 0x61, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x41, 0x6C,
0x61, 0x73, 0x6B, 0x61, 0x20, 0x70, 0x61, 0x6E, 0x68, 0x61, 0x6E, 0x64, 0x6C, 0x65,
@@ -4191,8 +4208,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xB0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x10, 0xFF,
0xFF, 0xC7, 0xC0, 0x01, 0x14, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54,
0x00, 0x43, 0x50, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x29, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69, 0x6D,
+0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xC3, 0xB3, 0x48, 0x00, 0x92, 0x1E,
+0x08, 0x00, 0x00, 0x00, 0x29, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69, 0x6D,
0x65, 0x20, 0x2D, 0x20, 0x4B, 0x65, 0x6E, 0x74, 0x75, 0x63, 0x6B, 0x79, 0x20, 0x2D, 0x20, 0x4C,
0x6F, 0x75, 0x69, 0x73, 0x76, 0x69, 0x6C, 0x6C, 0x65, 0x20, 0x61, 0x72, 0x65, 0x61,
@@ -4250,7 +4267,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x14, 0x43,
0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43, 0x50, 0x54, 0x00, 0x45,
0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x26, 0x45,
+0x01, 0x00, 0x00, 0x00, 0xC1, 0x86, 0xDC, 0x00, 0x93, 0xC7, 0xB4, 0x00, 0x00, 0x00, 0x26, 0x45,
0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x4B, 0x65,
0x6E, 0x74, 0x75, 0x63, 0x6B, 0x79, 0x20, 0x2D, 0x20, 0x57, 0x61, 0x79, 0x6E, 0x65, 0x20, 0x43,
0x6F, 0x75, 0x6E, 0x74, 0x79,
@@ -4319,8 +4336,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0D, 0xB8, 0x1E, 0x96, 0xE4,
0xB8, 0xEE, 0xD5, 0xD4, 0x01, 0x02, 0xFF, 0xFF, 0xC0, 0x1C, 0x00, 0x00, 0xFF, 0xFF, 0xCE, 0x2C,
0x01, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x09, 0x43, 0x4D, 0x54, 0x00, 0x42, 0x4F, 0x53, 0x54,
-0x00, 0x42, 0x4F, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x42, 0x4F, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x71, 0xAD, 0x90, 0x00,
+0xAB, 0x20, 0x98, 0x00, 0x00, 0x00, 0x00,
/* America/Lima */
0x50, 0x48, 0x50, 0x31, 0x01, 0x50, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -4332,8 +4349,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x2D, 0x25, 0x03, 0x50, 0x2D, 0x9B, 0x9C, 0x40, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xB7, 0xAC, 0x00, 0x00, 0xFF, 0xFF, 0xC7,
0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x50, 0x45, 0x53,
-0x54, 0x00, 0x50, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x54, 0x00, 0x50, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x18, 0x48,
+0x00, 0x9D, 0x3D, 0xE8, 0x00, 0x00, 0x00, 0x00,
/* America/Los_Angeles */
0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -4399,8 +4416,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x00, 0xFF,
0xFF, 0x8F, 0x80, 0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
0x0C, 0x50, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x0C, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x54, 0x69, 0x6D,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xBD, 0x49, 0xE6, 0x00, 0x5E, 0xF9,
+0x95, 0x00, 0x00, 0x00, 0x0C, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x54, 0x69, 0x6D,
0x65,
/* America/Louisville */
@@ -4487,8 +4504,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xDE, 0x84, 0x00, 0x00, 0xFF,
0xFF, 0xE3, 0xE0, 0x01, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x42,
-0x52, 0x53, 0x54, 0x00, 0x42, 0x52, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89,
-0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x10, 0x41, 0x6C, 0x61, 0x67, 0x6F, 0x61,
+0x52, 0x53, 0x54, 0x00, 0x42, 0x52, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C,
+0x9D, 0x0A, 0x00, 0xDE, 0x58, 0x92, 0x00, 0x00, 0x00, 0x10, 0x41, 0x6C, 0x61, 0x67, 0x6F, 0x61,
0x73, 0x2C, 0x20, 0x53, 0x65, 0x72, 0x67, 0x69, 0x70, 0x65,
/* America/Managua */
@@ -4502,7 +4519,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x02, 0x01, 0x03, 0x01, 0x03, 0x01, 0xFF, 0xFF, 0xAF, 0x18, 0x00, 0x00, 0xFF, 0xFF, 0xAB,
0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0x4D,
0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0xDE, 0x58, 0x00, 0x8F, 0xDD, 0x6D, 0x00,
0x00, 0x00, 0x00,
/* America/Manaus */
@@ -4520,8 +4537,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xC7, 0xBC, 0x00, 0x00, 0xFF, 0xFF, 0xD5,
0xD0, 0x01, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4D, 0x53,
-0x54, 0x00, 0x41, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0A, 0x45, 0x20, 0x41, 0x6D, 0x61, 0x7A, 0x6F, 0x6E,
+0x54, 0x00, 0x41, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0xF4, 0x75,
+0x00, 0xB7, 0x21, 0x82, 0x00, 0x00, 0x00, 0x0A, 0x45, 0x20, 0x41, 0x6D, 0x61, 0x7A, 0x6F, 0x6E,
0x61, 0x73,
/* America/Marigot */
@@ -4529,8 +4546,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xD5, 0xE1, 0xB0,
0x01, 0xFF, 0xFF, 0xC6, 0x50, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xE5, 0x8A, 0x00, 0xB2, 0xA7,
+0xAD, 0x00, 0x00, 0x00, 0x00,
/* America/Martinique */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -4539,7 +4556,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x13, 0x4D, 0x6E, 0x40, 0x14, 0x34, 0x16, 0xB0, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xC6, 0xBC, 0x00,
0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x05, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x09, 0x46, 0x46, 0x4D,
0x54, 0x00, 0x41, 0x53, 0x54, 0x00, 0x41, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x9F, 0x9B, 0x60, 0x00, 0xB5, 0xB4, 0xED, 0x00, 0x00, 0x00, 0x00,
/* America/Mazatlan */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -4577,8 +4594,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF,
0xFF, 0x8F, 0x80, 0x00, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D,
0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x28, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x54, 0x69,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAC, 0xC1, 0x42, 0x00, 0x71, 0x8D,
+0x02, 0x00, 0x00, 0x00, 0x28, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x54, 0x69,
0x6D, 0x65, 0x20, 0x2D, 0x20, 0x53, 0x20, 0x42, 0x61, 0x6A, 0x61, 0x2C, 0x20, 0x4E, 0x61, 0x79,
0x61, 0x72, 0x69, 0x74, 0x2C, 0x20, 0x53, 0x69, 0x6E, 0x61, 0x6C, 0x6F, 0x61,
@@ -4663,8 +4680,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x01, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF,
0xB9, 0xB0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x10,
0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43, 0x50, 0x54, 0x00,
-0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x89,
-0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x47, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61,
+0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xCE,
+0x28, 0x79, 0x00, 0x8E, 0xD8, 0x08, 0x00, 0x00, 0x00, 0x47, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61,
0x6C, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x4D, 0x69, 0x63, 0x68, 0x69, 0x67, 0x61,
0x6E, 0x20, 0x2D, 0x20, 0x44, 0x69, 0x63, 0x6B, 0x69, 0x6E, 0x73, 0x6F, 0x6E, 0x2C, 0x20, 0x47,
0x6F, 0x67, 0x65, 0x62, 0x69, 0x63, 0x2C, 0x20, 0x49, 0x72, 0x6F, 0x6E, 0x20, 0x26, 0x20, 0x4D,
@@ -4705,7 +4722,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xAB, 0xFC, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00,
0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45,
0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x20, 0x43, 0x65, 0x6E, 0x74, 0x72,
+0xA9, 0x52, 0x5A, 0x00, 0x8B, 0xCB, 0xC2, 0x00, 0x00, 0x00, 0x20, 0x43, 0x65, 0x6E, 0x74, 0x72,
0x61, 0x6C, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x43, 0x61, 0x6D, 0x70, 0x65, 0x63,
0x68, 0x65, 0x2C, 0x20, 0x59, 0x75, 0x63, 0x61, 0x74, 0x61, 0x6E,
@@ -4747,7 +4764,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF,
0xB9, 0xB0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
0x43, 0x44, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x1D, 0x43, 0x65,
+0x00, 0x00, 0x00, 0xA6, 0xEE, 0x60, 0x00, 0x7B, 0xD3, 0x38, 0x00, 0x00, 0x00, 0x1D, 0x43, 0x65,
0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x6D, 0x6F, 0x73,
0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73,
@@ -4790,7 +4807,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x03, 0x02, 0x03, 0x02, 0xFF, 0xFF, 0xCB, 0x58, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04,
0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x0D, 0x4C, 0x4D, 0x54, 0x00,
0x41, 0x53, 0x54, 0x00, 0x50, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x4D, 0x44, 0x54, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD1, 0x1F, 0x28, 0x00, 0xBD, 0xB7, 0xB5, 0x00, 0x00,
0x00, 0x00,
/* America/Moncton */
@@ -4864,8 +4881,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x02, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x04, 0xFF, 0xFF,
0xC7, 0xC0, 0x00, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x0C, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x10,
0x45, 0x53, 0x54, 0x00, 0x41, 0x44, 0x54, 0x00, 0x41, 0x53, 0x54, 0x00, 0x41, 0x57, 0x54, 0x00,
-0x41, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x89,
-0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x1D, 0x41, 0x74, 0x6C, 0x61, 0x6E, 0x74,
+0x41, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xCF,
+0xAC, 0x10, 0x00, 0xB2, 0x32, 0x7D, 0x00, 0x00, 0x00, 0x1D, 0x41, 0x74, 0x6C, 0x61, 0x6E, 0x74,
0x69, 0x63, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x4E, 0x65, 0x77, 0x20, 0x42, 0x72,
0x75, 0x6E, 0x73, 0x77, 0x69, 0x63, 0x6B,
@@ -4902,7 +4919,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0xFF,
0xFF, 0xA1, 0xF4, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01,
0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x38, 0x43,
+0x00, 0x00, 0x00, 0x00, 0xB0, 0x7E, 0x4A, 0x00, 0x7A, 0x8D, 0xB2, 0x00, 0x00, 0x00, 0x38, 0x43,
0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x43, 0x6F,
0x61, 0x68, 0x75, 0x69, 0x6C, 0x61, 0x2C, 0x20, 0x44, 0x75, 0x72, 0x61, 0x6E, 0x67, 0x6F, 0x2C,
0x20, 0x4E, 0x75, 0x65, 0x76, 0x6F, 0x20, 0x4C, 0x65, 0x6F, 0x6E, 0x2C, 0x20, 0x54, 0x61, 0x6D,
@@ -4957,7 +4974,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xC8, 0x00, 0x0A, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x0A, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x0E, 0xFF,
0xFF, 0xDC, 0xD8, 0x01, 0x04, 0x4D, 0x4D, 0x54, 0x00, 0x55, 0x59, 0x48, 0x53, 0x54, 0x00, 0x55,
0x59, 0x54, 0x00, 0x55, 0x59, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0xCC, 0x0D, 0x00, 0xBD, 0x7D, 0x1D, 0x00, 0x00,
0x00, 0x00,
/* America/Montreal */
@@ -5039,7 +5056,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04,
0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0x45, 0x44, 0x54, 0x00,
0x45, 0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x45, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x26,
+0x00, 0x00, 0x00, 0x01, 0x00, 0xCE, 0xC8, 0x32, 0x00, 0xA4, 0x22, 0x3A, 0x00, 0x00, 0x00, 0x26,
0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x51,
0x75, 0x65, 0x62, 0x65, 0x63, 0x20, 0x2D, 0x20, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63,
0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73,
@@ -5049,8 +5066,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF4, 0x35, 0x10,
0x01, 0xFF, 0xFF, 0xC5, 0xAC, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0xD6, 0x32, 0x00, 0xB4, 0x62,
+0x62, 0x00, 0x00, 0x00, 0x00,
/* America/Nassau */
0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -5104,8 +5121,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xB7, 0x7C, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01,
0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x45,
-0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAF, 0x9A, 0x6D, 0x00, 0x9D, 0xB3,
+0x18, 0x00, 0x00, 0x00, 0x00,
/* America/New_York */
0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -5187,7 +5204,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x00, 0x01, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 0xFF,
0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0x45, 0x44, 0x54, 0x00, 0x45,
0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x45, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0C, 0x45,
+0x00, 0x00, 0x01, 0x00, 0xC7, 0x74, 0x38, 0x00, 0xA1, 0xC0, 0xBE, 0x00, 0x00, 0x00, 0x0C, 0x45,
0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65,
/* America/Nipigon */
@@ -5238,8 +5255,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x00,
0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xC7, 0xC0,
0x01, 0x0C, 0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x45, 0x50,
-0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x4B, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xD4, 0x1F, 0x62, 0x00, 0x8C,
+0xC9, 0xAA, 0x00, 0x00, 0x00, 0x4B, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69,
0x6D, 0x65, 0x20, 0x2D, 0x20, 0x4F, 0x6E, 0x74, 0x61, 0x72, 0x69, 0x6F, 0x20, 0x26, 0x20, 0x51,
0x75, 0x65, 0x62, 0x65, 0x63, 0x20, 0x2D, 0x20, 0x70, 0x6C, 0x61, 0x63, 0x65, 0x73, 0x20, 0x74,
0x68, 0x61, 0x74, 0x20, 0x64, 0x69, 0x64, 0x20, 0x6E, 0x6F, 0x74, 0x20, 0x6F, 0x62, 0x73, 0x65,
@@ -5300,8 +5317,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x18, 0xFF, 0xFF, 0x81, 0x70, 0x00, 0x1D, 0x4E, 0x53, 0x54, 0x00, 0x4E, 0x57, 0x54, 0x00, 0x4E,
0x50, 0x54, 0x00, 0x42, 0x53, 0x54, 0x00, 0x42, 0x44, 0x54, 0x00, 0x59, 0x53, 0x54, 0x00, 0x41,
0x4B, 0x44, 0x54, 0x00, 0x41, 0x4B, 0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x19, 0x41, 0x6C, 0x61, 0x73, 0x6B, 0x61, 0x20, 0x54, 0x69, 0x6D, 0x65,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEB, 0xBF, 0xFF, 0x00, 0x17, 0x82,
+0x1E, 0x00, 0x00, 0x00, 0x19, 0x41, 0x6C, 0x61, 0x73, 0x6B, 0x61, 0x20, 0x54, 0x69, 0x6D, 0x65,
0x20, 0x2D, 0x20, 0x77, 0x65, 0x73, 0x74, 0x20, 0x41, 0x6C, 0x61, 0x73, 0x6B, 0x61,
/* America/Noronha */
@@ -5322,7 +5339,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF,
0xFF, 0xE1, 0x9C, 0x00, 0x00, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x04, 0xFF, 0xFF, 0xE3, 0xE0, 0x00,
0x09, 0x4C, 0x4D, 0x54, 0x00, 0x46, 0x4E, 0x53, 0x54, 0x00, 0x46, 0x4E, 0x54, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x86, 0x0C, 0x68, 0x00, 0xE2, 0x77, 0x42, 0x00, 0x00, 0x00, 0x10,
0x41, 0x74, 0x6C, 0x61, 0x6E, 0x74, 0x69, 0x63, 0x20, 0x69, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73,
@@ -5380,8 +5397,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9,
0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x14, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54,
0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x2B, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xD1, 0x39,
+0x16, 0x00, 0x79, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x2B, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C,
0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x4E, 0x6F, 0x72, 0x74, 0x68, 0x20, 0x44, 0x61,
0x6B, 0x6F, 0x74, 0x61, 0x20, 0x2D, 0x20, 0x4F, 0x6C, 0x69, 0x76, 0x65, 0x72, 0x20, 0x43, 0x6F,
0x75, 0x6E, 0x74, 0x79,
@@ -5440,8 +5457,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9,
0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x14, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54,
0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x40, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xD0, 0xCF,
+0x14, 0x00, 0x79, 0x2B, 0xDB, 0x00, 0x00, 0x00, 0x40, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C,
0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x4E, 0x6F, 0x72, 0x74, 0x68, 0x20, 0x44, 0x61,
0x6B, 0x6F, 0x74, 0x61, 0x20, 0x2D, 0x20, 0x4D, 0x6F, 0x72, 0x74, 0x6F, 0x6E, 0x20, 0x43, 0x6F,
0x75, 0x6E, 0x74, 0x79, 0x20, 0x28, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x20, 0x4D, 0x61, 0x6E,
@@ -5452,8 +5469,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x8B, 0xF4, 0x61, 0xE8,
0x01, 0xFF, 0xFF, 0xB5, 0x18, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 0x43, 0x4D, 0x54,
-0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x97, 0x02, 0xDA, 0x00, 0x9A, 0xED,
+0x75, 0x00, 0x00, 0x00, 0x00,
/* America/Pangnirtung */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -5504,7 +5521,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x54, 0x00, 0x41, 0x50, 0x54, 0x00, 0x41, 0x53, 0x54, 0x00, 0x41, 0x44, 0x44, 0x54, 0x00, 0x41,
0x44, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43,
0x44, 0x54, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEE, 0x3D, 0x95, 0x00, 0xB0, 0x98, 0x55, 0x00,
0x00, 0x00, 0x23, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20,
0x2D, 0x20, 0x50, 0x61, 0x6E, 0x67, 0x6E, 0x69, 0x72, 0x74, 0x75, 0x6E, 0x67, 0x2C, 0x20, 0x4E,
0x75, 0x6E, 0x61, 0x76, 0x75, 0x74,
@@ -5518,7 +5535,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x04, 0xFF, 0xFF, 0xCC, 0x4C, 0x00, 0x04, 0xFF, 0xFF, 0xCE, 0xC8, 0x00, 0x08, 0xFF, 0xFF, 0xCE,
0xC8, 0x00, 0x0D, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x50, 0x4D, 0x54,
0x00, 0x4E, 0x45, 0x47, 0x54, 0x00, 0x53, 0x52, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x92, 0x3A, 0xE5, 0x00, 0xBE, 0xFD, 0x3A, 0x00, 0x00,
0x00, 0x00,
/* America/Phoenix */
@@ -5530,7 +5547,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFB, 0xE8, 0x58, 0x00, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x01, 0xFF, 0xFF,
0xAB, 0xA0, 0x01, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08,
0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x20, 0x4D, 0x6F,
+0x00, 0x00, 0x00, 0xBC, 0x5E, 0x01, 0x00, 0x67, 0xDF, 0x25, 0x00, 0x00, 0x00, 0x20, 0x4D, 0x6F,
0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x53, 0x74, 0x61, 0x6E, 0x64, 0x61, 0x72, 0x64, 0x20,
0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x41, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x61,
@@ -5552,7 +5569,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x05, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x09, 0xFF, 0xFF, 0xC7,
0xC0, 0x01, 0x05, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x09, 0x50, 0x50, 0x4D, 0x54, 0x00, 0x45, 0x44,
0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xA5, 0x9B, 0xD5, 0x00, 0xA5, 0x4D, 0xB5, 0x00, 0x00, 0x00, 0x00,
/* America/Porto_Acre */
0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -5577,8 +5594,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC,
0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0x94, 0x68, 0x00, 0xB6, 0x5E,
+0x32, 0x00, 0x00, 0x00, 0x00,
/* America/Porto_Velho */
0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -5595,7 +5612,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xC4,
0x18, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x09, 0x4C,
0x4D, 0x54, 0x00, 0x41, 0x4D, 0x53, 0x54, 0x00, 0x41, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x08, 0x52, 0x6F,
+0x00, 0x00, 0x00, 0x7E, 0x4A, 0xBA, 0x00, 0xB3, 0xE6, 0xB0, 0x00, 0x00, 0x00, 0x08, 0x52, 0x6F,
0x6E, 0x64, 0x6F, 0x6E, 0x69, 0x61,
/* America/Puerto_Rico */
@@ -5605,7 +5622,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x60, 0xED, 0xD0, 0x02, 0x01, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00,
0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x08, 0x41, 0x53, 0x54,
0x00, 0x41, 0x50, 0x54, 0x00, 0x41, 0x57, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0xA5, 0x82, 0x71, 0x00, 0xAE, 0x1C, 0xB3, 0x00, 0x00, 0x00, 0x00,
/* America/Rainy_River */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -5655,8 +5672,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x00,
0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0,
0x01, 0x0C, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43, 0x50,
-0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x32, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x54, 0x69,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xD3, 0xAA, 0x32, 0x00, 0x84,
+0x17, 0x1A, 0x00, 0x00, 0x00, 0x32, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x54, 0x69,
0x6D, 0x65, 0x20, 0x2D, 0x20, 0x52, 0x61, 0x69, 0x6E, 0x79, 0x20, 0x52, 0x69, 0x76, 0x65, 0x72,
0x20, 0x26, 0x20, 0x46, 0x6F, 0x72, 0x74, 0x20, 0x46, 0x72, 0x61, 0x6E, 0x63, 0x65, 0x73, 0x2C,
0x20, 0x4F, 0x6E, 0x74, 0x61, 0x72, 0x69, 0x6F,
@@ -5705,8 +5722,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00,
0x09, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0D, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x11, 0x7A, 0x7A, 0x7A,
0x00, 0x43, 0x44, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x45, 0x53,
-0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x1E, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE9, 0x2E, 0x02,
+0x00, 0x86, 0x67, 0x71, 0x00, 0x00, 0x00, 0x1E, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20,
0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x63, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x4E,
0x75, 0x6E, 0x61, 0x76, 0x75, 0x74,
@@ -5728,7 +5745,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF,
0xFF, 0xDF, 0x48, 0x00, 0x00, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x00,
0x09, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x52, 0x53, 0x54, 0x00, 0x42, 0x52, 0x54, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0A,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x7D, 0x32, 0xC8, 0x00, 0xE0, 0x26, 0xD0, 0x00, 0x00, 0x00, 0x0A,
0x50, 0x65, 0x72, 0x6E, 0x61, 0x6D, 0x62, 0x75, 0x63, 0x6F,
/* America/Regina */
@@ -5755,8 +5772,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0xAB,
0xA0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x44, 0x54,
0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x43, 0x53, 0x54,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x35, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xD6, 0x3B,
+0xC0, 0x00, 0x74, 0xF5, 0x68, 0x00, 0x00, 0x00, 0x35, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C,
0x20, 0x53, 0x74, 0x61, 0x6E, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D,
0x20, 0x53, 0x61, 0x73, 0x6B, 0x61, 0x74, 0x63, 0x68, 0x65, 0x77, 0x61, 0x6E, 0x20, 0x2D, 0x20,
0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73,
@@ -5806,7 +5823,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x09, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0D, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x11, 0xFF, 0xFF, 0xB9,
0xB0, 0x00, 0x0D, 0x7A, 0x7A, 0x7A, 0x00, 0x43, 0x44, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
0x43, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x29,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, 0x4E, 0x33, 0x00, 0x84, 0x7D, 0xA4, 0x00, 0x00, 0x00, 0x29,
0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x53, 0x74, 0x61, 0x6E, 0x64, 0x61, 0x72, 0x64,
0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x52, 0x65, 0x73, 0x6F, 0x6C, 0x75, 0x74, 0x65,
0x2C, 0x20, 0x4E, 0x75, 0x6E, 0x61, 0x76, 0x75, 0x74,
@@ -5827,7 +5844,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x03, 0xFF, 0xFF, 0xC0, 0x70, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF,
0xB9, 0xB0, 0x00, 0x09, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x43,
0x53, 0x54, 0x00, 0x41, 0x43, 0x54, 0x00, 0x41, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x04, 0x41,
+0x00, 0x00, 0x00, 0x00, 0x7D, 0x12, 0x3A, 0x00, 0xAD, 0xA5, 0x20, 0x00, 0x00, 0x00, 0x04, 0x41,
0x63, 0x72, 0x65,
/* America/Rosario */
@@ -5893,7 +5910,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x03, 0xFF, 0xFF, 0xCC, 0xB8, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x04, 0xFF, 0xFF,
0xC7, 0xC0, 0x00, 0x09, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4D,
0x53, 0x54, 0x00, 0x41, 0x4D, 0x54, 0x00, 0x42, 0x52, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x06, 0x57,
+0x00, 0x00, 0x00, 0x00, 0x86, 0xF0, 0x45, 0x00, 0xC1, 0x95, 0x4A, 0x00, 0x00, 0x00, 0x06, 0x57,
0x20, 0x50, 0x61, 0x72, 0x61,
/* America/Santiago */
@@ -5954,7 +5971,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x08, 0xFF, 0xFF, 0xC7, 0xC0,
0x00, 0x04, 0x53, 0x4D, 0x54, 0x00, 0x43, 0x4C, 0x54, 0x00, 0x43, 0x4C, 0x53, 0x54, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0E, 0x6D, 0x6F, 0x73, 0x74, 0x20,
+0x57, 0xA9, 0x68, 0x00, 0xA8, 0xDD, 0x2A, 0x00, 0x00, 0x00, 0x0E, 0x6D, 0x6F, 0x73, 0x74, 0x20,
0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73,
/* America/Santo_Domingo */
@@ -5969,8 +5986,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x05, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x09, 0xFF, 0xFF,
0xC0, 0xB8, 0x01, 0x0D, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x12, 0x53, 0x44, 0x4D, 0x54, 0x00, 0x45,
0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 0x48, 0x44, 0x54, 0x00, 0x41, 0x53, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA5, 0x81, 0xCA, 0x00, 0xAA,
+0xBE, 0xF0, 0x00, 0x00, 0x00, 0x00,
/* America/Sao_Paulo */
0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -6018,7 +6035,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xD4, 0x4C,
0x00, 0x00, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x09, 0x4C, 0x4D,
0x54, 0x00, 0x42, 0x52, 0x53, 0x54, 0x00, 0x42, 0x52, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x32, 0x53, 0x20, 0x26,
+0x00, 0x00, 0x67, 0x0C, 0x35, 0x00, 0xCD, 0x68, 0xA2, 0x00, 0x00, 0x00, 0x32, 0x53, 0x20, 0x26,
0x20, 0x53, 0x45, 0x20, 0x42, 0x72, 0x61, 0x7A, 0x69, 0x6C, 0x20, 0x28, 0x47, 0x4F, 0x2C, 0x20,
0x44, 0x46, 0x2C, 0x20, 0x4D, 0x47, 0x2C, 0x20, 0x45, 0x53, 0x2C, 0x20, 0x52, 0x4A, 0x2C, 0x20,
0x53, 0x50, 0x2C, 0x20, 0x50, 0x52, 0x2C, 0x20, 0x53, 0x43, 0x2C, 0x20, 0x52, 0x53, 0x29,
@@ -6068,7 +6085,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xF0, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0x01, 0x11, 0x4C,
0x4D, 0x54, 0x00, 0x43, 0x47, 0x54, 0x00, 0x43, 0x47, 0x53, 0x54, 0x00, 0x45, 0x47, 0x54, 0x00,
0x45, 0x47, 0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x1F, 0x53,
+0x01, 0x01, 0x00, 0x00, 0xF4, 0xE0, 0xCD, 0x00, 0xF4, 0x16, 0xFA, 0x00, 0x00, 0x00, 0x1F, 0x53,
0x63, 0x6F, 0x72, 0x65, 0x73, 0x62, 0x79, 0x73, 0x75, 0x6E, 0x64, 0x20, 0x2F, 0x20, 0x49, 0x74,
0x74, 0x6F, 0x71, 0x71, 0x6F, 0x72, 0x74, 0x6F, 0x6F, 0x72, 0x6D, 0x69, 0x69, 0x74,
@@ -6127,8 +6144,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0xAB,
0xA0, 0x01, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF,
0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54,
-0x00, 0x4D, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x16, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69,
+0x00, 0x4D, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xC1, 0x75,
+0x9B, 0x00, 0x6E, 0xE9, 0x1E, 0x00, 0x00, 0x00, 0x16, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69,
0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x4E, 0x61, 0x76, 0x61, 0x6A, 0x6F,
/* America/St_Barthelemy */
@@ -6136,8 +6153,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xD5, 0xE1, 0xB0,
0x01, 0xFF, 0xFF, 0xC6, 0x50, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0x9D, 0xED, 0x00, 0xB5, 0x59,
+0xC8, 0x00, 0x00, 0x00, 0x00,
/* America/St_Johns */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -6222,7 +6239,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xFF, 0xDC, 0xD8, 0x01, 0x0C, 0xFF, 0xFF, 0xEA, 0xE8, 0x01, 0x10, 0x4E, 0x44, 0x54, 0x00,
0x4E, 0x53, 0x54, 0x00, 0x4E, 0x50, 0x54, 0x00, 0x4E, 0x57, 0x54, 0x00, 0x4E, 0x44, 0x44, 0x54,
0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x28, 0x4E, 0x65, 0x77, 0x66, 0x6F,
+0xD1, 0xE8, 0xFA, 0x00, 0xC4, 0x67, 0xF2, 0x00, 0x00, 0x00, 0x28, 0x4E, 0x65, 0x77, 0x66, 0x6F,
0x75, 0x6E, 0x64, 0x6C, 0x61, 0x6E, 0x64, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x2C, 0x20, 0x69, 0x6E,
0x63, 0x6C, 0x75, 0x64, 0x69, 0x6E, 0x67, 0x20, 0x53, 0x45, 0x20, 0x4C, 0x61, 0x62, 0x72, 0x61,
0x64, 0x6F, 0x72,
@@ -6232,32 +6249,32 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x34, 0xCC,
0x01, 0xFF, 0xFF, 0xC5, 0x34, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0xBA, 0x10, 0x00, 0xB5, 0x25,
+0xB2, 0x00, 0x00, 0x00, 0x00,
/* America/St_Lucia */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4C, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x92, 0xE6, 0xC7, 0xB0,
0x01, 0xFF, 0xFF, 0xC6, 0xD0, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x43, 0x4D, 0x54,
-0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0xB7, 0x82, 0x00, 0xB5, 0x94,
+0x60, 0x00, 0x00, 0x00, 0x00,
/* America/St_Thomas */
0x50, 0x48, 0x50, 0x31, 0x01, 0x56, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF4, 0x37, 0x60,
0x01, 0xFF, 0xFF, 0xC3, 0x20, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA5, 0x54, 0x38, 0x00, 0xB2, 0x6D,
+0x15, 0x00, 0x00, 0x00, 0x00,
/* America/St_Vincent */
0x50, 0x48, 0x50, 0x31, 0x01, 0x56, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x92, 0xE6, 0xC7, 0xE8,
0x01, 0xFF, 0xFF, 0xC6, 0x98, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4B, 0x4D, 0x54,
-0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9D, 0x64, 0xF8, 0x00, 0xB5, 0xEF,
+0x85, 0x00, 0x00, 0x00, 0x00,
/* America/Swift_Current */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -6274,7 +6291,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x10, 0xFF, 0xFF, 0xAB,
0xA0, 0x00, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D,
0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xD6, 0x0E, 0x2D, 0x00, 0x70, 0xA9, 0x25, 0x00,
0x00, 0x00, 0x2E, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x53, 0x74, 0x61, 0x6E, 0x64,
0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x53, 0x61, 0x73, 0x6B, 0x61,
0x74, 0x63, 0x68, 0x65, 0x77, 0x61, 0x6E, 0x20, 0x2D, 0x20, 0x6D, 0x69, 0x64, 0x77, 0x65, 0x73,
@@ -6288,7 +6305,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x44, 0x5D, 0x8C, 0xE0, 0x44, 0xD6, 0xC8, 0xD0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF,
0xFF, 0xAE, 0x3C, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00,
0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x9E, 0xD8, 0x10, 0x00, 0x8E, 0x3C, 0xC2, 0x00, 0x00, 0x00, 0x00,
/* America/Thule */
0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -6325,8 +6342,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xBF, 0x84, 0x00, 0x00, 0xFF, 0xFF, 0xD5,
0xD0, 0x01, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x44, 0x54,
-0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x10, 0x54, 0x68, 0x75, 0x6C, 0x65, 0x20, 0x2F, 0x20, 0x50,
+0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x29, 0x1A, 0x00,
+0xAC, 0x17, 0xFD, 0x00, 0x00, 0x00, 0x10, 0x54, 0x68, 0x75, 0x6C, 0x65, 0x20, 0x2F, 0x20, 0x50,
0x69, 0x74, 0x75, 0x66, 0x66, 0x69, 0x6B,
/* America/Thunder_Bay */
@@ -6379,8 +6396,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xAB, 0xA0, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08,
0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x10, 0x43, 0x53, 0x54, 0x00,
0x45, 0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x45, 0x50, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x23, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xD3, 0x27, 0xFD, 0x00, 0x8B,
+0x3C, 0x88, 0x00, 0x00, 0x00, 0x23, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69,
0x6D, 0x65, 0x20, 0x2D, 0x20, 0x54, 0x68, 0x75, 0x6E, 0x64, 0x65, 0x72, 0x20, 0x42, 0x61, 0x79,
0x2C, 0x20, 0x4F, 0x6E, 0x74, 0x61, 0x72, 0x69, 0x6F,
@@ -6438,8 +6455,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D,
0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54,
0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0C, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xBA, 0xF8,
+0x95, 0x00, 0x60, 0x27, 0xE2, 0x00, 0x00, 0x00, 0x0C, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63,
0x20, 0x54, 0x69, 0x6D, 0x65,
/* America/Toronto */
@@ -6521,7 +6538,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04,
0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0x45, 0x44, 0x54, 0x00,
0x45, 0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x45, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x27,
+0x00, 0x00, 0x00, 0x01, 0x00, 0xCB, 0xEF, 0x08, 0x00, 0x9A, 0xB2, 0xDD, 0x00, 0x00, 0x00, 0x27,
0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x4F,
0x6E, 0x74, 0x61, 0x72, 0x69, 0x6F, 0x20, 0x2D, 0x20, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F,
0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73,
@@ -6531,8 +6548,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF4, 0x37, 0x14,
0x01, 0xFF, 0xFF, 0xC3, 0x6C, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA5, 0x7B, 0x48, 0x00, 0xB1, 0xF1,
+0x62, 0x00, 0x00, 0x00, 0x00,
/* America/Vancouver */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -6599,8 +6616,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0x9D,
0x90, 0x01, 0x00, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x08, 0xFF,
0xFF, 0x9D, 0x90, 0x01, 0x0C, 0x50, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x57, 0x54,
-0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x24, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63,
+0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xD4, 0x81,
+0x0A, 0x00, 0x57, 0x27, 0x32, 0x00, 0x00, 0x00, 0x24, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63,
0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x77, 0x65, 0x73, 0x74, 0x20, 0x42, 0x72, 0x69,
0x74, 0x69, 0x73, 0x68, 0x20, 0x43, 0x6F, 0x6C, 0x75, 0x6D, 0x62, 0x69, 0x61,
@@ -6660,7 +6677,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x15, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x19, 0x59, 0x44, 0x54, 0x00,
0x59, 0x53, 0x54, 0x00, 0x59, 0x57, 0x54, 0x00, 0x59, 0x50, 0x54, 0x00, 0x59, 0x44, 0x44, 0x54,
0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xE5, 0xF9, 0xB2, 0x00, 0x44, 0xBD, 0xA8, 0x00,
0x00, 0x00, 0x1A, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20,
0x2D, 0x20, 0x73, 0x6F, 0x75, 0x74, 0x68, 0x20, 0x59, 0x75, 0x6B, 0x6F, 0x6E,
@@ -6729,8 +6746,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xB9, 0xB0, 0x01, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x08,
0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x00, 0xFF, 0xFF, 0xAB, 0xA0,
0x00, 0x04, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43, 0x50,
-0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x89,
-0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x26, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xD5,
+0x71, 0xED, 0x00, 0x7E, 0xE0, 0x78, 0x00, 0x00, 0x00, 0x26, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61,
0x6C, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x4D, 0x61, 0x6E, 0x69, 0x74, 0x6F, 0x62,
0x61, 0x20, 0x26, 0x20, 0x77, 0x65, 0x73, 0x74, 0x20, 0x4F, 0x6E, 0x74, 0x61, 0x72, 0x69, 0x6F,
@@ -6787,8 +6804,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x8F, 0x80, 0x01, 0x08, 0xFF, 0xFF, 0x8F, 0x80, 0x01, 0x0C, 0xFF, 0xFF, 0x8F, 0x80, 0x01, 0x10,
0xFF, 0xFF, 0x81, 0x70, 0x00, 0x15, 0x59, 0x53, 0x54, 0x00, 0x59, 0x57, 0x54, 0x00, 0x59, 0x50,
0x54, 0x00, 0x59, 0x44, 0x54, 0x00, 0x41, 0x4B, 0x44, 0x54, 0x00, 0x41, 0x4B, 0x53, 0x54, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x23, 0x41, 0x6C, 0x61, 0x73, 0x6B, 0x61, 0x20, 0x54,
+0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xE4, 0x30, 0xC6,
+0x00, 0x3F, 0xAB, 0xB2, 0x00, 0x00, 0x00, 0x23, 0x41, 0x6C, 0x61, 0x73, 0x6B, 0x61, 0x20, 0x54,
0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x41, 0x6C, 0x61, 0x73, 0x6B, 0x61, 0x20, 0x70, 0x61, 0x6E,
0x68, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x20, 0x6E, 0x65, 0x63, 0x6B,
@@ -6838,7 +6855,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0,
0x01, 0x15, 0x7A, 0x7A, 0x7A, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x4D, 0x53,
0x54, 0x00, 0x4D, 0x44, 0x44, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xE8, 0x9E, 0xC7, 0x00, 0x65, 0x3D, 0xF7, 0x00,
0x00, 0x00, 0x2D, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65,
0x20, 0x2D, 0x20, 0x63, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x4E, 0x6F, 0x72, 0x74, 0x68,
0x77, 0x65, 0x73, 0x74, 0x20, 0x54, 0x65, 0x72, 0x72, 0x69, 0x74, 0x6F, 0x72, 0x69, 0x65, 0x73,
@@ -6849,8 +6866,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0xFE, 0x1E, 0xCC, 0x80,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x04, 0x7A, 0x7A, 0x7A,
-0x00, 0x57, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x1F, 0x43, 0x61, 0x73, 0x65, 0x79, 0x20, 0x53, 0x74, 0x61, 0x74, 0x69,
+0x00, 0x57, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x25, 0x0D, 0xAD, 0x01, 0xBB, 0x4B,
+0x12, 0x00, 0x00, 0x00, 0x1F, 0x43, 0x61, 0x73, 0x65, 0x79, 0x20, 0x53, 0x74, 0x61, 0x74, 0x69,
0x6F, 0x6E, 0x2C, 0x20, 0x42, 0x61, 0x69, 0x6C, 0x65, 0x79, 0x20, 0x50, 0x65, 0x6E, 0x69, 0x6E,
0x73, 0x75, 0x6C, 0x61,
@@ -6860,7 +6877,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0xE7, 0x9C, 0x40, 0x00,
0xF6, 0x47, 0xDF, 0x10, 0xFE, 0x47, 0xAB, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x7A, 0x7A, 0x7A, 0x00, 0x44, 0x41, 0x56, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x1D,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x75, 0x9D, 0x01, 0x89, 0xA0, 0x3A, 0x00, 0x00, 0x00, 0x1D,
0x44, 0x61, 0x76, 0x69, 0x73, 0x20, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x2C, 0x20, 0x56,
0x65, 0x73, 0x74, 0x66, 0x6F, 0x6C, 0x64, 0x20, 0x48, 0x69, 0x6C, 0x6C, 0x73,
@@ -6871,7 +6888,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xDE, 0x34, 0x60, 0x60, 0xE7, 0x3C, 0x02, 0x80, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x8C, 0xA0, 0x00, 0x04, 0x00, 0x00, 0x8C, 0xA0, 0x00, 0x08, 0x7A, 0x7A, 0x7A,
0x00, 0x50, 0x4D, 0x54, 0x00, 0x44, 0x44, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x26, 0x44, 0x75, 0x6D, 0x6F,
+0x00, 0x25, 0xA3, 0x6A, 0x01, 0xE8, 0x4E, 0x82, 0x00, 0x00, 0x00, 0x26, 0x44, 0x75, 0x6D, 0x6F,
0x6E, 0x74, 0x2D, 0x64, 0x27, 0x55, 0x72, 0x76, 0x69, 0x6C, 0x6C, 0x65, 0x20, 0x53, 0x74, 0x61,
0x74, 0x69, 0x6F, 0x6E, 0x2C, 0x20, 0x54, 0x65, 0x72, 0x72, 0x65, 0x20, 0x41, 0x64, 0x65, 0x6C,
0x69, 0x65,
@@ -6881,8 +6898,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0xE2, 0x20, 0x32, 0x80,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x60, 0x00, 0x04, 0x7A, 0x7A, 0x7A,
-0x00, 0x4D, 0x41, 0x57, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x19, 0x4D, 0x61, 0x77, 0x73, 0x6F, 0x6E, 0x20, 0x53, 0x74, 0x61,
+0x00, 0x4D, 0x41, 0x57, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x02, 0xBF, 0x01, 0x72,
+0x9C, 0x4D, 0x00, 0x00, 0x00, 0x19, 0x4D, 0x61, 0x77, 0x73, 0x6F, 0x6E, 0x20, 0x53, 0x74, 0x61,
0x74, 0x69, 0x6F, 0x6E, 0x2C, 0x20, 0x48, 0x6F, 0x6C, 0x6D, 0x65, 0x20, 0x42, 0x61, 0x79,
/* Antarctica/McMurdo */
@@ -6931,8 +6948,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xB6, 0xD0, 0x01, 0x04, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x09, 0x00, 0x00,
0xA8, 0xC0, 0x00, 0x09, 0x7A, 0x7A, 0x7A, 0x00, 0x4E, 0x5A, 0x44, 0x54, 0x00, 0x4E, 0x5A, 0x53,
-0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x1C, 0x4D, 0x63, 0x4D, 0x75, 0x72, 0x64, 0x6F, 0x20, 0x53, 0x74,
+0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x1B, 0xA5, 0x02, 0x10,
+0xDE, 0xA0, 0x00, 0x00, 0x00, 0x1C, 0x4D, 0x63, 0x4D, 0x75, 0x72, 0x64, 0x6F, 0x20, 0x53, 0x74,
0x61, 0x74, 0x69, 0x6F, 0x6E, 0x2C, 0x20, 0x52, 0x6F, 0x73, 0x73, 0x20, 0x49, 0x73, 0x6C, 0x61,
0x6E, 0x64,
@@ -6984,7 +7001,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x0D, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x12, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x12, 0x7A, 0x7A, 0x7A,
0x00, 0x41, 0x52, 0x54, 0x00, 0x41, 0x52, 0x53, 0x54, 0x00, 0x43, 0x4C, 0x53, 0x54, 0x00, 0x43,
0x4C, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x1D, 0x50,
+0x01, 0x01, 0x00, 0x00, 0x28, 0xE4, 0xBF, 0x00, 0xB1, 0x27, 0x90, 0x00, 0x00, 0x00, 0x1D, 0x50,
0x61, 0x6C, 0x6D, 0x65, 0x72, 0x20, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x2C, 0x20, 0x41,
0x6E, 0x76, 0x65, 0x72, 0x73, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64,
@@ -6993,8 +7010,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0x0D, 0x02, 0x2D, 0x00,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0x7A, 0x7A, 0x7A,
-0x00, 0x52, 0x4F, 0x54, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x20, 0x52, 0x6F, 0x74, 0x68, 0x65, 0x72, 0x61, 0x20, 0x53, 0x74,
+0x00, 0x52, 0x4F, 0x54, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0xF5, 0xBA, 0x00, 0xAB,
+0x1A, 0x15, 0x00, 0x00, 0x00, 0x20, 0x52, 0x6F, 0x74, 0x68, 0x65, 0x72, 0x61, 0x20, 0x53, 0x74,
0x61, 0x74, 0x69, 0x6F, 0x6E, 0x2C, 0x20, 0x41, 0x64, 0x65, 0x6C, 0x61, 0x69, 0x64, 0x65, 0x20,
0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64,
@@ -7044,7 +7061,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xB6, 0xD0, 0x01, 0x04, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x09, 0x00, 0x00,
0xA8, 0xC0, 0x00, 0x09, 0x7A, 0x7A, 0x7A, 0x00, 0x4E, 0x5A, 0x44, 0x54, 0x00, 0x4E, 0x5A, 0x53,
-0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
+0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x12,
0xA8, 0x80, 0x00, 0x00, 0x00, 0x22, 0x41, 0x6D, 0x75, 0x6E, 0x64, 0x73, 0x65, 0x6E, 0x2D, 0x53,
0x63, 0x6F, 0x74, 0x74, 0x20, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x2C, 0x20, 0x53, 0x6F,
0x75, 0x74, 0x68, 0x20, 0x50, 0x6F, 0x6C, 0x65,
@@ -7054,8 +7071,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0xE7, 0xB1, 0x58, 0x00,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x7A, 0x7A, 0x7A,
-0x00, 0x53, 0x59, 0x4F, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x18, 0x53, 0x79, 0x6F, 0x77, 0x61, 0x20, 0x53, 0x74, 0x61, 0x74,
+0x00, 0x53, 0x59, 0x4F, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x0D, 0x83, 0x01, 0x4F,
+0x11, 0x58, 0x00, 0x00, 0x00, 0x18, 0x53, 0x79, 0x6F, 0x77, 0x61, 0x20, 0x53, 0x74, 0x61, 0x74,
0x69, 0x6F, 0x6E, 0x2C, 0x20, 0x45, 0x20, 0x4F, 0x6E, 0x67, 0x75, 0x6C, 0x20, 0x49,
/* Antarctica/Vostok */
@@ -7063,8 +7080,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0xE9, 0x58, 0x89, 0x80,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x60, 0x00, 0x04, 0x7A, 0x7A, 0x7A,
-0x00, 0x56, 0x4F, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x1F, 0x56, 0x6F, 0x73, 0x74, 0x6F, 0x6B, 0x20, 0x53, 0x74, 0x61,
+0x00, 0x56, 0x4F, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0xEB, 0xC0, 0x01, 0xB5,
+0xC6, 0x4F, 0x00, 0x00, 0x00, 0x1F, 0x56, 0x6F, 0x73, 0x74, 0x6F, 0x6B, 0x20, 0x53, 0x74, 0x61,
0x74, 0x69, 0x6F, 0x6E, 0x2C, 0x20, 0x53, 0x20, 0x4D, 0x61, 0x67, 0x6E, 0x65, 0x74, 0x69, 0x63,
0x20, 0x50, 0x6F, 0x6C, 0x65,
@@ -7119,7 +7136,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00,
0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00,
0x05, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x59, 0x00, 0x01, 0x2B, 0x12, 0x80, 0x00, 0x00,
0x00, 0x00,
/* Asia/Aden */
@@ -7127,8 +7144,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0xDA, 0x61, 0x38, 0x20,
0x01, 0x00, 0x00, 0x2A, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9C, 0xC8, 0xB8, 0x01, 0x57, 0xA0,
+0xC0, 0x00, 0x00, 0x00, 0x00,
/* Asia/Almaty */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4B, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7153,7 +7170,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x04, 0x00, 0x00, 0x62, 0x70, 0x01, 0x09, 0x00, 0x00, 0x54, 0x60, 0x00, 0x04, 0x00, 0x00,
0x54, 0x60, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70, 0x01, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4C,
0x4D, 0x54, 0x00, 0x41, 0x4C, 0x4D, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCB, 0x52, 0xC8, 0x01, 0x88, 0x13, 0x18, 0x00, 0x00, 0x00,
0x0E, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73,
/* Asia/Amman */
@@ -7170,37 +7187,37 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x2B, 0xBB, 0x65, 0xE0, 0x2C, 0xAB, 0x48, 0xD0, 0x2D, 0x9B, 0x47, 0xE0, 0x2E, 0x78, 0xB5, 0xD0,
0x2F, 0x84, 0x64, 0x60, 0x30, 0x58, 0xA5, 0xE0, 0x31, 0x64, 0x46, 0x60, 0x32, 0x41, 0xC2, 0x60,
0x33, 0x44, 0x28, 0x60, 0x34, 0x21, 0xA4, 0x60, 0x35, 0x24, 0x0A, 0x60, 0x36, 0x01, 0x86, 0x60,
-0x37, 0x7A, 0x93, 0x60, 0x37, 0xF2, 0x8B, 0xE0, 0x38, 0xE2, 0x7C, 0xE0, 0x39, 0xD2, 0x6D, 0xE0,
-0x3A, 0xC2, 0x5E, 0xE0, 0x3B, 0xB2, 0x4F, 0xE0, 0x3C, 0xA2, 0x40, 0xE0, 0x3D, 0x92, 0x31, 0xE0,
-0x3E, 0x82, 0x22, 0xE0, 0x3F, 0x98, 0x4F, 0x60, 0x40, 0x62, 0x04, 0xE0, 0x41, 0x6E, 0xF6, 0xE0,
-0x42, 0x4B, 0x21, 0x60, 0x43, 0x3C, 0x63, 0xE0, 0x44, 0x2B, 0x03, 0x60, 0x45, 0x41, 0x2F, 0xE0,
-0x46, 0x0A, 0xE5, 0x60, 0x47, 0x21, 0x11, 0xE0, 0x47, 0xEA, 0xC7, 0x60, 0x49, 0x0A, 0x2E, 0x60,
-0x49, 0xCA, 0xA9, 0x60, 0x4A, 0xEA, 0x10, 0x60, 0x4B, 0xAA, 0x8B, 0x60, 0x4C, 0xC9, 0xF2, 0x60,
-0x4D, 0x93, 0xA7, 0xE0, 0x4E, 0xA9, 0xD4, 0x60, 0x4F, 0x73, 0x89, 0xE0, 0x50, 0x89, 0xB6, 0x60,
-0x51, 0x53, 0x6B, 0xE0, 0x52, 0x69, 0x98, 0x60, 0x53, 0x33, 0x4D, 0xE0, 0x54, 0x52, 0xB4, 0xE0,
-0x55, 0x13, 0x2F, 0xE0, 0x56, 0x32, 0x96, 0xE0, 0x56, 0xFC, 0x4C, 0x60, 0x58, 0x12, 0x78, 0xE0,
-0x58, 0xDC, 0x2E, 0x60, 0x59, 0xF2, 0x5A, 0xE0, 0x5A, 0xBC, 0x10, 0x60, 0x5B, 0xD2, 0x3C, 0xE0,
-0x5C, 0x9B, 0xF2, 0x60, 0x5D, 0xB2, 0x1E, 0xE0, 0x5E, 0x7B, 0xD4, 0x60, 0x5F, 0x9B, 0x3B, 0x60,
-0x60, 0x5B, 0xB6, 0x60, 0x61, 0x7B, 0x1D, 0x60, 0x62, 0x44, 0xD2, 0xE0, 0x63, 0x5A, 0xFF, 0x60,
-0x64, 0x24, 0xB4, 0xE0, 0x65, 0x3A, 0xE1, 0x60, 0x66, 0x04, 0x96, 0xE0, 0x67, 0x1A, 0xC3, 0x60,
-0x67, 0xE4, 0x78, 0xE0, 0x69, 0x03, 0xDF, 0xE0, 0x69, 0xC4, 0x5A, 0xE0, 0x6A, 0xE3, 0xC1, 0xE0,
-0x6B, 0xA4, 0x3C, 0xE0, 0x6C, 0xC3, 0xA3, 0xE0, 0x6D, 0x8D, 0x59, 0x60, 0x6E, 0xA3, 0x85, 0xE0,
-0x6F, 0x6D, 0x3B, 0x60, 0x70, 0x83, 0x67, 0xE0, 0x71, 0x4D, 0x1D, 0x60, 0x72, 0x63, 0x49, 0xE0,
-0x73, 0x2C, 0xFF, 0x60, 0x74, 0x4C, 0x66, 0x60, 0x75, 0x0C, 0xE1, 0x60, 0x76, 0x2C, 0x48, 0x60,
-0x76, 0xF5, 0xFD, 0xE0, 0x78, 0x0C, 0x2A, 0x60, 0x78, 0xD5, 0xDF, 0xE0, 0x79, 0xEC, 0x0C, 0x60,
-0x7A, 0xB5, 0xC1, 0xE0, 0x7B, 0xCB, 0xEE, 0x60, 0x7C, 0x95, 0xA3, 0xE0, 0x7D, 0xB5, 0x0A, 0xE0,
-0x7E, 0x75, 0x85, 0xE0, 0x7F, 0x94, 0xEC, 0xE0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x37, 0x7A, 0x93, 0x60, 0x37, 0xEA, 0xA2, 0xE0, 0x38, 0xE2, 0x7C, 0xE0, 0x39, 0xD3, 0xBF, 0x60,
+0x3A, 0xC2, 0x5E, 0xE0, 0x3B, 0xB3, 0xA1, 0x60, 0x3C, 0xA3, 0x92, 0x60, 0x3D, 0x93, 0x83, 0x60,
+0x3E, 0x83, 0x74, 0x60, 0x3F, 0x98, 0x4F, 0x60, 0x40, 0x63, 0x56, 0x60, 0x41, 0x6E, 0xF6, 0xE0,
+0x42, 0x4C, 0x72, 0xE0, 0x43, 0x3C, 0x63, 0xE0, 0x44, 0x2C, 0x54, 0xE0, 0x45, 0x41, 0x2F, 0xE0,
+0x46, 0x0C, 0x36, 0xE0, 0x47, 0x21, 0x11, 0xE0, 0x47, 0xEC, 0x18, 0xE0, 0x49, 0x0A, 0x2E, 0x60,
+0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xEA, 0x10, 0x60, 0x4B, 0xAB, 0xDC, 0xE0, 0x4C, 0xC9, 0xF2, 0x60,
+0x4D, 0x94, 0xF9, 0x60, 0x4E, 0xA9, 0xD4, 0x60, 0x4F, 0x74, 0xDB, 0x60, 0x50, 0x89, 0xB6, 0x60,
+0x51, 0x54, 0xBD, 0x60, 0x52, 0x69, 0x98, 0x60, 0x53, 0x34, 0x9F, 0x60, 0x54, 0x52, 0xB4, 0xE0,
+0x55, 0x14, 0x81, 0x60, 0x56, 0x32, 0x96, 0xE0, 0x56, 0xFD, 0x9D, 0xE0, 0x58, 0x12, 0x78, 0xE0,
+0x58, 0xDD, 0x7F, 0xE0, 0x59, 0xF2, 0x5A, 0xE0, 0x5A, 0xBD, 0x61, 0xE0, 0x5B, 0xD2, 0x3C, 0xE0,
+0x5C, 0x9D, 0x43, 0xE0, 0x5D, 0xB2, 0x1E, 0xE0, 0x5E, 0x7D, 0x25, 0xE0, 0x5F, 0x9B, 0x3B, 0x60,
+0x60, 0x5D, 0x07, 0xE0, 0x61, 0x7B, 0x1D, 0x60, 0x62, 0x46, 0x24, 0x60, 0x63, 0x5A, 0xFF, 0x60,
+0x64, 0x26, 0x06, 0x60, 0x65, 0x3A, 0xE1, 0x60, 0x66, 0x05, 0xE8, 0x60, 0x67, 0x1A, 0xC3, 0x60,
+0x67, 0xE5, 0xCA, 0x60, 0x69, 0x03, 0xDF, 0xE0, 0x69, 0xC5, 0xAC, 0x60, 0x6A, 0xE3, 0xC1, 0xE0,
+0x6B, 0xA5, 0x8E, 0x60, 0x6C, 0xC3, 0xA3, 0xE0, 0x6D, 0x8E, 0xAA, 0xE0, 0x6E, 0xA3, 0x85, 0xE0,
+0x6F, 0x6E, 0x8C, 0xE0, 0x70, 0x83, 0x67, 0xE0, 0x71, 0x4E, 0x6E, 0xE0, 0x72, 0x63, 0x49, 0xE0,
+0x73, 0x2E, 0x50, 0xE0, 0x74, 0x4C, 0x66, 0x60, 0x75, 0x0E, 0x32, 0xE0, 0x76, 0x2C, 0x48, 0x60,
+0x76, 0xF7, 0x4F, 0x60, 0x78, 0x0C, 0x2A, 0x60, 0x78, 0xD7, 0x31, 0x60, 0x79, 0xEC, 0x0C, 0x60,
+0x7A, 0xB7, 0x13, 0x60, 0x7B, 0xCB, 0xEE, 0x60, 0x7C, 0x96, 0xF5, 0x60, 0x7D, 0xB5, 0x0A, 0xE0,
+0x7E, 0x76, 0xD7, 0x60, 0x7F, 0x94, 0xEC, 0xE0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x00,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
+0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
+0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
+0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
+0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x00,
0x00, 0x21, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00,
0x09, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x4C, 0x4D, 0x54,
0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xBA, 0x14, 0xB8, 0x01, 0x49, 0x7C, 0xF5, 0x00, 0x00, 0x00, 0x00,
/* Asia/Anadyr */
@@ -7248,8 +7265,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xD0, 0x01, 0x09, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x04, 0x00, 0x00, 0xB6, 0xD0, 0x01, 0x09, 0x00,
0x00, 0xA8, 0xC0, 0x01, 0x09, 0x00, 0x00, 0x9A, 0xB0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x41,
0x4E, 0x41, 0x54, 0x00, 0x41, 0x4E, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x16, 0x4D, 0x6F, 0x73, 0x63, 0x6F, 0x77, 0x2B, 0x31,
+0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEC, 0x21, 0x38,
+0x02, 0x21, 0x79, 0xED, 0x00, 0x00, 0x00, 0x16, 0x4D, 0x6F, 0x73, 0x63, 0x6F, 0x77, 0x2B, 0x31,
0x30, 0x20, 0x2D, 0x20, 0x42, 0x65, 0x72, 0x69, 0x6E, 0x67, 0x20, 0x53, 0x65, 0x61,
/* Asia/Aqtau */
@@ -7281,7 +7298,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x45, 0x54, 0x00, 0x53, 0x48, 0x45, 0x53, 0x54, 0x00, 0x41, 0x51, 0x54, 0x53, 0x54, 0x00, 0x41,
0x51, 0x54, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01,
0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x31, 0x41, 0x74,
+0x00, 0x00, 0x00, 0xCD, 0x41, 0x92, 0x01, 0x5F, 0x5B, 0xEA, 0x00, 0x00, 0x00, 0x31, 0x41, 0x74,
0x79, 0x72, 0x61, 0x75, 0x20, 0x28, 0x41, 0x74, 0x69, 0x72, 0x61, 0x75, 0x2C, 0x20, 0x47, 0x75,
0x72, 0x27, 0x79, 0x65, 0x76, 0x29, 0x2C, 0x20, 0x4D, 0x61, 0x6E, 0x67, 0x67, 0x68, 0x79, 0x73,
0x74, 0x61, 0x75, 0x20, 0x28, 0x4D, 0x61, 0x6E, 0x6B, 0x69, 0x73, 0x74, 0x61, 0x75, 0x29,
@@ -7312,8 +7329,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x15, 0x00, 0x00, 0x54, 0x60, 0x01, 0x0F, 0x00, 0x00, 0x46, 0x50, 0x00, 0x15, 0x4C, 0x4D, 0x54,
0x00, 0x41, 0x4B, 0x54, 0x54, 0x00, 0x41, 0x4B, 0x54, 0x53, 0x54, 0x00, 0x41, 0x51, 0x54, 0x53,
0x54, 0x00, 0x41, 0x51, 0x54, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0F, 0x41, 0x71, 0x74, 0x6F, 0x62, 0x65, 0x20,
+0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD6, 0x0E,
+0x2D, 0x01, 0x69, 0xE3, 0x3A, 0x00, 0x00, 0x00, 0x0F, 0x41, 0x71, 0x74, 0x6F, 0x62, 0x65, 0x20,
0x28, 0x41, 0x6B, 0x74, 0x6F, 0x62, 0x65, 0x29,
/* Asia/Ashgabat */
@@ -7334,7 +7351,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x38, 0x40, 0x00, 0x0F, 0x00, 0x00, 0x46, 0x50, 0x00, 0x0F, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x53,
0x48, 0x54, 0x00, 0x41, 0x53, 0x48, 0x53, 0x54, 0x00, 0x54, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00,
0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0xC3, 0x3C, 0x78, 0x01, 0x6B, 0xBE, 0x7D, 0x00, 0x00, 0x00, 0x00,
/* Asia/Ashkhabad */
0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7379,8 +7396,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x03, 0x04, 0x03, 0x04, 0x03, 0x00, 0x00, 0x29, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x00,
0x04, 0x00, 0x00, 0x38, 0x40, 0x01, 0x08, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x00, 0x00, 0x38,
0x40, 0x01, 0x08, 0x42, 0x4D, 0x54, 0x00, 0x41, 0x53, 0x54, 0x00, 0x41, 0x44, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBC, 0x37, 0x98, 0x01, 0x56, 0x6E,
+0xC2, 0x00, 0x00, 0x00, 0x00,
/* Asia/Bahrain */
0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7388,8 +7405,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xA1, 0xF2, 0x9E, 0x14,
0x04, 0x8A, 0x92, 0xC0, 0x01, 0x02, 0x00, 0x00, 0x2F, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x38, 0x40,
0x00, 0x04, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x47, 0x53, 0x54, 0x00,
-0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB1, 0x96, 0x3D, 0x01, 0x5F,
+0xD7, 0x9D, 0x00, 0x00, 0x00, 0x00,
/* Asia/Baku */
0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7437,16 +7454,16 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x38, 0x40, 0x00, 0x0F, 0x00, 0x00, 0x46, 0x50, 0x01, 0x13, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x41,
0x4B, 0x54, 0x00, 0x42, 0x41, 0x4B, 0x53, 0x54, 0x00, 0x41, 0x5A, 0x54, 0x00, 0x41, 0x5A, 0x53,
0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0xC6, 0xF2, 0xFD,
+0x01, 0x5E, 0xB9, 0x28, 0x00, 0x00, 0x00, 0x00,
/* Asia/Bangkok */
0x50, 0x48, 0x50, 0x31, 0x01, 0x54, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0xA2, 0x6A, 0x67, 0xC4,
0x01, 0x00, 0x00, 0x5E, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x42, 0x4D, 0x54,
-0x00, 0x49, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x49, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x4F, 0x58, 0x01, 0xAC, 0x08,
+0xD2, 0x00, 0x00, 0x00, 0x00,
/* Asia/Beirut */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4C, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7497,7 +7514,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x00, 0x00, 0x00,
0x1C, 0x20, 0x00, 0x05, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0xBD, 0x07, 0xED, 0x01, 0x48, 0xD3, 0xB0, 0x00, 0x00, 0x00, 0x00,
/* Asia/Bishkek */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4B, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7526,7 +7543,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x46, 0x52, 0x55, 0x54, 0x00, 0x46, 0x52, 0x55, 0x53, 0x54,
0x00, 0x4B, 0x47, 0x53, 0x54, 0x00, 0x4B, 0x47, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,
0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xCA, 0xCA, 0x10, 0x01, 0x84, 0x7D, 0x20, 0x00, 0x00, 0x00, 0x00,
/* Asia/Brunei */
0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7534,7 +7551,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0xAD, 0x8A, 0x02, 0x44,
0xBA, 0x67, 0x47, 0x88, 0x01, 0x02, 0x00, 0x00, 0x6B, 0xBC, 0x00, 0x00, 0x00, 0x00, 0x69, 0x78,
0x00, 0x04, 0x00, 0x00, 0x70, 0x80, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x4E, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0xDB, 0x55, 0x01, 0xC2, 0x01, 0xD2, 0x00, 0x00,
0x00, 0x00,
/* Asia/Calcutta */
@@ -7569,8 +7586,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x70, 0x00, 0x04, 0x00, 0x00, 0x70, 0x80, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x09, 0x00,
0x00, 0x8C, 0xA0, 0x01, 0x0E, 0x00, 0x00, 0x70, 0x80, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x55,
0x4C, 0x41, 0x54, 0x00, 0x43, 0x48, 0x4F, 0x54, 0x00, 0x43, 0x48, 0x4F, 0x53, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x12, 0x44, 0x6F, 0x72, 0x6E, 0x6F, 0x64, 0x2C, 0x20, 0x53,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD2, 0xAC, 0x4A, 0x01,
+0xC1, 0x5F, 0x10, 0x00, 0x00, 0x00, 0x12, 0x44, 0x6F, 0x72, 0x6E, 0x6F, 0x64, 0x2C, 0x20, 0x53,
0x75, 0x6B, 0x68, 0x62, 0x61, 0x61, 0x74, 0x61, 0x72,
/* Asia/Chongqing */
@@ -7584,7 +7601,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x03, 0x00, 0x00, 0x63, 0xEC, 0x00, 0x00, 0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x00, 0x00,
0x7E, 0x90, 0x01, 0x09, 0x00, 0x00, 0x70, 0x80, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x4C, 0x4F,
0x4E, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x40, 0x63,
+0x00, 0x00, 0x00, 0x00, 0xB6, 0x71, 0xBA, 0x01, 0xB5, 0x4A, 0x9D, 0x00, 0x00, 0x00, 0x40, 0x63,
0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x43, 0x68, 0x69, 0x6E, 0x61, 0x20, 0x2D, 0x20, 0x53,
0x69, 0x63, 0x68, 0x75, 0x61, 0x6E, 0x2C, 0x20, 0x59, 0x75, 0x6E, 0x6E, 0x61, 0x6E, 0x2C, 0x20,
0x47, 0x75, 0x61, 0x6E, 0x67, 0x78, 0x69, 0x2C, 0x20, 0x53, 0x68, 0x61, 0x61, 0x6E, 0x78, 0x69,
@@ -7613,18 +7630,20 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x08, 0x00, 0x00, 0x5B, 0x68, 0x01, 0x04, 0x00, 0x00, 0x5B, 0x68, 0x00, 0x0D, 0x00, 0x00, 0x54,
0x60, 0x00, 0x0D, 0x4D, 0x4D, 0x54, 0x00, 0x49, 0x53, 0x54, 0x00, 0x49, 0x48, 0x53, 0x54, 0x00,
0x4C, 0x4B, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x93, 0xE8, 0x95, 0x01, 0x8C, 0x7F, 0xE8, 0x00, 0x00, 0x00, 0x00,
/* Asia/Dacca */
0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x16, 0xCA, 0xDB, 0x86, 0xB0,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1B, 0xCA, 0xDB, 0x86, 0xB0,
0xCC, 0x05, 0x71, 0x18, 0xCC, 0x95, 0x32, 0xA8, 0xDD, 0xA8, 0xD2, 0x98, 0x02, 0x4F, 0x9D, 0x20,
-0x01, 0x02, 0x01, 0x03, 0x04, 0x00, 0x00, 0x52, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5B, 0x68, 0x00,
-0x04, 0x00, 0x00, 0x4D, 0x58, 0x00, 0x09, 0x00, 0x00, 0x54, 0x60, 0x00, 0x0D, 0x00, 0x00, 0x54,
-0x60, 0x00, 0x12, 0x48, 0x4D, 0x54, 0x00, 0x42, 0x55, 0x52, 0x54, 0x00, 0x49, 0x53, 0x54, 0x00,
-0x44, 0x41, 0x43, 0x54, 0x00, 0x42, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x4A, 0x3B, 0xC4, 0x10, 0x01, 0x02, 0x01, 0x03, 0x04, 0x05, 0x00, 0x00, 0x52, 0xD0, 0x00, 0x00,
+0x00, 0x00, 0x5B, 0x68, 0x00, 0x04, 0x00, 0x00, 0x4D, 0x58, 0x00, 0x09, 0x00, 0x00, 0x54, 0x60,
+0x00, 0x0D, 0x00, 0x00, 0x54, 0x60, 0x00, 0x12, 0x00, 0x00, 0x62, 0x70, 0x01, 0x16, 0x48, 0x4D,
+0x54, 0x00, 0x42, 0x55, 0x52, 0x54, 0x00, 0x49, 0x53, 0x54, 0x00, 0x44, 0x41, 0x43, 0x54, 0x00,
+0x42, 0x44, 0x54, 0x00, 0x42, 0x44, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00,
+0x00,
/* Asia/Damascus */
0x50, 0x48, 0x50, 0x31, 0x01, 0x53, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7653,21 +7672,21 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x3E, 0x88, 0xBA, 0x60, 0x3F, 0x79, 0xEE, 0xD0, 0x40, 0x6B, 0x3F, 0x60, 0x41, 0x5C, 0x73, 0xD0,
0x42, 0x4C, 0x72, 0xE0, 0x43, 0x3D, 0xA7, 0x50, 0x44, 0x2D, 0xA6, 0x60, 0x45, 0x12, 0xFD, 0x50,
0x46, 0x0C, 0x36, 0xE0, 0x47, 0x2A, 0x3E, 0x50, 0x47, 0xF5, 0x53, 0x60, 0x49, 0x0B, 0x71, 0xD0,
-0x49, 0xD5, 0x35, 0x60, 0x4A, 0xEC, 0xA5, 0x50, 0x4B, 0xB5, 0x17, 0x60, 0x4C, 0xCD, 0xD8, 0xD0,
-0x4D, 0x94, 0xF9, 0x60, 0x4E, 0xAF, 0x0C, 0x50, 0x4F, 0x7E, 0x15, 0xE0, 0x50, 0x91, 0x91, 0x50,
-0x51, 0x5D, 0xF7, 0xE0, 0x52, 0x72, 0xC4, 0xD0, 0x53, 0x3D, 0xD9, 0xE0, 0x54, 0x53, 0xF8, 0x50,
-0x55, 0x1D, 0xBB, 0xE0, 0x56, 0x35, 0x2B, 0xD0, 0x56, 0xFD, 0x9D, 0xE0, 0x58, 0x17, 0xB0, 0xD0,
-0x58, 0xE6, 0xBA, 0x60, 0x59, 0xF8, 0xE4, 0x50, 0x5A, 0xC6, 0x9C, 0x60, 0x5B, 0xDA, 0x17, 0xD0,
-0x5C, 0xA6, 0x7E, 0x60, 0x5D, 0xBB, 0x4B, 0x50, 0x5E, 0x86, 0x60, 0x60, 0x5F, 0x9D, 0xD0, 0x50,
-0x60, 0x66, 0x42, 0x60, 0x61, 0x7F, 0x03, 0xD0, 0x62, 0x46, 0x24, 0x60, 0x63, 0x60, 0x37, 0x50,
-0x64, 0x2F, 0x40, 0xE0, 0x65, 0x41, 0x6A, 0xD0, 0x66, 0x0F, 0x22, 0xE0, 0x67, 0x23, 0xEF, 0xD0,
-0x67, 0xEF, 0x04, 0xE0, 0x69, 0x05, 0x23, 0x50, 0x69, 0xCE, 0xE6, 0xE0, 0x6A, 0xE6, 0x56, 0xD0,
-0x6B, 0xAE, 0xC8, 0xE0, 0x6C, 0xC7, 0x8A, 0x50, 0x6D, 0x97, 0xE5, 0x60, 0x6E, 0xAA, 0x0F, 0x50,
-0x6F, 0x77, 0xC7, 0x60, 0x70, 0x8B, 0x42, 0xD0, 0x71, 0x57, 0xA9, 0x60, 0x72, 0x6C, 0x76, 0x50,
-0x73, 0x37, 0x8B, 0x60, 0x74, 0x4D, 0xA9, 0xD0, 0x75, 0x17, 0x6D, 0x60, 0x76, 0x30, 0x2E, 0xD0,
-0x76, 0xF7, 0x4F, 0x60, 0x78, 0x11, 0x62, 0x50, 0x78, 0xE0, 0x6B, 0xE0, 0x79, 0xF2, 0x95, 0xD0,
-0x7A, 0xC0, 0x4D, 0xE0, 0x7B, 0xD3, 0xC9, 0x50, 0x7C, 0xA0, 0x2F, 0xE0, 0x7D, 0xB6, 0x4E, 0x50,
-0x7E, 0x80, 0x11, 0xE0, 0x7F, 0x97, 0x81, 0xD0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xEC, 0xA5, 0x50, 0x4B, 0xAB, 0xDC, 0xE0, 0x4C, 0xCD, 0xD8, 0xD0,
+0x4D, 0x8B, 0xBE, 0xE0, 0x4E, 0xAF, 0x0C, 0x50, 0x4F, 0x74, 0xDB, 0x60, 0x50, 0x91, 0x91, 0x50,
+0x51, 0x54, 0xBD, 0x60, 0x52, 0x72, 0xC4, 0xD0, 0x53, 0x34, 0x9F, 0x60, 0x54, 0x53, 0xF8, 0x50,
+0x55, 0x14, 0x81, 0x60, 0x56, 0x35, 0x2B, 0xD0, 0x56, 0xF4, 0x63, 0x60, 0x58, 0x17, 0xB0, 0xD0,
+0x58, 0xDD, 0x7F, 0xE0, 0x59, 0xF8, 0xE4, 0x50, 0x5A, 0xBD, 0x61, 0xE0, 0x5B, 0xDA, 0x17, 0xD0,
+0x5C, 0x9D, 0x43, 0xE0, 0x5D, 0xBB, 0x4B, 0x50, 0x5E, 0x7D, 0x25, 0xE0, 0x5F, 0x9D, 0xD0, 0x50,
+0x60, 0x5D, 0x07, 0xE0, 0x61, 0x7F, 0x03, 0xD0, 0x62, 0x3C, 0xE9, 0xE0, 0x63, 0x60, 0x37, 0x50,
+0x64, 0x26, 0x06, 0x60, 0x65, 0x41, 0x6A, 0xD0, 0x66, 0x05, 0xE8, 0x60, 0x67, 0x23, 0xEF, 0xD0,
+0x67, 0xE5, 0xCA, 0x60, 0x69, 0x05, 0x23, 0x50, 0x69, 0xC5, 0xAC, 0x60, 0x6A, 0xE6, 0x56, 0xD0,
+0x6B, 0xA5, 0x8E, 0x60, 0x6C, 0xC7, 0x8A, 0x50, 0x6D, 0x8E, 0xAA, 0xE0, 0x6E, 0xAA, 0x0F, 0x50,
+0x6F, 0x6E, 0x8C, 0xE0, 0x70, 0x8B, 0x42, 0xD0, 0x71, 0x4E, 0x6E, 0xE0, 0x72, 0x6C, 0x76, 0x50,
+0x73, 0x2E, 0x50, 0xE0, 0x74, 0x4D, 0xA9, 0xD0, 0x75, 0x0E, 0x32, 0xE0, 0x76, 0x30, 0x2E, 0xD0,
+0x76, 0xEE, 0x14, 0xE0, 0x78, 0x11, 0x62, 0x50, 0x78, 0xD7, 0x31, 0x60, 0x79, 0xF2, 0x95, 0xD0,
+0x7A, 0xB7, 0x13, 0x60, 0x7B, 0xD3, 0xC9, 0x50, 0x7C, 0x96, 0xF5, 0x60, 0x7D, 0xB6, 0x4E, 0x50,
+0x7E, 0x76, 0xD7, 0x60, 0x7F, 0x97, 0x81, 0xD0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
@@ -7679,19 +7698,21 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00,
0x00, 0x22, 0x08, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00,
0x09, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xBC, 0x72, 0x30, 0x01, 0x4A, 0x0C, 0x30, 0x00, 0x00, 0x00, 0x00,
/* Asia/Dhaka */
0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x16, 0xCA, 0xDB, 0x86, 0xB0,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1B, 0xCA, 0xDB, 0x86, 0xB0,
0xCC, 0x05, 0x71, 0x18, 0xCC, 0x95, 0x32, 0xA8, 0xDD, 0xA8, 0xD2, 0x98, 0x02, 0x4F, 0x9D, 0x20,
-0x01, 0x02, 0x01, 0x03, 0x04, 0x00, 0x00, 0x52, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5B, 0x68, 0x00,
-0x04, 0x00, 0x00, 0x4D, 0x58, 0x00, 0x09, 0x00, 0x00, 0x54, 0x60, 0x00, 0x0D, 0x00, 0x00, 0x54,
-0x60, 0x00, 0x12, 0x48, 0x4D, 0x54, 0x00, 0x42, 0x55, 0x52, 0x54, 0x00, 0x49, 0x53, 0x54, 0x00,
-0x44, 0x41, 0x43, 0x54, 0x00, 0x42, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x4A, 0x3B, 0xC4, 0x10, 0x01, 0x02, 0x01, 0x03, 0x04, 0x05, 0x00, 0x00, 0x52, 0xD0, 0x00, 0x00,
+0x00, 0x00, 0x5B, 0x68, 0x00, 0x04, 0x00, 0x00, 0x4D, 0x58, 0x00, 0x09, 0x00, 0x00, 0x54, 0x60,
+0x00, 0x0D, 0x00, 0x00, 0x54, 0x60, 0x00, 0x12, 0x00, 0x00, 0x62, 0x70, 0x01, 0x16, 0x48, 0x4D,
+0x54, 0x00, 0x42, 0x55, 0x52, 0x54, 0x00, 0x49, 0x53, 0x54, 0x00, 0x44, 0x41, 0x43, 0x54, 0x00,
+0x42, 0x44, 0x54, 0x00, 0x42, 0x44, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAD, 0x84, 0x92, 0x01, 0x9C, 0x9F, 0x82, 0x00, 0x00, 0x00,
+0x00,
/* Asia/Dili */
0x50, 0x48, 0x50, 0x31, 0x01, 0x54, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7701,16 +7722,16 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x02, 0x03, 0x04, 0x03, 0x00, 0x00, 0x75, 0xBC, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00,
0x04, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x04, 0x00, 0x00, 0x70,
0x80, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x54, 0x4C, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x43,
-0x49, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x49, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xF6,
+0x18, 0x01, 0xD2, 0x48, 0x7D, 0x00, 0x00, 0x00, 0x00,
/* Asia/Dubai */
0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0xA1, 0xF2, 0x99, 0xA8,
0x01, 0x00, 0x00, 0x33, 0xD8, 0x00, 0x00, 0x00, 0x00, 0x38, 0x40, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x47, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x47, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAF, 0xEF, 0x10, 0x01, 0x67, 0x0A,
+0x10, 0x00, 0x00, 0x00, 0x00,
/* Asia/Dushanbe */
0x50, 0x48, 0x50, 0x31, 0x01, 0x54, 0x4A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7728,7 +7749,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x04, 0x00, 0x00, 0x62, 0x70, 0x01, 0x09, 0x00, 0x00, 0x54, 0x60, 0x01, 0x09, 0x00, 0x00,
0x46, 0x50, 0x00, 0x0F, 0x4C, 0x4D, 0x54, 0x00, 0x44, 0x55, 0x53, 0x54, 0x00, 0x44, 0x55, 0x53,
0x53, 0x54, 0x00, 0x54, 0x4A, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC4, 0x33, 0xDD, 0x01, 0x7B, 0xA3, 0x80, 0x00,
0x00, 0x00, 0x00,
/* Asia/Gaza */
@@ -7756,21 +7777,21 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x3D, 0xAF, 0x24, 0xD0, 0x3E, 0x9F, 0x23, 0xE0, 0x3F, 0x8F, 0x06, 0xD0, 0x40, 0x7F, 0x05, 0xE0,
0x41, 0x5C, 0x81, 0xE0, 0x42, 0x5E, 0xE7, 0xE0, 0x43, 0x41, 0xB7, 0xF0, 0x44, 0x2D, 0xA6, 0x60,
0x45, 0x12, 0xFD, 0x50, 0x46, 0x0E, 0xD9, 0xE0, 0x46, 0xE8, 0x6F, 0x70, 0x47, 0xF1, 0x5E, 0xE0,
-0x48, 0xB5, 0xDC, 0x70, 0x49, 0xD2, 0x92, 0x60, 0x4A, 0x95, 0xBE, 0x70, 0x4B, 0xB3, 0xC5, 0xE0,
-0x4C, 0x75, 0xA0, 0x70, 0x4D, 0x94, 0xF9, 0x60, 0x4E, 0x55, 0x82, 0x70, 0x4F, 0x77, 0x7E, 0x60,
-0x50, 0x3E, 0x9E, 0xF0, 0x51, 0x58, 0xB1, 0xE0, 0x52, 0x1E, 0x80, 0xF0, 0x53, 0x39, 0xE5, 0x60,
-0x53, 0xFE, 0x62, 0xF0, 0x55, 0x1B, 0x18, 0xE0, 0x55, 0xDE, 0x44, 0xF0, 0x56, 0xFD, 0x9D, 0xE0,
-0x57, 0xBE, 0x26, 0xF0, 0x58, 0xDE, 0xD1, 0x60, 0x59, 0xA7, 0x43, 0x70, 0x5A, 0xC0, 0x04, 0xE0,
-0x5B, 0x87, 0x25, 0x70, 0x5C, 0xA1, 0x38, 0x60, 0x5D, 0x67, 0x07, 0x70, 0x5E, 0x83, 0xBD, 0x60,
-0x5F, 0x46, 0xE9, 0x70, 0x60, 0x64, 0xF0, 0xE0, 0x61, 0x26, 0xCB, 0x70, 0x62, 0x46, 0x24, 0x60,
-0x63, 0x06, 0xAD, 0x70, 0x64, 0x27, 0x57, 0xE0, 0x64, 0xEF, 0xC9, 0xF0, 0x66, 0x09, 0xDC, 0xE0,
-0x66, 0xCF, 0xAB, 0xF0, 0x67, 0xEB, 0x10, 0x60, 0x68, 0xAF, 0x8D, 0xF0, 0x69, 0xCC, 0x43, 0xE0,
-0x6A, 0x8F, 0x6F, 0xF0, 0x6B, 0xAD, 0x77, 0x60, 0x6C, 0x6F, 0x51, 0xF0, 0x6D, 0x8F, 0xFC, 0x60,
-0x6E, 0x58, 0x6E, 0x70, 0x6F, 0x71, 0x2F, 0xE0, 0x70, 0x38, 0x50, 0x70, 0x71, 0x52, 0x63, 0x60,
-0x72, 0x18, 0x32, 0x70, 0x73, 0x33, 0x96, 0xE0, 0x73, 0xF8, 0x14, 0x70, 0x75, 0x16, 0x1B, 0xE0,
-0x75, 0xD7, 0xF6, 0x70, 0x76, 0xF7, 0x4F, 0x60, 0x77, 0xB7, 0xD8, 0x70, 0x78, 0xD8, 0x82, 0xE0,
-0x79, 0xA0, 0xF4, 0xF0, 0x7A, 0xB9, 0xB6, 0x60, 0x7B, 0x80, 0xD6, 0xF0, 0x7C, 0x9C, 0x3B, 0x60,
-0x7D, 0x60, 0xB8, 0xF0, 0x7E, 0x7D, 0x6E, 0xE0, 0x7F, 0x40, 0x9A, 0xF0, 0x00, 0x01, 0x00, 0x01,
+0x48, 0xB7, 0x2D, 0xF0, 0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xBF, 0xEE, 0x70, 0x4B, 0xAB, 0xDC, 0xE0,
+0x4C, 0x9F, 0xD0, 0x70, 0x4D, 0x8B, 0xBE, 0xE0, 0x4E, 0x7F, 0xB2, 0x70, 0x4F, 0x74, 0xDB, 0x60,
+0x50, 0x5F, 0x94, 0x70, 0x51, 0x54, 0xBD, 0x60, 0x52, 0x48, 0xB0, 0xF0, 0x53, 0x34, 0x9F, 0x60,
+0x54, 0x28, 0x92, 0xF0, 0x55, 0x14, 0x81, 0x60, 0x56, 0x08, 0x74, 0xF0, 0x56, 0xF4, 0x63, 0x60,
+0x57, 0xE8, 0x56, 0xF0, 0x58, 0xDD, 0x7F, 0xE0, 0x59, 0xC8, 0x38, 0xF0, 0x5A, 0xBD, 0x61, 0xE0,
+0x5B, 0xA8, 0x1A, 0xF0, 0x5C, 0x9D, 0x43, 0xE0, 0x5D, 0x91, 0x37, 0x70, 0x5E, 0x7D, 0x25, 0xE0,
+0x5F, 0x71, 0x19, 0x70, 0x60, 0x5D, 0x07, 0xE0, 0x61, 0x50, 0xFB, 0x70, 0x62, 0x3C, 0xE9, 0xE0,
+0x63, 0x30, 0xDD, 0x70, 0x64, 0x26, 0x06, 0x60, 0x65, 0x10, 0xBF, 0x70, 0x66, 0x05, 0xE8, 0x60,
+0x66, 0xF9, 0xDB, 0xF0, 0x67, 0xE5, 0xCA, 0x60, 0x68, 0xD9, 0xBD, 0xF0, 0x69, 0xC5, 0xAC, 0x60,
+0x6A, 0xB9, 0x9F, 0xF0, 0x6B, 0xA5, 0x8E, 0x60, 0x6C, 0x99, 0x81, 0xF0, 0x6D, 0x8E, 0xAA, 0xE0,
+0x6E, 0x79, 0x63, 0xF0, 0x6F, 0x6E, 0x8C, 0xE0, 0x70, 0x59, 0x45, 0xF0, 0x71, 0x4E, 0x6E, 0xE0,
+0x72, 0x42, 0x62, 0x70, 0x73, 0x2E, 0x50, 0xE0, 0x74, 0x22, 0x44, 0x70, 0x75, 0x0E, 0x32, 0xE0,
+0x76, 0x02, 0x26, 0x70, 0x76, 0xEE, 0x14, 0xE0, 0x77, 0xE2, 0x08, 0x70, 0x78, 0xD7, 0x31, 0x60,
+0x79, 0xC1, 0xEA, 0x70, 0x7A, 0xB7, 0x13, 0x60, 0x7B, 0xA1, 0xCC, 0x70, 0x7C, 0x96, 0xF5, 0x60,
+0x7D, 0x8A, 0xE8, 0xF0, 0x7E, 0x76, 0xD7, 0x60, 0x7F, 0x6A, 0xCA, 0xF0, 0x00, 0x01, 0x00, 0x01,
0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04,
0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
@@ -7783,8 +7804,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00,
0x2A, 0x30, 0x01, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x0D, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x00,
0x45, 0x45, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x49, 0x44, 0x54, 0x00, 0x49, 0x53, 0x54,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB9, 0x64,
+0xF0, 0x01, 0x47, 0x40, 0x0A, 0x00, 0x00, 0x00, 0x00,
/* Asia/Harbin */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7798,8 +7819,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x00, 0x00, 0x76, 0xC4, 0x00, 0x00, 0x00, 0x00, 0x77, 0x88, 0x00, 0x04, 0x00, 0x00, 0x70,
0x80, 0x00, 0x09, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x0D, 0x4C,
0x4D, 0x54, 0x00, 0x43, 0x48, 0x41, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x21, 0x48, 0x65, 0x69, 0x6C, 0x6F, 0x6E, 0x67, 0x6A, 0x69, 0x61,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCF, 0x23, 0x58, 0x01, 0xD3,
+0xF6, 0x2D, 0x00, 0x00, 0x00, 0x21, 0x48, 0x65, 0x69, 0x6C, 0x6F, 0x6E, 0x67, 0x6A, 0x69, 0x61,
0x6E, 0x67, 0x20, 0x28, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x20, 0x4D, 0x6F, 0x68, 0x65, 0x29,
0x2C, 0x20, 0x4A, 0x69, 0x6C, 0x69, 0x6E,
@@ -7810,8 +7831,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x91, 0x5F, 0xEE, 0xD0, 0x93, 0x85, 0xB1, 0x90, 0xB7, 0x41, 0xBC, 0x00, 0x01, 0x02, 0x03, 0x02,
0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0xEC, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70,
0x00, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x4D, 0x54, 0x00,
-0x49, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x49, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0xBB, 0x78,
+0x01, 0xB5, 0x6B, 0x2A, 0x00, 0x00, 0x00, 0x00,
/* Asia/Hong_Kong */
0x50, 0x48, 0x50, 0x31, 0x01, 0x48, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7840,8 +7861,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x6B, 0x04, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x90, 0x01,
0x04, 0x00, 0x00, 0x70, 0x80, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x4B, 0x53, 0x54, 0x00,
-0x48, 0x4B, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x48, 0x4B, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAB, 0x54, 0xAD, 0x01, 0xC0,
+0xD6, 0x57, 0x00, 0x00, 0x00, 0x00,
/* Asia/Hovd */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7864,7 +7885,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x03, 0x00, 0x00, 0x55, 0xEC, 0x00, 0x00, 0x00, 0x00, 0x54, 0x60, 0x00, 0x04, 0x00, 0x00,
0x70, 0x80, 0x01, 0x09, 0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x4F,
0x56, 0x54, 0x00, 0x48, 0x4F, 0x56, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x2B, 0x42, 0x61, 0x79,
+0x00, 0x00, 0xD2, 0x98, 0xC2, 0x01, 0x9E, 0x81, 0x47, 0x00, 0x00, 0x00, 0x2B, 0x42, 0x61, 0x79,
0x61, 0x6E, 0x2D, 0x4F, 0x6C, 0x67, 0x69, 0x79, 0x2C, 0x20, 0x47, 0x6F, 0x76, 0x69, 0x2D, 0x41,
0x6C, 0x74, 0x61, 0x69, 0x2C, 0x20, 0x48, 0x6F, 0x76, 0x64, 0x2C, 0x20, 0x55, 0x76, 0x73, 0x2C,
0x20, 0x5A, 0x61, 0x76, 0x6B, 0x68, 0x61, 0x6E,
@@ -7914,7 +7935,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x80, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x09, 0x00, 0x00, 0x70, 0x80, 0x01, 0x09, 0x00,
0x00, 0x62, 0x70, 0x00, 0x04, 0x49, 0x4D, 0x54, 0x00, 0x49, 0x52, 0x4B, 0x54, 0x00, 0x49, 0x52,
0x4B, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x17,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xD9, 0x14, 0xEA, 0x01, 0xB1, 0xDB, 0xB5, 0x00, 0x00, 0x00, 0x17,
0x4D, 0x6F, 0x73, 0x63, 0x6F, 0x77, 0x2B, 0x30, 0x35, 0x20, 0x2D, 0x20, 0x4C, 0x61, 0x6B, 0x65,
0x20, 0x42, 0x61, 0x69, 0x6B, 0x61, 0x6C,
@@ -7993,7 +8014,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x09, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0D, 0x00, 0x00, 0x70, 0x80, 0x00, 0x09, 0x00, 0x00, 0x62,
0x70, 0x00, 0x09, 0x4A, 0x4D, 0x54, 0x00, 0x4A, 0x41, 0x56, 0x54, 0x00, 0x57, 0x49, 0x54, 0x00,
0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0E, 0x4A, 0x61, 0x76, 0x61,
+0x00, 0x80, 0x6D, 0x9A, 0x01, 0xB5, 0x9F, 0x40, 0x00, 0x00, 0x00, 0x0E, 0x4A, 0x61, 0x76, 0x61,
0x20, 0x26, 0x20, 0x53, 0x75, 0x6D, 0x61, 0x74, 0x72, 0x61,
/* Asia/Jayapura */
@@ -8003,7 +8024,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xD0, 0x58, 0xB9, 0xF0, 0xF4, 0xB5, 0xA2, 0x68, 0x01, 0x02, 0x01, 0x00, 0x00, 0x83, 0xE8, 0x00,
0x00, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x04, 0x00, 0x00, 0x85, 0x98, 0x00, 0x08, 0x4C, 0x4D, 0x54,
0x00, 0x45, 0x49, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x19, 0x49, 0x72, 0x69, 0x61, 0x6E,
+0x87, 0x17, 0x55, 0x01, 0xE9, 0x59, 0x70, 0x00, 0x00, 0x00, 0x19, 0x49, 0x72, 0x69, 0x61, 0x6E,
0x20, 0x4A, 0x61, 0x79, 0x61, 0x20, 0x26, 0x20, 0x74, 0x68, 0x65, 0x20, 0x4D, 0x6F, 0x6C, 0x75,
0x63, 0x63, 0x61, 0x73,
@@ -8058,14 +8079,14 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x02, 0x00, 0x00, 0x20, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00,
0x1C, 0x20, 0x00, 0x08, 0x00, 0x00, 0x38, 0x40, 0x01, 0x0C, 0x4A, 0x4D, 0x54, 0x00, 0x49, 0x44,
0x54, 0x00, 0x49, 0x53, 0x54, 0x00, 0x49, 0x44, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0xB9, 0xCD, 0x1A, 0x01, 0x48, 0x6B, 0x85, 0x00, 0x00, 0x00, 0x00,
/* Asia/Kabul */
0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0xD0, 0xF9, 0xD7, 0x40,
0x01, 0x00, 0x00, 0x38, 0x40, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x48, 0x00, 0x00, 0x41, 0x46, 0x54,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBD, 0xFF, 0x52, 0x01, 0x7C, 0x3F, 0xC0, 0x00, 0x00, 0x00,
0x00,
/* Asia/Kamchatka */
@@ -8113,22 +8134,23 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xC0, 0x00, 0x04, 0x00, 0x00, 0xB6, 0xD0, 0x01, 0x09, 0x00, 0x00, 0xA8, 0xC0, 0x01, 0x09, 0x00,
0x00, 0x9A, 0xB0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x50, 0x45, 0x54, 0x54, 0x00, 0x50, 0x45,
0x54, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x15,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xDA, 0x39, 0xE2, 0x02, 0x04, 0xBD, 0x28, 0x00, 0x00, 0x00, 0x15,
0x4D, 0x6F, 0x73, 0x63, 0x6F, 0x77, 0x2B, 0x30, 0x39, 0x20, 0x2D, 0x20, 0x4B, 0x61, 0x6D, 0x63,
0x68, 0x61, 0x74, 0x6B, 0x61,
/* Asia/Karachi */
0x50, 0x48, 0x50, 0x31, 0x01, 0x50, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x16, 0x89, 0x7E, 0xFC, 0xA4,
+0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x16, 0x89, 0x7E, 0xFC, 0xA4,
0xCC, 0x95, 0x32, 0xA8, 0xD2, 0x74, 0x12, 0x98, 0xDD, 0xA8, 0xE0, 0xA8, 0x02, 0x4F, 0xAB, 0x30,
0x3C, 0xAF, 0x45, 0xEC, 0x3D, 0x9F, 0x28, 0xDC, 0x48, 0x41, 0xA0, 0x30, 0x49, 0x0B, 0x47, 0xA0,
-0x01, 0x02, 0x01, 0x03, 0x05, 0x04, 0x05, 0x04, 0x05, 0x00, 0x00, 0x3E, 0xDC, 0x00, 0x00, 0x00,
-0x00, 0x4D, 0x58, 0x00, 0x04, 0x00, 0x00, 0x5B, 0x68, 0x01, 0x04, 0x00, 0x00, 0x46, 0x50, 0x00,
-0x08, 0x00, 0x00, 0x54, 0x60, 0x01, 0x0D, 0x00, 0x00, 0x46, 0x50, 0x00, 0x12, 0x4C, 0x4D, 0x54,
-0x00, 0x49, 0x53, 0x54, 0x00, 0x4B, 0x41, 0x52, 0x54, 0x00, 0x50, 0x4B, 0x53, 0x54, 0x00, 0x50,
-0x4B, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x49, 0xE4, 0xDD, 0x30, 0x4A, 0xEC, 0x7B, 0x20, 0x01, 0x02, 0x01, 0x03, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x05, 0x00, 0x00, 0x3E, 0xDC, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x58, 0x00, 0x04, 0x00,
+0x00, 0x5B, 0x68, 0x01, 0x04, 0x00, 0x00, 0x46, 0x50, 0x00, 0x08, 0x00, 0x00, 0x54, 0x60, 0x01,
+0x0D, 0x00, 0x00, 0x46, 0x50, 0x00, 0x12, 0x4C, 0x4D, 0x54, 0x00, 0x49, 0x53, 0x54, 0x00, 0x4B,
+0x41, 0x52, 0x54, 0x00, 0x50, 0x4B, 0x53, 0x54, 0x00, 0x50, 0x4B, 0x54, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAF, 0x45, 0xCA, 0x01, 0x78, 0xF7,
+0xE8, 0x00, 0x00, 0x00, 0x00,
/* Asia/Kashgar */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8142,7 +8164,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x58, 0x00, 0x04, 0x00, 0x00, 0x46, 0x50, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x09, 0x00,
0x00, 0x70, 0x80, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x4B, 0x41, 0x53, 0x54, 0x00, 0x43, 0x44,
0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x15, 0x77, 0x65, 0x73, 0x74,
+0x00, 0xC5, 0x93, 0x6D, 0x01, 0x86, 0x99, 0x7D, 0x00, 0x00, 0x00, 0x15, 0x77, 0x65, 0x73, 0x74,
0x20, 0x54, 0x69, 0x62, 0x65, 0x74, 0x20, 0x26, 0x20, 0x58, 0x69, 0x6E, 0x6A, 0x69, 0x61, 0x6E,
0x67,
@@ -8152,8 +8174,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xA1, 0xF2, 0x7D, 0x84,
0x1E, 0x18, 0x30, 0xA8, 0x01, 0x02, 0x00, 0x00, 0x4F, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x58,
0x00, 0x04, 0x00, 0x00, 0x50, 0xDC, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x49, 0x53, 0x54, 0x00,
-0x4E, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x4E, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB3, 0x9F, 0x12, 0x01, 0x94,
+0xD7, 0x52, 0x00, 0x00, 0x00, 0x00,
/* Asia/Katmandu */
0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8171,8 +8193,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xCC, 0x05, 0x71, 0x18, 0xCC, 0x95, 0x32, 0xA8, 0xD2, 0x74, 0x12, 0x98, 0x01, 0x02, 0x03, 0x02,
0x00, 0x00, 0x52, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x5B, 0x68, 0x00, 0x04, 0x00, 0x00, 0x4D, 0x58,
0x00, 0x09, 0x00, 0x00, 0x5B, 0x68, 0x01, 0x09, 0x48, 0x4D, 0x54, 0x00, 0x42, 0x55, 0x52, 0x54,
-0x00, 0x49, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x49, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAB, 0xB6,
+0x55, 0x01, 0x99, 0x7E, 0xBA, 0x00, 0x00, 0x00, 0x00,
/* Asia/Krasnoyarsk */
0x50, 0x48, 0x50, 0x31, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8219,7 +8241,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x70, 0x00, 0x04, 0x00, 0x00, 0x70, 0x80, 0x01, 0x09, 0x00, 0x00, 0x62, 0x70, 0x01, 0x09, 0x00,
0x00, 0x54, 0x60, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4B, 0x52, 0x41, 0x54, 0x00, 0x4B, 0x52,
0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x19,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xDE, 0xCD, 0xC2, 0x01, 0xA0, 0x4F, 0x85, 0x00, 0x00, 0x00, 0x19,
0x4D, 0x6F, 0x73, 0x63, 0x6F, 0x77, 0x2B, 0x30, 0x34, 0x20, 0x2D, 0x20, 0x59, 0x65, 0x6E, 0x69,
0x73, 0x65, 0x69, 0x20, 0x52, 0x69, 0x76, 0x65, 0x72,
@@ -8233,8 +8255,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x09, 0x00, 0x00, 0x67, 0x20, 0x00, 0x04, 0x00, 0x00, 0x69, 0x78, 0x00, 0x04, 0x00, 0x00, 0x7E,
0x90, 0x00, 0x0F, 0x00, 0x00, 0x70, 0x80, 0x00, 0x13, 0x53, 0x4D, 0x54, 0x00, 0x4D, 0x41, 0x4C,
0x54, 0x00, 0x4D, 0x41, 0x4C, 0x53, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x4D, 0x59, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89,
-0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x13, 0x70, 0x65, 0x6E, 0x69, 0x6E, 0x73,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8E,
+0x29, 0x3A, 0x01, 0xAD, 0xD7, 0x10, 0x00, 0x00, 0x00, 0x13, 0x70, 0x65, 0x6E, 0x69, 0x6E, 0x73,
0x75, 0x6C, 0x61, 0x72, 0x20, 0x4D, 0x61, 0x6C, 0x61, 0x79, 0x73, 0x69, 0x61,
/* Asia/Kuching */
@@ -8251,7 +8273,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x80, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x10, 0x00, 0x00, 0x70, 0x80, 0x00, 0x14, 0x4C,
0x4D, 0x54, 0x00, 0x42, 0x4F, 0x52, 0x54, 0x00, 0x42, 0x4F, 0x52, 0x54, 0x53, 0x54, 0x00, 0x4A,
0x53, 0x54, 0x00, 0x4D, 0x59, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0F, 0x53,
+0x00, 0x00, 0x00, 0x00, 0x8B, 0xB1, 0xB8, 0x01, 0xBB, 0x03, 0x75, 0x00, 0x00, 0x00, 0x0F, 0x53,
0x61, 0x62, 0x61, 0x68, 0x20, 0x26, 0x20, 0x53, 0x61, 0x72, 0x61, 0x77, 0x61, 0x6B,
/* Asia/Kuwait */
@@ -8259,8 +8281,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0xDA, 0x61, 0x35, 0x84,
0x01, 0x00, 0x00, 0x2C, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB6, 0x16, 0x95, 0x01, 0x5B, 0xDF,
+0xFD, 0x00, 0x00, 0x00, 0x00,
/* Asia/Macao */
0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8304,7 +8326,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x6A, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x04, 0x00, 0x00, 0x70, 0x80, 0x00, 0x09,
0x00, 0x00, 0x70, 0x80, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x4F, 0x53, 0x54, 0x00, 0x4D,
0x4F, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0xAB, 0x41, 0x25, 0x01, 0xBF, 0xF8, 0xFD, 0x00, 0x00, 0x00, 0x00,
/* Asia/Magadan */
0x50, 0x48, 0x50, 0x31, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8351,7 +8373,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xB0, 0x00, 0x04, 0x00, 0x00, 0xA8, 0xC0, 0x01, 0x09, 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x09, 0x00,
0x00, 0x8C, 0xA0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x41, 0x47, 0x54, 0x00, 0x4D, 0x41,
0x47, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x13,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xE4, 0x38, 0x7A, 0x01, 0xF8, 0xC2, 0xC0, 0x00, 0x00, 0x00, 0x13,
0x4D, 0x6F, 0x73, 0x63, 0x6F, 0x77, 0x2B, 0x30, 0x38, 0x20, 0x2D, 0x20, 0x4D, 0x61, 0x67, 0x61,
0x64, 0x61, 0x6E,
@@ -8363,7 +8385,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x6F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0xF0, 0x00, 0x04, 0x00, 0x00, 0x70, 0x80,
0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x4D, 0x54, 0x00,
0x43, 0x49, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x3D, 0x65, 0x61, 0x73, 0x74,
+0x00, 0x81, 0xE0, 0xB2, 0x01, 0xC8, 0xD9, 0x1F, 0x00, 0x00, 0x00, 0x3D, 0x65, 0x61, 0x73, 0x74,
0x20, 0x26, 0x20, 0x73, 0x6F, 0x75, 0x74, 0x68, 0x20, 0x42, 0x6F, 0x72, 0x6E, 0x65, 0x6F, 0x2C,
0x20, 0x43, 0x65, 0x6C, 0x65, 0x62, 0x65, 0x73, 0x2C, 0x20, 0x42, 0x61, 0x6C, 0x69, 0x2C, 0x20,
0x4E, 0x75, 0x73, 0x61, 0x20, 0x54, 0x65, 0x6E, 0x67, 0x61, 0x72, 0x72, 0x61, 0x2C, 0x20, 0x77,
@@ -8377,16 +8399,16 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xE2, 0xD5, 0xA2, 0xF0, 0x0F, 0x75, 0x46, 0x80, 0x10, 0x66, 0x7A, 0xF0, 0x00, 0x01, 0x02, 0x01,
0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x05,
0x00, 0x00, 0x7E, 0x90, 0x00, 0x09, 0x50, 0x48, 0x53, 0x54, 0x00, 0x50, 0x48, 0x54, 0x00, 0x4A,
-0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9F, 0x94, 0xDD, 0x01, 0xCB, 0x4A,
+0x20, 0x00, 0x00, 0x00, 0x00,
/* Asia/Muscat */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4F, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0xA1, 0xF2, 0x96, 0x94,
0x01, 0x00, 0x00, 0x36, 0xEC, 0x00, 0x00, 0x00, 0x00, 0x38, 0x40, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x47, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x47, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAD, 0x57, 0x00, 0x01, 0x6C, 0x0C,
+0x9D, 0x00, 0x00, 0x00, 0x00,
/* Asia/Nicosia */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8434,8 +8456,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x00, 0x00, 0x1F, 0x48, 0x00, 0x00, 0x00, 0x00, 0x2A,
0x30, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00,
0x00, 0x2A, 0x30, 0x01, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45,
-0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xBE, 0xFD, 0x3A,
+0x01, 0x45, 0x92, 0x5A, 0x00, 0x00, 0x00, 0x00,
/* Asia/Novosibirsk */
0x50, 0x48, 0x50, 0x31, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8483,7 +8505,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x62, 0x70, 0x01, 0x09, 0x00, 0x00, 0x54, 0x60, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70, 0x01, 0x09,
0x4C, 0x4D, 0x54, 0x00, 0x4E, 0x4F, 0x56, 0x54, 0x00, 0x4E, 0x4F, 0x56, 0x53, 0x54, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x17, 0x4D, 0x6F, 0x73,
+0x00, 0x00, 0xDD, 0x4D, 0xA5, 0x01, 0x91, 0x2D, 0xD2, 0x00, 0x00, 0x00, 0x17, 0x4D, 0x6F, 0x73,
0x63, 0x6F, 0x77, 0x2B, 0x30, 0x33, 0x20, 0x2D, 0x20, 0x4E, 0x6F, 0x76, 0x6F, 0x73, 0x69, 0x62,
0x69, 0x72, 0x73, 0x6B,
@@ -8532,7 +8554,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x60, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70, 0x01, 0x09, 0x00, 0x00, 0x54, 0x60, 0x01, 0x09, 0x00,
0x00, 0x46, 0x50, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4F, 0x4D, 0x53, 0x54, 0x00, 0x4F, 0x4D,
0x53, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x18,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xDD, 0x40, 0xA0, 0x01, 0x82, 0xA8, 0x60, 0x00, 0x00, 0x00, 0x18,
0x4D, 0x6F, 0x73, 0x63, 0x6F, 0x77, 0x2B, 0x30, 0x33, 0x20, 0x2D, 0x20, 0x77, 0x65, 0x73, 0x74,
0x20, 0x53, 0x69, 0x62, 0x65, 0x72, 0x69, 0x61,
@@ -8564,7 +8586,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x4D, 0x54, 0x00, 0x55, 0x52, 0x41, 0x54, 0x00, 0x55, 0x52, 0x41, 0x53, 0x54, 0x00, 0x4F, 0x52,
0x41, 0x53, 0x54, 0x00, 0x4F, 0x52, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,
0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD7, 0x7A, 0xC2, 0x01, 0x61, 0x03, 0x18, 0x00, 0x00, 0x00,
0x0F, 0x57, 0x65, 0x73, 0x74, 0x20, 0x4B, 0x61, 0x7A, 0x61, 0x6B, 0x68, 0x73, 0x74, 0x61, 0x6E,
@@ -8575,8 +8597,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x91, 0x5F, 0xEE, 0xD0, 0x93, 0x85, 0xB1, 0x90, 0xB7, 0x41, 0xBC, 0x00, 0x01, 0x02, 0x03, 0x02,
0x00, 0x00, 0x62, 0x5C, 0x00, 0x00, 0x00, 0x00, 0x63, 0xEC, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70,
0x00, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x4D, 0x54, 0x00,
-0x49, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x49, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xF3, 0xF8,
+0x01, 0xB2, 0xBF, 0x92, 0x00, 0x00, 0x00, 0x00,
/* Asia/Pontianak */
0x50, 0x48, 0x50, 0x31, 0x01, 0x49, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8589,7 +8611,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x10, 0x00, 0x00, 0x62, 0x70, 0x00, 0x08, 0x4C, 0x4D,
0x54, 0x00, 0x50, 0x4D, 0x54, 0x00, 0x57, 0x49, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x43, 0x49,
0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x15, 0x77, 0x65, 0x73, 0x74,
+0x00, 0x89, 0x61, 0x45, 0x01, 0xB9, 0x7C, 0xD5, 0x00, 0x00, 0x00, 0x15, 0x77, 0x65, 0x73, 0x74,
0x20, 0x26, 0x20, 0x63, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x42, 0x6F, 0x72, 0x6E, 0x65,
0x6F,
@@ -8600,7 +8622,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xB0, 0xFE, 0x8D, 0xF0, 0xB8, 0x84, 0xB4, 0x78, 0xE2, 0x4F, 0x29, 0xF0, 0xF0, 0x35, 0x78, 0x80,
0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x00, 0x77, 0x88, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x90, 0x00,
0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x00, 0x4B, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0xC4, 0xDD, 0x22, 0x01, 0xD2, 0x89, 0x98, 0x00, 0x00, 0x00, 0x00,
/* Asia/Qatar */
0x50, 0x48, 0x50, 0x31, 0x01, 0x51, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8608,8 +8630,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xA1, 0xF2, 0x9D, 0x30,
0x04, 0x8A, 0x92, 0xC0, 0x01, 0x02, 0x00, 0x00, 0x30, 0x50, 0x00, 0x00, 0x00, 0x00, 0x38, 0x40,
0x00, 0x04, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x47, 0x53, 0x54, 0x00,
-0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAF, 0xE8, 0x8D, 0x01, 0x61,
+0x4A, 0xB5, 0x00, 0x00, 0x00, 0x00,
/* Asia/Qyzylorda */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4B, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8638,8 +8660,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x14, 0x00, 0x00, 0x54, 0x60, 0x00, 0x0F, 0x4C, 0x4D, 0x54, 0x00, 0x4B, 0x49, 0x5A, 0x54,
0x00, 0x4B, 0x49, 0x5A, 0x53, 0x54, 0x00, 0x51, 0x59, 0x5A, 0x54, 0x00, 0x51, 0x59, 0x5A, 0x53,
0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x20, 0x51, 0x79, 0x7A, 0x79, 0x6C, 0x6F, 0x72, 0x64, 0x61, 0x20,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCD, 0xB0, 0x40, 0x01, 0x76,
+0x8D, 0x6A, 0x00, 0x00, 0x00, 0x20, 0x51, 0x79, 0x7A, 0x79, 0x6C, 0x6F, 0x72, 0x64, 0x61, 0x20,
0x28, 0x4B, 0x79, 0x7A, 0x79, 0x6C, 0x6F, 0x72, 0x64, 0x61, 0x2C, 0x20, 0x4B, 0x7A, 0x79, 0x6C,
0x2D, 0x4F, 0x72, 0x64, 0x61, 0x29,
@@ -8650,16 +8672,16 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xCB, 0xF2, 0xFC, 0x18, 0xD1, 0x9A, 0x67, 0xF0, 0x01, 0x02, 0x03, 0x00, 0x00, 0x5A, 0x24, 0x00,
0x00, 0x00, 0x00, 0x5B, 0x68, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x09, 0x00, 0x00, 0x5B,
0x68, 0x00, 0x0D, 0x52, 0x4D, 0x54, 0x00, 0x42, 0x55, 0x52, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00,
-0x4D, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x4D, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0xF0, 0x3D,
+0x01, 0xA5, 0x65, 0x9A, 0x00, 0x00, 0x00, 0x00,
/* Asia/Riyadh */
0x50, 0x48, 0x50, 0x31, 0x01, 0x53, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0xDA, 0x61, 0x36, 0xB4,
0x01, 0x00, 0x00, 0x2B, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAE, 0xEA, 0xA5, 0x01, 0x59, 0xF1,
+0x32, 0x00, 0x00, 0x00, 0x00,
/* Asia/Saigon */
0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8717,8 +8739,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xA8, 0xC0, 0x01, 0x0C, 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x0C, 0x00, 0x00, 0x8C, 0xA0, 0x00, 0x12,
0x4C, 0x4D, 0x54, 0x00, 0x43, 0x4A, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x53, 0x41, 0x4B, 0x53,
0x54, 0x00, 0x53, 0x41, 0x4B, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x1B, 0x4D, 0x6F, 0x73, 0x63, 0x6F, 0x77, 0x2B, 0x30, 0x37, 0x20, 0x2D,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD0, 0xFE, 0x9A, 0x01, 0xEC, 0x66,
+0xB0, 0x00, 0x00, 0x00, 0x1B, 0x4D, 0x6F, 0x73, 0x63, 0x6F, 0x77, 0x2B, 0x30, 0x37, 0x20, 0x2D,
0x20, 0x53, 0x61, 0x6B, 0x68, 0x61, 0x6C, 0x69, 0x6E, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64,
@@ -8740,8 +8762,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x54, 0x60, 0x01, 0x18, 0x00, 0x00, 0x46, 0x50, 0x00, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x41,
0x4D, 0x54, 0x00, 0x53, 0x41, 0x4D, 0x53, 0x54, 0x00, 0x54, 0x41, 0x53, 0x54, 0x00, 0x55, 0x5A,
0x54, 0x00, 0x55, 0x5A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0F, 0x77, 0x65, 0x73, 0x74, 0x20, 0x55, 0x7A, 0x62, 0x65,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC5, 0xDB, 0x0A, 0x01,
+0x78, 0x96, 0x40, 0x00, 0x00, 0x00, 0x0F, 0x77, 0x65, 0x73, 0x74, 0x20, 0x55, 0x7A, 0x62, 0x65,
0x6B, 0x69, 0x73, 0x74, 0x61, 0x6E,
/* Asia/Seoul */
@@ -8754,7 +8776,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x03, 0x00, 0x01, 0x04, 0x01, 0x04, 0x01, 0x00, 0x00, 0x77, 0x88, 0x00, 0x00, 0x00, 0x00,
0x7E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x04, 0x00, 0x00, 0x70, 0x80, 0x00, 0x00,
0x00, 0x00, 0x8C, 0xA0, 0x01, 0x04, 0x4B, 0x53, 0x54, 0x00, 0x4B, 0x44, 0x54, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0xA0, 0x38, 0x01, 0xD4, 0x64, 0xDA,
0x00, 0x00, 0x00, 0x00,
/* Asia/Shanghai */
@@ -8768,7 +8790,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x00, 0x00, 0x71, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x04, 0x00, 0x00, 0x70,
0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB8, 0xFC, 0xC5, 0x01, 0xCC, 0x00, 0x6A, 0x00, 0x00, 0x00,
0x2F, 0x65, 0x61, 0x73, 0x74, 0x20, 0x43, 0x68, 0x69, 0x6E, 0x61, 0x20, 0x2D, 0x20, 0x42, 0x65,
0x69, 0x6A, 0x69, 0x6E, 0x67, 0x2C, 0x20, 0x47, 0x75, 0x61, 0x6E, 0x67, 0x64, 0x6F, 0x6E, 0x67,
0x2C, 0x20, 0x53, 0x68, 0x61, 0x6E, 0x67, 0x68, 0x61, 0x69, 0x2C, 0x20, 0x65, 0x74, 0x63, 0x2E,
@@ -8785,8 +8807,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x04, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0F, 0x00, 0x00, 0x69, 0x78, 0x00, 0x13, 0x00, 0x00,
0x70, 0x80, 0x00, 0x13, 0x53, 0x4D, 0x54, 0x00, 0x4D, 0x41, 0x4C, 0x54, 0x00, 0x4D, 0x41, 0x4C,
0x53, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x53, 0x47, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8B, 0x49, 0x8D, 0x01,
+0xB1, 0x1E, 0xE8, 0x00, 0x00, 0x00, 0x00,
/* Asia/Taipei */
0x50, 0x48, 0x50, 0x31, 0x01, 0x54, 0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8805,8 +8827,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x04,
-0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAF, 0x8D, 0x68,
+0x01, 0xCC, 0x0D, 0x70, 0x00, 0x00, 0x00, 0x00,
/* Asia/Tashkent */
0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8826,7 +8848,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x54, 0x60, 0x01, 0x13, 0x00, 0x00, 0x46, 0x50, 0x00, 0x0F, 0x4C, 0x4D, 0x54, 0x00, 0x54, 0x41,
0x53, 0x54, 0x00, 0x54, 0x41, 0x53, 0x53, 0x54, 0x00, 0x55, 0x5A, 0x54, 0x00, 0x55, 0x5A, 0x53,
0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC8, 0x66, 0x15, 0x01, 0x7C, 0x66, 0xD0, 0x00, 0x00,
0x00, 0x0F, 0x65, 0x61, 0x73, 0x74, 0x20, 0x55, 0x7A, 0x62, 0x65, 0x6B, 0x69, 0x73, 0x74, 0x61,
0x6E,
@@ -8857,8 +8879,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x10, 0x00, 0x00, 0x46, 0x50, 0x01, 0x14, 0x00, 0x00, 0x38, 0x40, 0x00, 0x10, 0x54, 0x42, 0x4D,
0x54, 0x00, 0x54, 0x42, 0x49, 0x54, 0x00, 0x54, 0x42, 0x49, 0x53, 0x54, 0x00, 0x47, 0x45, 0x54,
0x00, 0x47, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89,
-0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC8,
+0xFB, 0xD2, 0x01, 0x57, 0x0B, 0x02, 0x00, 0x00, 0x00, 0x00,
/* Asia/Tehran */
0x50, 0x48, 0x50, 0x31, 0x01, 0x49, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8899,7 +8921,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x08, 0x00, 0x00, 0x46, 0x50, 0x01, 0x0D, 0x00, 0x00, 0x38, 0x40, 0x00, 0x08, 0x00, 0x00,
0x3F, 0x48, 0x01, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x54, 0x4D, 0x54, 0x00, 0x49, 0x52, 0x53, 0x54,
0x00, 0x49, 0x52, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xBF, 0xC0, 0x8A, 0x01, 0x61, 0x23, 0xA5, 0x00, 0x00, 0x00, 0x00,
/* Asia/Tel_Aviv */
0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8969,8 +8991,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xD5, 0xE6, 0x15, 0x74,
0x21, 0x61, 0x4D, 0xA8, 0x01, 0x02, 0x00, 0x00, 0x54, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x58,
0x00, 0x04, 0x00, 0x00, 0x54, 0x60, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x49, 0x53, 0x54, 0x00,
-0x42, 0x54, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x42, 0x54, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB3, 0x3D, 0x6A, 0x01, 0x9B,
+0x74, 0x07, 0x00, 0x00, 0x00, 0x00,
/* Asia/Tokyo */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4A, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8980,8 +9002,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xDB, 0x07, 0x1D, 0x10, 0xDB, 0xAB, 0xDA, 0x80, 0xDC, 0xE6, 0xFF, 0x10, 0xDD, 0x8B, 0xBC, 0x80,
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x00, 0x00,
0x00, 0x8C, 0xA0, 0x01, 0x04, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x08, 0x43, 0x4A, 0x54, 0x00, 0x4A,
-0x44, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x44, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xBB,
+0xC4, 0x01, 0xE7, 0xE4, 0x48, 0x00, 0x00, 0x00, 0x00,
/* Asia/Ujung_Pandang */
0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9014,7 +9036,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x03, 0x00, 0x00, 0x64, 0x34, 0x00, 0x00, 0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x00, 0x00,
0x7E, 0x90, 0x01, 0x09, 0x00, 0x00, 0x70, 0x80, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x55, 0x4C,
0x41, 0x54, 0x00, 0x55, 0x4C, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0E, 0x6D, 0x6F, 0x73,
+0x00, 0x00, 0xD2, 0x71, 0xB2, 0x01, 0xB5, 0xBF, 0xCD, 0x00, 0x00, 0x00, 0x0E, 0x6D, 0x6F, 0x73,
0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73,
/* Asia/Ulan_Bator */
@@ -9051,7 +9073,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x03, 0x00, 0x00, 0x52, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x54, 0x60, 0x00, 0x04, 0x00, 0x00,
0x7E, 0x90, 0x01, 0x09, 0x00, 0x00, 0x70, 0x80, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x55, 0x52,
0x55, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x18, 0x6D,
+0x00, 0x00, 0x00, 0x00, 0xCC, 0x29, 0xA0, 0x01, 0x98, 0x4C, 0xBD, 0x00, 0x00, 0x00, 0x18, 0x6D,
0x6F, 0x73, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x54, 0x69, 0x62, 0x65, 0x74, 0x20, 0x26, 0x20, 0x58,
0x69, 0x6E, 0x6A, 0x69, 0x61, 0x6E, 0x67,
@@ -9062,8 +9084,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x91, 0x5F, 0xEE, 0xD0, 0x93, 0x85, 0xB1, 0x90, 0xB7, 0x41, 0xBC, 0x00, 0x01, 0x02, 0x03, 0x02,
0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x63, 0xEC, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70,
0x00, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x4D, 0x54, 0x00,
-0x49, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x49, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xBE, 0x7A,
+0x01, 0xAF, 0x36, 0xA0, 0x00, 0x00, 0x00, 0x00,
/* Asia/Vladivostok */
0x50, 0x48, 0x50, 0x31, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9110,8 +9132,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xA0, 0x00, 0x04, 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x09, 0x00, 0x00, 0x8C, 0xA0, 0x01, 0x0F, 0x00,
0x00, 0x7E, 0x90, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x56, 0x4C, 0x41, 0x54, 0x00, 0x56, 0x4C,
0x41, 0x53, 0x54, 0x00, 0x56, 0x4C, 0x41, 0x53, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x16, 0x4D, 0x6F, 0x73, 0x63, 0x6F, 0x77, 0x2B, 0x30, 0x37,
+0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCB, 0x32, 0x3A, 0x01,
+0xDB, 0xF8, 0xF5, 0x00, 0x00, 0x00, 0x16, 0x4D, 0x6F, 0x73, 0x63, 0x6F, 0x77, 0x2B, 0x30, 0x37,
0x20, 0x2D, 0x20, 0x41, 0x6D, 0x75, 0x72, 0x20, 0x52, 0x69, 0x76, 0x65, 0x72,
/* Asia/Yakutsk */
@@ -9159,7 +9181,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x90, 0x00, 0x04, 0x00, 0x00, 0x8C, 0xA0, 0x01, 0x09, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x09, 0x00,
0x00, 0x70, 0x80, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x59, 0x41, 0x4B, 0x54, 0x00, 0x59, 0x41,
0x4B, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x16,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xE7, 0xEF, 0x00, 0x01, 0xD8, 0x83, 0x8A, 0x00, 0x00, 0x00, 0x16,
0x4D, 0x6F, 0x73, 0x63, 0x6F, 0x77, 0x2B, 0x30, 0x36, 0x20, 0x2D, 0x20, 0x4C, 0x65, 0x6E, 0x61,
0x20, 0x52, 0x69, 0x76, 0x65, 0x72,
@@ -9211,7 +9233,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x53, 0x56, 0x45, 0x54, 0x00, 0x53, 0x56, 0x45, 0x53, 0x54, 0x00, 0x59, 0x45, 0x4B, 0x53,
0x54, 0x00, 0x59, 0x45, 0x4B, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00,
0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x11, 0x4D, 0x6F, 0x73, 0x63, 0x6F,
+0xE0, 0x13, 0x48, 0x01, 0x6F, 0x20, 0x60, 0x00, 0x00, 0x00, 0x11, 0x4D, 0x6F, 0x73, 0x63, 0x6F,
0x77, 0x2B, 0x30, 0x32, 0x20, 0x2D, 0x20, 0x55, 0x72, 0x61, 0x6C, 0x73,
/* Asia/Yerevan */
@@ -9262,7 +9284,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x38, 0x40, 0x00, 0x0F, 0x4C, 0x4D, 0x54, 0x00, 0x59, 0x45, 0x52, 0x54, 0x00, 0x59, 0x45, 0x52,
0x53, 0x54, 0x00, 0x41, 0x4D, 0x54, 0x00, 0x41, 0x4D, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00,
0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC6, 0xA4, 0xDD, 0x01, 0x56, 0x8F, 0x50,
0x00, 0x00, 0x00, 0x00,
/* Atlantic/Azores */
@@ -9345,7 +9367,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x48, 0x4D, 0x54, 0x00, 0x41, 0x5A, 0x4F, 0x53, 0x54, 0x00, 0x41, 0x5A, 0x4F, 0x54, 0x00, 0x41,
0x5A, 0x4F, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,
0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x06, 0x41, 0x7A, 0x6F,
+0x01, 0x00, 0xC2, 0xE7, 0xD5, 0x00, 0xED, 0x87, 0x4A, 0x00, 0x00, 0x00, 0x06, 0x41, 0x7A, 0x6F,
0x72, 0x65, 0x73,
/* Atlantic/Bermuda */
@@ -9394,7 +9416,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
0x01, 0xFF, 0xFF, 0xC3, 0x48, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xD5,
0xD0, 0x01, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x53, 0x54, 0x00, 0x41, 0x44, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBA, 0x96, 0xED, 0x00, 0xB2, 0x2B, 0xFA, 0x00, 0x00, 0x00,
0x00,
/* Atlantic/Canary */
@@ -9441,8 +9463,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10,
0x01, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x0D, 0x4C, 0x4D,
0x54, 0x00, 0x43, 0x41, 0x4E, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0E, 0x43, 0x61, 0x6E, 0x61, 0x72, 0x79, 0x20, 0x49,
+0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xB4, 0x34, 0xD0,
+0x00, 0xFC, 0x61, 0x60, 0x00, 0x00, 0x00, 0x0E, 0x43, 0x61, 0x6E, 0x61, 0x72, 0x79, 0x20, 0x49,
0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73,
/* Atlantic/Cape_Verde */
@@ -9452,8 +9474,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xCC, 0x95, 0x9C, 0x20, 0xD2, 0x74, 0x7C, 0x10, 0x0B, 0x17, 0xF7, 0x40, 0x01, 0x02, 0x01, 0x03,
0xFF, 0xFF, 0xE9, 0xF4, 0x00, 0x00, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x04, 0xFF, 0xFF, 0xF1, 0xF0,
0x01, 0x08, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x56, 0x54, 0x00,
-0x43, 0x56, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x43, 0x56, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x17,
+0x12, 0x00, 0xF0, 0x59, 0xF2, 0x00, 0x00, 0x00, 0x00,
/* Atlantic/Faeroe */
0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9542,7 +9564,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0xFF, 0xFF, 0xF9, 0xA8, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x08, 0x00, 0x00, 0x00,
0x00, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0xE7, 0xF5, 0x82, 0x01, 0x0A, 0xAC, 0x3A,
0x00, 0x00, 0x00, 0x00,
/* Atlantic/Jan_Mayen */
@@ -9678,8 +9700,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x15, 0x46, 0x4D, 0x54, 0x00, 0x4D, 0x41,
0x44, 0x53, 0x54, 0x00, 0x4D, 0x41, 0x44, 0x54, 0x00, 0x4D, 0x41, 0x44, 0x4D, 0x54, 0x00, 0x57,
0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89,
-0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0F, 0x4D, 0x61, 0x64, 0x65, 0x69, 0x72,
+0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xBB,
+0x1F, 0xA5, 0x00, 0xFB, 0x9E, 0x10, 0x00, 0x00, 0x00, 0x0F, 0x4D, 0x61, 0x64, 0x65, 0x69, 0x72,
0x61, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73,
/* Atlantic/Reykjavik */
@@ -9709,14 +9731,14 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x09, 0x00, 0x00,
0x00, 0x00, 0x01, 0x04, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D,
0x52, 0x4D, 0x54, 0x00, 0x49, 0x53, 0x53, 0x54, 0x00, 0x49, 0x53, 0x54, 0x00, 0x47, 0x4D, 0x54,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEB, 0x36,
+0xD8, 0x00, 0xF3, 0xE9, 0x68, 0x00, 0x00, 0x00, 0x00,
/* Atlantic/South_Georgia */
0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0xFF, 0xFF, 0xE3, 0xE0,
-0x00, 0x00, 0x47, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x47, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x37, 0x56, 0xAA, 0x00, 0xDC, 0x8A, 0x55,
0x00, 0x00, 0x00, 0x00,
/* Atlantic/Stanley */
@@ -9764,7 +9786,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x02, 0x01, 0xFF, 0xFF, 0xC9, 0xC4, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x04, 0xFF,
0xFF, 0xC7, 0xC0, 0x00, 0x09, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x00,
0x09, 0x53, 0x4D, 0x54, 0x00, 0x46, 0x4B, 0x53, 0x54, 0x00, 0x46, 0x4B, 0x54, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x93, 0xD0, 0x00, 0xBC, 0xFA, 0xE8,
0x00, 0x00, 0x00, 0x00,
/* Atlantic/St_Helena */
@@ -9772,8 +9794,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0xDC, 0x42, 0x9B, 0x58,
0x01, 0xFF, 0xFF, 0xFA, 0xA8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x4A, 0x4D, 0x54,
-0x00, 0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x47, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0xD6, 0xF2, 0x01, 0x0C, 0x18,
+0xD0, 0x00, 0x00, 0x00, 0x00,
/* Australia/ACT */
0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9877,7 +9899,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x00, 0x00, 0x93,
0xA8, 0x01, 0x00, 0x00, 0x00, 0x85, 0x98, 0x00, 0x00, 0x00, 0x00, 0x93, 0xA8, 0x01, 0x00, 0x00,
0x00, 0x85, 0x98, 0x00, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0F, 0x53, 0x6F, 0x75,
+0x00, 0x00, 0x56, 0xD9, 0x12, 0x01, 0xE6, 0x1E, 0x9D, 0x00, 0x00, 0x00, 0x0F, 0x53, 0x6F, 0x75,
0x74, 0x68, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6C, 0x69, 0x61,
/* Australia/Brisbane */
@@ -9891,7 +9913,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x01, 0x00, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x9A, 0xB0,
0x01, 0x00, 0x00, 0x00, 0x8C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x00, 0x00, 0x00,
0x8C, 0xA0, 0x00, 0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x1B, 0x51, 0x75, 0x65, 0x65,
+0x00, 0x60, 0xD7, 0xAA, 0x01, 0xFC, 0x2B, 0x25, 0x00, 0x00, 0x00, 0x1B, 0x51, 0x75, 0x65, 0x65,
0x6E, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x20, 0x2D, 0x20, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F,
0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73,
@@ -9945,7 +9967,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
0x03, 0x02, 0x00, 0x00, 0x93, 0xA8, 0x01, 0x00, 0x00, 0x00, 0x85, 0x98, 0x00, 0x00, 0x00, 0x00,
0x93, 0xA8, 0x01, 0x00, 0x00, 0x00, 0x85, 0x98, 0x00, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
+0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5B, 0x79, 0xF8, 0x01, 0xEA, 0x7E, 0x68, 0x00, 0x00,
0x00, 0x1C, 0x4E, 0x65, 0x77, 0x20, 0x53, 0x6F, 0x75, 0x74, 0x68, 0x20, 0x57, 0x61, 0x6C, 0x65,
0x73, 0x20, 0x2D, 0x20, 0x59, 0x61, 0x6E, 0x63, 0x6F, 0x77, 0x69, 0x6E, 0x6E, 0x61,
@@ -10051,7 +10073,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x00, 0x00, 0x8C,
0xA0, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x00, 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x00, 0x00,
0x00, 0x8C, 0xA0, 0x00, 0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x16, 0x54, 0x61, 0x73,
+0x00, 0x00, 0x4F, 0x3E, 0x75, 0x01, 0xEE, 0x2E, 0x6A, 0x00, 0x00, 0x00, 0x16, 0x54, 0x61, 0x73,
0x6D, 0x61, 0x6E, 0x69, 0x61, 0x20, 0x2D, 0x20, 0x4B, 0x69, 0x6E, 0x67, 0x20, 0x49, 0x73, 0x6C,
0x61, 0x6E, 0x64,
@@ -10062,7 +10084,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x9C, 0xBC, 0x27, 0xF8, 0xCB, 0x54, 0xBA, 0x08, 0xCB, 0xC7, 0x5E, 0x78, 0xCC, 0xB7, 0x5D, 0x88,
0xCD, 0xA7, 0x40, 0x78, 0xCE, 0xA0, 0x7A, 0x08, 0xCF, 0x87, 0x22, 0x78, 0x00, 0x01, 0x00, 0x01,
0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x93, 0xA8, 0x01, 0x00, 0x00, 0x00, 0x85, 0x98, 0x00, 0x00,
-0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0xBB, 0x0A, 0x01, 0xDA, 0x4B, 0x45,
0x00, 0x00, 0x00, 0x12, 0x4E, 0x6F, 0x72, 0x74, 0x68, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x65, 0x72,
0x72, 0x69, 0x74, 0x6F, 0x72, 0x79,
@@ -10077,8 +10099,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x49, 0xCE, 0x5B, 0x14, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x89, 0x1C, 0x01, 0x00, 0x00, 0x00, 0x7B, 0x0C,
0x00, 0x00, 0x00, 0x00, 0x89, 0x1C, 0x01, 0x00, 0x00, 0x00, 0x7B, 0x0C, 0x00, 0x00, 0x43, 0x57,
-0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x1E, 0x57, 0x65, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x41,
+0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5B, 0x1E, 0xD2, 0x01,
+0xD7, 0x4B, 0x0A, 0x00, 0x00, 0x00, 0x1E, 0x57, 0x65, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x41,
0x75, 0x73, 0x74, 0x72, 0x61, 0x6C, 0x69, 0x61, 0x20, 0x2D, 0x20, 0x45, 0x75, 0x63, 0x6C, 0x61,
0x20, 0x61, 0x72, 0x65, 0x61,
@@ -10134,8 +10156,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
0x02, 0x03, 0x02, 0x03, 0x02, 0x00, 0x00, 0x8C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xB0, 0x01,
0x00, 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x00, 0x00, 0x00, 0x8C, 0xA0, 0x00, 0x00, 0x45, 0x53, 0x54,
-0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x19, 0x54, 0x61, 0x73, 0x6D, 0x61, 0x6E, 0x69, 0x61, 0x20, 0x2D, 0x20,
+0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0x97, 0x0D, 0x01, 0xF3, 0x72,
+0x12, 0x00, 0x00, 0x00, 0x19, 0x54, 0x61, 0x73, 0x6D, 0x61, 0x6E, 0x69, 0x61, 0x20, 0x2D, 0x20,
0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73,
/* Australia/LHI */
@@ -10194,8 +10216,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
0x01, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x00, 0x00, 0x00, 0x8C, 0xA0, 0x00,
0x00, 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x00, 0x00, 0x00, 0x8C, 0xA0, 0x00, 0x00, 0x45, 0x53, 0x54,
-0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x1C, 0x51, 0x75, 0x65, 0x65, 0x6E, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x20,
+0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x37, 0xEA, 0x01, 0xF6, 0x03,
+0xA0, 0x00, 0x00, 0x00, 0x1C, 0x51, 0x75, 0x65, 0x65, 0x6E, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x20,
0x2D, 0x20, 0x48, 0x6F, 0x6C, 0x69, 0x64, 0x61, 0x79, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64,
0x73,
@@ -10241,7 +10263,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x8C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xB8,
0x01, 0x04, 0x00, 0x00, 0x93, 0xA8, 0x00, 0x04, 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x04, 0x45, 0x53,
0x54, 0x00, 0x4C, 0x48, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x10, 0x4C, 0x6F, 0x72, 0x64, 0x20,
+0x5A, 0xDD, 0xB8, 0x02, 0x05, 0x66, 0x6D, 0x00, 0x00, 0x00, 0x10, 0x4C, 0x6F, 0x72, 0x64, 0x20,
0x48, 0x6F, 0x77, 0x65, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64,
/* Australia/Melbourne */
@@ -10294,7 +10316,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x00, 0x00, 0x9A,
0xB0, 0x01, 0x00, 0x00, 0x00, 0x8C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x00, 0x00,
0x00, 0x8C, 0xA0, 0x00, 0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x08, 0x56, 0x69, 0x63,
+0x00, 0x00, 0x52, 0x1E, 0x22, 0x01, 0xEF, 0xDC, 0x1A, 0x00, 0x00, 0x00, 0x08, 0x56, 0x69, 0x63,
0x74, 0x6F, 0x72, 0x69, 0x61,
/* Australia/North */
@@ -10370,8 +10392,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x49, 0xCE, 0x65, 0xA0, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x00, 0x00, 0x00, 0x70, 0x80,
0x00, 0x00, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x00, 0x57, 0x53,
-0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x22, 0x57, 0x65, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x41, 0x75,
+0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5B, 0x79, 0xF8, 0x01, 0xC3,
+0x6E, 0x68, 0x00, 0x00, 0x00, 0x22, 0x57, 0x65, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x41, 0x75,
0x73, 0x74, 0x72, 0x61, 0x6C, 0x69, 0x61, 0x20, 0x2D, 0x20, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C,
0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73,
@@ -10490,7 +10512,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x00, 0x00, 0x9A,
0xB0, 0x01, 0x00, 0x00, 0x00, 0x8C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x00, 0x00,
0x00, 0x8C, 0xA0, 0x00, 0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x20, 0x4E, 0x65, 0x77,
+0x00, 0x00, 0x58, 0x4C, 0x2A, 0x01, 0xF9, 0x65, 0x82, 0x00, 0x00, 0x00, 0x20, 0x4E, 0x65, 0x77,
0x20, 0x53, 0x6F, 0x75, 0x74, 0x68, 0x20, 0x57, 0x61, 0x6C, 0x65, 0x73, 0x20, 0x2D, 0x20, 0x6D,
0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73,
@@ -11679,21 +11701,21 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x3F, 0x73, 0x57, 0x50, 0x40, 0x91, 0x7A, 0xE0, 0x41, 0x5C, 0x73, 0xD0, 0x42, 0x71, 0x5C, 0xE0,
0x43, 0x3C, 0x55, 0xD0, 0x44, 0x51, 0x3E, 0xE0, 0x45, 0x12, 0xFD, 0x50, 0x46, 0x31, 0x20, 0xE0,
0x46, 0xE0, 0x6A, 0x50, 0x48, 0x11, 0x02, 0xE0, 0x48, 0xB7, 0x11, 0xD0, 0x49, 0xF0, 0xE4, 0xE0,
-0x4A, 0x96, 0xF3, 0xD0, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0x76, 0xD5, 0xD0, 0x4D, 0xB9, 0xE3, 0x60,
-0x4E, 0x56, 0xB7, 0xD0, 0x4F, 0x99, 0xC5, 0x60, 0x50, 0x3F, 0xD4, 0x50, 0x51, 0x79, 0xA7, 0x60,
-0x52, 0x1F, 0xB6, 0x50, 0x53, 0x59, 0x89, 0x60, 0x53, 0xFF, 0x98, 0x50, 0x55, 0x39, 0x6B, 0x60,
-0x55, 0xDF, 0x7A, 0x50, 0x57, 0x22, 0x87, 0xE0, 0x57, 0xBF, 0x5C, 0x50, 0x59, 0x02, 0x69, 0xE0,
-0x59, 0xA8, 0x78, 0xD0, 0x5A, 0xE2, 0x4B, 0xE0, 0x5B, 0x88, 0x5A, 0xD0, 0x5C, 0xC2, 0x2D, 0xE0,
-0x5D, 0x68, 0x3C, 0xD0, 0x5E, 0xA2, 0x0F, 0xE0, 0x5F, 0x48, 0x1E, 0xD0, 0x60, 0x8B, 0x2C, 0x60,
-0x61, 0x28, 0x00, 0xD0, 0x62, 0x6B, 0x0E, 0x60, 0x63, 0x07, 0xE2, 0xD0, 0x64, 0x4A, 0xF0, 0x60,
-0x64, 0xF0, 0xFF, 0x50, 0x66, 0x2A, 0xD2, 0x60, 0x66, 0xD0, 0xE1, 0x50, 0x68, 0x0A, 0xB4, 0x60,
-0x68, 0xB0, 0xC3, 0x50, 0x69, 0xEA, 0x96, 0x60, 0x6A, 0x90, 0xA5, 0x50, 0x6B, 0xD3, 0xB2, 0xE0,
-0x6C, 0x70, 0x87, 0x50, 0x6D, 0xB3, 0x94, 0xE0, 0x6E, 0x59, 0xA3, 0xD0, 0x6F, 0x93, 0x76, 0xE0,
-0x70, 0x39, 0x85, 0xD0, 0x71, 0x73, 0x58, 0xE0, 0x72, 0x19, 0x67, 0xD0, 0x73, 0x53, 0x3A, 0xE0,
-0x73, 0xF9, 0x49, 0xD0, 0x75, 0x3C, 0x57, 0x60, 0x75, 0xD9, 0x2B, 0xD0, 0x77, 0x1C, 0x39, 0x60,
-0x77, 0xB9, 0x0D, 0xD0, 0x78, 0xFC, 0x1B, 0x60, 0x79, 0xA2, 0x2A, 0x50, 0x7A, 0xDB, 0xFD, 0x60,
-0x7B, 0x82, 0x0C, 0x50, 0x7C, 0xBB, 0xDF, 0x60, 0x7D, 0x61, 0xEE, 0x50, 0x7E, 0x9B, 0xC1, 0x60,
-0x7F, 0x41, 0xD0, 0x50, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
+0x4A, 0xBB, 0xDD, 0xD0, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0xA4, 0xFA, 0x50, 0x4D, 0xB9, 0xE3, 0x60,
+0x4E, 0x84, 0xDC, 0x50, 0x4F, 0x99, 0xC5, 0x60, 0x50, 0x64, 0xBE, 0x50, 0x51, 0x79, 0xA7, 0x60,
+0x52, 0x44, 0xA0, 0x50, 0x53, 0x59, 0x89, 0x60, 0x54, 0x24, 0x82, 0x50, 0x55, 0x39, 0x6B, 0x60,
+0x56, 0x04, 0x64, 0x50, 0x57, 0x22, 0x87, 0xE0, 0x57, 0xED, 0x80, 0xD0, 0x59, 0x02, 0x69, 0xE0,
+0x59, 0xCD, 0x62, 0xD0, 0x5A, 0xE2, 0x4B, 0xE0, 0x5B, 0xAD, 0x44, 0xD0, 0x5C, 0xC2, 0x2D, 0xE0,
+0x5D, 0x8D, 0x26, 0xD0, 0x5E, 0xA2, 0x0F, 0xE0, 0x5F, 0x6D, 0x08, 0xD0, 0x60, 0x8B, 0x2C, 0x60,
+0x61, 0x56, 0x25, 0x50, 0x62, 0x6B, 0x0E, 0x60, 0x63, 0x36, 0x07, 0x50, 0x64, 0x4A, 0xF0, 0x60,
+0x65, 0x15, 0xE9, 0x50, 0x66, 0x2A, 0xD2, 0x60, 0x66, 0xF5, 0xCB, 0x50, 0x68, 0x0A, 0xB4, 0x60,
+0x68, 0xD5, 0xAD, 0x50, 0x69, 0xEA, 0x96, 0x60, 0x6A, 0xB5, 0x8F, 0x50, 0x6B, 0xD3, 0xB2, 0xE0,
+0x6C, 0x9E, 0xAB, 0xD0, 0x6D, 0xB3, 0x94, 0xE0, 0x6E, 0x7E, 0x8D, 0xD0, 0x6F, 0x93, 0x76, 0xE0,
+0x70, 0x5E, 0x6F, 0xD0, 0x71, 0x73, 0x58, 0xE0, 0x72, 0x3E, 0x51, 0xD0, 0x73, 0x53, 0x3A, 0xE0,
+0x74, 0x1E, 0x33, 0xD0, 0x75, 0x3C, 0x57, 0x60, 0x76, 0x07, 0x50, 0x50, 0x77, 0x1C, 0x39, 0x60,
+0x77, 0xE7, 0x32, 0x50, 0x78, 0xFC, 0x1B, 0x60, 0x79, 0xC7, 0x14, 0x50, 0x7A, 0xDB, 0xFD, 0x60,
+0x7B, 0xA6, 0xF6, 0x50, 0x7C, 0xBB, 0xDF, 0x60, 0x7D, 0x86, 0xD8, 0x50, 0x7E, 0x9B, 0xC1, 0x60,
+0x7F, 0x66, 0xBA, 0x50, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
@@ -12169,7 +12191,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x54, 0x00, 0x41, 0x4D, 0x54, 0x00, 0x4E, 0x45, 0x54, 0x00, 0x4E, 0x45, 0x53, 0x54, 0x00, 0x43,
0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01,
0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x01, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x00, 0xD9, 0x3B, 0xFA, 0x01, 0x1A, 0x22, 0x90, 0x00, 0x00, 0x00, 0x00,
/* Europe/Andorra */
0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -12211,7 +12233,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x03, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x04, 0x00,
0x00, 0x1C, 0x20, 0x01, 0x08, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x04, 0x57, 0x45, 0x54, 0x00, 0x43,
0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xCA, 0x2D, 0xD0, 0x01, 0x14, 0xF8, 0xF2, 0x00, 0x00, 0x00, 0x00,
/* Europe/Athens */
0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -12265,7 +12287,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x41,
0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00,
0x43, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xC3, 0x42, 0xFA, 0x01, 0x36, 0xD8, 0xD2, 0x00,
0x00, 0x00, 0x00,
/* Europe/Belfast */
@@ -12398,8 +12420,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x04, 0x05, 0x04, 0x05, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00,
0x00, 0x00, 0x1C, 0x20, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20,
0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54,
-0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xCD, 0xBD,
+0x45, 0x01, 0x31, 0xF0, 0x50, 0x00, 0x00, 0x00, 0x00,
/* Europe/Berlin */
0x50, 0x48, 0x50, 0x31, 0x01, 0x44, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -12454,8 +12476,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x09,
0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x43, 0x45, 0x53, 0x54,
0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01,
-0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xD9, 0x70, 0x10, 0x01, 0x27,
+0x0D, 0xDA, 0x00, 0x00, 0x00, 0x00,
/* Europe/Bratislava */
0x50, 0x48, 0x50, 0x31, 0x01, 0x53, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -12508,7 +12530,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00,
0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00,
0x05, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xD2, 0xCC, 0xD8, 0x01, 0x2C, 0xC6, 0xB2, 0x00, 0x00,
0x00, 0x00,
/* Europe/Brussels */
@@ -12578,8 +12600,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x08, 0x00,
0x00, 0x0E, 0x10, 0x00, 0x04, 0x57, 0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53,
0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01,
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0xD6, 0xE5, 0x05, 0x01,
+0x19, 0x45, 0x35, 0x00, 0x00, 0x00, 0x00,
/* Europe/Bucharest */
0x50, 0x48, 0x50, 0x31, 0x01, 0x52, 0x4F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -12631,8 +12653,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x01,
0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x1C,
0x20, 0x00, 0x09, 0x42, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89,
-0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xCD,
+0x21, 0x05, 0x01, 0x3A, 0x7B, 0xD0, 0x00, 0x00, 0x00, 0x00,
/* Europe/Budapest */
0x50, 0x48, 0x50, 0x31, 0x01, 0x48, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -12689,7 +12711,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00,
0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20,
0x01, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01,
-0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xD1, 0xCE, 0xF0, 0x01, 0x2F, 0xC6, 0xED, 0x00,
0x00, 0x00, 0x00,
/* Europe/Chisinau */
@@ -12749,7 +12771,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x4D, 0x53, 0x44, 0x00,
0x4D, 0x53, 0x4B, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01,
0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x01, 0x00, 0xD1, 0x0B, 0xA0, 0x01, 0x3E, 0xA7, 0x85, 0x00, 0x00, 0x00, 0x00,
/* Europe/Copenhagen */
0x50, 0x48, 0x50, 0x31, 0x01, 0x44, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -12799,8 +12821,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x05, 0x04, 0x05, 0x04, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00,
0x05, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x1C,
0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45,
-0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89,
-0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xDE,
+0x45, 0x0A, 0x01, 0x25, 0xDB, 0xDD, 0x00, 0x00, 0x00, 0x00,
/* Europe/Dublin */
0x50, 0x48, 0x50, 0x31, 0x01, 0x49, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -12883,7 +12905,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x0E, 0x10, 0x00, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
0x0C, 0x44, 0x4D, 0x54, 0x00, 0x49, 0x53, 0x54, 0x00, 0x42, 0x53, 0x54, 0x00, 0x47, 0x4D, 0x54,
0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xDA, 0xB5, 0x95, 0x01, 0x09, 0xE2, 0x68, 0x00, 0x00, 0x00,
0x00,
/* Europe/Gibraltar */
@@ -12955,8 +12977,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x04, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x08, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0D, 0x00, 0x00, 0x1C,
0x20, 0x01, 0x11, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0D, 0x42, 0x53, 0x54, 0x00, 0x47, 0x4D, 0x54,
0x00, 0x42, 0x44, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x01,
-0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xC0, 0x76, 0xD5, 0x01,
+0x0B, 0x90, 0x18, 0x00, 0x00, 0x00, 0x00,
/* Europe/Guernsey */
0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -13041,8 +13063,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x08, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00,
0x0E, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
0x42, 0x53, 0x54, 0x00, 0x47, 0x4D, 0x54, 0x00, 0x42, 0x44, 0x53, 0x54, 0x00, 0x01, 0x01, 0x01,
-0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0xD4, 0xC8, 0xA7, 0x01,
+0x10, 0x6B, 0x95, 0x00, 0x00, 0x00, 0x00,
/* Europe/Helsinki */
0x50, 0x48, 0x50, 0x31, 0x01, 0x46, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -13087,8 +13109,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x04, 0x03, 0x04, 0x03, 0x04, 0x00, 0x00, 0x17, 0x68, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01,
0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x1C,
0x20, 0x00, 0x09, 0x48, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xE5, 0x22, 0xDA, 0x01, 0x38,
+0xC1, 0x1A, 0x00, 0x00, 0x00, 0x00,
/* Europe/Isle_of_Man */
0x50, 0x48, 0x50, 0x31, 0x01, 0x49, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -13173,8 +13195,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x08, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00,
0x0E, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
0x42, 0x53, 0x54, 0x00, 0x47, 0x4D, 0x54, 0x00, 0x42, 0x44, 0x53, 0x54, 0x00, 0x01, 0x01, 0x01,
-0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0xDB, 0xF4, 0x98, 0x01,
+0x0D, 0x44, 0x4A, 0x00, 0x00, 0x00, 0x00,
/* Europe/Istanbul */
0x50, 0x48, 0x50, 0x31, 0x01, 0x54, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -13239,7 +13261,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x30, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x49, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53,
0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x54, 0x52, 0x53, 0x54, 0x00, 0x54, 0x52, 0x54, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0xC7, 0xEA, 0x62, 0x01, 0x3E, 0xDB, 0x9A, 0x00, 0x00, 0x00, 0x00,
/* Europe/Jersey */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4A, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -13324,8 +13346,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x08, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00,
0x0E, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
0x42, 0x53, 0x54, 0x00, 0x47, 0x4D, 0x54, 0x00, 0x42, 0x44, 0x53, 0x54, 0x00, 0x01, 0x01, 0x01,
-0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0xD4, 0x66, 0xFF, 0x01,
+0x0F, 0xC8, 0xD2, 0x00, 0x00, 0x00, 0x00,
/* Europe/Kaliningrad */
0x50, 0x48, 0x50, 0x31, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -13380,7 +13402,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x45, 0x54, 0x00, 0x4D, 0x53, 0x44, 0x00, 0x4D, 0x53, 0x4B, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00,
0x45, 0x45, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x17, 0x4D, 0x6F, 0x73, 0x63,
+0x00, 0xDC, 0xD1, 0xF2, 0x01, 0x31, 0xF0, 0x50, 0x00, 0x00, 0x00, 0x17, 0x4D, 0x6F, 0x73, 0x63,
0x6F, 0x77, 0x2D, 0x30, 0x31, 0x20, 0x2D, 0x20, 0x4B, 0x61, 0x6C, 0x69, 0x6E, 0x69, 0x6E, 0x67,
0x72, 0x61, 0x64,
@@ -13432,8 +13454,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x19, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x04, 0x4B, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x4D,
0x53, 0x4B, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x4D, 0x53, 0x44, 0x00,
0x45, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01,
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0E, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F,
+0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xD6, 0x48,
+0xC5, 0x01, 0x41, 0x39, 0x12, 0x00, 0x00, 0x00, 0x0E, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F,
0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73,
/* Europe/Lisbon */
@@ -13516,7 +13538,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54,
0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01,
0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x08, 0x6D, 0x61, 0x69, 0x6E,
+0x00, 0xC4, 0x67, 0xF2, 0x01, 0x05, 0x20, 0xF5, 0x00, 0x00, 0x00, 0x08, 0x6D, 0x61, 0x69, 0x6E,
0x6C, 0x61, 0x6E, 0x64,
/* Europe/Ljubljana */
@@ -13563,8 +13585,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x04, 0x05, 0x04, 0x05, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00,
0x00, 0x00, 0x1C, 0x20, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20,
0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54,
-0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xCF, 0x98,
+0x88, 0x01, 0x28, 0xCF, 0x12, 0x00, 0x00, 0x00, 0x00,
/* Europe/London */
0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -13649,8 +13671,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x08, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00,
0x0E, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
0x42, 0x53, 0x54, 0x00, 0x47, 0x4D, 0x54, 0x00, 0x42, 0x44, 0x53, 0x54, 0x00, 0x01, 0x01, 0x01,
-0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0xD7, 0xEC, 0xB1, 0x01,
+0x12, 0xD9, 0x6F, 0x00, 0x00, 0x00, 0x00,
/* Europe/Luxembourg */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4C, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -13721,8 +13743,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54,
0x00, 0x43, 0x45, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x00, 0x00,
0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xD5, 0x03, 0x40, 0x01, 0x1C,
+0x0A, 0xD8, 0x00, 0x00, 0x00, 0x00,
/* Europe/Madrid */
0x50, 0x48, 0x50, 0x31, 0x01, 0x45, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -13784,7 +13806,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x1C, 0x20, 0x01, 0x0E, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x13, 0x57, 0x45, 0x53, 0x54, 0x00,
0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45,
0x54, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x08, 0x6D, 0x61,
+0x01, 0x01, 0x00, 0xC6, 0xF9, 0x80, 0x01, 0x0F, 0x1F, 0x8D, 0x00, 0x00, 0x00, 0x08, 0x6D, 0x61,
0x69, 0x6E, 0x6C, 0x61, 0x6E, 0x64,
/* Europe/Malta */
@@ -13846,8 +13868,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x04, 0x05, 0x04, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05,
0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20,
0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54,
-0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xC0, 0x1B,
+0xB0, 0x01, 0x28, 0xCF, 0x12, 0x00, 0x00, 0x00, 0x00,
/* Europe/Mariehamn */
0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -13892,8 +13914,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x04, 0x03, 0x04, 0x03, 0x04, 0x00, 0x00, 0x17, 0x68, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01,
0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x1C,
0x20, 0x00, 0x09, 0x48, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xE5, 0x08, 0xD0, 0x01, 0x31,
+0x19, 0x78, 0x00, 0x00, 0x00, 0x00,
/* Europe/Minsk */
0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -13944,7 +13966,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x45, 0x54, 0x00, 0x4D, 0x53, 0x4B, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00,
0x4D, 0x53, 0x44, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0xDB, 0x92, 0xF0, 0x01, 0x3C, 0xB8, 0xBA, 0x00, 0x00, 0x00, 0x00,
/* Europe/Monaco */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -14014,7 +14036,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x50, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D,
0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0xCC, 0x02, 0x8F, 0x01, 0x1D, 0xEC, 0x9D, 0x00, 0x00, 0x00, 0x00,
/* Europe/Moscow */
0x50, 0x48, 0x50, 0x31, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -14068,7 +14090,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x4D, 0x44, 0x53, 0x54, 0x00, 0x4D, 0x53, 0x4B, 0x00, 0x4D, 0x53, 0x44, 0x00, 0x45, 0x45,
0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x17, 0x4D, 0x6F, 0x73, 0x63, 0x6F,
+0xDE, 0x65, 0x98, 0x01, 0x4C, 0x01, 0x7D, 0x00, 0x00, 0x00, 0x17, 0x4D, 0x6F, 0x73, 0x63, 0x6F,
0x77, 0x2B, 0x30, 0x30, 0x20, 0x2D, 0x20, 0x77, 0x65, 0x73, 0x74, 0x20, 0x52, 0x75, 0x73, 0x73,
0x69, 0x61,
@@ -14172,7 +14194,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00,
0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00,
0x05, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xE4, 0xC1, 0x32, 0x01, 0x23, 0x0F, 0xB8, 0x00, 0x00,
0x00, 0x00,
/* Europe/Paris */
@@ -14243,8 +14265,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x11, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0D, 0x50, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00,
0x57, 0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x4D,
0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xD3, 0xE4, 0xCA, 0x01, 0x16,
+0x37, 0xF5, 0x00, 0x00, 0x00, 0x00,
/* Europe/Podgorica */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -14290,8 +14312,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x04, 0x05, 0x04, 0x05, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00,
0x00, 0x00, 0x1C, 0x20, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20,
0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54,
-0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xCA, 0x13,
+0xC5, 0x01, 0x30, 0x0E, 0x8A, 0x00, 0x00, 0x00, 0x00,
/* Europe/Prague */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -14344,7 +14366,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00,
0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00,
0x05, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xD5, 0xC0, 0x0D, 0x01, 0x28, 0xAE, 0x85, 0x00, 0x00,
0x00, 0x00,
/* Europe/Riga */
@@ -14399,8 +14421,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x4D, 0x53, 0x4B, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43,
0x45, 0x53, 0x54, 0x00, 0x4D, 0x53, 0x44, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00,
0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xE0, 0x3A, 0x57, 0x01, 0x37, 0x6E,
+0x90, 0x00, 0x00, 0x00, 0x00,
/* Europe/Rome */
0x50, 0x48, 0x50, 0x31, 0x01, 0x49, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -14462,7 +14484,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00,
0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10,
0x00, 0x05, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01,
-0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xC9, 0x43, 0x70, 0x01, 0x25, 0xB4, 0xCD, 0x00,
0x00, 0x00, 0x00,
/* Europe/Samara */
@@ -14514,7 +14536,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x54, 0x00, 0x53, 0x41, 0x4D, 0x54, 0x00, 0x4B, 0x55, 0x59, 0x53, 0x54, 0x00, 0x4B, 0x55, 0x59,
0x54, 0x00, 0x53, 0x41, 0x4D, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x1C,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xDA, 0x81, 0x7F, 0x01, 0x5F, 0x2E, 0x58, 0x00, 0x00, 0x00, 0x1C,
0x4D, 0x6F, 0x73, 0x63, 0x6F, 0x77, 0x2B, 0x30, 0x31, 0x20, 0x2D, 0x20, 0x53, 0x61, 0x6D, 0x61,
0x72, 0x61, 0x2C, 0x20, 0x55, 0x64, 0x6D, 0x75, 0x72, 0x74, 0x69, 0x61,
@@ -14578,7 +14600,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00,
0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10,
0x00, 0x05, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01,
-0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xCC, 0x57, 0x32, 0x01, 0x25, 0xAE, 0x4A, 0x00,
0x00, 0x00, 0x00,
/* Europe/Sarajevo */
@@ -14625,8 +14647,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x04, 0x05, 0x04, 0x05, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00,
0x00, 0x00, 0x1C, 0x20, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20,
0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54,
-0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xCC, 0x43,
+0xAA, 0x01, 0x2E, 0xC2, 0x82, 0x00, 0x00, 0x00, 0x00,
/* Europe/Simferopol */
0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -14678,7 +14700,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x45, 0x54, 0x00, 0x4D, 0x53, 0x4B, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00,
0x4D, 0x53, 0x44, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0E, 0x63, 0x65, 0x6E,
+0x01, 0x00, 0xCD, 0xEA, 0xD7, 0x01, 0x46, 0xB0, 0xD0, 0x00, 0x00, 0x00, 0x0E, 0x63, 0x65, 0x6E,
0x74, 0x72, 0x61, 0x6C, 0x20, 0x43, 0x72, 0x69, 0x6D, 0x65, 0x61,
/* Europe/Skopje */
@@ -14725,8 +14747,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x04, 0x05, 0x04, 0x05, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00,
0x00, 0x00, 0x1C, 0x20, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20,
0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54,
-0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xC9, 0x63,
+0xFD, 0x01, 0x33, 0x5C, 0xE5, 0x00, 0x00, 0x00, 0x00,
/* Europe/Sofia */
0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -14776,8 +14798,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x0D, 0x00, 0x00, 0x2A, 0x30,
0x01, 0x0D, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x00, 0x45, 0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00,
0x43, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01,
-0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xCA, 0x75, 0x6D,
+0x01, 0x36, 0x3C, 0x92, 0x00, 0x00, 0x00, 0x00,
/* Europe/Stockholm */
0x50, 0x48, 0x50, 0x31, 0x01, 0x53, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -14822,7 +14844,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00,
0x00, 0x00, 0x1C, 0x20, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x04, 0x00, 0x00, 0x0E, 0x10,
0x00, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x01, 0x00, 0xE3, 0xDD, 0x55, 0x01, 0x2E, 0x33, 0x48, 0x00, 0x00, 0x00, 0x00,
/* Europe/Tallinn */
0x50, 0x48, 0x50, 0x31, 0x01, 0x45, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -14875,8 +14897,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x19, 0x54, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x45,
0x45, 0x54, 0x00, 0x4D, 0x53, 0x4B, 0x00, 0x4D, 0x53, 0x44, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00,
0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x89,
-0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0xE3,
+0xFD, 0xE2, 0x01, 0x38, 0x6C, 0x78, 0x00, 0x00, 0x00, 0x00,
/* Europe/Tirane */
0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -14926,8 +14948,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x03, 0x04, 0x03, 0x04, 0x03, 0x00, 0x00, 0x12, 0x98, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00,
0x04, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x08, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x04, 0x00, 0x00, 0x1C,
0x20, 0x01, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xC8, 0x66, 0x15, 0x01, 0x30,
+0xEB, 0xE5, 0x00, 0x00, 0x00, 0x00,
/* Europe/Tiraspol */
0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -15037,7 +15059,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x11, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x4D, 0x53, 0x44, 0x00, 0x4D, 0x53,
0x4B, 0x00, 0x45, 0x45, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x08, 0x52,
+0x00, 0x01, 0x01, 0x00, 0xD3, 0x83, 0x22, 0x01, 0x34, 0xAF, 0x70, 0x00, 0x00, 0x00, 0x08, 0x52,
0x75, 0x74, 0x68, 0x65, 0x6E, 0x69, 0x61,
/* Europe/Vaduz */
@@ -15081,7 +15103,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x20,
0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54,
-0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0xD1, 0x46, 0x38, 0x01, 0x21, 0x2D, 0xF2, 0x00,
0x00, 0x00, 0x00,
/* Europe/Vatican */
@@ -15144,7 +15166,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00,
0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10,
0x00, 0x05, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01,
-0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xC9, 0x44, 0x4E, 0x01, 0x25, 0xA8, 0xF9, 0x00,
0x00, 0x00, 0x00,
/* Europe/Vienna */
@@ -15198,7 +15220,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05,
0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x43, 0x45, 0x53, 0x54,
0x00, 0x43, 0x45, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0xD2, 0xE6, 0xE2, 0x01, 0x2B, 0x94, 0xB5, 0x00, 0x00, 0x00, 0x00,
/* Europe/Vilnius */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4C, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -15252,7 +15274,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x53, 0x4B, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x4D, 0x53, 0x44, 0x00, 0x45, 0x45, 0x53, 0x54,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x01, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x01, 0x01, 0x00, 0xDC, 0xC4, 0xED, 0x01, 0x39, 0x49, 0xD2, 0x00, 0x00, 0x00, 0x00,
/* Europe/Volgograd */
0x50, 0x48, 0x50, 0x31, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -15301,7 +15323,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x14, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x54, 0x53, 0x41, 0x54, 0x00,
0x53, 0x54, 0x41, 0x54, 0x00, 0x56, 0x4F, 0x4C, 0x53, 0x54, 0x00, 0x56, 0x4F, 0x4C, 0x54, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD3, 0xB0, 0xB5, 0x01, 0x56, 0x6E, 0xC2, 0x00, 0x00,
0x00, 0x17, 0x4D, 0x6F, 0x73, 0x63, 0x6F, 0x77, 0x2B, 0x30, 0x30, 0x20, 0x2D, 0x20, 0x43, 0x61,
0x73, 0x70, 0x69, 0x61, 0x6E, 0x20, 0x53, 0x65, 0x61,
@@ -15367,7 +15389,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x1C, 0x20, 0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x09, 0x57, 0x4D, 0x54, 0x00, 0x43,
0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54,
0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xD9, 0x0E, 0x68, 0x01, 0x32, 0xB3, 0xA0, 0x00, 0x00, 0x00,
0x00,
/* Europe/Zagreb */
@@ -15414,8 +15436,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x04, 0x05, 0x04, 0x05, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00,
0x00, 0x00, 0x1C, 0x20, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20,
0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54,
-0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xCF, 0x36,
+0xE0, 0x01, 0x2B, 0x05, 0x7A, 0x00, 0x00, 0x00, 0x00,
/* Europe/Zaporozhye */
0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -15466,7 +15488,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x04, 0x43, 0x55, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x4D, 0x53, 0x4B, 0x00, 0x43, 0x45, 0x54,
0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x4D, 0x53, 0x44, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x00,
0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xD2, 0x51, 0x25, 0x01, 0x48, 0x51, 0x7A, 0x00,
0x00, 0x00, 0x2E, 0x5A, 0x61, 0x70, 0x6F, 0x72, 0x6F, 0x7A, 0x68, 0x27, 0x79, 0x65, 0x2C, 0x20,
0x45, 0x20, 0x4C, 0x75, 0x67, 0x61, 0x6E, 0x73, 0x6B, 0x20, 0x2F, 0x20, 0x5A, 0x61, 0x70, 0x6F,
0x72, 0x69, 0x7A, 0x68, 0x69, 0x61, 0x2C, 0x20, 0x45, 0x20, 0x4C, 0x75, 0x68, 0x61, 0x6E, 0x73,
@@ -15515,7 +15537,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00,
0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10,
0x00, 0x05, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x01, 0x00, 0xD1, 0xA1, 0x5D, 0x01, 0x1F, 0xAD, 0xD5, 0x00, 0x00, 0x00, 0x00,
/* Factory */
0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -15808,7 +15830,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xE2, 0x33, 0xC0, 0xC0, 0xE2, 0xAB, 0xB9, 0x40, 0x01, 0x02, 0x03, 0x00, 0x00, 0x2C, 0x8C, 0x00,
0x00, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x00, 0x00, 0x38, 0x40, 0x01, 0x08, 0x00, 0x00, 0x2A,
0x30, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x41, 0x54, 0x00, 0x45, 0x41, 0x53, 0x54, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x43, 0x12, 0x01, 0x5B, 0x29, 0xB2,
0x00, 0x00, 0x00, 0x00,
/* Indian/Chagos */
@@ -15817,21 +15839,21 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x89, 0x7E, 0xF7, 0x9C,
0x30, 0xE6, 0xDD, 0xB0, 0x01, 0x02, 0x00, 0x00, 0x43, 0xE4, 0x00, 0x00, 0x00, 0x00, 0x46, 0x50,
0x00, 0x04, 0x00, 0x00, 0x54, 0x60, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x49, 0x4F, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x28, 0x15, 0x01, 0x81, 0x28, 0x42, 0x00, 0x00,
0x00, 0x00,
/* Indian/Christmas */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70,
-0x00, 0x00, 0x43, 0x58, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x43, 0x58, 0x54, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB4, 0xC2, 0x01, 0xB3, 0xF8, 0x12,
0x00, 0x00, 0x00, 0x00,
/* Indian/Cocos */
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x5B, 0x68,
-0x00, 0x00, 0x43, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x43, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x77, 0x45, 0xDA, 0x01, 0xA6, 0x8A, 0x92,
0x00, 0x00, 0x00, 0x00,
/* Indian/Comoro */
@@ -15839,32 +15861,32 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF3, 0xD1, 0xF0,
0x01, 0x00, 0x00, 0x28, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x45, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x45, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x96, 0x4D, 0x01, 0x54, 0xAD,
+0x8A, 0x00, 0x00, 0x00, 0x00,
/* Indian/Kerguelen */
0x50, 0x48, 0x50, 0x31, 0x01, 0x54, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0xDA, 0x61, 0x62, 0x80,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x50, 0x00, 0x04, 0x7A, 0x7A, 0x7A,
-0x00, 0x54, 0x46, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x54, 0x46, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x19, 0x6D, 0x01, 0x7D, 0xCD,
+0x36, 0x00, 0x00, 0x00, 0x00,
/* Indian/Mahe */
0x50, 0x48, 0x50, 0x31, 0x01, 0x53, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x88, 0x64, 0xE6, 0x84,
0x01, 0x00, 0x00, 0x33, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x38, 0x40, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x53, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x53, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x3E, 0x2A, 0x01, 0x67, 0x4B,
+0x2A, 0x00, 0x00, 0x00, 0x00,
/* Indian/Maldives */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0xED, 0x2F, 0xC3, 0x98,
0x01, 0x00, 0x00, 0x44, 0xE8, 0x00, 0x00, 0x00, 0x00, 0x46, 0x50, 0x00, 0x04, 0x4D, 0x4D, 0x54,
-0x00, 0x4D, 0x56, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x4D, 0x56, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8F, 0xAF, 0xDA, 0x01, 0x82, 0xCF,
+0x70, 0x00, 0x00, 0x00, 0x00,
/* Indian/Mauritius */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -15892,7 +15914,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x04, 0x03, 0x00, 0x00, 0x35, 0xE8, 0x00, 0x00, 0x00, 0x00, 0x46, 0x50, 0x01, 0x04, 0x00, 0x00,
0x38, 0x40, 0x00, 0x09, 0x00, 0x00, 0x46, 0x50, 0x01, 0x04, 0x00, 0x00, 0x38, 0x40, 0x00, 0x09,
0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x55, 0x53, 0x54, 0x00, 0x4D, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x10, 0xDA, 0x01, 0x6A, 0x65, 0x70, 0x00,
0x00, 0x00, 0x00,
/* Indian/Mayotte */
@@ -15900,16 +15922,16 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF3, 0xD0, 0x18,
0x01, 0x00, 0x00, 0x2A, 0x68, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x45, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x45, 0x41, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x36, 0xBD, 0x01, 0x57, 0xAD,
+0xC5, 0x00, 0x00, 0x00, 0x00,
/* Indian/Reunion */
0x50, 0x48, 0x50, 0x31, 0x01, 0x52, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xCC, 0x39, 0x80,
0x01, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x40, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x52, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x52, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6C, 0x22, 0x4A, 0x01, 0x67, 0x4B,
+0x2A, 0x00, 0x00, 0x00, 0x00,
/* Iran */
0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16479,8 +16501,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0D, 0x91, 0x05, 0xFC, 0x00,
0xDA, 0x62, 0x04, 0x38, 0x01, 0x02, 0xFF, 0xFF, 0x5F, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x5E, 0x48,
0x00, 0x04, 0xFF, 0xFF, 0x65, 0x50, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x41, 0x4D, 0x54,
-0x00, 0x57, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x57, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xC3, 0xA5, 0x00,
+0x0E, 0xDA, 0x15, 0x00, 0x00, 0x00, 0x00,
/* Pacific/Auckland */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4E, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16538,7 +16560,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0xA8, 0xC0, 0x01, 0x00, 0x00, 0x00, 0xB6, 0xD0, 0x01, 0x0A, 0x00, 0x00, 0xA8, 0xC0, 0x00,
0x00, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x00, 0x4E, 0x5A, 0x53, 0x54, 0x00, 0x4E, 0x5A, 0x4D, 0x54,
0x00, 0x4E, 0x5A, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0E, 0x6D, 0x6F,
+0x00, 0x00, 0x00, 0x53, 0xB8, 0x4A, 0x02, 0x1D, 0x54, 0xBA, 0x00, 0x00, 0x00, 0x0E, 0x6D, 0x6F,
0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73,
/* Pacific/Chatham */
@@ -16587,8 +16609,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0xAB, 0xFC,
0x00, 0x00, 0x00, 0x00, 0xC1, 0x5C, 0x01, 0x04, 0x00, 0x00, 0xB3, 0x4C, 0x00, 0x0A, 0x00, 0x00,
0xB3, 0x4C, 0x00, 0x0A, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x48, 0x41, 0x44, 0x54, 0x00, 0x43, 0x48,
-0x41, 0x53, 0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0F, 0x43, 0x68, 0x61, 0x74, 0x68, 0x61, 0x6D, 0x20,
+0x41, 0x53, 0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x2A, 0x78,
+0x00, 0x06, 0xF1, 0x58, 0x00, 0x00, 0x00, 0x0F, 0x43, 0x68, 0x61, 0x74, 0x68, 0x61, 0x6D, 0x20,
0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73,
/* Pacific/Easter */
@@ -16643,7 +16665,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x09, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x09, 0xFF,
0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x09, 0x45, 0x4D, 0x54, 0x00, 0x45,
0x41, 0x53, 0x54, 0x00, 0x45, 0x41, 0x53, 0x53, 0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01,
-0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
+0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x60, 0x5B, 0xF8, 0x00, 0x6C, 0xFF, 0xA5, 0x00, 0x00,
0x00, 0x1C, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x20,
0x26, 0x20, 0x53, 0x61, 0x6C, 0x61, 0x20, 0x79, 0x20, 0x47, 0x6F, 0x6D, 0x65, 0x7A,
@@ -16659,8 +16681,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x9D, 0xCC, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xC0, 0x01,
0x04, 0x00, 0x00, 0x9A, 0xB0, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x56, 0x55, 0x53, 0x54, 0x00,
-0x56, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x56, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x68, 0x0A, 0x02, 0x13,
+0xA4, 0x42, 0x00, 0x00, 0x00, 0x00,
/* Pacific/Enderbury */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4B, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16668,14 +16690,14 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x05, 0x12, 0x56, 0x04, 0xC0,
0x2F, 0x06, 0x8B, 0x30, 0x01, 0x02, 0xFF, 0xFF, 0x57, 0x40, 0x00, 0x00, 0xFF, 0xFF, 0x65, 0x50,
0x00, 0x00, 0x00, 0x00, 0xB6, 0xD0, 0x00, 0x00, 0x50, 0x48, 0x4F, 0x54, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0F, 0x50,
+0x00, 0x00, 0x00, 0x00, 0x84, 0xF4, 0x75, 0x00, 0x0D, 0xDC, 0x2D, 0x00, 0x00, 0x00, 0x0F, 0x50,
0x68, 0x6F, 0x65, 0x6E, 0x69, 0x78, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73,
/* Pacific/Fakaofo */
0x50, 0x48, 0x50, 0x31, 0x01, 0x54, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0xFF, 0xFF, 0x73, 0x60,
-0x00, 0x00, 0x54, 0x4B, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x54, 0x4B, 0x54, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x27, 0xDA, 0x00, 0x0E, 0x16, 0xC5,
0x00, 0x00, 0x00, 0x00,
/* Pacific/Fiji */
@@ -16685,14 +16707,14 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x36, 0x3B, 0x17, 0xE0, 0x36, 0xD7, 0xFA, 0x60, 0x38, 0x24, 0x34, 0x60, 0x38, 0xB7, 0xDC, 0x60,
0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0xA7, 0x44, 0x00, 0x00, 0x00, 0x00, 0xB6, 0xD0, 0x01,
0x04, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x46, 0x4A, 0x53, 0x54, 0x00,
-0x46, 0x4A, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x46, 0x4A, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6E, 0x11, 0x15, 0x02, 0x22,
+0xE6, 0x82, 0x00, 0x00, 0x00, 0x00,
/* Pacific/Funafuti */
0x50, 0x48, 0x50, 0x31, 0x01, 0x54, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0xA8, 0xC0,
-0x00, 0x00, 0x54, 0x56, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x54, 0x56, 0x54, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xE9, 0x12, 0x02, 0x24, 0x1F, 0x02,
0x00, 0x00, 0x00, 0x00,
/* Pacific/Galapagos */
@@ -16701,8 +16723,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0D, 0xB6, 0xA4, 0x4C, 0x80,
0x1E, 0x18, 0xC4, 0x50, 0x01, 0x02, 0xFF, 0xFF, 0xAC, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0,
0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x43, 0x54, 0x00,
-0x47, 0x41, 0x4C, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x11, 0x47, 0x61, 0x6C, 0x61, 0x70, 0x61, 0x67, 0x6F, 0x73,
+0x47, 0x41, 0x4C, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8A, 0xB3, 0xD0, 0x00,
+0x8B, 0xC5, 0x40, 0x00, 0x00, 0x00, 0x11, 0x47, 0x61, 0x6C, 0x61, 0x70, 0x61, 0x67, 0x6F, 0x73,
0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73,
/* Pacific/Gambier */
@@ -16710,8 +16732,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0x94, 0x50, 0x48, 0x04,
0x01, 0xFF, 0xFF, 0x81, 0x7C, 0x00, 0x00, 0xFF, 0xFF, 0x81, 0x70, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x47, 0x41, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x0F, 0x47, 0x61, 0x6D, 0x62, 0x69, 0x65, 0x72, 0x20, 0x49, 0x73,
+0x00, 0x47, 0x41, 0x4D, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x6F, 0xF5, 0x00, 0x47,
+0xA3, 0xD7, 0x00, 0x00, 0x00, 0x0F, 0x47, 0x61, 0x6D, 0x62, 0x69, 0x65, 0x72, 0x20, 0x49, 0x73,
0x6C, 0x61, 0x6E, 0x64, 0x73,
/* Pacific/Guadalcanal */
@@ -16719,16 +16741,16 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x94, 0x4F, 0x33, 0x8C,
0x01, 0x00, 0x00, 0x95, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xB0, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x53, 0x42, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x53, 0x42, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x68, 0xF5, 0x02, 0x07, 0x1A,
+0xA0, 0x00, 0x00, 0x00, 0x00,
/* Pacific/Guam */
0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0x3A, 0x43, 0x5E, 0x60,
0x01, 0x00, 0x00, 0x8C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x8C, 0xA0, 0x00, 0x04, 0x47, 0x53, 0x54,
-0x00, 0x43, 0x68, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x43, 0x68, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9D, 0xE0, 0xAA, 0x01, 0xEF,
+0x87, 0x78, 0x00, 0x00, 0x00, 0x00,
/* Pacific/Honolulu */
0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16739,14 +16761,14 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x04, 0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x08, 0xFF, 0xFF, 0x7A, 0x68,
0x01, 0x0C, 0xFF, 0xFF, 0x73, 0x60, 0x00, 0x00, 0x48, 0x53, 0x54, 0x00, 0x48, 0x44, 0x54, 0x00,
0x48, 0x57, 0x54, 0x00, 0x48, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x06, 0x48, 0x61,
+0x01, 0x00, 0x00, 0xA9, 0xD7, 0x46, 0x00, 0x24, 0x67, 0xA9, 0x00, 0x00, 0x00, 0x06, 0x48, 0x61,
0x77, 0x61, 0x69, 0x69,
/* Pacific/Johnston */
0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0xFF, 0xFF, 0x73, 0x60,
-0x00, 0x00, 0x48, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x48, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0xA2, 0xE3, 0x38, 0x00, 0x11, 0x92, 0xB2,
0x00, 0x00, 0x00, 0x0E, 0x4A, 0x6F, 0x68, 0x6E, 0x73, 0x74, 0x6F, 0x6E, 0x20, 0x41, 0x74, 0x6F,
0x6C, 0x6C,
@@ -16756,7 +16778,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x05, 0x12, 0x55, 0xF2, 0x00,
0x2F, 0x06, 0x7D, 0x20, 0x01, 0x02, 0xFF, 0xFF, 0x6A, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x73, 0x60,
0x00, 0x00, 0x00, 0x00, 0xC4, 0xE0, 0x00, 0x00, 0x4C, 0x49, 0x4E, 0x54, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0C, 0x4C,
+0x00, 0x00, 0x00, 0x00, 0x8C, 0x2D, 0x6A, 0x00, 0x23, 0x9A, 0x95, 0x00, 0x00, 0x00, 0x0C, 0x4C,
0x69, 0x6E, 0x65, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73,
/* Pacific/Kosrae */
@@ -16764,8 +16786,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x05, 0xFF, 0x86, 0x1B, 0x50,
0x36, 0x8B, 0x67, 0x40, 0x01, 0x00, 0x00, 0x00, 0x9A, 0xB0, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xC0,
-0x00, 0x00, 0x4B, 0x4F, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01,
-0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x06, 0x4B, 0x6F, 0x73, 0x72, 0x61, 0x65,
+0x00, 0x00, 0x4B, 0x4F, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x91, 0x71, 0x12, 0x02,
+0x0B, 0x59, 0xDD, 0x00, 0x00, 0x00, 0x06, 0x4B, 0x6F, 0x73, 0x72, 0x61, 0x65,
/* Pacific/Kwajalein */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16773,7 +16795,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x09, 0xFF, 0x86, 0x1B, 0x50,
0x2C, 0x74, 0xBC, 0xC0, 0x01, 0x02, 0x00, 0x00, 0x9A, 0xB0, 0x00, 0x00, 0xFF, 0xFF, 0x57, 0x40,
0x00, 0x04, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x00, 0x4D, 0x48, 0x54, 0x00, 0x4B, 0x57, 0x41, 0x54,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x97, 0x30, 0x6D, 0x02, 0x11, 0xFD, 0x15, 0x00,
0x00, 0x00, 0x09, 0x4B, 0x77, 0x61, 0x6A, 0x61, 0x6C, 0x65, 0x69, 0x6E,
/* Pacific/Majuro */
@@ -16781,7 +16803,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0xFF, 0x86, 0x1B, 0x50,
0x01, 0x00, 0x00, 0x9A, 0xB0, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x00, 0x4D, 0x48, 0x54,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x94, 0x3D, 0x38, 0x02, 0x17, 0xE3, 0x80, 0x00, 0x00, 0x00,
0x0E, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73,
/* Pacific/Marquesas */
@@ -16789,8 +16811,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0x94, 0x50, 0x4C, 0x48,
0x01, 0xFF, 0xFF, 0x7D, 0x38, 0x00, 0x00, 0xFF, 0xFF, 0x7A, 0x68, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x4D, 0x41, 0x52, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x11, 0x4D, 0x61, 0x72, 0x71, 0x75, 0x65, 0x73, 0x61, 0x73, 0x20,
+0x00, 0x4D, 0x41, 0x52, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7B, 0x98, 0xA0, 0x00, 0x3F,
+0x52, 0xF0, 0x00, 0x00, 0x00, 0x11, 0x4D, 0x61, 0x72, 0x71, 0x75, 0x65, 0x73, 0x61, 0x73, 0x20,
0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73,
/* Pacific/Midway */
@@ -16801,7 +16823,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xFF, 0x65, 0x50, 0x00, 0x00, 0xFF, 0xFF, 0x73, 0x60, 0x01, 0x04, 0xFF, 0xFF, 0x65, 0x50,
0x00, 0x08, 0xFF, 0xFF, 0x65, 0x50, 0x00, 0x0C, 0x4E, 0x53, 0x54, 0x00, 0x4E, 0x44, 0x54, 0x00,
0x42, 0x53, 0x54, 0x00, 0x53, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x0E, 0x4D, 0x69, 0x64, 0x77,
+0x00, 0xB4, 0x62, 0x62, 0x00, 0x05, 0x23, 0x1A, 0x00, 0x00, 0x00, 0x0E, 0x4D, 0x69, 0x64, 0x77,
0x61, 0x79, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73,
/* Pacific/Nauru */
@@ -16811,8 +16833,8 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xCB, 0xB4, 0xBF, 0x48, 0xD0, 0x42, 0x50, 0x70, 0x11, 0x8B, 0x04, 0xC8, 0x01, 0x02, 0x01, 0x03,
0x00, 0x00, 0x9C, 0x7C, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xB8, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90,
0x00, 0x08, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4E, 0x52, 0x54, 0x00,
-0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40,
-0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8A, 0x1E, 0x12,
+0x02, 0x11, 0x5A, 0x52, 0x00, 0x00, 0x00, 0x00,
/* Pacific/Niue */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4E, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16820,15 +16842,15 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0xDC, 0x43, 0x35, 0x60,
0x10, 0x74, 0xCA, 0x38, 0x01, 0x02, 0xFF, 0xFF, 0x60, 0xA0, 0x00, 0x00, 0xFF, 0xFF, 0x5E, 0x48,
0x00, 0x00, 0xFF, 0xFF, 0x65, 0x50, 0x00, 0x00, 0x4E, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x6C, 0x5C, 0xE2, 0x00, 0x12, 0x2E, 0xF2, 0x00, 0x00, 0x00, 0x00,
/* Pacific/Norfolk */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4E, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0xDC, 0x41, 0xF8, 0x80,
0x01, 0x00, 0x00, 0x9D, 0x80, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xB8, 0x00, 0x04, 0x4E, 0x4D, 0x54,
-0x00, 0x4E, 0x46, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x4E, 0x46, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0x27, 0xA8, 0x02, 0x12, 0xF4,
+0x7A, 0x00, 0x00, 0x00, 0x00,
/* Pacific/Noumea */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4E, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16839,7 +16861,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x9C, 0x0C, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xC0, 0x01, 0x04, 0x00, 0x00, 0x9A, 0xB0, 0x00,
0x09, 0x00, 0x00, 0xA8, 0xC0, 0x01, 0x04, 0x00, 0x00, 0x9A, 0xB0, 0x00, 0x09, 0x4C, 0x4D, 0x54,
0x00, 0x4E, 0x43, 0x53, 0x54, 0x00, 0x4E, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x2A, 0xAA, 0x02, 0x10, 0xA4, 0x08, 0x00, 0x00, 0x00, 0x00,
/* Pacific/Pago_Pago */
@@ -16850,14 +16872,14 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0xFF, 0xFF, 0x5F, 0xF8, 0x00, 0x00, 0xFF, 0xFF, 0x5E, 0x48, 0x00, 0x04, 0xFF, 0xFF, 0x65, 0x50,
0x00, 0x09, 0xFF, 0xFF, 0x65, 0x50, 0x00, 0x0D, 0xFF, 0xFF, 0x65, 0x50, 0x00, 0x11, 0x4C, 0x4D,
0x54, 0x00, 0x53, 0x41, 0x4D, 0x54, 0x00, 0x4E, 0x53, 0x54, 0x00, 0x42, 0x53, 0x54, 0x00, 0x53,
-0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54,
-0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x5F,
+0xAA, 0x00, 0x10, 0x53, 0xAF, 0x00, 0x00, 0x00, 0x00,
/* Pacific/Palau */
0x50, 0x48, 0x50, 0x31, 0x01, 0x50, 0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90,
-0x00, 0x00, 0x50, 0x57, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x50, 0x57, 0x54, 0x00, 0x00, 0x00, 0x00, 0x94, 0x84, 0xD5, 0x01, 0xDF, 0xDD, 0x0D,
0x00, 0x00, 0x00, 0x00,
/* Pacific/Pitcairn */
@@ -16865,22 +16887,22 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x35, 0x44, 0x42, 0x08,
0x01, 0xFF, 0xFF, 0x88, 0x78, 0x00, 0x00, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x04, 0x50, 0x4E, 0x54,
-0x00, 0x50, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x50, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x48, 0xAA, 0x00, 0x4C, 0x6B,
+0xCD, 0x00, 0x00, 0x00, 0x00,
/* Pacific/Ponape */
0x50, 0x48, 0x50, 0x31, 0x01, 0x46, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x9A, 0xB0,
-0x00, 0x00, 0x50, 0x4F, 0x4E, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x10, 0x50, 0x6F, 0x6E, 0x61, 0x70, 0x65, 0x20, 0x28, 0x50, 0x6F, 0x68,
+0x00, 0x00, 0x50, 0x4F, 0x4E, 0x54, 0x00, 0x00, 0x00, 0x00, 0x93, 0xF5, 0x9A, 0x02, 0x04, 0x13,
+0xE2, 0x00, 0x00, 0x00, 0x10, 0x50, 0x6F, 0x6E, 0x61, 0x70, 0x65, 0x20, 0x28, 0x50, 0x6F, 0x68,
0x6E, 0x70, 0x65, 0x69, 0x29,
/* Pacific/Port_Moresby */
0x50, 0x48, 0x50, 0x31, 0x01, 0x50, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x8C, 0xA0,
-0x00, 0x00, 0x50, 0x47, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x50, 0x47, 0x54, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x5B, 0xF0, 0x01, 0xF3, 0x37, 0x7A,
0x00, 0x00, 0x00, 0x00,
/* Pacific/Rarotonga */
@@ -16897,7 +16919,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF,
0x6C, 0x58, 0x00, 0x00, 0xFF, 0xFF, 0x73, 0x60, 0x00, 0x00, 0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x04,
0x43, 0x4B, 0x54, 0x00, 0x43, 0x4B, 0x48, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x69, 0xA4, 0x45, 0x00, 0x21, 0x36, 0x9A, 0x00, 0x00, 0x00, 0x00,
/* Pacific/Saipan */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16905,7 +16927,7 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x09, 0xFF, 0x86, 0x37, 0x70,
0x3A, 0x43, 0x5E, 0x60, 0x01, 0x02, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x8C, 0xA0,
0x00, 0x00, 0x00, 0x00, 0x8C, 0xA0, 0x00, 0x04, 0x4D, 0x50, 0x54, 0x00, 0x43, 0x68, 0x53, 0x54,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x85, 0xC0, 0x01, 0xF1, 0x0E, 0x18, 0x00,
0x00, 0x00, 0x00,
/* Pacific/Samoa */
@@ -16924,16 +16946,16 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0x94, 0x50, 0x55, 0xB8,
0x01, 0xFF, 0xFF, 0x73, 0xC8, 0x00, 0x00, 0xFF, 0xFF, 0x73, 0x60, 0x00, 0x04, 0x4C, 0x4D, 0x54,
-0x00, 0x54, 0x41, 0x48, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12,
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x0F, 0x53, 0x6F, 0x63, 0x69, 0x65, 0x74, 0x79, 0x20, 0x49, 0x73,
+0x00, 0x54, 0x41, 0x48, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x33, 0xF5, 0x00, 0x30,
+0x2A, 0xBA, 0x00, 0x00, 0x00, 0x0F, 0x53, 0x6F, 0x63, 0x69, 0x65, 0x74, 0x79, 0x20, 0x49, 0x73,
0x6C, 0x61, 0x6E, 0x64, 0x73,
/* Pacific/Tarawa */
0x50, 0x48, 0x50, 0x31, 0x01, 0x4B, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0xA8, 0xC0,
-0x00, 0x00, 0x47, 0x49, 0x4C, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x0F, 0x47, 0x69, 0x6C, 0x62, 0x65, 0x72, 0x74, 0x20, 0x49, 0x73, 0x6C,
+0x00, 0x00, 0x47, 0x49, 0x4C, 0x54, 0x00, 0x00, 0x00, 0x00, 0x8B, 0x7D, 0xA2, 0x02, 0x1A, 0xA2,
+0xA0, 0x00, 0x00, 0x00, 0x0F, 0x47, 0x69, 0x6C, 0x62, 0x65, 0x72, 0x74, 0x20, 0x49, 0x73, 0x6C,
0x61, 0x6E, 0x64, 0x73,
/* Pacific/Tongatapu */
@@ -16945,29 +16967,29 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0xAD, 0x70, 0x00, 0x00, 0x00, 0x00, 0xB6, 0xD0, 0x00, 0x00, 0x00, 0x00, 0xC4, 0xE0, 0x01,
0x04, 0x00, 0x00, 0xB6, 0xD0, 0x00, 0x00, 0x00, 0x00, 0xC4, 0xE0, 0x01, 0x04, 0x54, 0x4F, 0x54,
0x00, 0x54, 0x4F, 0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x69, 0x8A, 0x3A, 0x00, 0x07, 0xE2, 0x3A, 0x00, 0x00, 0x00, 0x00,
/* Pacific/Truk */
0x50, 0x48, 0x50, 0x31, 0x01, 0x46, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x8C, 0xA0,
-0x00, 0x00, 0x54, 0x52, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x14, 0x54, 0x72, 0x75, 0x6B, 0x20, 0x28, 0x43, 0x68, 0x75, 0x75, 0x6B,
+0x00, 0x00, 0x54, 0x52, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x94, 0xA5, 0x62, 0x01, 0xFA, 0x42,
+0xDD, 0x00, 0x00, 0x00, 0x14, 0x54, 0x72, 0x75, 0x6B, 0x20, 0x28, 0x43, 0x68, 0x75, 0x75, 0x6B,
0x29, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x59, 0x61, 0x70,
/* Pacific/Wake */
0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0xA8, 0xC0,
-0x00, 0x00, 0x57, 0x41, 0x4B, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8,
-0x80, 0x00, 0x00, 0x00, 0x0B, 0x57, 0x61, 0x6B, 0x65, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64,
+0x00, 0x00, 0x57, 0x41, 0x4B, 0x54, 0x00, 0x00, 0x00, 0x00, 0xA6, 0xC0, 0xCD, 0x02, 0x10, 0xE5,
+0x22, 0x00, 0x00, 0x00, 0x0B, 0x57, 0x61, 0x6B, 0x65, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64,
/* Pacific/Wallis */
0x50, 0x48, 0x50, 0x31, 0x01, 0x57, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0xA8, 0xC0,
-0x00, 0x00, 0x57, 0x46, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
+0x00, 0x00, 0x57, 0x46, 0x54, 0x00, 0x00, 0x00, 0x00, 0x75, 0xF3, 0x50, 0x00, 0x06, 0x5B, 0x9A,
0x00, 0x00, 0x00, 0x00,
/* Pacific/Yap */
@@ -18091,4 +18113,4 @@ const unsigned char timelib_timezone_db_data_builtin[257587] = {
0x00, 0x00, 0x55, 0x54, 0x43, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
0x00, 0x00, 0x00, 0x00, };
-const timelib_tzdb timezonedb_builtin = { "2009.3", 560, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
+const timelib_tzdb timezonedb_builtin = { "2009.10", 560, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
diff --git a/ext/date/lib/tm2unixtime.c b/ext/date/lib/tm2unixtime.c
index bd882b6..77ca091 100644
--- a/ext/date/lib/tm2unixtime.c
+++ b/ext/date/lib/tm2unixtime.c
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tm2unixtime.c,v 1.13.2.3.2.2.2.12 2008/12/31 11:15:35 sebastian Exp $ */
+/* $Id: tm2unixtime.c,v 1.13.2.3.2.2.2.13 2009/05/03 18:22:40 derick Exp $ */
#include "timelib.h"
@@ -31,20 +31,12 @@ static int days_in_month[13] = { 31, 31, 28, 31, 30, 31, 30, 31, 3
static int do_range_limit(timelib_sll start, timelib_sll end, timelib_sll adj, timelib_sll *a, timelib_sll *b)
{
if (*a < start) {
- *a += adj;
- (*b)--;
- return 1;
+ *b -= (start - *a - 1) / adj + 1;
+ *a += adj * ((start - *a - 1) / adj + 1);
}
if (*a >= end) {
- if (start == 0) {
- (*b) += (*a / end);
- (*a) -= (end * (*a / end));
- return 0;
- }
-
- *a -= adj;
- (*b)++;
- return 1;
+ *b += *a / adj;
+ *a -= adj * (*a / adj);
}
return 0;
}
@@ -90,6 +82,12 @@ static int do_range_limit_days(timelib_sll *y, timelib_sll *m, timelib_sll *d)
timelib_sll days_this_month;
timelib_sll last_month, last_year;
timelib_sll days_last_month;
+
+ /* can jump an entire leap year period quickly */
+ if (*d >= DAYS_PER_LYEAR_PERIOD || *d <= -DAYS_PER_LYEAR_PERIOD) {
+ *y += YEARS_PER_LYEAR_PERIOD * (*d / DAYS_PER_LYEAR_PERIOD);
+ *d -= DAYS_PER_LYEAR_PERIOD * (*d / DAYS_PER_LYEAR_PERIOD);
+ }
do_range_limit(1, 13, 12, m, y);
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 8756681..b561811 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.65 2009/01/27 13:48:10 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.79 2009/06/17 17:56:17 bjori Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -31,6 +31,14 @@
#include "lib/timelib.h"
#include <time.h>
+#ifdef PHP_WIN32
+# include "win32/php_stdint.h"
+#endif
+
+#if defined(__GNUC__) && __GNUC__ < 3
+static __inline __int64_t llabs( __int64_t i ) { return i >= 0 ? i : -i; }
+#endif
+
/* {{{ arginfo */
ZEND_BEGIN_ARG_INFO_EX(arginfo_date, 0, 0, 1)
ZEND_ARG_INFO(0, format)
@@ -328,15 +336,20 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_timezone_abbreviations_list, 0)
ZEND_END_ARG_INFO()
+ZEND_BEGIN_ARG_INFO(arginfo_timezone_version_get, 0)
+ZEND_END_ARG_INFO()
+
ZEND_BEGIN_ARG_INFO_EX(arginfo_date_interval_create_from_date_string, 0, 0, 1)
ZEND_ARG_INFO(0, time)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO_EX(arginfo_date_interval_format, 0, 0, 1)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_date_interval_format, 0, 0, 2)
ZEND_ARG_INFO(0, object)
+ ZEND_ARG_INFO(0, format)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_date_method_interval_format, 0)
+ ZEND_ARG_INFO(0, format)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_date_period_construct, 0, 0, 3)
@@ -398,6 +411,7 @@ const zend_function_entry date_functions[] = {
PHP_FE(timezone_location_get, arginfo_timezone_location_get)
PHP_FE(timezone_identifiers_list, arginfo_timezone_identifiers_list)
PHP_FE(timezone_abbreviations_list, arginfo_timezone_abbreviations_list)
+ PHP_FE(timezone_version_get, arginfo_timezone_version_get)
PHP_FE(date_interval_create_from_date_string, arginfo_date_interval_create_from_date_string)
PHP_FE(date_interval_format, arginfo_date_interval_format)
@@ -428,7 +442,7 @@ const zend_function_entry date_funcs_date[] = {
PHP_ME_MAPPING(getOffset, date_offset_get, arginfo_date_method_offset_get, 0)
PHP_ME_MAPPING(setTime, date_time_set, arginfo_date_method_time_set, 0)
PHP_ME_MAPPING(setDate, date_date_set, arginfo_date_method_date_set, 0)
- PHP_ME_MAPPING(setISODate, date_isodate_set, arginfo_date_isodate_set, 0)
+ PHP_ME_MAPPING(setISODate, date_isodate_set, arginfo_date_method_isodate_set, 0)
PHP_ME_MAPPING(setTimestamp, date_timestamp_set, arginfo_date_method_timestamp_set, 0)
PHP_ME_MAPPING(getTimestamp, date_timestamp_get, arginfo_date_method_timestamp_get, 0)
PHP_ME_MAPPING(diff, date_diff, arginfo_date_method_diff, 0)
@@ -548,21 +562,16 @@ static zend_object_value date_object_clone_period(zval *this_ptr TSRMLS_DC);
static int date_object_compare_date(zval *d1, zval *d2 TSRMLS_DC);
static HashTable *date_object_get_properties(zval *object TSRMLS_DC);
+static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC);
zval *date_interval_read_property(zval *object, zval *member, int type TSRMLS_DC);
void date_interval_write_property(zval *object, zval *member, zval *value TSRMLS_DC);
-/* This is need to ensure that session extension request shutdown occurs 1st, because it uses the date extension */
-static const zend_module_dep date_deps[] = {
- ZEND_MOD_OPTIONAL("session")
- {NULL, NULL, NULL}
-};
-
/* {{{ Module struct */
zend_module_entry date_module_entry = {
STANDARD_MODULE_HEADER_EX,
NULL,
- date_deps,
+ NULL,
"date", /* extension name */
date_functions, /* function list */
PHP_MINIT(date), /* process startup */
@@ -585,6 +594,7 @@ static PHP_GINIT_FUNCTION(date)
{
date_globals->default_timezone = NULL;
date_globals->timezone = NULL;
+ date_globals->tzcache = NULL;
}
/* }}} */
@@ -603,7 +613,7 @@ PHP_RINIT_FUNCTION(date)
efree(DATEG(timezone));
}
DATEG(timezone) = NULL;
- zend_hash_init(&DATEG(tzcache), 4, NULL, _php_date_tzinfo_dtor, 0);
+ DATEG(tzcache) = NULL;
return SUCCESS;
}
@@ -616,8 +626,11 @@ PHP_RSHUTDOWN_FUNCTION(date)
efree(DATEG(timezone));
}
DATEG(timezone) = NULL;
- zend_hash_destroy(&DATEG(tzcache));
-
+ if(DATEG(tzcache)) {
+ zend_hash_destroy(DATEG(tzcache));
+ FREE_HASHTABLE(DATEG(tzcache));
+ DATEG(tzcache) = NULL;
+ }
return SUCCESS;
}
/* }}} */
@@ -799,13 +812,18 @@ static timelib_tzinfo *php_date_parse_tzfile(char *formal_tzname, const timelib_
{
timelib_tzinfo *tzi, **ptzi;
- if (zend_hash_find(&DATEG(tzcache), formal_tzname, strlen(formal_tzname) + 1, (void **) &ptzi) == SUCCESS) {
+ if(!DATEG(tzcache)) {
+ ALLOC_HASHTABLE(DATEG(tzcache));
+ zend_hash_init(DATEG(tzcache), 4, NULL, _php_date_tzinfo_dtor, 0);
+ }
+
+ if (zend_hash_find(DATEG(tzcache), formal_tzname, strlen(formal_tzname) + 1, (void **) &ptzi) == SUCCESS) {
return *ptzi;
}
tzi = timelib_parse_tzfile(formal_tzname, tzdb);
if (tzi) {
- zend_hash_add(&DATEG(tzcache), formal_tzname, strlen(formal_tzname) + 1, (void *) &tzi, sizeof(timelib_tzinfo*), NULL);
+ zend_hash_add(DATEG(tzcache), formal_tzname, strlen(formal_tzname) + 1, (void *) &tzi, sizeof(timelib_tzinfo*), NULL);
}
return tzi;
}
@@ -901,7 +919,7 @@ PHPAPI timelib_tzinfo *get_timezone_info(TSRMLS_D)
{
char *tz;
timelib_tzinfo *tzi;
-
+
tz = guess_timezone(DATE_TIMEZONEDB TSRMLS_CC);
tzi = php_date_parse_tzfile(tz, DATE_TIMEZONEDB TSRMLS_CC);
if (! tzi) {
@@ -1032,7 +1050,7 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca
/* year */
case 'L': length = slprintf(buffer, 32, "%d", timelib_is_leap((int) t->y)); break;
case 'y': length = slprintf(buffer, 32, "%02d", (int) t->y % 100); break;
- case 'Y': length = slprintf(buffer, 32, "%s%04d", t->y < 0 ? "-" : "", abs((int) t->y)); break;
+ case 'Y': length = slprintf(buffer, 32, "%s%04ld", t->y < 0 ? "-" : "", llabs((timelib_sll) t->y)); break;
/* time */
case 'a': length = slprintf(buffer, 32, "%s", t->h >= 12 ? "pm" : "am"); break;
@@ -1951,6 +1969,7 @@ static void date_register_classes(TSRMLS_D)
date_object_handlers_interval.clone_obj = date_object_clone_interval;
date_object_handlers_interval.read_property = date_interval_read_property;
date_object_handlers_interval.write_property = date_interval_write_property;
+ date_object_handlers_interval.get_properties = date_object_get_properties_interval;
INIT_CLASS_ENTRY(ce_period, "DatePeriod", date_funcs_period);
ce_period.create_object = date_object_new_period;
@@ -2178,6 +2197,34 @@ static zend_object_value date_object_clone_interval(zval *this_ptr TSRMLS_DC)
return new_ov;
}
+static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC)
+{
+ HashTable *props;
+ zval *zv;
+ php_interval_obj *intervalobj;
+
+
+ intervalobj = (php_interval_obj *) zend_object_store_get_object(object TSRMLS_CC);
+
+ props = intervalobj->std.properties;
+
+#define PHP_DATE_INTERVAL_ADD_PROPERTY(n,f) \
+ MAKE_STD_ZVAL(zv); \
+ ZVAL_LONG(zv, intervalobj->diff->f); \
+ zend_hash_update(props, n, strlen(n) + 1, &zv, sizeof(zval), NULL);
+
+ PHP_DATE_INTERVAL_ADD_PROPERTY("y", y);
+ PHP_DATE_INTERVAL_ADD_PROPERTY("m", m);
+ PHP_DATE_INTERVAL_ADD_PROPERTY("d", d);
+ PHP_DATE_INTERVAL_ADD_PROPERTY("h", h);
+ PHP_DATE_INTERVAL_ADD_PROPERTY("i", i);
+ PHP_DATE_INTERVAL_ADD_PROPERTY("s", s);
+ PHP_DATE_INTERVAL_ADD_PROPERTY("invert", invert);
+ PHP_DATE_INTERVAL_ADD_PROPERTY("days", days);
+
+ return props;
+}
+
static inline zend_object_value date_object_new_period_ex(zend_class_entry *class_type, php_period_obj **ptr TSRMLS_DC)
{
php_period_obj *intern;
@@ -2268,10 +2315,6 @@ static void date_object_free_storage_period(void *object TSRMLS_DC)
/* Advanced Interface */
static zval * date_instantiate(zend_class_entry *pce, zval *object TSRMLS_DC)
{
- if (!object) {
- ALLOC_ZVAL(object);
- }
-
Z_TYPE_P(object) = IS_OBJECT;
object_init_ex(object, pce);
Z_SET_REFCOUNT_P(object, 1);
@@ -2461,12 +2504,14 @@ static int php_date_initialize_from_hash(zval **return_value, php_date_obj **dat
tzi = php_date_parse_tzfile(Z_STRVAL_PP(z_timezone), DATE_TIMEZONEDB TSRMLS_CC);
+ ALLOC_INIT_ZVAL(tmp_obj);
tzobj = zend_object_store_get_object(date_instantiate(date_ce_timezone, tmp_obj TSRMLS_CC) TSRMLS_CC);
tzobj->type = TIMELIB_ZONETYPE_ID;
tzobj->tzi.tz = tzi;
tzobj->initialized = 1;
date_initialize(*dateobj, Z_STRVAL_PP(z_date), Z_STRLEN_PP(z_date), NULL, tmp_obj, 0 TSRMLS_CC);
+ zval_ptr_dtor(&tmp_obj);
return 1;
}
}
@@ -2680,7 +2725,7 @@ PHP_FUNCTION(date_format)
}
/* }}} */
-/* {{{ proto void date_modify(DateTime object, string modify)
+/* {{{ proto DateTime date_modify(DateTime object, string modify)
Alters the timestamp.
*/
PHP_FUNCTION(date_modify)
@@ -2711,7 +2756,7 @@ PHP_FUNCTION(date_modify)
}
/* }}} */
-/* {{{ proto void date_add(DateTime object, DateInterval interval)
+/* {{{ proto DateTime date_add(DateTime object, DateInterval interval)
Adds an interval to the current date in object.
*/
PHP_FUNCTION(date_add)
@@ -2756,7 +2801,7 @@ PHP_FUNCTION(date_add)
}
/* }}} */
-/* {{{ proto void date_sub(DateTime object, DateInterval interval)
+/* {{{ proto DateTime date_sub(DateTime object, DateInterval interval)
Subtracts an interval to the current date in object.
*/
PHP_FUNCTION(date_sub)
@@ -2834,7 +2879,7 @@ PHP_FUNCTION(date_timezone_get)
}
/* }}} */
-/* {{{ proto void date_timezone_set(DateTime object, DateTimeZone object)
+/* {{{ proto DateTime date_timezone_set(DateTime object, DateTimeZone object)
Sets the timezone for the DateTime object.
*/
PHP_FUNCTION(date_timezone_set)
@@ -2896,7 +2941,7 @@ PHP_FUNCTION(date_offset_get)
}
/* }}} */
-/* {{{ proto void date_time_set(DateTime object, long hour, long minute[, long second])
+/* {{{ proto DateTime date_time_set(DateTime object, long hour, long minute[, long second])
Sets the time.
*/
PHP_FUNCTION(date_time_set)
@@ -2919,7 +2964,7 @@ PHP_FUNCTION(date_time_set)
}
/* }}} */
-/* {{{ proto void date_date_set(DateTime object, long year, long month, long day)
+/* {{{ proto DateTime date_date_set(DateTime object, long year, long month, long day)
Sets the date.
*/
PHP_FUNCTION(date_date_set)
@@ -2942,7 +2987,7 @@ PHP_FUNCTION(date_date_set)
}
/* }}} */
-/* {{{ proto void date_isodate_set(DateTime object, long year, long week[, long day])
+/* {{{ proto DateTime date_isodate_set(DateTime object, long year, long week[, long day])
Sets the ISO date.
*/
PHP_FUNCTION(date_isodate_set)
@@ -2968,7 +3013,7 @@ PHP_FUNCTION(date_isodate_set)
}
/* }}} */
-/* {{{ proto void date_timestamp_set(DateTime object, long unixTimestamp)
+/* {{{ proto DateTime date_timestamp_set(DateTime object, long unixTimestamp)
Sets the date and time based on an Unix timestamp.
*/
PHP_FUNCTION(date_timestamp_set)
@@ -3540,7 +3585,7 @@ static char *date_interval_format(char *format, int format_len, timelib_rel_time
}
/* }}} */
-/* {{{ proto string date_interval_format(DateInterval object)
+/* {{{ proto string date_interval_format(DateInterval object, string format)
Formats the interval.
*/
PHP_FUNCTION(date_interval_format)
@@ -3732,6 +3777,18 @@ PHP_FUNCTION(timezone_identifiers_list)
}
/* }}} */
+/* {{{ proto array timezone_version_get()
+ Returns the Olson database version number.
+*/
+PHP_FUNCTION(timezone_version_get)
+{
+ const timelib_tzdb *tzdb;
+
+ tzdb = DATE_TIMEZONEDB;
+ RETURN_STRING(tzdb->version, 1);
+}
+/* }}} */
+
/* {{{ proto array timezone_abbreviations_list()
Returns associative array containing dst, offset and the timezone name
*/
diff --git a/ext/date/php_date.h b/ext/date/php_date.h
index 185b784..e55e68a 100644
--- a/ext/date/php_date.h
+++ b/ext/date/php_date.h
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.h,v 1.17.2.11.2.3.2.11 2008/12/31 11:15:35 sebastian Exp $ */
+/* $Id: php_date.h,v 1.17.2.11.2.3.2.13 2009/05/31 21:28:38 stas Exp $ */
#ifndef PHP_DATE_H
#define PHP_DATE_H
@@ -79,6 +79,7 @@ PHP_FUNCTION(timezone_transitions_get);
PHP_FUNCTION(timezone_location_get);
PHP_FUNCTION(timezone_identifiers_list);
PHP_FUNCTION(timezone_abbreviations_list);
+PHP_FUNCTION(timezone_version_get);
PHP_METHOD(DateInterval, __construct);
PHP_FUNCTION(date_interval_format);
@@ -148,7 +149,7 @@ struct _php_period_obj {
ZEND_BEGIN_MODULE_GLOBALS(date)
char *default_timezone;
char *timezone;
- HashTable tzcache;
+ HashTable *tzcache;
timelib_error_container *last_errors;
ZEND_END_MODULE_GLOBALS(date)
diff --git a/ext/date/tests/002.phpt b/ext/date/tests/002.phpt
index 7384b74..92d0d5f 100644
--- a/ext/date/tests/002.phpt
+++ b/ext/date/tests/002.phpt
@@ -32,16 +32,16 @@ if (!@putenv("TZ=EST5") || getenv("TZ") != 'EST5') {
);
echo "*** GMT0\n";
- putenv ("TZ=GMT0");
+ date_default_timezone_set("GMT0");
foreach ($dates as $date) {
echo date ("Y-m-d H:i:s\n", strtotime ($date));
}
echo "*** US/Eastern\n";
- putenv("TZ=US/Eastern");
+ date_default_timezone_set("US/Eastern");
if( date("T") == "GMT" ) {
// POSIX style
- putenv ("TZ=EST5EDT4,M4.1.0,M10.5.0");
+ date_default_timezone_set("EST5EDT4,M4.1.0,M10.5.0");
}
foreach ($dates as $date) {
diff --git a/ext/date/tests/009_win32.phpt b/ext/date/tests/009_win32.phpt
index 6121f62..cbdc8b7 100644
--- a/ext/date/tests/009_win32.phpt
+++ b/ext/date/tests/009_win32.phpt
@@ -34,17 +34,17 @@ var_dump(gmstrftime("blah", $t));
echo "Done\n";
?>
--EXPECTF--
-Warning: strftime() expects at least 1 parameter, 0 given in C:\Users\pierre\Documents\php-sdk\vc9\x86\php_5_3\ext\date\tests\009_win32.php on line 5
+Warning: strftime() expects at least 1 parameter, 0 given in %s on line %d
bool(false)
bool(false)
-string(147) "Tue Tuesday Jun June 06/27/06 00:00:00 27 00 12 178 06 00 AM 00 26 26 2 06/27/06 00:00:00 06 2006 W. Europe Daylight Time W. Europe Daylight Time %"
+string(%d) "Tue Tuesday Jun June 06/27/06 00:00:00 27 00 12 178 06 00 AM 00 26 26 2 06/27/06 00:00:00 06 2006 %s"
string(5) "%q %a"
string(4) "blah"
-Warning: gmstrftime() expects at least 1 parameter, 0 given in C:\Users\pierre\Documents\php-sdk\vc9\x86\php_5_3\ext\date\tests\009_win32.php on line 15
+Warning: gmstrftime() expects at least 1 parameter, 0 given in %s on line %d
bool(false)
bool(false)
-string(146) "Mon Monday Jun June 06/26/06 21:00:00 26 21 09 177 06 00 PM 00 26 26 1 06/26/06 21:00:00 06 2006 W. Europe Standard Time W. Europe Standard Time %"
+string(%d) "Mon Monday Jun June 06/26/06 21:00:00 26 21 09 177 06 00 PM 00 26 26 1 06/26/06 21:00:00 06 2006 %s"
string(5) "%q %a"
string(4) "blah"
Done
diff --git a/ext/date/tests/DateTimeZone_getOffset_basic1.phpt b/ext/date/tests/DateTimeZone_getOffset_basic1.phpt
index 46c0e6a..ea3c280 100644
--- a/ext/date/tests/DateTimeZone_getOffset_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_getOffset_basic1.phpt
@@ -27,7 +27,7 @@ var_dump( $tz3->getOffset($date) );
===DONE===
--EXPECTF--
*** Testing DateTimeZone::getOffset() : basic functionality ***
-int(0)
+%rint\(0\)|int\(3600\)%r
%rint\(-18000\)|int\(-14400\)%r
%rint\(-28800\)|int\(-25200\)%r
===DONE===
\ No newline at end of file
diff --git a/ext/date/tests/bug13142.phpt b/ext/date/tests/bug13142.phpt
index 5e54263..60fc7e7 100644
--- a/ext/date/tests/bug13142.phpt
+++ b/ext/date/tests/bug13142.phpt
@@ -1,5 +1,7 @@
--TEST--
Bug #13142 (strtotime handling of "M d H:i:s Y" format)
+--INI--
+date.timezone=US/Eastern
--SKIPIF--
<?php
if (!@putenv("TZ=US/Eastern") || getenv("TZ") != 'US/Eastern') {
@@ -8,7 +10,7 @@ if (!@putenv("TZ=US/Eastern") || getenv("TZ") != 'US/Eastern') {
?>
--FILE--
<?php
-putenv("TZ=US/Eastern");
+
if (date('T') == 'GMT') {
putenv("TZ=EST5EDT4,M4.1.0,M10.5.0");
}
diff --git a/ext/date/tests/bug14561.phpt b/ext/date/tests/bug14561.phpt
index 98638c3..86a64fd 100644
--- a/ext/date/tests/bug14561.phpt
+++ b/ext/date/tests/bug14561.phpt
@@ -1,8 +1,9 @@
--TEST--
Bug #14561 (strtotime() bug)
+--INI--
+date.timezone=GMT
--FILE--
<?php
-putenv("TZ=GMT");
echo strtotime("19:30 Dec 17 2005"), "\n";
echo strtotime("Dec 17 19:30 2005"), "\n";
?>
diff --git a/ext/date/tests/bug17988.phpt b/ext/date/tests/bug17988.phpt
index 259fa7d..e758b16 100644
--- a/ext/date/tests/bug17988.phpt
+++ b/ext/date/tests/bug17988.phpt
@@ -1,8 +1,9 @@
--TEST--
Bug #17988 (strtotime handling of postgresql timestamps)
+--INI--
+date.timezone=GMT
--FILE--
<?php
-putenv("TZ=GMT");
echo gmdate('Y-m-d H:i:s', strtotime("2002-06-25 14:18:48.543728"))."\n";
echo gmdate('Y-m-d H:i:s', strtotime("2002-06-25 14:18:48.543728 GMT"))."\n";
echo gmdate('Y-m-d H:i:s', strtotime("2002-06-25 14:18:48.543728 MET"))."\n";
diff --git a/ext/date/tests/bug20382-1.phpt b/ext/date/tests/bug20382-1.phpt
index a259d93..e81ac20 100644
--- a/ext/date/tests/bug20382-1.phpt
+++ b/ext/date/tests/bug20382-1.phpt
@@ -1,8 +1,9 @@
--TEST--
Bug #20382 [1] (strtotime ("Monday", $date) produces wrong result on DST changeover)
+--INI--
+date.timezone=Europe/Amsterdam
--FILE--
<?php
- putenv("TZ=Europe/Amsterdam");
$tStamp = mktime (17, 17, 17, 10, 27, 2004);
echo "tStamp=". date("l Y-m-d H:i:s T", $tStamp). "\n";
diff --git a/ext/date/tests/bug20382-2.phpt b/ext/date/tests/bug20382-2.phpt
index 2026ed4..e1f8369 100644
--- a/ext/date/tests/bug20382-2.phpt
+++ b/ext/date/tests/bug20382-2.phpt
@@ -32,7 +32,7 @@ $tests = array(
);
foreach ($tests as $test) {
- putenv("TZ={$test[0]}");
+ date_default_timezone_set($test[0]);
print "{$test[0]}\n";
array_shift($test);
$timestamp = call_user_func_array('mktime', $test);
diff --git a/ext/date/tests/bug21399.phpt b/ext/date/tests/bug21399.phpt
index 08040be..a295c8b 100644
--- a/ext/date/tests/bug21399.phpt
+++ b/ext/date/tests/bug21399.phpt
@@ -1,8 +1,9 @@
--TEST--
Bug #21399 (strtotime() request for "YYYYMMDDhhmmss [ZZZ]")
+--INI--
+date.timezone=GMT
--FILE--
<?php
- putenv("TZ=GMT");
echo gmdate("Y-m-d H:i:s", strtotime("20050620091407 GMT"));
?>
--EXPECT--
diff --git a/ext/date/tests/bug21966.phpt b/ext/date/tests/bug21966.phpt
index 31f592f..353e7e5 100644
--- a/ext/date/tests/bug21966.phpt
+++ b/ext/date/tests/bug21966.phpt
@@ -1,9 +1,9 @@
--TEST--
Bug #21966 (date() or mktime() returning bad value for mktime month param of '2')
+--INI--
+date.timezone=Europe/London
--FILE--
<?php
-putenv("TZ=Europe/London");
-
echo '27/3/04 = ' . strval(mktime(0,0,0,3,27,2004)) . "\n"; // 1080345600
echo '28/3/04 = ' . strval(mktime(0,0,0,3,28,2004)) . "\n"; // -3662 - should be 108043200
echo '28/3/04 = ' . strval(mktime(2,0,0,3,28,2004)) . "\n"; // 1080435600
diff --git a/ext/date/tests/bug26090.phpt b/ext/date/tests/bug26090.phpt
index 03a9035..4b81949 100644
--- a/ext/date/tests/bug26090.phpt
+++ b/ext/date/tests/bug26090.phpt
@@ -1,8 +1,9 @@
--TEST--
Bug #26090 (allow colons in time zone offset to strtotime())
+--INI--
+date.timezone=America/New_York
--FILE--
<?php
-putenv("TZ=America/New_York");
$t = '2003-10-28 10:20:30-0800';
echo date('Y-m-d H:i:s T', strtotime($t)) . "\n";
diff --git a/ext/date/tests/bug26317.phpt b/ext/date/tests/bug26317.phpt
index aef2903..5b79bec 100644
--- a/ext/date/tests/bug26317.phpt
+++ b/ext/date/tests/bug26317.phpt
@@ -1,12 +1,13 @@
--TEST--
Bug #26317 (military timezone offset signedness)
+--INI--
+date.timezone=GMT0
--SKIPIF--
if (!@putenv("TZ=GMT0") || getenv("TZ") != 'GMT0') {
die("skip unable to change TZ enviroment variable\n");
}
--FILE--
<?php
- putenv("TZ=GMT0");
echo date("Y-m-d H:i:s\n", strtotime("2003-11-19 16:20:42 Z"));
echo date("Y-m-d H:i:s\n", strtotime("2003-11-19 09:20:42 T"));
echo date("Y-m-d H:i:s\n", strtotime("2003-11-19 19:20:42 C"));
diff --git a/ext/date/tests/bug26320.phpt b/ext/date/tests/bug26320.phpt
index 5b237ca..c8aeb00 100644
--- a/ext/date/tests/bug26320.phpt
+++ b/ext/date/tests/bug26320.phpt
@@ -1,12 +1,13 @@
--TEST--
Bug #26320 (strtotime handling of XML Schema/ISO 8601 format)
+--INI--
+date.timezone=GMT0
--SKIPIF--
if (!@putenv("TZ=GMT0") || getenv("TZ") != 'GMT0') {
die("skip unable to change TZ enviroment variable\n");
}
--FILE--
<?php
- putenv("TZ=GMT0");
echo date("Y-m-d H:i:s\n", strtotime("2003-11-19T12:30:42"));
echo date("Y-m-d H:i:s\n", strtotime("2003-11-19T12:30:42Z"));
?>
diff --git a/ext/date/tests/bug26694.phpt b/ext/date/tests/bug26694.phpt
index a709d16..939b04c 100644
--- a/ext/date/tests/bug26694.phpt
+++ b/ext/date/tests/bug26694.phpt
@@ -1,8 +1,9 @@
--TEST--
Bug #26694 (strtotime() request for "Sun, 21 Dec 2003 20:38:33 +0000 GMT")
+--INI--
+date.timezone=GMT
--FILE--
<?php
- putenv("TZ=GMT");
echo gmdate("Y-m-d H:i:s", strtotime("Sun, 21 Dec 2003 20:38:33 +0000 GMT"));
?>
--EXPECT--
diff --git a/ext/date/tests/bug27719.phpt b/ext/date/tests/bug27719.phpt
index 63cdc61..b86c324 100644
--- a/ext/date/tests/bug27719.phpt
+++ b/ext/date/tests/bug27719.phpt
@@ -1,10 +1,10 @@
--TEST--
Bug #27719 (mktime returns incorrect timestamp for dst days)
--INI--
+date.timezone=EST
error_reporting=2047
--FILE--
-<?php /* $Id: bug27719.phpt,v 1.1 2005/07/03 14:36:59 derick Exp $ */
- putenv("TZ=EST"); // No DST
+<?php /* $Id: bug27719.phpt,v 1.1.6.1 2009/05/12 19:46:58 felipe Exp $ */
$a = mktime(0, 0, 0, 4, 4, 2004, 0);
$b = mktime(0, 0, 0, 4, 4, 2004, 1);
$c = mktime(0, 0, 0, 4, 4, 2004, -1);
@@ -12,7 +12,7 @@ error_reporting=2047
echo "$b ".date("m/d/y h:i:s\n",$b);
echo "$c ".date("m/d/y h:i:s\n",$c);
echo "\n";
- putenv("TZ=EST5EDT"); // DST not in effect
+ date_default_timezone_set('EST5EDT'); // DST not in effect
$a = mktime(0, 0, 0, 2, 4, 2004, 0);
$b = mktime(0, 0, 0, 2, 4, 2004, 1);
$c = mktime(0, 0, 0, 2, 4, 2004, -1);
@@ -20,7 +20,7 @@ error_reporting=2047
echo "$b ".date("m/d/y h:i:s\n",$b);
echo "$c ".date("m/d/y h:i:s\n",$c);
echo "\n";
- putenv("TZ=EST5EDT"); // Just before DST changeover
+ date_default_timezone_set('EST5EDT');
$a = mktime(0, 0, 0, 4, 4, 2004, 0);
$b = mktime(0, 0, 0, 4, 4, 2004, 1);
$c = mktime(0, 0, 0, 4, 4, 2004, -1);
@@ -28,7 +28,7 @@ error_reporting=2047
echo "$b ".date("m/d/y h:i:s\n",$b);
echo "$c ".date("m/d/y h:i:s\n",$c);
echo "\n";
- putenv("TZ=EST5EDT"); // Just after DST changeover
+ date_default_timezone_set('EST5EDT');
$a = mktime(3, 0, 0, 4, 4, 2004, 0);
$b = mktime(3, 0, 0, 4, 4, 2004, 1);
$c = mktime(3, 0, 0, 4, 4, 2004, -1);
@@ -36,7 +36,7 @@ error_reporting=2047
echo "$b ".date("m/d/y h:i:s\n",$b);
echo "$c ".date("m/d/y h:i:s\n",$c);
echo "\n";
- putenv("TZ=EST5EDT"); // DST in effect
+ date_default_timezone_set('EST5EDT');
$a = mktime(0, 0, 0, 6, 4, 2004, 0);
$b = mktime(0, 0, 0, 6, 4, 2004, 1);
$c = mktime(0, 0, 0, 6, 4, 2004, -1);
diff --git a/ext/date/tests/bug27780.phpt b/ext/date/tests/bug27780.phpt
index f1e6eb6..bd3bc94 100644
--- a/ext/date/tests/bug27780.phpt
+++ b/ext/date/tests/bug27780.phpt
@@ -24,7 +24,7 @@ $timestrings = array (
);
foreach ($timezones as $timezone) {
- putenv("TZ=$timezone");
+ date_default_timezone_set($timezone);
echo $timezone, "\n";
foreach ($timestrings as $timestring) {
diff --git a/ext/date/tests/bug28024.phpt b/ext/date/tests/bug28024.phpt
index 3e0399a..b5f97bd 100644
--- a/ext/date/tests/bug28024.phpt
+++ b/ext/date/tests/bug28024.phpt
@@ -1,8 +1,9 @@
--TEST--
Bug #28024 (Changed behavior of strtotime())
+--INI--
+date.timezone=Europe/Berlin
--FILE--
<?php
- putenv("TZ=Europe/Berlin");
echo strtotime("17:00 2004-01-01"), "\n";
echo date("Y-m-d H:i:s T", strtotime("17:00 2004-01-01"));
?>
diff --git a/ext/date/tests/bug29150.phpt b/ext/date/tests/bug29150.phpt
index 274584d..d91d68d 100644
--- a/ext/date/tests/bug29150.phpt
+++ b/ext/date/tests/bug29150.phpt
@@ -1,8 +1,9 @@
--TEST--
Bug #29150 (Roman number format for months)
+--INI--
+date.timezone=GMT
--FILE--
<?php
- putenv("TZ=GMT");
echo gmdate("Y-m-d H:i:s", strtotime("20 VI. 2005"));
?>
--EXPECT--
diff --git a/ext/date/tests/bug30532.phpt b/ext/date/tests/bug30532.phpt
index faee0b3..6794b9d 100644
--- a/ext/date/tests/bug30532.phpt
+++ b/ext/date/tests/bug30532.phpt
@@ -1,8 +1,10 @@
--TEST--
Bug #30532 (strtotime - crossing daylight savings time)
+--INI--
+date.timezone=America/New_York
--FILE--
<?php
-putenv("TZ=America/New_York");
+
echo date('Y-m-d H:i:s T', strtotime('2004-10-31 EDT +1 hour'))."\n";
echo date('Y-m-d H:i:s T', strtotime('2004-10-31 EDT +2 hours'))."\n";
echo date('Y-m-d H:i:s T', strtotime('2004-10-31 EDT +3 hours'))."\n";
diff --git a/ext/date/tests/bug32086.phpt b/ext/date/tests/bug32086.phpt
index 2799164..e065c0b 100644
--- a/ext/date/tests/bug32086.phpt
+++ b/ext/date/tests/bug32086.phpt
@@ -1,8 +1,10 @@
--TEST--
Bug #32086 (strtotime don't work in DST)
+--INI--
+date.timezone=America/Sao_Paulo
--FILE--
<?php
-putenv("TZ=America/Sao_Paulo");
+
echo $g = strtotime("2004-11-01"), "\n";
echo $i = strtotime("2004-11-01 +1 day"), "\n";
echo $j = strtotime("+1 day", $g), "\n";
diff --git a/ext/date/tests/bug32270.phpt b/ext/date/tests/bug32270.phpt
index 2c5ff47..4533e06 100644
--- a/ext/date/tests/bug32270.phpt
+++ b/ext/date/tests/bug32270.phpt
@@ -1,8 +1,9 @@
--TEST--
Bug #32270 (strtotime/date behavior)
+--INI--
+date.timezone=America/Los_Angeles
--FILE--
<?php
-putenv("TZ=America/Los_Angeles");
echo date("m/d/Y H:i:s T", -2145888000)."\n";
diff --git a/ext/date/tests/bug32555.phpt b/ext/date/tests/bug32555.phpt
index 3ef513b..a99d3e2 100644
--- a/ext/date/tests/bug32555.phpt
+++ b/ext/date/tests/bug32555.phpt
@@ -1,8 +1,9 @@
--TEST--
Bug #32555 (strtotime("tomorrow") can return false)
+--INI--
+date.timezone=US/Eastern
--FILE--
<?php
-putenv("TZ=US/Eastern");
$stamp = 1112427000;
print strftime('%c %Z',strtotime('now',$stamp)) ."\n";
diff --git a/ext/date/tests/bug32588.phpt b/ext/date/tests/bug32588.phpt
index 6cf5ac9..4ecadf4 100644
--- a/ext/date/tests/bug32588.phpt
+++ b/ext/date/tests/bug32588.phpt
@@ -1,8 +1,9 @@
--TEST--
Bug #32588 (strtotime() error for 'last xxx' DST problem)
+--INI--
+date.timezone=America/New_York
--FILE--
<?php
-putenv("TZ=America/New_York");
echo date('D Y/m/d/H:i:s', strtotime('last saturday', 1112703348)). "\n";
echo date('D Y/m/d/H:i:s', strtotime("last sunday", 1112703348)). "\n";
diff --git a/ext/date/tests/bug33414-1.phpt b/ext/date/tests/bug33414-1.phpt
index 7b15228..03d9b4c 100644
--- a/ext/date/tests/bug33414-1.phpt
+++ b/ext/date/tests/bug33414-1.phpt
@@ -1,10 +1,11 @@
--TEST--
Bug #33414 [1] (Comprehensive list of incorrect days returned after strotime() / date() tests)
+--INI--
+date.timezone=America/Mendoza
--FILE--
<?php
print "TZ=America/Mendoza - wrong day.\n";
-putenv("TZ=America/Mendoza");
$tStamp = mktime (17, 17, 17, 1, 8327, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Sunday", $tStamp);
@@ -12,7 +13,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Sunday 00:00:00\n\n";
print "TZ=America/Catamarca - wrong day.\n";
-putenv("TZ=America/Catamarca");
+date_default_timezone_set("America/Catamarca");
$tStamp = mktime (17, 17, 17, 1, 7599, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Sunday", $tStamp);
@@ -20,7 +21,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Sunday 00:00:00\n\n";
print "TZ=America/Cordoba - wrong day.\n";
-putenv("TZ=America/Cordoba");
+date_default_timezone_set("America/Cordoba");
$tStamp = mktime (17, 17, 17, 1, 7599, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Sunday", $tStamp);
@@ -28,7 +29,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Sunday 00:00:00\n\n";
print "TZ=America/Rosario - wrong day.\n";
-putenv("TZ=America/Rosario");
+date_default_timezone_set("America/Rosario");
$tStamp = mktime (17, 17, 17, 1, 7958, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Tuesday", $tStamp);
@@ -37,7 +38,7 @@ print "wanted=Tuesday 00:00:00\n\n";
print "TZ=Europe/Vienna - wrong day - giving unexpected results, at
least on my system :-)\n";
-putenv("TZ=Europe/Vienna");
+date_default_timezone_set("Europe/Vienna");
$tStamp = mktime (17, 17, 17, 1, 3746, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Thursday", $tStamp);
@@ -45,7 +46,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Thursday 00:00:00\n\n";
print "TZ=Asia/Baku - wrong day.\n";
-putenv("TZ=Asia/Baku");
+date_default_timezone_set("Asia/Baku");
$tStamp = mktime (17, 17, 17, 1, 8299, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Sunday", $tStamp);
@@ -53,7 +54,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Sunday 00:00:00\n\n";
print "TZ=America/Noronha - wrong day.\n";
-putenv("TZ=America/Noronha");
+date_default_timezone_set("America/Noronha");
$tStamp = mktime (17, 17, 17, 1, 10866, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Friday", $tStamp);
@@ -61,7 +62,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Friday 00:00:00\n\n";
print "TZ=America/Havana - wrong day.\n";
-putenv("TZ=America/Havana");
+date_default_timezone_set("America/Havana");
$tStamp = mktime (17, 17, 17, 1, 12720, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Thursday", $tStamp);
@@ -69,7 +70,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Thursday 00:00:00\n\n";
print "TZ=Europe/Tallinn - wrong day.\n";
-putenv("TZ=Europe/Tallinn");
+date_default_timezone_set("Europe/Tallinn");
$tStamp = mktime (17, 17, 17, 1, 11777, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Saturday", $tStamp);
@@ -77,7 +78,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Saturday 00:00:00\n\n";
print "TZ=Asia/Jerusalem - wrong day.\n";
-putenv("TZ=Asia/Jerusalem");
+date_default_timezone_set("Asia/Jerusalem");
$tStamp = mktime (17, 17, 17, 1, 13056, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Thursday", $tStamp);
@@ -85,7 +86,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Thursday 00:00:00\n\n";
print "TZ=Europe/Vilnius - wrong day.\n";
-putenv("TZ=Europe/Vilnius");
+date_default_timezone_set("Europe/Vilnius");
$tStamp = mktime (17, 17, 17, 1, 12140, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Friday", $tStamp);
@@ -93,7 +94,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Friday 00:00:00\n\n";
print "TZ=Pacific/Kwajalein - wrong day.\n";
-putenv("TZ=Pacific/Kwajalein");
+date_default_timezone_set("Pacific/Kwajalein");
$tStamp = mktime (17, 17, 17, 1, 8626, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Friday", $tStamp);
@@ -101,7 +102,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Friday 00:00:00\n\n";
print "TZ=Asia/Ulan_Bator - wrong day.\n";
-putenv("TZ=Asia/Ulan_Bator");
+date_default_timezone_set("Asia/Ulan_Bator");
$tStamp = mktime (17, 17, 17, 1, 11588, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Saturday", $tStamp);
@@ -109,7 +110,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Saturday 00:00:00\n\n";
print "TZ=America/Cancun - wrong day.\n";
-putenv("TZ=America/Cancun");
+date_default_timezone_set("America/Cancun");
$tStamp = mktime (17, 17, 17, 1, 11785, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Sunday", $tStamp);
@@ -117,7 +118,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Sunday 00:00:00\n\n";
print "TZ=America/Mexico_City - wrong day.\n";
-putenv("TZ=America/Mexico_City");
+date_default_timezone_set("America/Mexico_City");
$tStamp = mktime (17, 17, 17, 1, 11781, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Wednesday", $tStamp);
@@ -125,7 +126,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Wednesday 00:00:00\n\n";
print "TZ=America/Mazatlan - wrong day.\n";
-putenv("TZ=America/Mazatlan");
+date_default_timezone_set("America/Mazatlan");
$tStamp = mktime (17, 17, 17, 1, 11780, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Tuesday", $tStamp);
@@ -133,7 +134,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Tuesday 00:00:00\n\n";
print "TZ=America/Chihuahua - wrong day.\n";
-putenv("TZ=America/Chihuahua");
+date_default_timezone_set("America/Chihuahua");
$tStamp = mktime (17, 17, 17, 1, 11782, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Thursday", $tStamp);
@@ -141,7 +142,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Thursday 00:00:00\n\n";
print "TZ=Asia/Kuala_Lumpur - wrong day.\n";
-putenv("TZ=Asia/Kuala_Lumpur");
+date_default_timezone_set("Asia/Kuala_Lumpur");
$tStamp = mktime (17, 17, 17, 1, 4380, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Monday", $tStamp);
@@ -149,7 +150,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Monday 00:00:00\n\n";
print "TZ=Pacific/Chatham - wrong day.\n";
-putenv("TZ=Pacific/Chatham");
+date_default_timezone_set("Pacific/Chatham");
$tStamp = mktime (17, 17, 17, 1, 1762, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Monday", $tStamp);
@@ -157,7 +158,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Monday 00:00:00\n\n";
print "TZ=America/Lima - wrong day.\n";
-putenv("TZ=America/Lima");
+date_default_timezone_set("America/Lima");
$tStamp = mktime (17, 17, 17, 1, 5839, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Thursday", $tStamp);
@@ -165,7 +166,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Thursday 00:00:00\n\n";
print "TZ=Asia/Karachi - wrong day.\n";
-putenv("TZ=Asia/Karachi");
+date_default_timezone_set("Asia/Karachi");
$tStamp = mktime (17, 17, 17, 1, 11783, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Friday", $tStamp);
@@ -173,7 +174,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Friday 00:00:00\n\n";
print "TZ=America/Asuncion - wrong day.\n";
-putenv("TZ=America/Asuncion");
+date_default_timezone_set("America/Asuncion");
$tStamp = mktime (17, 17, 17, 1, 11746, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Wednesday", $tStamp);
@@ -181,7 +182,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Wednesday 00:00:00\n\n";
print "TZ=Asia/Singapore - wrong day.\n";
-putenv("TZ=Asia/Singapore");
+date_default_timezone_set("Asia/Singapore");
$tStamp = mktime (17, 17, 17, 1, 4383, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Thursday", $tStamp);
@@ -189,7 +190,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Thursday 00:00:00\n\n";
print "TZ=America/Montevideo - wrong day.\n";
-putenv("TZ=America/Montevideo");
+date_default_timezone_set("America/Montevideo");
$tStamp = mktime (17, 17, 17, 1, 12678, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Thursday", $tStamp);
diff --git a/ext/date/tests/bug33414-2.phpt b/ext/date/tests/bug33414-2.phpt
index 8eb2a35..51cbe3b 100644
--- a/ext/date/tests/bug33414-2.phpt
+++ b/ext/date/tests/bug33414-2.phpt
@@ -3,7 +3,7 @@ Bug #33414 [2] (Comprehensive list of incorrect days returned after strotime() /
--FILE--
<?php
print "TZ=Pacific/Rarotonga - wrong day.\n";
-putenv("TZ=Pacific/Rarotonga");
+date_default_timezone_set("Pacific/Rarotonga");
$tStamp = mktime (17, 17, 17, 1, 1, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Tuesday", $tStamp);
@@ -11,7 +11,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Tuesday 00:00:00\n\n";
print "TZ=Atlantic/South_Georgia - wrong day.\n";
-putenv("TZ=Atlantic/South_Georgia");
+date_default_timezone_set("Atlantic/South_Georgia");
$tStamp = mktime (17, 17, 17, 1, 1, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Tuesday", $tStamp);
@@ -19,7 +19,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Tuesday 00:00:00\n\n";
print "TZ=America/Port-au-Prince - wrong day.\n";
-putenv("TZ=America/Port-au-Prince");
+date_default_timezone_set("America/Port-au-Prince");
$tStamp = mktime (17, 17, 17, 1, 12871, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Monday", $tStamp);
@@ -27,7 +27,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Monday 00:00:00\n\n";
print "TZ=Pacific/Enderbury - wrong day, off by 2 days.\n";
-putenv("TZ=Pacific/Enderbury");
+date_default_timezone_set("Pacific/Enderbury");
$tStamp = mktime (17, 17, 17, 1, 1, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Monday", $tStamp);
@@ -35,7 +35,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Monday 00:00:00\n\n";
print "TZ=Pacific/Kiritimati - wrong day, off by 2 days.\n";
-putenv("TZ=Pacific/Kiritimati");
+date_default_timezone_set("Pacific/Kiritimati");
$tStamp = mktime (17, 17, 17, 1, 1, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Monday", $tStamp);
@@ -43,7 +43,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Monday 00:00:00\n\n";
print "TZ=America/Managua - wrong day.\n";
-putenv("TZ=America/Managua");
+date_default_timezone_set("America/Managua");
$tStamp = mktime (17, 17, 17, 1, 12879, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Tuesday", $tStamp);
@@ -51,7 +51,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Tuesday 00:00:00\n\n";
print "TZ=Pacific/Pitcairn - wrong day.\n";
-putenv("TZ=Pacific/Pitcairn");
+date_default_timezone_set("Pacific/Pitcairn");
$tStamp = mktime (17, 17, 17, 1, 1, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Wednesday", $tStamp);
@@ -59,7 +59,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Wednesday 00:00:00\n\n";
print "TZ=Pacific/Fakaofo - wrong day.\n";
-putenv("TZ=Pacific/Fakaofo");
+date_default_timezone_set("Pacific/Fakaofo");
$tStamp = mktime (17, 17, 17, 1, 1, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Saturday", $tStamp);
@@ -67,7 +67,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Saturday 00:00:00\n\n";
print "TZ=Pacific/Johnston - wrong day.\n";
-putenv("TZ=Pacific/Johnston");
+date_default_timezone_set("Pacific/Johnston");
$tStamp = mktime (17, 17, 17, 1, 1, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Friday", $tStamp);
diff --git a/ext/date/tests/bug33415-1.phpt b/ext/date/tests/bug33415-1.phpt
index 3d36af8..698252a 100644
--- a/ext/date/tests/bug33415-1.phpt
+++ b/ext/date/tests/bug33415-1.phpt
@@ -5,7 +5,7 @@ Bug #33415 [1] (Possibly invalid non-one-hour DST or timezone shifts)
print "TZ=America/Jujuy - Is it OK for this to be 2 AM, rather than 1
AM as per most DST transitions?\n";
-putenv("TZ=America/Jujuy");
+date_default_timezone_set("America/Jujuy");
$tStamp = mktime (17, 17, 17, 1, 7593, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Monday", $tStamp);
@@ -13,7 +13,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
print "wanted=Monday 00:00:00\n\n";
print "TZ=Asia/Tbilisi - Is it OK for this to be 2 AM?\n";
-putenv("TZ=Asia/Tbilisi");
+date_default_timezone_set("Asia/Tbilisi");
$tStamp = mktime (17, 17, 17, 1, 12863, 1970);
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
$strtotime_tstamp = strtotime("next Sunday", $tStamp);
diff --git a/ext/date/tests/bug33532.phpt b/ext/date/tests/bug33532.phpt
index 2a8da03..286ceb4 100644
--- a/ext/date/tests/bug33532.phpt
+++ b/ext/date/tests/bug33532.phpt
@@ -5,7 +5,7 @@ error_reporting=2047
date.timezone=UTC
--FILE--
<?php
-putenv("TZ=");
+
setlocale(LC_ALL, 'C');
print "TZ has NOT been set\n";
@@ -17,7 +17,7 @@ print "strftime " . strftime("%r %B%e %Y %Z %z", $tStamp) . "\n";
print "datestr " . date ("H:i:s A F j Y T", $tStamp) . "\n";
print "\nSetting TZ\n";
-putenv("TZ=Australia/Sydney");
+date_default_timezone_set('Australia/Sydney');
$input = "10:00:00 AM July 1 2005";
print "input " . $input . "\n";
$tStamp = strtotime($input);
diff --git a/ext/date/tests/bug35425.phpt b/ext/date/tests/bug35425.phpt
index 4259b49..e55a4f5 100644
--- a/ext/date/tests/bug35425.phpt
+++ b/ext/date/tests/bug35425.phpt
@@ -1,8 +1,9 @@
--TEST--
Bug #35425 (idate() function ignores timezone settings)
+--INI--
+date.timezone=America/Montreal
--FILE--
<?php
-putenv('TZ=America/Montreal');
$time = mktime(1,1,1,1,1,2005);
foreach (array('B','d','h','H','i','I','L','m','s','t','U','w','W','y','Y','z','Z') as $v) {
diff --git a/ext/date/tests/bug45682.phpt b/ext/date/tests/bug45682.phpt
new file mode 100644
index 0000000..d8bbfc5
--- /dev/null
+++ b/ext/date/tests/bug45682.phpt
@@ -0,0 +1,32 @@
+--TEST--
+Bug #45682 (Unable to var_dump(DateInterval))
+--INI--
+date.timezone=UTC
+--FILE--
+<?php
+
+$date = new DateTime("28-July-2008");
+$other = new DateTime("31-July-2008");
+
+$diff = date_diff($date, $other);
+
+var_dump($diff);
+--EXPECT--
+object(DateInterval)#3 (8) {
+ ["y"]=>
+ int(0)
+ ["m"]=>
+ int(0)
+ ["d"]=>
+ int(3)
+ ["h"]=>
+ int(0)
+ ["i"]=>
+ int(0)
+ ["s"]=>
+ int(0)
+ ["invert"]=>
+ int(0)
+ ["days"]=>
+ int(3)
+}
diff --git a/ext/date/tests/bug46108.phpt b/ext/date/tests/bug46108.phpt
new file mode 100644
index 0000000..12fdfa7
--- /dev/null
+++ b/ext/date/tests/bug46108.phpt
@@ -0,0 +1,19 @@
+--TEST--
+Bug #46108 (DateTime - Memory leak when unserializing)
+--FILE--
+<?php
+
+date_default_timezone_set('America/Sao_Paulo');
+
+var_dump(unserialize(serialize(new Datetime)));
+
+?>
+--EXPECTF--
+object(DateTime)#%d (3) {
+ [%u|b%"date"]=>
+ %string|unicode%(%d) "%s"
+ [%u|b%"timezone_type"]=>
+ int(%d)
+ [%u|b%"timezone"]=>
+ %string|unicode%(%d) "America/Sao_Paulo"
+}
diff --git a/ext/date/tests/bug48058.phpt b/ext/date/tests/bug48058.phpt
new file mode 100644
index 0000000..290d3df
--- /dev/null
+++ b/ext/date/tests/bug48058.phpt
@@ -0,0 +1,29 @@
+--TEST--
+Bug #48058 (Year formatter goes wrong with out-of-int range)
+--INI--
+date.timezone=UTC
+--FILE--
+<?php
+date_default_timezone_set("Europe/London");
+$tz = new DateTimeZone("Europe/London");
+$tran = $tz->getTransitions();
+var_dump( $tran[0] );
+
+$base_time = '28 Feb 2008 12:00:00';
+$dt = date_create( "$base_time +10000000000 years" );
+echo date_format( $dt, DATE_ISO8601 );
+?>
+--EXPECT--
+array(5) {
+ ["ts"]=>
+ int(-9223372036854775808)
+ ["time"]=>
+ string(33) "-292277022657-01-27T08:29:52+0000"
+ ["offset"]=>
+ int(3600)
+ ["isdst"]=>
+ bool(true)
+ ["abbr"]=>
+ string(3) "BST"
+}
+10000002008-02-28T12:00:00+0000
diff --git a/ext/date/tests/bug48097.phpt b/ext/date/tests/bug48097.phpt
new file mode 100644
index 0000000..d71a97e
--- /dev/null
+++ b/ext/date/tests/bug48097.phpt
@@ -0,0 +1,38 @@
+--TEST--
+Bug #48097 (date_timezone_set function produces wrong datetime result)
+--INI--
+date.timezone=UTC
+--FILE--
+<?php
+$d = date_create( "Mon, 23 May 1955 00:00:00 +0200" );
+var_dump( $d );
+echo $d->format( DATE_ISO8601 ), "\n";
+echo $d->format( 'U' ), "\n\n";
+
+$d->setTimeZone( new DateTimeZone( 'Europe/Budapest' ) );
+var_dump( $d );
+echo $d->format( DATE_ISO8601 ), "\n\n";
+echo $d->format( 'U' ), "\n\n";
+--EXPECT--
+object(DateTime)#1 (3) {
+ ["date"]=>
+ string(19) "1955-05-23 00:00:00"
+ ["timezone_type"]=>
+ int(1)
+ ["timezone"]=>
+ string(6) "+02:00"
+}
+1955-05-23T00:00:00+0200
+-461124000
+
+object(DateTime)#1 (3) {
+ ["date"]=>
+ string(19) "1955-05-22 23:00:00"
+ ["timezone_type"]=>
+ int(3)
+ ["timezone"]=>
+ string(15) "Europe/Budapest"
+}
+1955-05-22T23:00:00+0100
+
+-461124000
diff --git a/ext/date/tests/date_add_basic2.phpt b/ext/date/tests/date_add_basic2.phpt
new file mode 100644
index 0000000..5beef23
--- /dev/null
+++ b/ext/date/tests/date_add_basic2.phpt
@@ -0,0 +1,14 @@
+--TEST--
+date_add() return false with wrong params
+--CREDITS--
+"Anna Filina" <afilina at phpquebec.org>
+#PHPTestFest2009 2009-05-02
+--INI--
+date.timezone=UTC
+display_errors=false
+--FILE--
+<?php
+var_dump(date_add()); // invalid parameters
+?>
+--EXPECT--
+bool(false)
\ No newline at end of file
diff --git a/ext/date/tests/date_create-relative.phpt b/ext/date/tests/date_create-relative.phpt
new file mode 100644
index 0000000..8a90931
--- /dev/null
+++ b/ext/date/tests/date_create-relative.phpt
@@ -0,0 +1,93 @@
+--TEST--
+date_create() with large relative offsets
+--FILE--
+<?php
+
+date_default_timezone_set('UTC');
+
+if (!defined('PHP_INT_MIN')) {
+ define('PHP_INT_MIN', intval(-PHP_INT_MAX - 1));
+}
+
+$base_time = '28 Feb 2008 12:00:00';
+
+// Most offsets tested in strtotime-relative.phpt. These are tests for dates outside the 32-bit range.
+$offsets = array(
+ // around 10 leap year periods (4000 years) in days
+ '1460000 days',
+ '1460969 days',
+ '1460970 days',
+ '1460971 days',
+ '1462970 days',
+
+ // around 1 leap year period in years
+ '398 years',
+ '399 years',
+ '400 years',
+ '401 years',
+
+ // around 40000 years
+ '39755 years',
+ '39999 years',
+ '40000 years',
+ '40001 years',
+ '41010 years',
+
+ // bigger than int (32-bit)
+ '10000000000 seconds',
+ '10000000000 minutes',
+ '10000000000 hours',
+ '10000000000 days',
+ '10000000000 months',
+ '10000000000 years',
+);
+
+foreach ($offsets AS $offset) {
+ foreach (array('+', '-') AS $direction) {
+ $dt = date_create("$base_time $direction$offset");
+ echo "$direction$offset: " . date_format($dt, DATE_ISO8601) . "\n";
+ }
+}
+
+?>
+--EXPECT--
++1460000 days: 6005-07-03T12:00:00+0000
+-1460000 days: -1990-10-25T12:00:00+0000
++1460969 days: 6008-02-27T12:00:00+0000
+-1460969 days: -1992-02-29T12:00:00+0000
++1460970 days: 6008-02-28T12:00:00+0000
+-1460970 days: -1992-02-28T12:00:00+0000
++1460971 days: 6008-02-29T12:00:00+0000
+-1460971 days: -1992-02-27T12:00:00+0000
++1462970 days: 6013-08-20T12:00:00+0000
+-1462970 days: -1998-09-07T12:00:00+0000
++398 years: 2406-02-28T12:00:00+0000
+-398 years: 1610-02-28T12:00:00+0000
++399 years: 2407-02-28T12:00:00+0000
+-399 years: 1609-02-28T12:00:00+0000
++400 years: 2408-02-28T12:00:00+0000
+-400 years: 1608-02-28T12:00:00+0000
++401 years: 2409-02-28T12:00:00+0000
+-401 years: 1607-02-28T12:00:00+0000
++39755 years: 41763-02-28T12:00:00+0000
+-39755 years: -37747-02-28T12:00:00+0000
++39999 years: 42007-02-28T12:00:00+0000
+-39999 years: -37991-02-28T12:00:00+0000
++40000 years: 42008-02-28T12:00:00+0000
+-40000 years: -37992-02-28T12:00:00+0000
++40001 years: 42009-02-28T12:00:00+0000
+-40001 years: -37993-02-28T12:00:00+0000
++41010 years: 43018-02-28T12:00:00+0000
+-41010 years: -39002-02-28T12:00:00+0000
++10000000000 seconds: 2325-01-18T05:46:40+0000
+-10000000000 seconds: 1691-04-09T18:13:20+0000
++10000000000 minutes: 21021-05-27T22:40:00+0000
+-10000000000 minutes: -17006-12-01T01:20:00+0000
++10000000000 hours: 1142802-09-30T04:00:00+0000
+-10000000000 hours: -1138787-07-28T20:00:00+0000
++10000000000 days: 27381078-03-25T12:00:00+0000
+-10000000000 days: -27377062-02-02T12:00:00+0000
++10000000000 months: 833335341-06-28T12:00:00+0000
+-10000000000 months: -833331326-10-28T12:00:00+0000
++10000000000 years: 10000002008-02-28T12:00:00+0000
+-10000000000 years: -9999997992-02-28T12:00:00+0000
diff --git a/ext/date/tests/date_create_from_format_basic.phpt b/ext/date/tests/date_create_from_format_basic.phpt
new file mode 100644
index 0000000..592692b
--- /dev/null
+++ b/ext/date/tests/date_create_from_format_basic.phpt
@@ -0,0 +1,14 @@
+--TEST--
+date_create_from_format() return false with wrong params
+--CREDITS--
+"Anna Filina" <afilina at phpquebec.org>
+#PHPTestFest2009 2009-05-02
+--INI--
+date.timezone=UTC
+display_errors=false
+--FILE--
+<?php
+var_dump(date_create_from_format()); // invalid parameters
+?>
+--EXPECT--
+bool(false)
\ No newline at end of file
diff --git a/ext/date/tests/date_create_from_format_basic2.phpt b/ext/date/tests/date_create_from_format_basic2.phpt
new file mode 100644
index 0000000..2b220a7
--- /dev/null
+++ b/ext/date/tests/date_create_from_format_basic2.phpt
@@ -0,0 +1,13 @@
+--TEST--
+date_create_from_format() return false
+--CREDITS--
+"Anna Filina" <afilina at phpquebec.org>
+#PHPTestFest2009 2009-05-02
+--INI--
+date.timezone=UTC
+--FILE--
+<?php
+var_dump(date_create_from_format('Y-m-d', '2009---01')); // invalid date
+?>
+--EXPECT--
+bool(false)
\ No newline at end of file
diff --git a/ext/date/tests/date_default_timezone_get-3.phpt b/ext/date/tests/date_default_timezone_get-3.phpt
index 0e2e3c5..ffc882e 100644
--- a/ext/date/tests/date_default_timezone_get-3.phpt
+++ b/ext/date/tests/date_default_timezone_get-3.phpt
@@ -1,10 +1,9 @@
--TEST--
date_default_timezone_get() function [3]
--INI--
-date.timezone=
+date.timezone=Europe/Rome
--FILE--
<?php
- putenv('TZ=Europe/Rome');
echo date_default_timezone_get(), "\n";
date_default_timezone_set("America/Chicago");
diff --git a/ext/date/tests/date_get_last_errors_basic.phpt b/ext/date/tests/date_get_last_errors_basic.phpt
new file mode 100644
index 0000000..5e83a52
--- /dev/null
+++ b/ext/date/tests/date_get_last_errors_basic.phpt
@@ -0,0 +1,13 @@
+--TEST--
+date_get_last_errors() return false
+--CREDITS--
+"Anna Filina" <afilina at phpquebec.org>
+#PHPTestFest2009 2009-05-02
+--INI--
+date.timezone=UTC
+--FILE--
+<?php
+var_dump(date_get_last_errors()); // no date was parsed, so no errors
+?>
+--EXPECT--
+bool(false)
\ No newline at end of file
diff --git a/ext/date/tests/date_parse_from_format_basic.phpt b/ext/date/tests/date_parse_from_format_basic.phpt
new file mode 100644
index 0000000..644949a
--- /dev/null
+++ b/ext/date/tests/date_parse_from_format_basic.phpt
@@ -0,0 +1,14 @@
+--TEST--
+date_parse_from_format() return false with wrong params
+--CREDITS--
+"Anna Filina" <afilina at phpquebec.org>
+#PHPTestFest2009 2009-05-02
+--INI--
+date.timezone=UTC
+display_errors=false
+--FILE--
+<?php
+var_dump(date_parse_from_format()); // invalid parameters
+?>
+--EXPECT--
+bool(false)
\ No newline at end of file
diff --git a/ext/date/tests/date_sunrise_variation9.phpt b/ext/date/tests/date_sunrise_variation9.phpt
index ce0e9cb..49af06d 100644
--- a/ext/date/tests/date_sunrise_variation9.phpt
+++ b/ext/date/tests/date_sunrise_variation9.phpt
@@ -36,12 +36,12 @@ var_dump( date_sunrise($time, SUNFUNCS_RET_TIMESTAMP, $latitude, $longitude, $ze
\*\*\* Testing date_sunrise\(\) : usage variation \*\*\*
-- Testing date_sunrise\(\) function by passing float 12.3456789000e10 value to time --
-string\(5\) "(08:53|07:49)"
-float\((8.883[0-9]*|8.883[0-9]*|7.821[0-9]*)\)
-int\((-2147466915|123456811756)\)
+string\(5\) "(07:34|07:49)"
+float\((7.566[0-9]*|7.821[0-9]*)\)
+int\((-1097256359|123456811756)\)
-- Testing date_sunrise\(\) function by passing float -12.3456789000e10 value to time --
-string\(5\) "(08:48|08:04)"
-float\((8.810[0-9]*|8.810[0-9]*|8.074[0-9]*)\)
-int\((-2147443882|-123456761731)\)
+string\(5\) "(07:42|08:48|08:04)"
+float\((7.713[0-9]*|8.810[0-9]*|8.074[0-9]*)\)
+int\((1097304168|-2147443882|-123456761731)\)
===DONE===
diff --git a/ext/date/tests/date_sunset_variation9.phpt b/ext/date/tests/date_sunset_variation9.phpt
index 6648dfb..59a4b58 100644
--- a/ext/date/tests/date_sunset_variation9.phpt
+++ b/ext/date/tests/date_sunset_variation9.phpt
@@ -36,12 +36,12 @@ var_dump( date_sunset($time, SUNFUNCS_RET_TIMESTAMP, $latitude, $longitude, $zen
\*\*\* Testing date_sunset\(\) : usage variation \*\*\*
-- Testing date_sunset\(\) function by passing float 12.3456789000e10 value to time --
-string\(5\) "(18:40|19:28)"
-float\((18.6762[0-9]*|19.480[0-9]*)\)
-int\((-2147431662|123456853728)\)
+string\(5\) "(19:49|19:28)"
+float\((19.830[0-9]*|19.830[0-9]*|19.480[0-9]*)\)
+int\((-1097212211|123456853728)\)
-- Testing date_sunset\(\) function by passing float -12.3456789000e10 value to time --
-string\(5\) "(18:12|18:48)"
-float\((18.213[0-9]*|18.808[0-9]*)\)
-int\((-2147410031|-123456723090)\)
+string\(5\) "(19:03|18:12|18:48)"
+float\((19.056[0-9]*|18.213[0-9]*|18.808[0-9]*)\)
+int\((1097345002|-2147410031|-123456723090)\)
===DONE===
diff --git a/ext/date/tests/getdate_variation7.phpt b/ext/date/tests/getdate_variation7.phpt
index bccd8d3..5af2dd5 100644
--- a/ext/date/tests/getdate_variation7.phpt
+++ b/ext/date/tests/getdate_variation7.phpt
@@ -27,52 +27,52 @@ var_dump( getdate($timestamp) );
-- Testing getdate\(\) function by passing float 12.3456789000e10 value to timestamp --
array\(11\) {
\["seconds"\]=>
- int\((7|0)\)
+ int\((36|0)\)
\["minutes"\]=>
- int\((44|0)\)
+ int\((43|0)\)
\["hours"\]=>
- int\((8|6)\)
+ int\((10|6)\)
\["mday"\]=>
- int\((19|11)\)
+ int\((26|11)\)
\["wday"\]=>
int\((2|6)\)
\["mon"\]=>
- int\((1|3)\)
+ int\(3\)
\["year"\]=>
- int\((2038|5882)\)
+ int\((1935|5882)\)
\["yday"\]=>
- int\((18|69)\)
+ int\((84|69)\)
\["weekday"\]=>
string\((7|8)\) "(Tuesday|Saturday)"
\["month"\]=>
- string\((7|5)\) "(January|March)"
+ string\(5\) "March"
\[0\]=>
- int\((2147483647|123456789000)\)
+ int\((-1097262584|123456789000)\)
}
-- Testing getdate\(\) function by passing float -12.3456789000e10 value to timestamp --
array\(11\) {
\["seconds"\]=>
- int\((12|20)\)
+ int\((44|12|20)\)
\["minutes"\]=>
int\((39|23)\)
\["hours"\]=>
- int\((2|5)\)
+ int\((0|2|5)\)
\["mday"\]=>
- int\((14|23)\)
+ int\((9|14|23)\)
\["wday"\]=>
int\((6|-4)\)
\["mon"\]=>
- int\((12|10)\)
+ int\((10|12)\)
\["year"\]=>
- int\((1901|-1943)\)
+ int\((2004|1901|-1943)\)
\["yday"\]=>
- int\((347|295)\)
+ int\((282|347|295)\)
\["weekday"\]=>
string\((8|7)\) "(Saturday|Unknown)"
\["month"\]=>
- string\((8|7)\) "(December|October)"
+ string\((7|8)\) "(October|December)"
\[0\]=>
- int\((-2147483648|-123456789000)\)
+ int\((1097262584|-2147483648|-123456789000)\)
}
===DONE===
diff --git a/ext/date/tests/gmdate_variation14.phpt b/ext/date/tests/gmdate_variation14.phpt
index 53dc647..5b62a82 100644
--- a/ext/date/tests/gmdate_variation14.phpt
+++ b/ext/date/tests/gmdate_variation14.phpt
@@ -27,8 +27,8 @@ var_dump( gmdate($format, $timestamp) );
\*\*\* Testing gmdate\(\) : usage variation \*\*\*
-- Testing gmdate\(\) function with float 12.3456789000e10 to timestamp --
-string\((24|25)\) "(2038-01-19T03:14:07\+0000|5882-03-11T00:30:00\+0000)"
+string\((24|25)\) "(1935-03-26T04:50:16\+0000|5882-03-11T00:30:00\+0000)"
-- Testing gmdate\(\) function with float -12.3456789000e10 to timestamp --
-string\((24|25)\) "(1901-12-13T20:45:52\+0000|-1943-10-22T23:30:00\+0000)"
+string\((24|25)\) "(2004-10-08T19:09:44\+0000|1901-12-13T20:45:52\+0000|-1943-10-22T23:30:00\+0000)"
===DONE===
\ No newline at end of file
diff --git a/ext/date/tests/gmstrftime_variation2.phpt b/ext/date/tests/gmstrftime_variation2.phpt
index b01de97..c577fe1 100644
--- a/ext/date/tests/gmstrftime_variation2.phpt
+++ b/ext/date/tests/gmstrftime_variation2.phpt
@@ -112,10 +112,10 @@ string(20) "Jan 01 1970 00:00:10"
string(20) "Dec 31 1969 23:59:50"
--float 12.3456789000e10--
-string(20) "Jan 19 2038 03:14:07"
+string(20) "Mar 26 1935 04:50:16"
--float -12.3456789000e10--
-string(20) "Dec 13 1901 20:45:52"
+string(20) "Oct 08 2004 19:09:44"
--float .5--
string(20) "Jan 01 1970 00:00:00"
diff --git a/ext/date/tests/idate_variation3.phpt b/ext/date/tests/idate_variation3.phpt
index 0546ff2..1a2ee1f 100644
--- a/ext/date/tests/idate_variation3.phpt
+++ b/ext/date/tests/idate_variation3.phpt
@@ -28,8 +28,8 @@ var_dump( idate($format, $timestamp) );
\*\*\* Testing idate\(\) : usage variation \*\*\*
-- Testing idate\(\) function with float 12.3456789000e10 to timestamp --
-int\((2038|5882)\)
+int\((1935|5882)\)
-- Testing idate\(\) function with float -12.3456789000e10 to timestamp --
-int\((1901|-1943)\)
+int\((2004|1901|-1943)\)
===DONE===
diff --git a/ext/date/tests/localtime_variation3.phpt b/ext/date/tests/localtime_variation3.phpt
index 7294f2e..d941e38 100644
--- a/ext/date/tests/localtime_variation3.phpt
+++ b/ext/date/tests/localtime_variation3.phpt
@@ -33,41 +33,41 @@ var_dump( localtime($timestamp, $is_associative) );
-- Testing localtime\(\) function with 'float 12.3456789000e10' to timestamp --
array\(9\) {
\[0\]=>
- int\((7|0)\)
+ int\((16|0)\)
\[1\]=>
- int\((14|30)\)
+ int\((50|30)\)
\[2\]=>
- int\((3|0)\)
+ int\((4|0)\)
\[3\]=>
- int\((19|11)\)
+ int\((26|11)\)
\[4\]=>
- int\((0|2)\)
+ int\(2\)
\[5\]=>
- int\((138|3982)\)
+ int\((35|3982)\)
\[6\]=>
int\((2|6)\)
\[7\]=>
- int\((18|69)\)
+ int\((84|69)\)
\[8\]=>
int\(0\)
}
array\(9\) {
\["tm_sec"\]=>
- int\((7|0)\)
+ int\((16|0)\)
\["tm_min"\]=>
- int\((14|30)\)
+ int\((50|30)\)
\["tm_hour"\]=>
- int\((3|0)\)
+ int\((4|0)\)
\["tm_mday"\]=>
- int\((19|11)\)
+ int\((26|11)\)
\["tm_mon"\]=>
- int\((0|2)\)
+ int\(2\)
\["tm_year"\]=>
- int\((138|3982)\)
+ int\((35|3982)\)
\["tm_wday"\]=>
int\((2|6)\)
\["tm_yday"\]=>
- int\((18|69)\)
+ int\((84|69)\)
\["tm_isdst"\]=>
int\(0\)
}
@@ -75,41 +75,41 @@ array\(9\) {
-- Testing localtime\(\) function with 'float -12.3456789000e10' to timestamp --
array\(9\) {
\[0\]=>
- int\((52|0)\)
+ int\((44|52|0)\)
\[1\]=>
- int\((45|30)\)
+ int\((9|45|30)\)
\[2\]=>
- int\((20|23)\)
+ int\((19|20|23)\)
\[3\]=>
- int\((13|22)\)
+ int\((8|13|22)\)
\[4\]=>
- int\((11|9)\)
+ int\((9|11)\)
\[5\]=>
- int\((1|-3843)\)
+ int\((104|1|-3843)\)
\[6\]=>
int\((5|-5)\)
\[7\]=>
- int\((346|294)\)
+ int\((281|346|294)\)
\[8\]=>
int\(0\)
}
array\(9\) {
\["tm_sec"\]=>
- int\((52|0)\)
+ int\((44|52|0)\)
\["tm_min"\]=>
- int\((45|30)\)
+ int\((9|45|30)\)
\["tm_hour"\]=>
- int\((20|23)\)
+ int\((19|20|23)\)
\["tm_mday"\]=>
- int\((13|22)\)
+ int\((8|13|22)\)
\["tm_mon"\]=>
- int\((11|9)\)
+ int\((9|11)\)
\["tm_year"\]=>
- int\((1|-3843)\)
+ int\((104|1|-3843)\)
\["tm_wday"\]=>
int\((5|-5)\)
\["tm_yday"\]=>
- int\((346|294)\)
+ int\((281|346|294)\)
\["tm_isdst"\]=>
int\(0\)
}
diff --git a/ext/date/tests/strftime_variation23.phpt b/ext/date/tests/strftime_variation23.phpt
index 34e14cf..b7cf8d7 100644
--- a/ext/date/tests/strftime_variation23.phpt
+++ b/ext/date/tests/strftime_variation23.phpt
@@ -29,8 +29,8 @@ var_dump( strftime($format, $timestamp) );
\*\*\* Testing strftime\(\) : usage variation \*\*\*
-- Testing strftime\(\) function with float 12.3456789000e10 to timestamp --
-string\(\d*\)\s"(Jan|Mar)\s(19|11)\s(2038|5882)\s(03|00):(14|30):(07|00)"
+string\(\d*\)\s"Mar\s(26|11)\s(1935|5882)\s(04|00):(50|30):(16|00)"
-- Testing strftime\(\) function with float -12.3456789000e10 to timestamp --
-string\(\d*\)\s"(Dec|Oct)\s(13|22)\s(1901|-1943)\s(20|23):(45|30):(52|00)"
+string\(\d*\)\s"(Oct|Dec)\s(08|13|22)\s(2004|1901|-1943)\s(19|20|23):(09|45|30):(44|52|00)"
===DONE===
diff --git a/ext/date/tests/strtotime-relative.phpt b/ext/date/tests/strtotime-relative.phpt
new file mode 100644
index 0000000..769cd2e
--- /dev/null
+++ b/ext/date/tests/strtotime-relative.phpt
@@ -0,0 +1,98 @@
+--TEST--
+strtotime() with relative offsets
+--FILE--
+<?php
+
+date_default_timezone_set('UTC');
+
+$base_time = 1204200000; // 28 Feb 2008 12:00:00
+
+$offsets = array(
+ // offset around a day
+ '80412 seconds',
+ '86399 seconds',
+ '86400 seconds',
+ '86401 seconds',
+ '112913 seconds',
+
+ // offset around 7 days
+ '134 hours',
+ '167 hours',
+ '168 hours',
+ '169 hours',
+ '183 hours',
+
+ // offset around 6 months
+ '178 days',
+ '179 days',
+ '180 days',
+ '183 days',
+ '184 days',
+
+ // offset around 10 years
+ '115 months',
+ '119 months',
+ '120 months',
+ '121 months',
+ '128 months',
+
+ // offset around 25 years (can't do much more reliably with strtotime)
+ '24 years',
+ '25 years',
+ '26 years'
+);
+
+foreach ($offsets AS $offset) {
+ foreach (array('+', '-') AS $direction) {
+ echo "$direction$offset: " . date(DATE_ISO8601, strtotime("$direction$offset", $base_time)) . "\n";
+ }
+}
+
+?>
+--EXPECT--
++80412 seconds: 2008-02-29T10:20:12+0000
+-80412 seconds: 2008-02-27T13:39:48+0000
++86399 seconds: 2008-02-29T11:59:59+0000
+-86399 seconds: 2008-02-27T12:00:01+0000
++86400 seconds: 2008-02-29T12:00:00+0000
+-86400 seconds: 2008-02-27T12:00:00+0000
++86401 seconds: 2008-02-29T12:00:01+0000
+-86401 seconds: 2008-02-27T11:59:59+0000
++112913 seconds: 2008-02-29T19:21:53+0000
+-112913 seconds: 2008-02-27T04:38:07+0000
++134 hours: 2008-03-05T02:00:00+0000
+-134 hours: 2008-02-22T22:00:00+0000
++167 hours: 2008-03-06T11:00:00+0000
+-167 hours: 2008-02-21T13:00:00+0000
++168 hours: 2008-03-06T12:00:00+0000
+-168 hours: 2008-02-21T12:00:00+0000
++169 hours: 2008-03-06T13:00:00+0000
+-169 hours: 2008-02-21T11:00:00+0000
++183 hours: 2008-03-07T03:00:00+0000
+-183 hours: 2008-02-20T21:00:00+0000
++178 days: 2008-08-24T12:00:00+0000
+-178 days: 2007-09-03T12:00:00+0000
++179 days: 2008-08-25T12:00:00+0000
+-179 days: 2007-09-02T12:00:00+0000
++180 days: 2008-08-26T12:00:00+0000
+-180 days: 2007-09-01T12:00:00+0000
++183 days: 2008-08-29T12:00:00+0000
+-183 days: 2007-08-29T12:00:00+0000
++184 days: 2008-08-30T12:00:00+0000
+-184 days: 2007-08-28T12:00:00+0000
++115 months: 2017-09-28T12:00:00+0000
+-115 months: 1998-07-28T12:00:00+0000
++119 months: 2018-01-28T12:00:00+0000
+-119 months: 1998-03-28T12:00:00+0000
++120 months: 2018-02-28T12:00:00+0000
+-120 months: 1998-02-28T12:00:00+0000
++121 months: 2018-03-28T12:00:00+0000
+-121 months: 1998-01-28T12:00:00+0000
++128 months: 2018-10-28T12:00:00+0000
+-128 months: 1997-06-28T12:00:00+0000
++24 years: 2032-02-28T12:00:00+0000
+-24 years: 1984-02-28T12:00:00+0000
++25 years: 2033-02-28T12:00:00+0000
+-25 years: 1983-02-28T12:00:00+0000
++26 years: 2034-02-28T12:00:00+0000
+-26 years: 1982-02-28T12:00:00+0000
diff --git a/ext/date/tests/strtotime_basic2.phpt b/ext/date/tests/strtotime_basic2.phpt
new file mode 100644
index 0000000..f90e66d
--- /dev/null
+++ b/ext/date/tests/strtotime_basic2.phpt
@@ -0,0 +1,13 @@
+--TEST--
+strtotime() with return false
+--CREDITS--
+"Anna Filina" <afilina at phpquebec.org>
+#PHPTestFest2009 2009-05-02
+--INI--
+date.timezone=UTC
+--FILE--
+<?php
+var_dump(strtotime('mayy 2 2009')); // misspelled month name
+?>
+--EXPECT--
+bool(false)
\ No newline at end of file
diff --git a/ext/date/tests/timezone_offset_get_basic1.phpt b/ext/date/tests/timezone_offset_get_basic1.phpt
index bf24178..aa658e9 100644
--- a/ext/date/tests/timezone_offset_get_basic1.phpt
+++ b/ext/date/tests/timezone_offset_get_basic1.phpt
@@ -28,7 +28,7 @@ var_dump(timezone_offset_get($tz, $date));
===DONE===
--EXPECTF--
*** Testing timezone_offset_get() : basic functionality ***
-int(0)
+%rint\(0\)|int\(3600\)%r
%rint\(-18000\)|int\(-14400\)%r
%rint\(-28800\)|int\(-25200\)%r
===DONE===
\ No newline at end of file
diff --git a/ext/dba/dba_db4.c b/ext/dba/dba_db4.c
index 774bd17..2c2da40 100644
--- a/ext/dba/dba_db4.c
+++ b/ext/dba/dba_db4.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba_db4.c,v 1.15.2.3.2.1.2.3 2008/12/31 11:15:36 sebastian Exp $ */
+/* $Id: dba_db4.c,v 1.15.2.3.2.1.2.4 2009/05/13 02:14:53 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -219,7 +219,7 @@ DBA_NEXTKEY_FUNC(db4)
gkey.flags |= DB_DBT_MALLOC;
gval.flags |= DB_DBT_MALLOC;
}
- if (dba->cursor->c_get(dba->cursor, &gkey, &gval, DB_NEXT) == 0) {
+ if (dba->cursor && dba->cursor->c_get(dba->cursor, &gkey, &gval, DB_NEXT) == 0) {
if (gkey.data) {
nkey = estrndup(gkey.data, gkey.size);
if (newlen) *newlen = gkey.size;
diff --git a/ext/dba/tests/bug48240.phpt b/ext/dba/tests/bug48240.phpt
new file mode 100644
index 0000000..72dc439
--- /dev/null
+++ b/ext/dba/tests/bug48240.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Bug #48240 (DBA Segmentation fault dba_nextkey)
+--SKIPIF--
+<?php
+ $handler = 'db4';
+ require_once('skipif.inc');
+?>
+--FILE--
+<?php
+
+$handler = 'db4';
+require_once('test.inc');
+
+$db = dba_open($db_filename, 'c', 'db4');
+
+var_dump(dba_nextkey($db));
+
+dba_close($db);
+unlink($db_filename);
+
+?>
+===DONE===
+--EXPECT--
+bool(false)
+===DONE===
diff --git a/ext/dba/tests/dba_cdb_make.phpt b/ext/dba/tests/dba_cdb_make.phpt
index 04df925..bb41e82 100644
--- a/ext/dba/tests/dba_cdb_make.phpt
+++ b/ext/dba/tests/dba_cdb_make.phpt
@@ -33,6 +33,7 @@ magic_quotes_runtime=1
}
?>
--EXPECT--
+PHP Warning: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0
database handler: cdb_make
string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
-string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
\ No newline at end of file
+string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
diff --git a/ext/dom/document.c b/ext/dom/document.c
index 5cd0a7e..ea3d1a8 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: document.c,v 1.68.2.3.2.5.2.15 2009/03/13 13:43:29 rrichards Exp $ */
+/* $Id: document.c,v 1.68.2.3.2.5.2.17 2009/06/14 13:13:35 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1196,6 +1196,9 @@ PHP_FUNCTION(dom_document_import_node)
if (nodep->doc == docp) {
retnodep = nodep;
} else {
+ if ((recursive == 0) && (nodep->type == XML_ELEMENT_NODE)) {
+ recursive = 2;
+ }
retnodep = xmlDocCopyNode(nodep, docp, recursive);
if (!retnodep) {
RETURN_FALSE;
@@ -1933,11 +1936,7 @@ PHP_FUNCTION(dom_document_validate)
}
DOM_GET_OBJ(docp, id, xmlDocPtr, intern);
-
- if (docp->intSubset == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "No DTD given in XML-Document");
- }
-
+
cvp = xmlNewValidCtxt();
cvp->userData = NULL;
diff --git a/ext/dom/tests/DOMAttr_construct_error_001.phpt b/ext/dom/tests/DOMAttr_construct_error_001.phpt
new file mode 100644
index 0000000..08734ca
--- /dev/null
+++ b/ext/dom/tests/DOMAttr_construct_error_001.phpt
@@ -0,0 +1,17 @@
+--TEST--
+DOMAttr __construct() with no arguments.
+--CREDITS--
+Josh Sweeney <jsweeney at alt-invest.net>
+# TestFest Atlanta 2009-05-14
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$attr = new DOMAttr();
+?>
+--EXPECTF--
+Fatal error: Uncaught exception 'DOMException' with message 'DOMAttr::__construct() expects at least 1 parameter, 0 given' in %s:%d
+Stack trace:
+#0 %s(%d): DOMAttr->__construct()
+#1 {main}
+ thrown in %s on line %d
diff --git a/ext/dom/tests/DOMAttr_name_basic_001.phpt b/ext/dom/tests/DOMAttr_name_basic_001.phpt
new file mode 100644
index 0000000..29ca8c5
--- /dev/null
+++ b/ext/dom/tests/DOMAttr_name_basic_001.phpt
@@ -0,0 +1,14 @@
+--TEST--
+DOMAttr read $name property.
+--CREDITS--
+Nic Rosental <nicrosental at gmail.com>
+# TestFest Atlanta 2009-05-14
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$attr = new DOMAttr('category', 'books');
+print $attr->name;
+?>
+--EXPECT--
+category
\ No newline at end of file
diff --git a/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt b/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt
new file mode 100755
index 0000000..a776654
--- /dev/null
+++ b/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt
@@ -0,0 +1,23 @@
+--TEST--
+Read $ownerElement with null parent.
+--CREDITS--
+Travis Pew
+# TestFest Atlanta 2009-05-14
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+
+$document = new DOMDocument;
+$root = $document->createElement('root');
+$document->appendChild($root);
+$attr = $root->setAttribute('category', 'books');
+$document->removeChild($root);
+$root = null;
+var_dump($attr->ownerElement);
+?>
+--EXPECTF--
+Warning: Couldn't fetch DOMAttr. Node no longer exists in %s on line %d
+
+Notice: Undefined property: DOMAttr::$ownerElement in %s on line %d
+NULL
diff --git a/ext/dom/tests/DOMAttr_value_basic_002.phpt b/ext/dom/tests/DOMAttr_value_basic_002.phpt
new file mode 100644
index 0000000..cf71eeb
--- /dev/null
+++ b/ext/dom/tests/DOMAttr_value_basic_002.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Write non-string $value property
+--CREDIT--
+Eric Berg <ehberg at gmail.com>
+# TestFest Atlanta 2009-05-14
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$attr = new DOMAttr('category');
+$attr->value = 1;
+print $attr->value;
+?>
+--EXPECTF--
+1
\ No newline at end of file
diff --git a/ext/dom/tests/DOMCDATASection_construct_error_001.phpt b/ext/dom/tests/DOMCDATASection_construct_error_001.phpt
new file mode 100644
index 0000000..4db2130
--- /dev/null
+++ b/ext/dom/tests/DOMCDATASection_construct_error_001.phpt
@@ -0,0 +1,21 @@
+--TEST--
+__construct() with no arguments.
+--CREDITS--
+Nic Rosental nicrosental at gmail.com
+# TestFest Atlanta 2009-5-14
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+ try
+ {
+ $section = new DOMCDataSection();
+
+ }
+ catch (Exception $e)
+ {
+ echo $e->getMessage();
+ }
+?>
+--EXPECT--
+DOMCdataSection::__construct() expects exactly 1 parameter, 0 given
\ No newline at end of file
diff --git a/ext/dom/tests/DOMCharacterData_appendData_error_001.phpt b/ext/dom/tests/DOMCharacterData_appendData_error_001.phpt
new file mode 100644
index 0000000..4126f99
--- /dev/null
+++ b/ext/dom/tests/DOMCharacterData_appendData_error_001.phpt
@@ -0,0 +1,19 @@
+--TEST--
+DOMCharacterData::appendData() with no arguments.
+--CREDITS--
+Eric Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-24
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$document = new DOMDocument;
+$root = $document->createElement('root');
+$document->appendChild($root);
+
+$cdata = $document->createCDATASection('test');
+$root->appendChild($cdata);
+$cdata->appendData();
+?>
+--EXPECTF--
+Warning: DOMCharacterData::appendData() expects exactly 1 parameter, 0 given in %s on line %d
\ No newline at end of file
diff --git a/ext/dom/tests/DOMCharacterData_data_error_002.phpt b/ext/dom/tests/DOMCharacterData_data_error_002.phpt
new file mode 100755
index 0000000..9dae096
--- /dev/null
+++ b/ext/dom/tests/DOMCharacterData_data_error_002.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Invalid State Error when getting data on DOMCharacterData out of content.
+--CREDIT--
+Eric Berg <ehberg at gmail.com>
+# TestFest Atlanta 2009-05-14
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$character_data = new DOMCharacterData();
+print $character_data->data;
+?>
+--EXPECTF--
+Warning: main(): Invalid State Error in %s on line %d
\ No newline at end of file
diff --git a/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt b/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt
new file mode 100644
index 0000000..ad104f1
--- /dev/null
+++ b/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt
@@ -0,0 +1,20 @@
+--TEST--
+DOMCharacterData::deleteData() with count exceeding string size.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-24
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$document = new DOMDocument;
+$root = $document->createElement('root');
+$document->appendChild($root);
+
+$cdata = $document->createCDATASection('test');
+$root->appendChild($cdata);
+$cdata->deleteData(1, 10);
+var_dump($cdata->data);
+?>
+--EXPECTF--
+%unicode|string%(%d) "t"
\ No newline at end of file
diff --git a/ext/dom/tests/DOMCharacterData_deleteData_error_001.phpt b/ext/dom/tests/DOMCharacterData_deleteData_error_001.phpt
new file mode 100644
index 0000000..3fa7fba
--- /dev/null
+++ b/ext/dom/tests/DOMCharacterData_deleteData_error_001.phpt
@@ -0,0 +1,19 @@
+--TEST--
+DOMCharacterData::deleteData() with no arguments.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-24
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$document = new DOMDocument;
+$root = $document->createElement('root');
+$document->appendChild($root);
+
+$cdata = $document->createCDATASection('test');
+$root->appendChild($cdata);
+$cdata->deleteData();
+?>
+--EXPECTF--
+Warning: DOMCharacterData::deleteData() expects exactly 2 parameters, 0 given in %s on line %d
\ No newline at end of file
diff --git a/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt b/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt
new file mode 100644
index 0000000..117d5de
--- /dev/null
+++ b/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt
@@ -0,0 +1,23 @@
+--TEST--
+DOMCharacterData::deleteData() with offset exceeding string size.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-24
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$document = new DOMDocument;
+$root = $document->createElement('root');
+$document->appendChild($root);
+
+$cdata = $document->createCDATASection('test');
+$root->appendChild($cdata);
+$cdata->deleteData(5, 1);
+?>
+--EXPECTF--
+Fatal error: Uncaught exception 'DOMException' with message 'Index Size Error' in %s:%d
+Stack trace:
+#0 %s(%d): DOMCharacterData->deleteData(5, 1)
+#1 {main}
+ thrown in %s on line %d
\ No newline at end of file
diff --git a/ext/dom/tests/DOMCharacterData_insertData_error_001.phpt b/ext/dom/tests/DOMCharacterData_insertData_error_001.phpt
new file mode 100644
index 0000000..813a0be
--- /dev/null
+++ b/ext/dom/tests/DOMCharacterData_insertData_error_001.phpt
@@ -0,0 +1,19 @@
+--TEST--
+DOMCharacterData::insertData() with no arguments.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-24
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$document = new DOMDocument;
+$root = $document->createElement('root');
+$document->appendChild($root);
+
+$cdata = $document->createCDATASection('test');
+$root->appendChild($cdata);
+$cdata->insertData();
+?>
+--EXPECTF--
+Warning: DOMCharacterData::insertData() expects exactly 2 parameters, 0 given in %s on line %d
\ No newline at end of file
diff --git a/ext/dom/tests/DOMCharacterData_replaceData_error_001.phpt b/ext/dom/tests/DOMCharacterData_replaceData_error_001.phpt
new file mode 100644
index 0000000..45d25dd
--- /dev/null
+++ b/ext/dom/tests/DOMCharacterData_replaceData_error_001.phpt
@@ -0,0 +1,19 @@
+--TEST--
+DOMCharacterData::replaceData() with no arguments.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-24
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$document = new DOMDocument;
+$root = $document->createElement('root');
+$document->appendChild($root);
+
+$cdata = $document->createCDATASection('test');
+$root->appendChild($cdata);
+$cdata->replaceData();
+?>
+--EXPECTF--
+Warning: DOMCharacterData::replaceData() expects exactly 3 parameters, 0 given in %s on line %d
\ No newline at end of file
diff --git a/ext/dom/tests/DOMComment_construct_basic_001.phpt b/ext/dom/tests/DOMComment_construct_basic_001.phpt
new file mode 100644
index 0000000..902f7bb
--- /dev/null
+++ b/ext/dom/tests/DOMComment_construct_basic_001.phpt
@@ -0,0 +1,19 @@
+--TEST--
+DOMComment::__construct() with constructor called twice.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-25
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$dom = new DOMDocument('1.0', 'UTF-8');
+$element = $dom->appendChild(new DOMElement('root'));
+$comment = new DOMComment("This is the first comment.");
+$comment->__construct("This is the second comment.");
+$comment = $element->appendChild($comment);
+print $dom->saveXML();
+?>
+--EXPECT--
+<?xml version="1.0" encoding="UTF-8"?>
+<root><!--This is the second comment.--></root>
diff --git a/ext/dom/tests/DOMComment_construct_error_001.phpt b/ext/dom/tests/DOMComment_construct_error_001.phpt
new file mode 100644
index 0000000..89142fe
--- /dev/null
+++ b/ext/dom/tests/DOMComment_construct_error_001.phpt
@@ -0,0 +1,17 @@
+--TEST--
+DOMComment::__construct() with more arguments than acceptable.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-24
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$comment = new DOMComment("comment1", "comment2");
+?>
+--EXPECTF--
+Fatal error: Uncaught exception 'DOMException' with message 'DOMComment::__construct() expects at most 1 parameter, 2 given' in %s:%d
+Stack trace:
+#0 %s(%d): DOMComment->__construct('comment1', 'comment2')
+#1 {main}
+ thrown in %s on line %d
\ No newline at end of file
diff --git a/ext/dom/tests/DOMDocumentFragment_appendXML_basic_001.phpt b/ext/dom/tests/DOMDocumentFragment_appendXML_basic_001.phpt
new file mode 100644
index 0000000..a6f381b
--- /dev/null
+++ b/ext/dom/tests/DOMDocumentFragment_appendXML_basic_001.phpt
@@ -0,0 +1,22 @@
+--TEST--
+DOMDocumentFragment::appendXML() with children with properties.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-24
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$document = new DOMDocument;
+$root = $document->createElement('root');
+$document->appendChild($root);
+
+$fragment = $document->createDocumentFragment();
+$fragment->appendXML('<foo id="baz">bar</foo>');
+$root->appendChild($fragment);
+
+print $document->saveXML();
+?>
+--EXPECT--
+<?xml version="1.0"?>
+<root><foo id="baz">bar</foo></root>
diff --git a/ext/dom/tests/DOMDocumentFragment_appendXML_error_001.phpt b/ext/dom/tests/DOMDocumentFragment_appendXML_error_001.phpt
new file mode 100644
index 0000000..6ffe510
--- /dev/null
+++ b/ext/dom/tests/DOMDocumentFragment_appendXML_error_001.phpt
@@ -0,0 +1,14 @@
+--TEST--
+DOMDocumentFragment::appendXML() with no arguments.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-24
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$fragment = new DOMDocumentFragment();
+$fragment->appendXML();
+?>
+--EXPECTF--
+Warning: DOMDocumentFragment::appendXML() expects exactly 1 parameter, 0 given in %s on line %d
\ No newline at end of file
diff --git a/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt b/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt
new file mode 100644
index 0000000..c02c920
--- /dev/null
+++ b/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt
@@ -0,0 +1,19 @@
+--TEST--
+DOMDocumentFragment::appendXML() with unbound fragment.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-24
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$fragment = new DOMDocumentFragment();
+$fragment->appendXML('<bait>crankbait</bait>');
+$document->appendChild($fragment);
+?>
+--EXPECTF--
+Fatal error: Uncaught exception 'DOMException' with message 'No Modification Allowed Error' in %s:%d
+Stack trace:
+#0 %s(%d): DOMDocumentFragment->appendXML('<bait>crankbait...')
+#1 {main}
+ thrown in %s on line %d
\ No newline at end of file
diff --git a/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt b/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt
new file mode 100644
index 0000000..8735ae6
--- /dev/null
+++ b/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt
@@ -0,0 +1,19 @@
+--TEST--
+DOMDocumentFragment::appendXML() with unbalanced chunks.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-24
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$document = new DOMDocument;
+$root = $document->createElement('root');
+$document->appendChild($root);
+
+$fragment = $document->createDocumentFragment();
+@$fragment->appendXML('<foo>is<bar>great</foo>');
+$root->appendChild($fragment);
+?>
+--EXPECTF--
+Warning: DOMNode::appendChild(): Document Fragment is empty in %s on line %d
\ No newline at end of file
diff --git a/ext/dom/tests/DOMDocumentFragment_construct_basic_001.phpt b/ext/dom/tests/DOMDocumentFragment_construct_basic_001.phpt
new file mode 100644
index 0000000..6021bac
--- /dev/null
+++ b/ext/dom/tests/DOMDocumentFragment_construct_basic_001.phpt
@@ -0,0 +1,15 @@
+--TEST--
+DOMDocumentFragment::__construct().
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-24
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$fragment = new DOMDocumentFragment();
+var_dump($fragment);
+?>
+--EXPECTF--
+object(DOMDocumentFragment)#%d (%d) {
+}
diff --git a/ext/dom/tests/DOMDocumentFragment_construct_basic_002.phpt b/ext/dom/tests/DOMDocumentFragment_construct_basic_002.phpt
new file mode 100644
index 0000000..0d73445
--- /dev/null
+++ b/ext/dom/tests/DOMDocumentFragment_construct_basic_002.phpt
@@ -0,0 +1,16 @@
+--TEST--
+DOMDocumentFragment::__construct() called twice.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-24
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$fragment = new DOMDocumentFragment();
+$fragment->__construct();
+var_dump($fragment);
+?>
+--EXPECTF--
+object(DOMDocumentFragment)#%d (%d) {
+}
diff --git a/ext/dom/tests/DOMDocumentFragment_construct_error_001.phpt b/ext/dom/tests/DOMDocumentFragment_construct_error_001.phpt
new file mode 100644
index 0000000..91173c4
--- /dev/null
+++ b/ext/dom/tests/DOMDocumentFragment_construct_error_001.phpt
@@ -0,0 +1,17 @@
+--TEST--
+DOMDocumentFragment::__construct() with too many errors.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-24
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$fragment = new DOMDocumentFragment("root");
+?>
+--EXPECTF--
+Fatal error: Uncaught exception 'DOMException' with message 'DOMDocumentFragment::__construct() expects exactly 0 parameters, 1 given' in %s:%d
+Stack trace:
+#0 %s(%d): DOMDocumentFragment->__construct('root')
+#1 {main}
+ thrown in %s on line %d
\ No newline at end of file
diff --git a/ext/dom/tests/DOMDocumentType_basic_001.phpt b/ext/dom/tests/DOMDocumentType_basic_001.phpt
new file mode 100644
index 0000000..8991ed9
--- /dev/null
+++ b/ext/dom/tests/DOMDocumentType_basic_001.phpt
@@ -0,0 +1,48 @@
+--TEST--
+DOMDocumentType: basic access to all properties.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-25
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+// Access publicId, systemId, name, internalSubset all with values.
+$xml = '<?xml version="1.0" encoding="UTF-8" ?>';
+$xml .= '<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML//EN" "docbookx.dtd">';
+$xml .= '<chapter>1</chapter>';
+$doc = new DOMDocument();
+$doc->loadXML($xml);
+$doctype = $doc->doctype;
+print "publicId: ".$doctype->publicId."\n";
+print "systemId: ".$doctype->systemId."\n";
+print "name: ".$doctype->name."\n";
+print "internalSubset: ".$doctype->internalSubset."\n";
+
+
+// Access entities and notations with values.
+$xml = '<?xml version="1.0" encoding="UTF-8" ?>';
+$xml .= '<!DOCTYPE img [';
+$xml .= ' <!ELEMENT img EMPTY>';
+$xml .= ' <!ATTLIST img src ENTITY #REQUIRED>';
+$xml .= ' <!ENTITY logo SYSTEM "http://www.xmlwriter.net/logo.gif" NDATA gif>';
+$xml .= ' <!NOTATION gif PUBLIC "gif viewer">';
+$xml .= ']>';
+$xml .= '<img src="logo"/>';
+$doc = new DOMDocument();
+$doc->loadXML($xml);
+$doctype = $doc->doctype;
+$entities = $doctype->entities;
+$entity = $entities->item(0);
+print 'entity: '.$entity->nodeName."\n";
+$notations = $doctype->notations;
+$notation = $notations->item(0);
+print 'notation: '.$notation->nodeName."\n";
+?>
+--EXPECT--
+publicId: -//OASIS//DTD DocBook XML//EN
+systemId: docbookx.dtd
+name: chapter
+internalSubset: <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML//EN" "docbookx.dtd">
+entity: logo
+notation: gif
\ No newline at end of file
diff --git a/ext/dom/tests/DOMDocumentType_entities_error_001.phpt b/ext/dom/tests/DOMDocumentType_entities_error_001.phpt
new file mode 100644
index 0000000..73655b0
--- /dev/null
+++ b/ext/dom/tests/DOMDocumentType_entities_error_001.phpt
@@ -0,0 +1,14 @@
+--TEST--
+DOMDocumentType::entities with invalid state.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-25
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$doctype = new DOMDocumentType();
+$entities = $doctype->entities;
+?>
+--EXPECTF--
+Warning: main(): Invalid State Error in %s on line %d
\ No newline at end of file
diff --git a/ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt b/ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt
new file mode 100644
index 0000000..c1f7d9b
--- /dev/null
+++ b/ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt
@@ -0,0 +1,14 @@
+--TEST--
+DOMDocumentType::internalSubset with invalid state.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-25
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$doctype = new DOMDocumentType();
+$internalSubset = $doctype->internalSubset;
+?>
+--EXPECTF--
+Warning: main(): Invalid State Error in %s on line %d
\ No newline at end of file
diff --git a/ext/dom/tests/DOMDocumentType_name_error_001.phpt b/ext/dom/tests/DOMDocumentType_name_error_001.phpt
new file mode 100644
index 0000000..d2426e8
--- /dev/null
+++ b/ext/dom/tests/DOMDocumentType_name_error_001.phpt
@@ -0,0 +1,14 @@
+--TEST--
+DOMDocumentType::name with invalid state.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-25
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$doctype = new DOMDocumentType();
+$name = $doctype->name;
+?>
+--EXPECTF--
+Warning: main(): Invalid State Error in %s on line %d
\ No newline at end of file
diff --git a/ext/dom/tests/DOMDocumentType_notations_error_001.phpt b/ext/dom/tests/DOMDocumentType_notations_error_001.phpt
new file mode 100644
index 0000000..e4d1c3c
--- /dev/null
+++ b/ext/dom/tests/DOMDocumentType_notations_error_001.phpt
@@ -0,0 +1,14 @@
+--TEST--
+DOMDocumentType::notations with invalid state.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-25
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$doctype = new DOMDocumentType();
+$notations = $doctype->notations;
+?>
+--EXPECTF--
+Warning: main(): Invalid State Error in %s on line %d
\ No newline at end of file
diff --git a/ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt b/ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt
new file mode 100644
index 0000000..49a7eec
--- /dev/null
+++ b/ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt
@@ -0,0 +1,19 @@
+--TEST--
+DOMDocumentType::publicId with empty value.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-25
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$xml = '<?xml version="1.0" encoding="UTF-8" ?>';
+$xml .= '<!DOCTYPE chapter SYSTEM "http://www.xmlwriter.net/logo.gif">';
+$xml .= '<chapter>1</chapter>';
+$doc = new DOMDocument();
+$doc->loadXML($xml);
+$doctype = $doc->doctype;
+var_dump($doctype->publicId);
+?>
+--EXPECT--
+string(0) ""
\ No newline at end of file
diff --git a/ext/dom/tests/DOMDocumentType_publicId_error_001.phpt b/ext/dom/tests/DOMDocumentType_publicId_error_001.phpt
new file mode 100644
index 0000000..275bb65
--- /dev/null
+++ b/ext/dom/tests/DOMDocumentType_publicId_error_001.phpt
@@ -0,0 +1,14 @@
+--TEST--
+DOMDocumentType::publicId with invalid state.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-25
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$doctype = new DOMDocumentType();
+$publicId = $doctype->publicId;
+?>
+--EXPECTF--
+Warning: main(): Invalid State Error in %s on line %d
\ No newline at end of file
diff --git a/ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt b/ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt
new file mode 100644
index 0000000..56f7ddd
--- /dev/null
+++ b/ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt
@@ -0,0 +1,19 @@
+--TEST--
+DOMDocumentType::systemId with empty value.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-25
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$xml = '<?xml version="1.0" encoding="UTF-8" ?>';
+$xml .= '<!DOCTYPE chapter>';
+$xml .= '<chapter>1</chapter>';
+$doc = new DOMDocument();
+$doc->loadXML($xml);
+$doctype = $doc->doctype;
+var_dump($doctype->systemId);
+?>
+--EXPECT--
+string(0) ""
\ No newline at end of file
diff --git a/ext/dom/tests/DOMDocumentType_systemId_error_001.phpt b/ext/dom/tests/DOMDocumentType_systemId_error_001.phpt
new file mode 100644
index 0000000..a4aadd7
--- /dev/null
+++ b/ext/dom/tests/DOMDocumentType_systemId_error_001.phpt
@@ -0,0 +1,14 @@
+--TEST--
+DOMDocumentType::systemId with invalid state.
+--CREDITS--
+Eric Lee Stewart <ericleestewart at gmail.com>
+# TestFest Atlanta 2009-05-25
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$doctype = new DOMDocumentType();
+$systemId = $doctype->systemId;
+?>
+--EXPECTF--
+Warning: main(): Invalid State Error in %s on line %d
\ No newline at end of file
diff --git a/ext/dom/tests/bug47849.phpt b/ext/dom/tests/bug47849.phpt
new file mode 100644
index 0000000..7e6b02c
--- /dev/null
+++ b/ext/dom/tests/bug47849.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #47849 (Non-deep import loses the namespace).
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+
+$aDOM= new DOMDocument();
+$aDOM->appendChild($aDOM->createElementNS('urn::root','r:root'));
+
+$fromdom= new DOMDocument();
+$fromdom->loadXML('<data xmlns="urn::data">aaa</data>');
+
+$data= $fromdom->documentElement;
+$aDOM->documentElement->appendChild($aDOM->importNode($data));
+
+echo $aDOM->saveXML();
+
+?>
+--EXPECT--
+<?xml version="1.0"?>
+<r:root xmlns:r="urn::root"><data xmlns="urn::data"/></r:root>
diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index 8bc12fd..38d23da 100644
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xpath.c,v 1.26.2.1.2.1.2.12 2008/12/31 11:15:36 sebastian Exp $ */
+/* $Id: xpath.c,v 1.26.2.1.2.1.2.13 2009/06/06 02:40:48 mattwil Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -232,7 +232,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs,
} else if (retval->type == IS_BOOL) {
valuePush(ctxt, xmlXPathNewBoolean(retval->value.lval));
} else if (retval->type == IS_OBJECT) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "A PHP Object can not be converted to a XPath-string");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "A PHP Object cannot be converted to a XPath-string");
valuePush(ctxt, xmlXPathNewString((xmlChar *)""));
} else {
convert_to_string_ex(&retval);
diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
index 9484c74..29a9b94 100644
--- a/ext/ereg/ereg.c
+++ b/ext/ereg/ereg.c
@@ -17,7 +17,7 @@
| Jaakko Hyvätti <jaakko at hyvatti.iki.fi> |
+----------------------------------------------------------------------+
*/
-/* $Id: ereg.c,v 1.90.2.12 2009/01/08 00:37:39 iliaa Exp $ */
+/* $Id: ereg.c,v 1.90.2.13 2009/05/28 21:57:24 scottmac Exp $ */
#include <stdio.h>
#include <ctype.h>
@@ -67,8 +67,10 @@ const zend_function_entry ereg_functions[] = {
typedef struct {
regex_t preg;
int cflags;
+ unsigned long lastuse;
} reg_cache;
static int reg_magic = 0;
+#define EREG_CACHE_SIZE 4096
/* }}} */
ZEND_DECLARE_MODULE_GLOBALS(ereg)
@@ -88,6 +90,38 @@ zend_module_entry ereg_module_entry = {
};
/* }}} */
+/* {{{ ereg_lru_cmp */
+static int ereg_lru_cmp(const void *a, const void *b TSRMLS_DC)
+{
+ Bucket *f = *((Bucket **) a);
+ Bucket *s = *((Bucket **) b);
+
+ if (((reg_cache *)f->pData)->lastuse <
+ ((reg_cache *)s->pData)->lastuse) {
+ return -1;
+ } else if (((reg_cache *)f->pData)->lastuse ==
+ ((reg_cache *)s->pData)->lastuse) {
+ return 0;
+ } else {
+ return 1;
+ }
+}
+/* }}} */
+
+/* {{{ static ereg_clean_cache */
+static int ereg_clean_cache(void *data, void *arg TSRMLS_DC)
+{
+ int *num_clean = (int *)arg;
+
+ if (*num_clean > 0) {
+ (*num_clean)--;
+ return ZEND_HASH_APPLY_REMOVE;
+ } else {
+ return ZEND_HASH_APPLY_STOP;
+ }
+}
+/* }}} */
+
/* {{{ _php_regcomp
*/
static int _php_regcomp(regex_t *preg, const char *pattern, int cflags)
@@ -96,7 +130,18 @@ static int _php_regcomp(regex_t *preg, const char *pattern, int cflags)
int patlen = strlen(pattern);
reg_cache *rc = NULL;
TSRMLS_FETCH();
-
+
+ if (zend_hash_num_elements(&EREG(ht_rc)) >= EREG_CACHE_SIZE) {
+ /* easier than dealing with overflow as it happens */
+ if (EREG(lru_counter) >= (1 << 31) || zend_hash_sort(&EREG(ht_rc), zend_qsort, ereg_lru_cmp, 0 TSRMLS_CC) == FAILURE) {
+ zend_hash_clean(&EREG(ht_rc));
+ EREG(lru_counter) = 0;
+ } else {
+ int num_clean = EREG_CACHE_SIZE / 4;
+ zend_hash_apply_with_argument(&EREG(ht_rc), ereg_clean_cache, &num_clean TSRMLS_CC);
+ }
+ }
+
if(zend_hash_find(&EREG(ht_rc), (char *) pattern, patlen+1, (void **) &rc) == SUCCESS
&& rc->cflags == cflags) {
#ifdef HAVE_REGEX_T_RE_MAGIC
@@ -106,6 +151,7 @@ static int _php_regcomp(regex_t *preg, const char *pattern, int cflags)
*/
if (rc->preg.re_magic != reg_magic) {
zend_hash_clean(&EREG(ht_rc));
+ EREG(lru_counter) = 0;
} else {
memcpy(preg, &rc->preg, sizeof(*preg));
return r;
@@ -117,6 +163,7 @@ static int _php_regcomp(regex_t *preg, const char *pattern, int cflags)
reg_cache rcp;
rcp.cflags = cflags;
+ rcp.lastuse = ++(EREG(lru_counter));
memcpy(&rcp.preg, preg, sizeof(*preg));
/*
* Since we don't have access to the actual MAGIC1 definition in the private
@@ -135,6 +182,7 @@ static int _php_regcomp(regex_t *preg, const char *pattern, int cflags)
reg_cache rcp;
rcp.cflags = cflags;
+ rcp.lastuse = ++(EREG(lru_counter));
memcpy(&rcp.preg, preg, sizeof(*preg));
zend_hash_update(&EREG(ht_rc), (char *) pattern, patlen+1,
(void *) &rcp, sizeof(rcp), NULL);
@@ -158,6 +206,7 @@ static void _free_ereg_cache(reg_cache *rc)
static void php_ereg_init_globals(zend_ereg_globals *ereg_globals TSRMLS_DC)
{
zend_hash_init(&ereg_globals->ht_rc, 0, NULL, (void (*)(void *)) _free_ereg_cache, 1);
+ ereg_globals->lru_counter = 0;
}
static void php_ereg_destroy_globals(zend_ereg_globals *ereg_globals TSRMLS_DC)
diff --git a/ext/ereg/php_ereg.h b/ext/ereg/php_ereg.h
index 04e73ec..70edbbe 100644
--- a/ext/ereg/php_ereg.h
+++ b/ext/ereg/php_ereg.h
@@ -17,7 +17,7 @@
*/
-/* $Id: php_ereg.h,v 1.24.2.4 2008/12/31 11:15:36 sebastian Exp $ */
+/* $Id: php_ereg.h,v 1.24.2.5 2009/05/28 21:57:24 scottmac Exp $ */
#ifndef EREG_H
#define EREG_H
@@ -39,6 +39,7 @@ PHPAPI PHP_FUNCTION(sql_regcase);
ZEND_BEGIN_MODULE_GLOBALS(ereg)
HashTable ht_rc;
+ unsigned int lru_counter;
ZEND_END_MODULE_GLOBALS(ereg)
/* Module functions */
diff --git a/ext/ereg/tests/split_variation_004.phpt b/ext/ereg/tests/split_variation_004.phpt
index 6b9a869..1fa71ed 100644
--- a/ext/ereg/tests/split_variation_004.phpt
+++ b/ext/ereg/tests/split_variation_004.phpt
@@ -36,16 +36,8 @@ array(1) {
string(9) "1 2 3 4 5"
}
Error: 8192 - Function split() is deprecated, %s(18)
-array(5) {
+array(1) {
[0]=>
- string(1) "1"
- [1]=>
- string(1) "2"
- [2]=>
- string(1) "3"
- [3]=>
- string(1) "4"
- [4]=>
- string(1) "5"
+ string(9) "1 2 3 4 5"
}
Done
diff --git a/ext/ereg/tests/spliti_variation_004.phpt b/ext/ereg/tests/spliti_variation_004.phpt
index e9b33d4..b6bf227 100644
--- a/ext/ereg/tests/spliti_variation_004.phpt
+++ b/ext/ereg/tests/spliti_variation_004.phpt
@@ -36,16 +36,8 @@ array(1) {
string(9) "1 2 3 4 5"
}
Error: 8192 - Function spliti() is deprecated, %s(18)
-array(5) {
+array(1) {
[0]=>
- string(1) "1"
- [1]=>
- string(1) "2"
- [2]=>
- string(1) "3"
- [3]=>
- string(1) "4"
- [4]=>
- string(1) "5"
+ string(9) "1 2 3 4 5"
}
Done
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index a10b6d0..96358f2 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.173.2.5.2.20.2.14 2008/12/31 11:15:36 sebastian Exp $ */
+/* $Id: exif.c,v 1.173.2.5.2.20.2.16 2009/06/12 14:03:35 felipe Exp $ */
/* ToDos
*
@@ -138,7 +138,7 @@ const zend_function_entry exif_functions[] = {
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.20.2.14 2008/12/31 11:15:36 sebastian Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.20.2.16 2009/06/12 14:03:35 felipe Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -3210,6 +3210,10 @@ static void exif_process_TIFF_in_JPEG(image_info_type *ImageInfo, char *CharBuf,
exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Invalid TIFF start (1)");
return;
}
+ if (offset_of_ifd > length) {
+ exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Invalid IFD start");
+ return;
+ }
ImageInfo->sections_found |= FOUND_IFD0;
/* First directory starts at offset 8. Offsets starts at 0. */
@@ -3909,17 +3913,17 @@ PHP_FUNCTION(exif_read_data)
int p_name_len, p_sections_needed_len = 0;
zend_bool sub_arrays=0, read_thumbnail=0, read_all=0;
- int i, ac = ZEND_NUM_ARGS(), ret, sections_needed=0;
+ int i, ret, sections_needed=0;
image_info_type ImageInfo;
char tmp[64], *sections_str, *s;
- if (zend_parse_parameters(ac TSRMLS_CC, "s|sbb", &p_name, &p_name_len, &p_sections_needed, &p_sections_needed_len, &sub_arrays, &read_thumbnail) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|sbb", &p_name, &p_name_len, &p_sections_needed, &p_sections_needed_len, &sub_arrays, &read_thumbnail) == FAILURE) {
return;
}
memset(&ImageInfo, 0, sizeof(ImageInfo));
- if (ac >= 2) {
+ if (p_sections_needed) {
spprintf(§ions_str, 0, ",%s,", p_sections_needed);
/* sections_str DOES start with , and SPACES are NOT allowed in names */
s = sections_str;
diff --git a/ext/exif/tests/bug48378.jpeg b/ext/exif/tests/bug48378.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..759d8057098948ac0fe579805aecff6997489888
GIT binary patch
literal 2566
zcmex=<Nrg3HrI;GGzJDwPb~&c1_uTv1|vo$1`!4Z1~nkgY-eF$1kzSOoB+f|1_qW^
z2Bua<CJKfYRt9EPie^B0<_QoTK0p;9fT7CJ3}`MR6U3}Kpb91sTL7e%1&BEq{@-Re
z%)rXb!otGL3M5!rS=-ooIM{)JpPQSLN047gNRVGpP*_YxTv$X(R8UYtQ9?>qR$g9S
zSX at a(NlryZPG0W+0S0akW(lSgMn*w~|3?@kK~7@?IUf#K+1QymfKuuLj6gRqGcYnU
zvqB{qnV3~r*#w2y6%B<&M8%bq9UK4OV&DMjw`cek0XG7f;egCxU{FBiGNE!Ycn&Bc
z>%Z at Nc&KEZvH!&9#ph&m_x_PG*}t{x($C!I=PqY<tX&<k^=;<-t=XBs|MA}YcxlUy
zTD$b}?O*@q8CRv5nj05IWHu)yf0lS}_T&CPpGDQ at uiV>t#cbQwol<!(Qm#FGd;0#D
z9j`0q1kRd~=`nLlb<OmXf)RiGkKH>{yLbMjx3=l!^KZQV72Dr&^O@<QbbI;sa at lW&
zE|qU?%lMz#S1mu|KSRNE6xV_|f&Uhi?tORqUX^cgM)up%ciP$Mlkfe_Z#n)>v;E7~
z)gR~YIlpsL{EdF4!sGk==RNviH>=j|!aw~<=MNXn-o0B!>>SUnKV{FwMXuhub??T_
z8^>pv8>X&F-dg;4&3&Gz`lE)XTYSUfU(U~JKb`gQ%HxeG4 at --`?$erCoRf6A;<3f6
z=xp7$c44`nZq9l<|IM1)=j#mPkH;^atG at MBkuAUb)R(vJ=-Dl`uC{5{t=(fSZRxw`
zMp44njlQ~;N;}n6pY3_tb$+AQPkZ_34Is~;Boj=p!bRYb3QWClHe42!;Q-_|pbBB<
zfieLQIDkpq1XLMr1t6IQ{L%zv33&=;fCG#{9*xT{3Q*&~g#(n0>LdrKC<cWQg$)==
zfC36|K at 9b{+|&Tqf?y~hm_v)jL|F<!#07E;;S2(7!Gsa+Sac&B?tm)KfyxE*5HW|W
z5uBs2DaT?0MM4hvbra)ZkO`=6hnk5HRDg;gQwUjPQKH!tYR9yv0aJ*8NCPzPNYY7?
eVpIp9Yek71k`fCd(V^NvUmn!`WX2 at _|C<2yEdUq*
literal 0
HcmV?d00001
diff --git a/ext/exif/tests/bug48378.phpt b/ext/exif/tests/bug48378.phpt
new file mode 100644
index 0000000..286ce61
--- /dev/null
+++ b/ext/exif/tests/bug48378.phpt
@@ -0,0 +1,19 @@
+--TEST--
+Bug #48378 (Infinite recursion due to corrupt JPEG)
+--SKIPIF--
+<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
+--FILE--
+<?php
+exif_read_data(
+dirname(__FILE__) . "/bug48378.jpeg",
+"FILE,COMPUTED,ANY_TAG"
+);
+?>
+--EXPECTF--
+Warning: exif_read_data(%s): Invalid IFD start in %s48378.php on line %d
+
+Warning: exif_read_data(%s): Error reading from file: got=x08B4(=2228) != itemlen-2=x1FFE(=8190) in %s48378.php on line %d
+
+Warning: exif_read_data(%s): Invalid JPEG file in %s48378.php on line %d
+
+
diff --git a/ext/exif/tests/exif006.phpt b/ext/exif/tests/exif006.phpt
index bad74ee..256a9eb 100644
--- a/ext/exif/tests/exif006.phpt
+++ b/ext/exif/tests/exif006.phpt
@@ -20,6 +20,7 @@ magic_quotes_runtime=1
var_dump(exif_read_data(dirname(__FILE__).'/test6.jpg','',true,false));
?>
--EXPECTF--
+PHP Warning: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0
array(5) {
["FILE"]=>
array(6) {
diff --git a/ext/fileinfo/data_file.c b/ext/fileinfo/data_file.c
index 3ad05d0..efd6528 100644
--- a/ext/fileinfo/data_file.c
+++ b/ext/fileinfo/data_file.c
@@ -1,6 +1,6 @@
/* This is a generated file, do not modify */
/* Usage: php create_data_file.php /path/to/magic.mgc >