php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
76,910 Commits 549 Branches 1,486 Tags
d4f4b66d434788b389ddf96950bb5d7974e603bd
Commit Graph

76910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derick Rethans d4f4b66d43 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-19 19:01:00 +00:00
Derick Rethans 7a402ca51e Merge branch 'PHP-5.4' into PHP-5.5 2013-12-19 18:58:45 +00:00
Derick Rethans e881334e49 - Updated to version 2013.9 (2013i) 2013-12-19 18:58:44 +00:00
Remi Collet 0fe9a9019b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
 2013-12-19 10:56:16 +01:00
Remi Collet eda1cec694 NEWS 2013-12-19 10:56:07 +01:00
Remi Collet f6ffecbd2d save a few memory 2013-12-19 10:55:26 +01:00
Remi Collet 99b91f98b1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
 2013-12-19 10:54:06 +01:00
Remi Collet 32d1d5fb59 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
 2013-12-19 10:53:50 +01:00
Remi Collet 20eb8e4d11 Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real) 2013-12-19 10:53:38 +01:00
Michael Wallner 17470df2a5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS handling section of README.GIT-RULES
 2013-12-19 10:08:27 +01:00
Michael Wallner 391fe528b7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update NEWS handling section of README.GIT-RULES
 2013-12-19 10:08:06 +01:00
Michael Wallner 3624a9ca7a Update NEWS handling section of README.GIT-RULES 
See http://marc.info/?t=138124004400005&r=1&w=2
 2013-12-19 10:07:46 +01:00
Dmitry Stogov 436ca2d019 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.

Conflicts:
	NEWS
 2013-12-18 19:21:21 +04:00
Dmitry Stogov 16e95d9137 Fixed reavlidate_path=1 behavior to avoid caching of symlinks values. 2013-12-18 19:19:53 +04:00
Anatol Belski beed28844b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed possibly uninitialized value usage
 2013-12-17 08:45:30 +01:00
Anatol Belski 5e5ecaea6e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed possibly uninitialized value usage
 2013-12-17 08:45:07 +01:00
Anatol Belski 2303d0ea22 fixed possibly uninitialized value usage 2013-12-17 08:44:22 +01:00
Xinchen Hui b331a219be Use memcmp here is better 2013-12-17 15:37:10 +08:00
Xinchen Hui eeb37c40e6 Save one char compare 2013-12-17 15:09:52 +08:00
Xinchen Hui 143ae34f29 Fixed test failed after rev 57c1335f 2013-12-17 15:05:31 +08:00
Stanislav Malyshev de4a2c3cbd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #65873 - Integer overflow in exif_read_data()
 2013-12-16 11:37:29 -08:00
Stanislav Malyshev 57408f9c85 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #65873 - Integer overflow in exif_read_data()
 2013-12-16 11:36:33 -08:00
Stanislav Malyshev cbcf6e1880 Fix bug #65873 - Integer overflow in exif_read_data() 2013-12-16 11:34:24 -08:00
David Soria Parra 85a10166e1 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-16 10:27:51 -08:00
Dmitry Stogov a67c615799 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  Fix tests expecting specific resource IDs
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
  Updated release process
 2013-12-16 13:13:29 +04:00
Dmitry Stogov 43f11165b8 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 
* 'PHP-5.6' of git.php.net:php-src:
  Fix tests expecting specific resource IDs
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
  Test pushing
  Updated release process
 2013-12-16 13:13:18 +04:00
Xinchen Hui 5eb8d9d700 Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6 2013-12-15 16:55:29 +08:00
Xinchen Hui 7cf6f012b1 Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5 2013-12-15 16:55:11 +08:00
Xinchen Hui 10964b7854 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-15 16:51:32 +08:00
Eric Stenson 330168a247 Fix tests expecting specific resource IDs 
When Wincache or APC are installed, the resource IDs are not the same.
This is because Wincache takes a few resource objects for itself.  As a
result, these tests become false positives.

On Windows boxes, the microtime precision is not granular enough
to reliably register a difference if two calls to uniqid() are made
concurrently.  This is a fix to the uniqid() test to avoid the false
positive when run on Windows machines.  Also, added a test to exercise
the 'more_entropy' variant of uniqid().
 2013-12-15 16:51:21 +08:00
Anatol Belski 904721189f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
 2013-12-14 20:47:37 +01:00
Anatol Belski 509a67d28f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
 2013-12-14 20:46:43 +01:00
Anatol Belski 68a73ce3c4 fixed parameter order for zend_throw_exception_ex call 2013-12-14 20:43:02 +01:00
DQNEO 1b3e2c299d Fix doc (svn -> git) 2013-12-13 23:20:37 +02:00
Xinchen Hui 41eaac3491 Test pushing 2013-12-13 21:32:14 +08:00
Julien Pauli d67fbaa74d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated release process
 2013-12-13 13:27:45 +01:00
Julien Pauli 47a0722b9f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Updated release process
 2013-12-13 13:27:19 +01:00
Julien Pauli cbc98df99e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Updated release process
 2013-12-13 13:26:16 +01:00
Julien Pauli 3eb2b1ac40 Updated release process 2013-12-13 13:16:54 +01:00
Dmitry Stogov af66b20781 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 
* 'PHP-5.6' of git.php.net:php-src:
  Use zend_error_noreturn here
  OCI8 build change: Fix source variable definition for C89 compatibility
  Add Tests for #65784 in 5.5
  Disallowed JMP into a finally block.
  Update NEWS for 5.5.7 release
  Fixed bug #65784 (Segfault with finally).
 2013-12-13 11:17:50 +04:00
Dmitry Stogov e6dbf0eeff Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  Use zend_error_noreturn here
  Add Tests for #65784 in 5.5
  Disallowed JMP into a finally block.
  Update NEWS for 5.5.7 release
 2013-12-13 11:16:17 +04:00
Xinchen Hui 6f95a07c41 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-13 11:37:43 +08:00
Xinchen Hui ef73f85079 Use zend_error_noreturn here 2013-12-13 10:56:35 +08:00
Christopher Jones bc748ba38c OCI8 build change: Fix source variable definition for C89 compatibility 2013-12-12 15:22:55 -08:00
Xinchen Hui c9d00a23ae Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6 2013-12-13 01:48:17 +08:00
Xinchen Hui ab12ccd16a Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6 2013-12-13 01:46:28 +08:00
Xinchen Hui dde552f2ee Add Tests for #65784 in 5.5 2013-12-13 01:45:45 +08:00
Xinchen Hui 54213b462d Disallowed JMP into a finally block. 2013-12-13 01:44:54 +08:00
Julien Pauli 3248b3c4d8 Update NEWS for 5.5.7 release 2013-12-12 17:16:13 +01:00
Xinchen Hui 794a888a48 Fixed bug #65784 (Segfault with finally). 2013-12-13 00:16:08 +08:00