php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-05 07:02:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
74,179 Commits 547 Branches 1,481 Tags
657116f12e19ea66572b6bd8fd703bef0b16efca
Commit Graph

74179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev
657116f12e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix the date for 5.4.17
 2013-07-12 10:58:24 -07:00
Stanislav Malyshev
d2a83efe5b fix the date for 5.4.17 2013-07-12 10:57:59 -07:00
Stanislav Malyshev
64b11f8918 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update 5.4.17 date
 2013-07-12 10:55:37 -07:00
Stanislav Malyshev
b2fbb4cc40 update 5.4.17 date 2013-07-12 10:55:24 -07:00
Stanislav Malyshev
20e9ca5c9f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update 5.4.17 date
 2013-07-12 10:53:47 -07:00
Stanislav Malyshev
5b01b0904f update 5.4.17 date 2013-07-12 10:53:23 -07:00
Anatol Belski
4f4fa32ca5 updated NEWS 2013-07-11 00:51:10 +02:00
Anatol Belski
ecf057d197 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #65226 chroot() does not get enabled
 2013-07-11 00:49:41 +02:00
Anatol Belski
2acc386270 Fixed bug #65226 chroot() does not get enabled 2013-07-11 00:48:12 +02:00
Christopher Jones
2d77bbdf64 Merge branch 'spl_tempfile_clean' into PHP-5.5 
* spl_tempfile_clean:
  Cleanup temp test file
 2013-07-10 11:18:58 -07:00
Christopher Jones
3478ddc1f0 Cleanup temp test file 2013-07-10 11:17:52 -07:00
Christopher Jones
c0bfc57ba8 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Merge PHP 5.3.27 NEWS
  add test for bug #65236
  fix possible resource leak and make sure there's something to qsort()
  Cleanup temp file
  - Updated to version 2013.4 (2013d)
 2013-07-10 11:13:19 -07:00
Christopher Jones
96f77f845a Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Merge PHP 5.3.27 NEWS
  add test for bug #65236
  fix possible resource leak and make sure there's something to qsort()
  - Updated to version 2013.4 (2013d)
 2013-07-10 11:13:18 -07:00
Johannes Schlüter
1891577d04 Merge branch 'PHP-5.4' into PHP-5.5 2013-07-10 19:47:15 +02:00
Johannes Schlüter
4c6c048e3e Merge branch 'PHP-5.3' into PHP-5.4 2013-07-10 19:46:37 +02:00
Johannes Schlüter
9c4ef50146 Merge PHP 5.3.27 NEWS 2013-07-10 19:45:45 +02:00
Johannes Schlüter
26019d2022 Merge branch 'PHP-5.4' into PHP-5.5 2013-07-10 19:38:00 +02:00
Johannes Schlüter
4204e2cb5b Merge branch 'PHP-5.3' into PHP-5.4 2013-07-10 19:36:12 +02:00
Johannes Schlüter
710eee5555 add test for bug #65236 2013-07-10 19:35:18 +02:00
Anatol Belski
f5b9d87fb9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix possible resource leak and make sure there's something to qsort()
 2013-07-10 13:31:22 +02:00
Anatol Belski
29ac511b8a fix possible resource leak and make sure there's something to qsort() 2013-07-10 13:00:47 +02:00
Christopher Jones
73b54b4a5b Merge branch 'gd_clean' into PHP-5.5 
* gd_clean:
  Cleanup temp file
 2013-07-09 14:52:35 -07:00
Christopher Jones
cd7e56e536 Cleanup temp file 2013-07-09 14:51:47 -07:00
Derick Rethans
06cef326fd Merge branch 'PHP-5.4' into PHP-5.5 2013-07-09 09:07:17 +01:00
Derick Rethans
c7ee677f2f - Updated to version 2013.4 (2013d) 2013-07-09 09:07:16 +01:00
Christopher Jones
7045bd5c4a Merge branch 'bump_pecl_check' into PHP-5.5 
* bump_pecl_check:
  Bump PECL package info version check to allow PECL installs with PHP 5.5+
 2013-07-08 13:38:45 -07:00
Christopher Jones
6ac7c9d0a7 Bump PECL package info version check to allow PECL installs with PHP 5.5+ 2013-07-08 13:32:04 -07:00
Christopher Jones
ac26d0e655 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fixed segfault in mysqlnd when doing long prepare
 2013-07-08 13:31:12 -07:00
Christopher Jones
79df8cf9c2 Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Fixed segfault in mysqlnd when doing long prepare
 2013-07-08 13:30:54 -07:00
Andrey Hristov
2c3f6dcdb6 Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4 
Conflicts:
	NEWS
 2013-07-08 20:28:51 +02:00
Andrey Hristov
dd71f1f173 Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5 2013-07-08 20:27:14 +02:00
Andrey Hristov
3dd5f4ae4c Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-07-08 20:24:58 +02:00
Andrey Hristov
9fc38183b7 Fixed segfault in mysqlnd when doing long prepare 2013-07-08 20:23:32 +02:00
Yasuo Ohgaki
204137693c Update NEWS 2013-07-08 19:21:52 +09:00
Yasuo Ohgaki
bde0f1318a Added warning for hex2bin() when input is invalid string 2013-07-08 19:14:45 +09:00
Yasuo Ohgaki
bdfe70ab34 Update NEWS 2013-07-08 19:02:42 +09:00
Yasuo Ohgaki
2bc8271b29 Add warning to pg_unescape_bytea() when invalid parameter is passed 2013-07-08 18:51:37 +09:00
Ben Ramsey
d1c261d7f8 array_column: Changing integer in test output to use %d 2013-07-06 20:50:34 +00:00
Rob Richards
eed492ce84 Merge branch 'PHP-5.4' into PHP-5.5 
# By Nuno Lopes (2) and Rob Richards (1)
* PHP-5.4:
  truncate results at depth of 255 to prevent corruption
  fix assembly of safe_address() for x86 and x86_64
  fix assembly of safe_address() for x86 and x86_64
 2013-07-06 08:00:58 -04:00
Rob Richards
e4a28b7b7b Merge branch 'PHP-5.3' into PHP-5.4 
# By Rob Richards (1)
* PHP-5.3:
  truncate results at depth of 255 to prevent corruption
 2013-07-06 07:59:20 -04:00
Rob Richards
7d163e8a08 truncate results at depth of 255 to prevent corruption 2013-07-06 07:53:07 -04:00
Ard Biesheuvel
47e21a2c40 Fix assembly of safe_address() for aarch64 2013-07-04 10:25:38 +02:00
Nuno Lopes
e964817b24 fix assembly of safe_address() for x86 and x86_64 2013-07-03 18:02:28 -04:00
Nuno Lopes
c652cc93ec fix assembly of safe_address() for x86 and x86_64 2013-07-03 17:56:02 -04:00
Nuno Lopes
40cbceaf71 fix assembly of safe_address() for x86 and x86_64 2013-07-03 17:55:18 -04:00
Anatol Belski
332e46b3aa Extended the test for bug #65184 2013-07-03 22:52:51 +02:00
Felipe Pena
00293fec05 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed build on FreeTDS 0.82
 2013-07-03 15:02:39 -03:00
Felipe Pena
7549beb102 - Fixed build on FreeTDS 0.82 2013-07-03 15:02:03 -03:00
Johannes Schlüter
9aa7343ae0 Merge branch 'PHP-5.4' into PHP-5.5 2013-07-03 17:10:58 +02:00
Johannes Schlüter
5bc7e597d9 Make sure return value is initialised in case transaction startup fails 2013-07-03 17:08:14 +02:00