php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 17:38:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
79,135 Commits 549 Branches 1,485 Tags
3023257ff0af0ff2c98b0fbbfce862d31d040fa4
Commit Graph

79135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski 3023257ff0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
 2014-04-29 13:46:38 +02:00
Anatol Belski 3fbacdc6e8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
 2014-04-29 13:46:03 +02:00
Anatol Belski b22f33afe2 updated NEWS 2014-04-29 13:44:54 +02:00
Anatol Belski 2d625b5f81 Fixed bug #66431 Special Character via COM Interface (CP_UTF8) 2014-04-29 13:40:44 +02:00
Popa Adrian Marius aa1c4fd0be Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/push/php-src:
  enable gmp for tests
 2014-04-28 12:15:53 +03:00
Popa Adrian Marius 6de915205c Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6 
* 'PHP-5.6' of https://git.php.net/push/php-src:
  Fix crashes in GMP serialize/unserialize
  enable gmp for tests
 2014-04-28 12:15:16 +03:00
Popa Adrian Marius 0edf1d4fe6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Cleanup ZEND_MODULE_API_NO => 20050922
 2014-04-28 12:14:01 +03:00
Popa Adrian Marius a827fa9cd8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Cleanup ZEND_MODULE_API_NO => 20050922
 2014-04-28 12:13:44 +03:00
Popa Adrian Marius bb422cb60e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Cleanup ZEND_MODULE_API_NO => 20050922
 2014-04-28 12:13:11 +03:00
Popa Adrian Marius dbcd6304bb Cleanup ZEND_MODULE_API_NO => 20050922 2014-04-28 12:12:52 +03:00
Stanislav Malyshev c18ae51aeb Fix crashes in GMP serialize/unserialize 2014-04-28 01:22:02 -07:00
Stanislav Malyshev 3842417289 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  enable gmp for tests
 2014-04-28 00:57:47 -07:00
Stanislav Malyshev b576cbbf05 enable gmp for tests 2014-04-28 00:56:22 -07:00
Anatol Belski 3b6bf6eec8 Merge remote-tracking branch 'phpdbg/master' into PHP-5.6 
* phpdbg/master:
  C89 compat
 2014-04-27 18:01:26 +02:00
Anatol Belski 4aa80db758 C89 compat 2014-04-27 17:57:38 +02:00
Anatol Belski a10dc3aa4f Merge remote-tracking branch 'phpdbg/master' into PHP-5.6 
* phpdbg/master:
  removed /EHa as __try/__catch syntax is used anyway
  fix ZEND_DEBUG usage
  fix CFLAGS_PHPDBGS and some formatting
 2014-04-26 00:15:32 +02:00
Anatol Belski c8617d82cc removed /EHa as __try/__catch syntax is used anyway 
see http://msdn.microsoft.com/en-us/library/1deeycx5.aspx
 2014-04-26 00:07:13 +02:00
Anatol Belski cdb775906d fix ZEND_DEBUG usage 2014-04-25 22:33:28 +02:00
Anatol Belski 70fdb21d93 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed test
 2014-04-25 17:40:33 +02:00
Anatol Belski 1c7f4d2b4b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed test
 2014-04-25 17:40:19 +02:00
Anatol Belski d3dcd61623 fixed test 2014-04-25 17:39:53 +02:00
Anatol Belski 38248e445d updated NEWS 2014-04-25 17:27:07 +02:00
Anatol Belski 6448916535 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  Fixed bug #67118 DateTime constructor crash with invalid data
 2014-04-25 17:26:20 +02:00
Anatol Belski 46344b11b4 updated NEWS 2014-04-25 17:25:37 +02:00
Anatol Belski cc9f02751b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #67118 DateTime constructor crash with invalid data
 2014-04-25 17:24:58 +02:00
Anatol Belski c1aa9baf29 Fixed bug #67118 DateTime constructor crash with invalid data 2014-04-25 17:23:26 +02:00
Stanislav Malyshev 5ddee799d2 update NEWS 2014-04-25 00:00:49 -07:00
Stanislav Malyshev 1bad4aa355 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  add a test case previously broken by a bad fix
  Revert "Fixed bug #64604"
 2014-04-25 00:00:20 -07:00
Stanislav Malyshev 81098de41c update NEWS 2014-04-25 00:00:01 -07:00
Stanislav Malyshev f6841d250a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add a test case previously broken by a bad fix
  Revert "Fixed bug #64604"
 2014-04-24 23:59:32 -07:00
Stanislav Malyshev 03c703b8bd add a test case previously broken by a bad fix 2014-04-24 23:58:38 -07:00
Stanislav Malyshev a328803803 Revert "Fixed bug #64604" 
This reverts commit b05c088a3a.
Breaks parsing urls where query has : in it, like: /foo/bar?baz=goo:boo
 2014-04-24 23:50:45 -07:00
Anatol Belski 5c34146104 updated libmagic.patch for 5.6+ 2014-04-24 20:16:06 +02:00
Anatol Belski 305c025cdd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated libmagic.patch
 2014-04-24 20:15:01 +02:00
Anatol Belski db960e82b4 updated libmagic.patch 2014-04-24 20:13:47 +02:00
Anatol Belski 8f43032ea4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  backport this piece from 5.6, related to the #66307 fix
 2014-04-24 19:52:53 +02:00
Anatol Belski d7bb09cc1d backport this piece from 5.6, related to the #66307 fix 2014-04-24 19:50:23 +02:00
Anatol Belski 0c381e19ad updated NEWS 2014-04-24 19:35:52 +02:00
Anatol Belski 74ce9da5dc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66307 Fileinfo crashes with powerpoint files

Conflicts:
	ext/fileinfo/libmagic/readcdf.c
 2014-04-24 19:33:54 +02:00
Anatol Belski 03fa5501a8 Fixed bug #66307 Fileinfo crashes with powerpoint files 2014-04-24 19:30:34 +02:00
Anatol Belski 4350c89428 fix CFLAGS_PHPDBGS and some formatting 2014-04-24 13:15:16 +02:00
Anatol Belski cd2641973c Merge remote-tracking branch 'phpdbg/master' into PHP-5.6 2014-04-24 11:05:52 +02:00
Anatol Belski 3e6a387454 use a portable strndup implementation 2014-04-24 11:01:54 +02:00
Anatol Belski 165994043a fixed C89 compat 2014-04-24 11:00:36 +02:00
Anatol Belski 5da403264f prepare config.w32 2014-04-24 10:58:30 +02:00
Anatol Belski 9280e25534 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix dll export
 2014-04-24 10:52:59 +02:00
Anatol Belski acfed1c4c7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix dll export
 2014-04-24 10:52:22 +02:00
Anatol Belski 03be983398 fix dll export 2014-04-24 10:51:42 +02:00
krakjoe f1493e0069 add parser files to dist 2014-04-24 08:09:35 +01:00
Stanislav Malyshev ab8065e4ec Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix accepting ill-formed UTF-8 characters
 2014-04-22 16:57:47 -07:00