archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
79527 commits 526 branches 1434 tags 865 MiB
Commit graph

79527 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lior Kaplan
b538816b0b Update copyright year to 2014 2014-06-16 23:34:50 +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
2d576c2a99 Update copyright year to 2014 2014-06-16 23:27:45 +03:00
Lior Kaplan
e667d23178 Update copyright year for re2c files as well 2014-06-16 23:26:50 +03:00
Bob Weinand
3c2b42ac41 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	Zend/zend_compile.c
 2014-06-16 11:18:45 +02:00
Bob Weinand
e93f8e74d4 Merge branch 'PHP-5.4' into PHP-5.5 2014-06-16 11:16:33 +02:00
Bob Weinand
0a3979e08b Fix patch for bug #67436 2014-06-16 11:10:50 +02:00
Remi Collet
6788f14f5e fix failed test 2014-06-16 10:52:26 +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
Bob Weinand
7cef3a57ad Merge branch 'PHP-5.5' into PHP-5.6 2014-06-16 00:42:50 +02:00
Bob Weinand
03ee0ddc5f Merge branch 'PHP-5.4' into PHP-5.5 2014-06-16 00:41:46 +02:00
Bob Weinand
4053dbe29f Merge branch 'pull-request/695' into PHP-5.4 2014-06-16 00:35:20 +02:00
Levi Morrison
6c9c44905e Added tests for bug 67436 2014-06-15 16:31:39 -06:00
Bob Weinand
0913c15092 Merge branch 'PHP-5.5' into PHP-5.6 2014-06-15 23:55:44 +02:00
Bob Weinand
4555779c39 Merge branch 'PHP-5.4' into PHP-5.5 2014-06-15 23:54:05 +02:00
Bob Weinand
a84a2d4ace Fixed wrong XFAIL test - already fixed 2014-06-15 23:52:41 +02:00
Lior Kaplan
2c327599a3 Fix typo in Bug #67406 NEWS entry 2014-06-16 00:33:09 +03:00
Lior Kaplan
d9432d6a50 Fix typo in Bug #67406 NEWS entry 2014-06-16 00:26:01 +03:00
Bob Weinand
f92143f740 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	NEWS
	Zend/zend_compile.c
 2014-06-15 23:06:15 +02:00
Bob Weinand
1d802ad5e5 Merge branch 'PHP-5.4' into PHP-5.5 2014-06-15 22:36:13 +02:00
Bob Weinand
85d3ac5763 Updated NEWS 2014-06-15 22:32:47 +02:00
Bob Weinand
f5f1c702cd Merge branch 'PHP-5.4' into PHP-5.5 2014-06-15 22:24:44 +02:00
Bob Weinand
ca29063da5 Fix bug #67436 2014-06-15 22:18:25 +02:00
Bob Weinand
05d7facb40 Update NEWS 2014-06-15 15:50:36 +02:00
Bob Weinand
f677889a9a Merge sapi/phpdbg into PHP-5.6 2014-06-15 15:47:14 +02:00
Stanislav Malyshev
da3ef175b9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  update NEWS
 2014-06-15 01:07:48 -07:00
Stanislav Malyshev
b303f19cff update NEWS 2014-06-15 01:07:39 -07:00
Stanislav Malyshev
b2b3ce717f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
 2014-06-15 01:06:46 -07:00
Stanislav Malyshev
55c2721229 update NEWS 2014-06-15 01:06:37 -07:00
Stanislav Malyshev
b053c4f4f6 update NEWS 2014-06-15 00:46:31 -07:00
kovacs.ferenc
e9c2e7d6e6 fix bugsnet #67212: phpdbg uses non-standard TIOCGWINSZ 2014-06-14 23:48:24 +02:00
kovacs.ferenc
fbb7bdc21e change the default terminal width from 100 to 80, as that is the most common value 2014-06-14 23:48:24 +02: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
df5551ba4f Fix bug #67433 SIGSEGV when using count() on an object implementing Countable 2014-06-13 13:14:12 +02:00
krakjoe
ab353c0a55 remove all references 2014-06-13 07:35:11 +01: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
e082199d8e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add 308 and 426 to the HTTP response code map in the CLI server.
 2014-06-12 17:57:36 -07:00
Adam Harvey
e956ba9357 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add 308 and 426 to the HTTP response code map in the CLI server.
 2014-06-12 17:56:10 -07:00
Adam Harvey
fe67674809 Add 308 and 426 to the HTTP response code map in the CLI server. 
Implements FR #67429 (CLI server is missing some new HTTP response codes).
 2014-06-12 17:54: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
Bob Weinand
d337fb0b62 Make run-tests.php PHP-5.4 compatible 2014-06-12 18:49:02 +03:00
Adam Harvey
af26a28ac0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS entry for "Fix potential segfault in dns_get_record()"
  NEWS entry for Fix potential segfault in dns_get_record(
  5.5.15 now

Conflicts:
	configure.in
	main/php_version.h
 2014-06-11 21:43:39 +00:00