php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 15:38:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
74,724 Commits 549 Branches 1,485 Tags
456ef2ebfa6d3765856bbe04dfeb953c352fe1e5
Commit Graph

74724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov 456ef2ebfa Merge branch 'PHP-5.5' 
* PHP-5.5:
  Compact HashTables before storing them in shared memory

Conflicts:
	ext/opcache/ZendAccelerator.c
 2013-06-10 11:25:41 +04:00
Dmitry Stogov 540488bf55 Compact HashTables before storing them in shared memory 2013-06-10 11:22:19 +04:00
Dmitry Stogov 841e1f0364 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Use size_t instead of int
 2013-06-10 10:37:53 +04:00
Dmitry Stogov 2e9d3e8b39 Use size_t instead of int 2013-06-10 10:36:35 +04:00
Xinchen Hui 00c7440b81 Merge branch 'PHP-5.5' 2013-06-09 22:26:18 +08:00
Xinchen Hui 8ae43caeee Update NEWS 2013-06-09 22:26:07 +08:00
Xinchen Hui 3f229f4364 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-09 22:25:49 +08:00
Xinchen Hui fdd7379686 Update NEWs 2013-06-09 22:25:28 +08:00
Xinchen Hui f338510c94 Merge branch 'PHP-5.3' into PHP-5.4 2013-06-09 22:25:07 +08:00
Xinchen Hui 75c57122e3 Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems) 2013-06-09 22:24:48 +08:00
Xinchen Hui afe547d335 Merge branch 'PHP-5.5' 2013-06-09 14:26:16 +08:00
Xinchen Hui b839e6921d Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	Zend/zend_vm_def.h
 2013-06-09 14:25:53 +08:00
Xinchen Hui e14800dd46 Fixed merge wrongly 2013-06-09 14:24:05 +08:00
Xinchen Hui 4600578830 Merge branch 'PHP-5.5' 2013-06-09 13:50:06 +08:00
Xinchen Hui 6139358804 Update NEWS 2013-06-09 13:49:43 +08:00
Xinchen Hui f372e00332 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	Zend/zend_vm_def.h
 2013-06-09 13:49:26 +08:00
Xinchen Hui 3cc891bf3a Update NEWS 2013-06-09 13:39:40 +08:00
Xinchen Hui ab22fda7e5 Merge branch 'PHP-5.3' into PHP-5.4 2013-06-09 13:35:45 +08:00
Xinchen Hui e8f004d542 Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC) 2013-06-09 13:20:40 +08:00
Matteo Beccati 2c0f09540e Fixed signedness warning 2013-06-07 09:38:58 +02:00
Matteo Beccati a649f42b20 NEWS 2013-06-07 09:36:54 +02:00
Matteo Beccati 19ead23e8e Fixed bug #63657 (pgsqlCopyFrom/To methods use Postgres < 7.3 syntax) 
Although still supported (for now), I've replaced with pre-9.0 syntax.
Still not cutting edge, but it works with any version PDO_pgsql is
compatible with (7.4+) and will possibly keep working for longer than
what we already had.
 2013-06-07 09:36:54 +02:00
Matteo Beccati 2f7f34374c NEWS 2013-06-07 09:36:53 +02:00
Stanislav Malyshev fbf1dff674 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix 5.4.16 date
 2013-06-06 13:27:39 -07:00
Stanislav Malyshev bccacb6308 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix 5.4.16 date
 2013-06-06 13:27:25 -07:00
Stanislav Malyshev a7e25bdd48 fix 5.4.16 date 2013-06-06 13:27:04 -07:00
Anatol Belski 73c627ccd5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix NEWS
 2013-06-06 18:58:23 +02:00
Anatol Belski 25980d4db5 fix NEWS 2013-06-06 18:57:20 +02:00
Anatol Belski c6b569011a Merge branch 'PHP-5.5' 
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #64934 Apache2 TS crash with get_browser()
 2013-06-06 18:53:41 +02:00
Anatol Belski f47e879235 updated NEWS 2013-06-06 18:53:22 +02:00
Anatol Belski bbdbef40db Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed bug #64934 Apache2 TS crash with get_browser()
 2013-06-06 18:52:39 +02:00
Anatol Belski 4b96b8f909 updated NEWS 2013-06-06 18:52:05 +02:00
Anatol Belski 25cae37b13 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #64934 Apache2 TS crash with get_browser()
 2013-06-06 18:51:32 +02:00
Anatol Belski 1aee7ad636 Fixed bug #64934 Apache2 TS crash with get_browser() 
In favour of reading the browscap.ini into a true global var
only once in MINIT, the price for that is to deep copy the
any data from it.
 2013-06-06 18:49:04 +02:00
David Soria Parra 83580ea956 Merge branch 'PHP-5.5' 
* PHP-5.5:
  News update
  PHP 5.5.0RC3 NEWS
 2013-06-05 23:09:27 +02:00
David Soria Parra c649186c31 News update 2013-06-05 23:08:48 +02:00
David Soria Parra aef5295756 PHP 5.5.0RC3 NEWS 2013-06-05 23:06:51 +02:00
Johannes Schlüter 9a9f42767d Merge branch 'PHP-5.5' 2013-06-05 16:35:27 +02:00
Johannes Schlüter fdeefc466e Merge branch 'PHP-5.4' into PHP-5.5 2013-06-05 16:35:14 +02:00
Johannes Schlüter 5ee047b486 Merge branch 'PHP-5.3' into PHP-5.4 2013-06-05 16:34:54 +02:00
Johannes Schlüter ec3bcbcb5a Add NEWS for PHP 5.3.26 2013-06-05 16:34:18 +02:00
Xinchen Hui ecfc3599a7 Merge branch 'PHP-5.5' 2013-06-05 17:32:09 +08:00
Xinchen Hui 7da648ff2f Update NEWS 2013-06-05 17:30:57 +08:00
Xinchen Hui e89537f2a3 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-05 17:30:09 +08:00
Xinchen Hui 3c93402f86 Update NEWS 2013-06-05 17:29:04 +08:00
Xinchen Hui f597f5561e Merge branch 'PHP-5.3' into PHP-5.4 2013-06-05 17:26:10 +08:00
Xinchen Hui 3c87945c95 Fixed bug #64960 (Segfault in gc_zval_possible_root) 2013-06-05 17:25:00 +08:00
Stanislav Malyshev 3c8c200d0a Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix CVE-2013-2110 - use correct formula to calculate string size
 2013-06-04 22:01:02 -07:00
Stanislav Malyshev 785f4c5fc6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix CVE-2013-2110 - use correct formula to calculate string size
 2013-06-04 22:00:45 -07:00
Stanislav Malyshev efdeec3c0e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix CVE-2013-2110 - use correct formula to calculate string size
 2013-06-04 21:58:44 -07:00