summaryrefslogtreecommitdiff
path: root/win32
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-01-101-0/+1
|\ | | | | | | | | * PHP-5.4: Fixed uninitialized zval.type (Yoram)
| * Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2013-01-101-0/+1
| |\ | | | | | | | | | | | | * PHP-5.3: Fixed uninitialized zval.type (Yoram)
| | * Fixed uninitialized zval.type (Yoram)Dmitry Stogov2013-01-101-0/+1
| | |
| | * Happy New Year~Xinchen Hui2013-01-0112-12/+12
| | |
| * | Happy New YearXinchen Hui2013-01-0112-12/+12
| | |
* | | Happy New YearXinchen Hui2013-01-0112-12/+12
| | |
* | | Invoke re2c with --no-generation-date to prevent unintentional / unnecessary ↵Sebastian Bergmann2012-12-061-2/+2
| | | | | | | | | | | | changes in generated files.
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-092-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-092-0/+0
| |\ \ | | |/
| | * Fixed bug #63236 (Executable permission on various source files)Xinchen Hui2012-10-092-0/+0
| | |
* | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-09-211-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.4: updated lib versions Fix folding
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-09-211-3/+3
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: updated lib versions
| | * updated lib versionsAnatoliy Belsky2012-09-211-3/+3
| | |
* | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-09-181-4/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: updated libary versions
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-09-181-4/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | * PHP-5.3: updated libary versions Conflicts: win32/build/libs_version.txt
| | * updated libary versionsAnatoliy Belsky2012-09-181-4/+4
| | |
* | | Merge branch 'PHP-5.4'unknown2012-09-082-2/+9
|\ \ \ | | | | | | | | | | | | | | | | * PHP-5.4: -enable VC11 (vc2012)
| * \ \ Merge branch 'PHP-5.3' into PHP-5.4unknown2012-09-082-2/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * PHP-5.3: -enable VC11 (vc2012)
| | * | | -enable VC11 (vc2012)unknown2012-09-082-2/+9
| | | | |
* | | | | Merge branch 'PHP-5.4'Xinchen Hui2012-09-052-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Conflicts: sapi/litespeed/lsapi_main.c
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-09-052-2/+2
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Conflicts: ext/interbase/interbase.rc
| | * | | year++Xinchen Hui2012-09-052-2/+2
| | | | |
* | | | | Merge branch 'generators'Gustavo Lopes2012-09-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * generators: (70 commits) Fix typos Fix segfault when traversing a by-ref generator twice Make sure that exception is thrown on rewind() after closing too Remove implementation stubs for yield delegation Fix several issues and allow rewind only at/before first yield Run finally if generator is closed before finishing Finally with return now works in generators too Add dedicated opcode for returns from a generator Disallow serialization and unserialization Fix zts build (typo) Drop Generator::close() method Forgot to add test Support trivial finally in generators (no yield, no return) Fix implementation of Iterator interface Add T_YIELD in tokenizer_data.c Throw error also for return occuring before yield Fix throwing of exceptions within a generator Remove reference restrictions from foreach Require parenthesis around yield expressions Add some more tests ...
| * \ \ \ \ Merge remote-tracking branch 'php-src/master' into addGeneratorsSupportNikita Popov2012-08-136-25/+25
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just an intial merge. It does not yet make generators and finally work together. Conflicts: Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h Zend/zend_vm_def.h Zend/zend_vm_execute.h Zend/zend_vm_execute.skl Zend/zend_vm_opcodes.h
| * | | | | | Add empty Generator classNikita Popov2012-05-201-1/+1
| | | | | | |
* | | | | | | Merge branch 'PHP-5.4'Felipe Pena2012-08-301-4/+5
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * PHP-5.4: - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry)
| * | | | | | Merge branch 'PHP-5.3' into PHP-5.4Felipe Pena2012-08-301-4/+5
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * PHP-5.3: - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry)
| | * | | | | - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" ↵Felipe Pena2012-08-301-4/+5
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Windows registry)
* | | | | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-08-291-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | * PHP-5.4: updated mpir version Fixed defective cloning in ext/intl classes
| * | | | updated mpir versionAnatoliy Belsky2012-08-291-1/+1
| | |_|/ | |/| |
* | | | Removed Logo GUIDs and replaced with Data URIs and div hidden with JSAndrew Faulds2012-07-143-17/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - removed php_logo_guid() - removed php_egg_logo_guid() - removed php_real_logo_guid() - removed zend_logo_guid() - removed logo GUID handling - removed logo GUIDs from source - added logo data URIs instead for phpinfo() - added credits to phpinfo() page, but hidden by default
* | | | Merge branch 'PHP-5.4'Xinchen Hui2012-06-071-5/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Gustavo André dos Santos Lopes (4) and others via Felipe Pena (2) and Xinchen Hui (2) * PHP-5.4: Remove unused codes based on microsoft's description,the direct convert from FILETIME struct to __int64 is unsafe. merge 5.3 entries restore NEWS Fix ext/intl build on ICU < 4.8 Optimization in ext/intl/msgformat Fixed tests in ext/intl Changed XFAILed collator_get_sort_key.phpt
| * | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-06-071-5/+13
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Gustavo André dos Santos Lopes (4) and others via Felipe Pena (1) and Xinchen Hui (1) * PHP-5.3: Remove unused codes based on microsoft's description,the direct convert from FILETIME struct to __int64 is unsafe. Fix ext/intl build on ICU < 4.8 Optimization in ext/intl/msgformat Fixed tests in ext/intl Changed XFAILed collator_get_sort_key.phpt
| | * | Remove unused codesXinchen Hui2012-06-071-10/+8
| | | |
| | * | based on microsoft's description,the direct convert from FILETIME struct to ↵slayercat2012-06-071-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | __int64 is unsafe. via http://technet.microsoft.com/en-us/library/ms724284(v=vs.85).aspx "Do not cast a pointer to a FILETIME structure to either a ULARGE_INTEGER* or __int64* value because it can cause alignment faults on 64-bit Windows."
* | | | Merge branch 'PHP-5.4'Felipe Pena2012-05-161-2/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.4: - Fixed bug #55299 (multiple null pointer in win32/registry.c)
| * | | Merge branch 'PHP-5.3' into PHP-5.4Felipe Pena2012-05-161-2/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.3: - Fixed bug #55299 (multiple null pointer in win32/registry.c)
| | * | - Fixed bug #55299 (multiple null pointer in win32/registry.c)Felipe Pena2012-05-161-2/+10
| | | |
* | | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-05-111-1/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * PHP-5.4: Fix bug #61990 ext\spl\examples\tests\dualiterator_001.phpt fails
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-05-111-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: Fix bug #61990 ext\spl\examples\tests\dualiterator_001.phpt fails
| | * Fix bug #61990 ext\spl\examples\tests\dualiterator_001.phpt failsAnatoliy Belsky2012-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | This fixes a general issue. In this ticket and not for the first time is being seen, that people are trying to use data from "examples" in the tests. When extracting a test pack only "tests" and its siblings was taken into account. Now "examples" are copied as well.
* | | Merge branch 'PHP-5.4'Johannes Schlüter2012-04-141-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Rename README.SVN-RULES to README.GIT-RULES, here, too
| * | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-04-141-2/+2
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: Rename README.SVN-RULES to README.GIT-RULES, here, too
| | * Rename README.SVN-RULES to README.GIT-RULES, here, tooJohannes Schlüter2012-04-141-2/+2
| | |
| | * - update to openssl 0.9.8uPierre Joye2012-04-021-1/+1
| | |
| | * - fix bug #61290, fix buildPierre Joye2012-03-051-1/+1
| | |
| | * - fix bug #54407, Incorrectly defined NTDDI_VERSION macroPierre Joye2012-03-041-1/+1
| | |
| | * - fix bug #54407, Incorrectly defined NTDDI_VERSION macroPierre Joye2012-03-041-2/+2
| | |
| | * - libssh2 1.3.0Pierre Joye2012-01-301-1/+1
| | |
| | * - update libsPierre Joye2012-01-271-0/+1
| | |
View Lorry Controller Status