archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
80697 commits 526 branches 1434 tags 877 MiB
Commit graph

34569 commits

Author SHA1 Message Date
Dmitry Stogov
687fa7d63d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed MarinaDB support
 2014-06-20 14:01:22 +04:00
Dmitry Stogov
f08a5bfadc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed MarinaDB support
 2014-06-20 13:58:26 +04:00
Dmitry Stogov
f0639611cf Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed MarinaDB support
 2014-06-20 13:57:38 +04:00
Dmitry Stogov
680ddabac1 Fixed MarinaDB support 2014-06-20 13:56:32 +04:00
Remi Collet
ae9db5d0a2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  skip this test which fails without network
 2014-06-20 06:45:36 +02:00
Remi Collet
e9c9169e05 skip this test which fails without network 2014-06-20 06:45:16 +02:00
Andrey Hristov
2eb42c953d Merge branch 'PHP-5.6' 
Conflicts:
	NEWS
 2014-06-18 21:54:26 +03:00
Andrey Hristov
a886a0cf93 Add support for gb18030/MySQL 5.7 2014-06-18 21:53:34 +03:00
Andrey Hristov
6dd0e8e0fc Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-06-18 18:32:51 +03:00
Andrey Hristov
af94a01ebe Merge branch 'master' of git.php.net:php-src 2014-06-18 18:31:07 +03:00
Andrey Hristov
29cef140ed Merge branch 'PHP-5.6' 2014-06-18 18:30:49 +03:00
Andrey Hristov
f201bf2305 Fix another problem with MySQL 5.7 2014-06-18 18:30:37 +03:00
Remi Collet
e3b74cb168 Merge branch 'PHP-5.6' 
* PHP-5.6:
  new test, missing in ea466a3
 2014-06-18 16:00:07 +02:00
Remi Collet
bf7fed7e41 new test, missing in ea466a3 2014-06-18 15:59:45 +02:00
Andrey Hristov
ea1632d697 Merge branch 'PHP-5.6' 2014-06-18 16:45:12 +03:00
Andrey Hristov
23f77050eb Merge branch 'PHP-5.5' into PHP-5.6 2014-06-18 16:42:42 +03:00
Andrey Hristov
21c9a9388f Suppress test failure with MySQL 5.7 2014-06-18 16:20:14 +03:00
Lior Kaplan
9d047bb138 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
 2014-06-18 00:21:20 +03:00
Lior Kaplan
9f727692b6 Update copyright year to 2014 
Align with online version at http://www.php.net/license/3_01.txt
 2014-06-18 00:16:23 +03:00
Lior Kaplan
1222f51ebd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
 2014-06-18 00:14:18 +03:00
Lior Kaplan
728c554f93 Update copyright year to 2014 2014-06-18 00:12:33 +03:00
Remi Collet
a012c2befa Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fix Request #67453 Allow to unserialize empty data.
 2014-06-17 09:41:30 +02:00
Remi Collet
ea466a316f Fix Request #67453 Allow to unserialize empty data. 
SplDoublyLinkedList, SplObjectStorage and ArrayObject have empty
constructor (no arg), so it make sense to allow to unserialize empty
data.

This allow the hack (used in various place, including PHPUnit) to
instanciate class without call to constructor to work.
 2014-06-17 09:38:54 +02:00
Lior Kaplan
6e0a9b4588 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Update copyright year to 2014
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
 2014-06-16 23:36:39 +03:00
Lior Kaplan
11b18347d8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
 2014-06-16 23:32:10 +03:00
Lior Kaplan
c38b73a701 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
 2014-06-16 23:30:44 +03:00
Lior Kaplan
6f3bcb0d6e Update copyright year for re2c generated files 2014-06-16 23:28:36 +03:00
Lior Kaplan
e667d23178 Update copyright year for re2c files as well 2014-06-16 23:26:50 +03:00
Remi Collet
ced7f0ea12 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix failed test
 2014-06-16 10:52:39 +02:00
Remi Collet
6788f14f5e fix failed test 2014-06-16 10:52:26 +02:00
Remi Collet
6b9fa109e0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function.
 2014-06-16 09:44:58 +02:00
Remi Collet
fc36277eb6 Fix test on modern distro where old unsecure algo are disabled in openssl config. 
Testing recent algo should be enough to check this function.
 2014-06-16 09:42:55 +02:00
Sara Golemon
21525d0413 Fix potential segfault in dns_get_record() 
If the remote sends us a packet with a malformed TXT record,
we could end up trying to over-consume the packet and wander
off into overruns.
 2014-06-15 01:04:24 -07:00
Derick Rethans
b1a708b28c Merge branch 'PHP-5.6' 2014-06-13 23:26:50 +01:00
Derick Rethans
a06dabb5e9 Merge branch 'PHP-5.5' into PHP-5.6 2014-06-13 23:26:47 +01:00
Derick Rethans
c06ccf7c70 Merge branch 'PHP-5.4' into PHP-5.5 2014-06-13 23:26:43 +01:00
Derick Rethans
ce70b920e4 - Updated to version 2014.5 (2014e) 2014-06-13 23:26:42 +01:00
Matteo Beccati
7d2bcbe20c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #67433 SIGSEGV when using count() on an object implementing Countable
 2014-06-13 13:14:52 +02:00
Matteo Beccati
df5551ba4f Fix bug #67433 SIGSEGV when using count() on an object implementing Countable 2014-06-13 13:14:12 +02:00
Adam Harvey
64f85d5afa Merge branch 'PHP-5.6' 
* PHP-5.6:
  Follow 308 Permanent Redirect responses.
 2014-06-12 18:19:11 -07:00
Adam Harvey
84f339546a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Follow 308 Permanent Redirect responses.
 2014-06-12 18:17:18 -07:00
Adam Harvey
2546434008 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Follow 308 Permanent Redirect responses.
 2014-06-12 18:15:07 -07:00
Adam Harvey
b51f82f260 Follow 308 Permanent Redirect responses. 
Fixes bug #67430 (http:// wrapper doesn't follow 308 redirects).
 2014-06-12 18:12:53 -07:00
Adam Harvey
a92e3eb0fe Merge branch 'PHP-5.6' 
* PHP-5.6:
  Keep 308-399 HTTP response codes when header('Location:') is called.
 2014-06-12 17:42:29 -07:00
Adam Harvey
82231b5d89 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Keep 308-399 HTTP response codes when header('Location:') is called.
 2014-06-12 17:40:51 -07:00
Adam Harvey
aa3a5f7681 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Keep 308-399 HTTP response codes when header('Location:') is called.
 2014-06-12 17:38:52 -07:00
Adam Harvey
1b9cbab9a7 Keep 308-399 HTTP response codes when header('Location:') is called. 
Fixes bug #67428 (header('Location: foo') will override a 308-399 response
code).
 2014-06-12 17:35:05 -07:00
Andrea Faulds
2b5d25d1fc Merge branch 'httponly-cookies' of https://github.com/mj/php-src 2014-06-12 10:03:14 +01:00
Sara Golemon
b34d7849ed Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix potential segfault in dns_get_record()
 2014-06-11 13:53:59 -07:00
Sara Golemon
e2ef56f760 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix potential segfault in dns_get_record()
 2014-06-11 13:51:53 -07:00