summaryrefslogtreecommitdiff
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-151-2/+2
|\ | | | | | | | | | | | | | | | | | | * origin/master: made the apache ini holders to be zend_bool Removed useless local variable Use simpler functions Fixed test small fixes to UPGRADING Reorder to save alignment size (of course, only for common used structs)
| * Reorder to save alignment size (of course, only for common used structs)Xinchen Hui2014-12-151-2/+2
| |
| * Revert HTTP status codes mergerAndrea Faulds2014-12-151-80/+0
| | | | | | | | This reverts commits 65768edcf3ef27a21a07e5e994bfd9ca1cabfa94, 627b350f31be83eb1d5ac5fad692256dcfaf1281 and 9c18ad3ac9103bc0a6c7b7ab8938fd7272095652.
| * fixed tests, bugs in status codes mergerAndrea Faulds2014-12-141-2/+2
| |
| * Fix indentationAndrea Faulds2014-12-141-48/+48
| |
| * Merge branch 'unify_http'Andrea Faulds2014-12-141-0/+80
| |\ | | | | | | | | | | | | * unify_http: Share HTTP status codes map
| | * Share HTTP status codes mapAndrea Faulds2014-12-141-0/+80
| | |
* | | second shot on removing TSRMLS_*Anatol Belski2014-12-1410-46/+46
| | |
* | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-1347-1706/+1683
| | |
* | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-131-8/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (37 commits) NEWS NEWS Fix bug #68601 buffer read overflow in gd_gif_in.c Fixed compilation warnings Removed unnecessary checks pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary Merged PR #911. Removed ZEND_ACC_FINAL_CLASS which is unnecessary. This also fixed some currently defined classes as final which were just not being considered as such before. Updated NEWS Updated NEWS Updated NEWS Fix bug #68532: convert.base64-encode omits padding bytes Updated NEWS Updated NEWS Updated NEWS Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor) Updated NEWS Updated NEWS Fix MySQLi tests Fixed gd test ...
| * | Merge branch 'PHP-5.6'Julien Pauli2014-12-121-8/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Updated NEWS Updated NEWS Fix bug #68532: convert.base64-encode omits padding bytes
| | * \ Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2014-12-121-8/+12
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Updated NEWS Fix bug #68532: convert.base64-encode omits padding bytes
| | | * | Fix bug #68532: convert.base64-encode omits padding bytesmcq82014-12-121-8/+12
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-063-4/+34
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (35 commits) Fixed bug #68398 msooxml matches too many archives Fix zpp call in apache_getenv() Drop unnecessary zval containers fixed test C89 compat add include for missing localeconv_r proto updated NEWS Fixed bug #65230 setting locale randomly broken Fix compilation error (ref #68424) Removed useless handlers Move checks for references into slow paths of operator functions. Remove duplicate opcode handlers. Revert unintentional docblock change Restored zip/oci8 PHP 4 code, add PHP 7 checks Note macro removal in UPGRADING.INTERNALS Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!) Zend Engine 3 Updated NEWS Updated NEWS Updated NEWS Start adding new attribute to control multi statements ...
| * | | | Merge branch 'PHP-5.6'Anatol Belski2014-12-062-0/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | * PHP-5.6: C89 compat add include for missing localeconv_r proto
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-062-0/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | * PHP-5.5: C89 compat add include for missing localeconv_r proto
| | | * | add include for missing localeconv_r protoAnatol Belski2014-12-062-0/+2
| | | | |
| * | | | Merge branch 'PHP-5.6'Anatol Belski2014-12-062-0/+32
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | * PHP-5.6: updated NEWS Fixed bug #65230 setting locale randomly broken
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-062-0/+32
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #65230 setting locale randomly broken
| | | * | Fixed bug #65230 setting locale randomly brokenAnatol Belski2014-12-062-0/+32
| | | | |
| * | | | Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!)Andrea Faulds2014-12-051-4/+0
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-055-41/+26
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (111 commits) Fix zend_fcall_info_arg*() to use ZVAL_COPY Fixed #65213 - cannot cast SplFileInfo to boolean add initial install switch to C travis project instead of PHP use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/) fix TS build add config option to target codegen architectures updated NEWS updated NEWS Fixed bug #55541 errors spawn MessageBox, which blocks test automation Get rid of duplicate handlers (ZEND_ADD_SPEC_TMP_TMP and ZEND_ADD_SPEC_VAR_VAR are absolutely the same). Use zend_string* for op_array->arg_info[]->name and op_array->arg_info[]->class_name. For internal functions we still use char*. Fixed __debugInfo() support Update UPGRADING for the new variadic functions, and re-sort. Improved POST INC/DEC make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path Missed closed folder mark Revert "Unecessary assignment" Fixed improper memory release Unecessary assignment ...
| * | | | Fix zend_fcall_info_arg*() to use ZVAL_COPYMichael Wallner2014-12-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As zend_fcall_info_args_clear() calls zval_ptr_dtor() we also have to increase the refcount of refcounted zvals added as params, like it is already done in zend_fcall_info_args_ex().
| * | | | Merge branch 'PHP-5.6'Anatol Belski2014-12-031-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: updated NEWS updated NEWS Fixed bug #55541 errors spawn MessageBox, which blocks test automation
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-031-2/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | * PHP-5.5: updated NEWS Fixed bug #55541 errors spawn MessageBox, which blocks test automation
| | | * | Fixed bug #55541 errors spawn MessageBox, which blocks test automationAnatol Belski2014-12-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With that, also fixed bug #68297 (Application Popup provides too few information) as a better error message is provided to the event log. In the second case, the condition for display_startup_error was removed. The condition was added as a fix for bug #30760 which was preventing the MessageBox to appear. When display_startup_error=on, the error will be seen on the console. But when running under a webserver it'll probably get lost, so we need to log it other way into the event log (would be done automatically when message box was used, but that would eventually cause issues of blocked execution). Generally speaking - any MessageBox or other graphical element is a potential issue and that was repeatedly reported. Graphical elements shouldn't be used in the core. Even being a rare one it can cause a bad situation where the server is blocked. Yet some places have to cleaned up.
| * | | | fix datatype mismatchesAnatol Belski2014-12-022-6/+6
| | | | |
| * | | | Merge branch 'PHP-5.6'Anatol Belski2014-12-011-4/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: add include for missing usleep proto C89 compat Added more useful warning messages Changed based on comments and make its behaviour equal to the Windows version Fix #53092 - dns_get_record does not return false on dns server failure Fix php cli (-S option) inconsistent port parsing Conflicts: main/streams/plain_wrapper.c
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-011-4/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: add include for missing usleep proto C89 compat Added more useful warning messages Changed based on comments and make its behaviour equal to the Windows version Fix #53092 - dns_get_record does not return false on dns server failure Fix php cli (-S option) inconsistent port parsing
| | | * | add include for missing usleep protoAnatol Belski2014-12-011-0/+1
| | | | |
| | | * | C89 compatAnatol Belski2014-12-011-4/+1
| | | | |
| * | | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-11-301-29/+16
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Update NEWS fix typo Added test and review suggestion Fix bug #68335: rmdir doesnt work with file:// stream wrapper
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-11-301-29/+16
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Added test and review suggestion Fix bug #68335: rmdir doesnt work with file:// stream wrapper
| | | * | Added test and review suggestionmcq82014-11-301-34/+14
| | | | |
| | | * | Fix bug #68335: rmdir doesnt work with file:// stream wrappermcq82014-11-301-0/+7
| | | | |
| | | * | 5.5.21 nowJulien Pauli2014-11-261-3/+3
| | | | |
| | | * | PHP 5.5.20 nowJulien Pauli2014-10-281-3/+3
| | | | |
| | * | | PHP-5.6.5 is nextFerenc Kovacs2014-11-261-3/+3
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-203-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (36 commits) NEWS adapt test for error message introduce in fix for #68463 Fix bug #68463 listen.allowed_clients can silently result in no allowed access run a few request in this test fix test fix test added info about some other macro changes added note about toolset and phpize added note about the response files split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1 split formatter_format*.phpt for ICP 54.1 split dateformat_timezone_arg_variations*.phpt for ICU 54.1 split dateformat_get_set_timezone_variant*.phpt for ICU 54.1 fix icu version to test split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1 split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1 split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1 split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1 clone dateformat_calendars_variant3.phpt for ICU 54.1 split collator_get_sort_key_variant3.phpt for icu 54.1 ...
| * | | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-193-3/+3
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-1822-128/+142
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (398 commits) NEWS add test for bug #68381 Fixed bug #68381 Set FPM log level earlier during init proper dllexport move to size_t where zend_string is used internally fix some datatype mismatches return after the warning, to fix uninitialized salt usage fix datatype mismatches add missing type specifier fix datatype mismatches fix unsigned check "extern" shouldn't be used for definitions joined identical conditional blocks simplify fpm tests SEND_VAR_NO_REF optimization Add test for bug #68442 Add various tests for FPM - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client Get rid of zend_free_op structure (use zval* instead). Get rid of useless TSRMLS arguments. Add new FPM test for IPv4/IPv6 ... Conflicts: win32/build/config.w32
| * | | | proper dllexportAnatol Belski2014-11-181-1/+1
| | | | |
| * | | | fix datatype mismatchesAnatol Belski2014-11-181-2/+2
| | | | |
| * | | | add missing type specifierAnatol Belski2014-11-181-1/+1
| | | | |
| * | | | fix unused var warningAnatol Belski2014-11-141-1/+2
| | | | |
| * | | | fix datatype mismatch and unused var warningAnatol Belski2014-11-111-3/+5
| | | | |
| * | | | adjust pid_t declaration so it doesn't conflict with apache oneAnatol Belski2014-11-071-1/+1
| | |_|/ | |/| |
| * | | Merge branch 'PHP-5.6'Anatol Belski2014-10-302-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.6: add DLL export to the output globals
| | * | add DLL export to the output globalsAnatol Belski2014-10-302-2/+2
| | | |
| * | | Merge branch 'PHP-5.6'Xinchen Hui2014-10-302-10/+2
| |\ \ \ | | |/ /
View Lorry Controller Status