clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 23:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,298 Commits 494 Branches 1,367 Tags 809 MiB
a522f2d1c9
Commit Graph

75298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Johannes Schlüter
9c0cd00b44 Merge branch 'PHP-5.5' 2013-07-10 19:38:29 +02:00
Anatol Belski
c7490a6edd add usleep() to the header, already exported to dll 2013-07-10 16:16:33 +02:00
Anatol Belski
638f1c3b79 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix possible resource leak and make sure there's something to qsort()
 2013-07-10 13:32:13 +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
3fd987f493 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Cleanup temp file
 2013-07-09 14:53:05 -07: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
3cdd09a76e Merge branch 'PHP-5.5' 2013-07-09 09:07:21 +01: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
Yasuo Ohgaki
baac810eb8 Improve pg_unescape_bytea() error message 2013-07-09 14:54:03 +09:00
Yasuo Ohgaki
84e6576203 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed pgsql_stmt_get_column_meta() OID signedness
 2013-07-09 07:02:09 +09:00
Yasuo Ohgaki
98e6473f98 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed pgsql_stmt_get_column_meta() OID signedness
 2013-07-09 07:00:47 +09:00
Yasuo Ohgaki
24037fd3d9 Fixed pgsql_stmt_get_column_meta() OID signedness 2013-07-09 06:59:50 +09:00
Christopher Jones
0cf978c92e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Bump PECL package info version check to allow PECL installs with PHP 5.5+
 2013-07-08 13:39:26 -07: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
fbebe431b4 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Update NEWS
 2013-07-08 13:35:21 -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
e78ca0b634 Merge branch 'master' of ssh://git.php.net/php-src 2013-07-08 20:26:38 +02:00
Andrey Hristov
a5d2854bdc Merge branch 'PHP-5.5' 2013-07-08 20:26:04 +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
870d238b06 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added warning for hex2bin() when input is invalid string
  Update NEWS
 2013-07-08 19:15:04 +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
4fd1e24ee5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Add warning to pg_unescape_bytea() when invalid parameter is passed
 2013-07-08 18:53:12 +09:00
Yasuo Ohgaki
2bc8271b29 Add warning to pg_unescape_bytea() when invalid parameter is passed 2013-07-08 18:51:37 +09:00
Xinchen Hui
11b757d53e Merge branch 'PHP-5.5' 2013-07-08 11:21:54 +08:00
Ben Ramsey
d1c261d7f8 array_column: Changing integer in test output to use %d 2013-07-06 20:50:34 +00:00
Rob Richards
b955dbecfb Merge branch 'PHP-5.5' 
# By Nuno Lopes (2) and Rob Richards (1)
* PHP-5.5:
  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:01:31 -04: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
e4192e4cb4 Merge branch 'PHP-5.5' 2013-07-04 10:32:55 +02: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
Nuno Lopes
97e9d01dc7 fix assembly of safe_address() for x86 and x86_64 2013-07-03 17:53:46 -04:00
Anatol Belski
675beb06a6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Extended the test for bug #65184
 2013-07-03 22:53:34 +02:00
Anatol Belski
332e46b3aa Extended the test for bug #65184 2013-07-03 22:52:51 +02:00
Felipe Pena
0107b2afe8 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed build on FreeTDS 0.82
 2013-07-03 15:04:30 -03: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