php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-25 08:58:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
80,875 Commits 549 Branches 1,485 Tags
03dcdf5742e56abe305809ea233ba41301fddc16
Commit Graph

34613 Commits

Author SHA1 Message Date
Ferenc Kovacs 03dcdf5742 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Revert "Fix bug #66568: the second arg for unserialize is optional." as we already reverted the introduction of the second arg.
 2014-07-25 13:16:31 +02:00
Ferenc Kovacs a68ef0a117 Revert "Fix bug #66568: the second arg for unserialize is optional." as we already reverted the introduction of the second arg. 
This reverts commit aefc8f22b3.

Conflicts:
	NEWS
 2014-07-25 13:15:27 +02:00
Johannes Schlüter 0ac3d8d4f4 Merge branch 'PHP-5.6' 2014-07-24 18:02:00 +02:00
Johannes Schlüter 8d1ec3814e Merge branch 'PHP-5.5' into PHP-5.6 2014-07-24 18:01:35 +02:00
Johannes Schlüter 432bd117a9 Merge branch 'PHP-5.4' into PHP-5.5 2014-07-24 18:00:06 +02:00
Dmitry Saprykin d491b2f916 Fix bug #67496 Save command history when exiting interactive shell with control-c 2014-07-24 17:58:39 +02:00
Johannes Schlüter 6fdbb4601f Merge branch 'PHP-5.6' 2014-07-24 16:59:37 +02:00
Johannes Schlüter 210315d5a5 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-24 16:58:50 +02:00
Johannes Schlüter ffc1d25b37 Merge branch 'PHP-5.4' into PHP-5.5 2014-07-24 16:56:05 +02:00
Johannes Schlüter 71d3a69425 Fix bug #55496 Interactive mode doesn't force a newline before the prompt 2014-07-24 16:53:51 +02:00
Tjerk Meesters 4b41009064 Merge branch 'PHP-5.6' 2014-07-24 14:40:30 +08:00
Tjerk Meesters 38e714ece5 Fixed #67666 - Subject altName doesn't match wildcards 2014-07-24 14:36:31 +08:00
Dmitry Stogov 39740a33e5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed crash on self-referencing constant expression (part of a constant AST)
 2014-07-24 00:59:42 +04:00
Dmitry Stogov d909b6330e Fixed crash on self-referencing constant expression (part of a constant AST) 2014-07-24 00:37:15 +04:00
Xinchen Hui 9bef96d96e Merge branch 'PHP-5.5' into PHP-5.6 2014-07-19 13:12:36 +08:00
Yasuo Ohgaki 5ed63b3bfc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
 2014-07-19 10:00:10 +09:00
Yasuo Ohgaki d0d5a1c444 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
 2014-07-19 09:59:51 +09:00
Yasuo Ohgaki f83a6c33b4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
 2014-07-19 09:53:04 +09:00
Yasuo Ohgaki e946de29d2 Fixed bug #66827 Session raises E_NOTICE when session name variable is array 2014-07-19 09:52:31 +09:00
Lior Kaplan 46dcd12d53 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Enable build without atoll (e.g old AIX flavours)
  Enable build without atoll (e.g old AIX flavours)
 2014-07-17 23:11:33 +03:00
Lior Kaplan c186ce8fef Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Enable build without atoll (e.g old AIX flavours)
 2014-07-17 23:09:54 +03:00
Lior Kaplan 3e1b749f5e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Enable build without atoll (e.g old AIX flavours)
 2014-07-17 23:04:23 +03:00
Lior Kaplan 2dff153b23 Enable build without atoll (e.g old AIX flavours) 2014-07-17 22:58:36 +03:00
Andrey Hristov 24381cdeb2 Merge branch 'PHP-5.6' 2014-07-16 19:50:41 +03:00
Andrey Hristov 23554aae19 Easier to read 2014-07-16 19:50:28 +03:00
Andrey Hristov 5d6805d498 Merge branch 'PHP-5.6' 
Conflicts:
	NEWS
 2014-07-16 19:25:31 +03:00
Andrey Hristov 06f5f65c94 Add some trace info as well as update CLIENT_ flags 2014-07-16 19:24:39 +03:00
Daniel Lowrey a0cc25bbfb Merge branch 'PHP-5.6' 2014-07-16 00:15:05 -04:00
Lior Kaplan cbcbf73fe8 Add ifdef on ecdh for single_ecdh_use 
Allows build with OpenSSL < 0.9.8
 2014-07-16 00:10:29 +03:00
Anatol Belski 1fef4e87fc Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix C89 compat
  This test depends on expose_php being on
  The test output is dependent on expose_php ini
  1.2 is a problematic float to print out Lower the default display precision for this test
  Test output relies on expose_php being on
 2014-07-14 20:28:23 +02:00
Anatol Belski 236365a016 fix C89 compat 2014-07-14 20:27:59 +02:00
Rasmus Lerdorf 275e41cb12 Test output relies on expose_php being on 2014-07-14 07:21:11 -07:00
Rasmus Lerdorf 050ef52549 1.2 is a problematic float to print out 
Lower the default display precision for this test
 2014-07-14 07:21:10 -07:00
Rasmus Lerdorf b270cc9284 1.2 is a problematic float to print out 
Lower the default display precision for this test
 2014-07-14 07:17:39 -07:00
Rasmus Lerdorf 8d359bbcca Test output relies on expose_php being on 2014-07-14 07:17:12 -07:00
Daniel Lowrey 4bdb0120dc Merge branch 'PHP-5.6' 2014-07-12 10:57:30 -04:00
Daniel Lowrey f3bf887e6d Bug #67609: TLS connections fail behind HTTP proxy 2014-07-12 10:51:44 -04:00
Tjerk Meesters 7de82eaeef Merge branch 'PHP-5.6' 2014-07-12 11:15:03 +08:00
Tjerk Meesters 18feaf9416 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-12 11:10:15 +08:00
Tjerk Meesters 8757e2cab8 Merge branch 'PHP-5.4' into PHP-5.5 2014-07-12 11:08:50 +08:00
Tjerk Meesters 4fc0d46ae7 Fix for bug #34407 - ucwords and title case 
Added support for ranges like trim() has
 2014-07-12 10:44:11 +08:00
Rasmus Lerdorf cf23a2efc5 Test output relies on expose_php being on 2014-07-11 10:59:02 -07:00
Rasmus Lerdorf a6d27b80b3 1.2 is a problematic float to print out 
Lower the default display precision for this test
 2014-07-11 10:29:40 -07:00
Stanislav Malyshev cd1130751d fix unstable test 2014-07-08 15:04:09 -07:00
Stanislav Malyshev b19c30c1fa Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix unstable test
 2014-07-08 14:32:45 -07:00
Stanislav Malyshev 062f1482c3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix unstable test
 2014-07-08 14:32:27 -07:00
Stanislav Malyshev f559976be6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix unstable test
 2014-07-08 14:31:40 -07:00
Stanislav Malyshev 64e4261c9b fix unstable test 2014-07-08 14:13:46 -07:00
Stanislav Malyshev ef2f12ec84 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #67587: Redirection loop on nginx with FPM
  Fix bug #67587: Redirection loop on nginx with FPM
 2014-07-08 12:55:35 -07:00
Christian Weiske e65e013e15 Fix bug #67587: Redirection loop on nginx with FPM 
Redirection will work correctly as long as PATH_INFO is available,
e.g. via the following nginx configuration:

    set $path_info $fastcgi_path_info;
    fastcgi_param PATH_INFO $path_info;
 2014-07-08 12:54:57 -07:00