clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-26 20:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,555 Commits 494 Branches 1,367 Tags 881 MiB
0da5d94a6c
Commit Graph

79555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Adam Harvey
16e0dcea72 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS entry for "Fix potential segfault in dns_get_record()"
 2014-06-11 21:42:26 +00:00
Sara Golemon
1ba338624b NEWS entry for Fix potential segfault in dns_get_record() 2014-06-11 14:24:50 -07:00
Sara Golemon
5f2a30e111 NEWS entry for "Fix potential segfault in dns_get_record()" 2014-06-11 14:24:13 -07:00
Sara Golemon
ace35a3d3b NEWS entry for Fix potential segfault in dns_get_record( 2014-06-11 14:22:59 -07:00
Bob Weinand
65c2001acd Fixed order in travis script 2014-06-12 00:18:47 +03:00
Bob Weinand
181323eecd Check for all phpdbg compitble php versions 2014-06-11 23:08:55 +02: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
Sara Golemon
1978f41c8a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix potential segfault in dns_get_record()
 2014-06-11 13:37:40 -07:00
Sara Golemon
4f73394fdd 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-11 13:37:04 -07:00
Bob Weinand
3d48c7e5ec Fix issue #89 — Compile failure in PHP 5.4 
zend_hash_get_current_key_zval_ex isn't defined in PHP 5.4. (used in phpdbg_watch.c)
 2014-06-11 23:35:12 +03:00
Ferenc Kovacs
c38ab260fe Revert "Add optional second arg to unserialize()" 
This reverts commit cfd1045822.
 2014-06-11 14:43:09 +02:00
Julien Pauli
a6e0751079 5.5.15 now 2014-06-11 10:21:26 +02:00
Stanislav Malyshev
ff74b9b2fc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
 2014-06-10 23:24:36 -07:00
Stanislav Malyshev
495e6719e0 update NEWS 2014-06-10 23:23:37 -07:00
Stanislav Malyshev
2ed66ed21c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
 2014-06-10 23:20:07 -07:00
Stanislav Malyshev
f11bba4929 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next

Conflicts:
	configure.in
	main/php_version.h
 2014-06-10 23:19:21 -07:00
Stanislav Malyshev
317bcb96d0 Fix bug #66127 (Segmentation fault with ArrayObject unset) 2014-06-10 23:17:30 -07:00
Stanislav Malyshev
979eed5c6b 5.4.31 next 2014-06-10 23:03:40 -07:00
Xinchen Hui
ebe6854dbc Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	Zend/zend_execute_API.c
 2014-06-10 21:58:16 +08:00
Xinchen Hui
e8699d75da Remove unused included file 2014-06-10 21:56:30 +08:00
Remi Collet
e72ab79196 NEWS 2014-06-10 14:36:31 +02:00
Remi Collet
0a7e131128 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
 2014-06-10 14:36:02 +02:00