php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 17:38:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
75,802 Commits 549 Branches 1,485 Tags
c38b73a701bf48321a586ef5a4e49ee4e368d486
Commit Graph

75802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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 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 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
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
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
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 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 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
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 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
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
Julien Pauli a6e0751079 5.5.15 now 2014-06-11 10:21:26 +02:00
Stanislav Malyshev 495e6719e0 update NEWS 2014-06-10 23:23:37 -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 e8699d75da Remove unused included file 2014-06-10 21:56:30 +08:00
Remi Collet a4d709afe2 NEWS 2014-06-10 14:35:57 +02:00
Remi Collet 12a62ce868 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
 2014-06-10 14:35:23 +02:00
Remi Collet 6256b79a35 NEWS 2014-06-10 14:35:14 +02:00
Remi Collet 25b1dc917a Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec 
Upstream:
https://github.com/file/file/commit/93e063ee374b6a75729df9e7201fb511e47e259d

Adapted for C standard.
 2014-06-10 14:33:37 +02:00
Remi Collet 20b03c84ec NEWS 2014-06-10 14:24:00 +02:00
Remi Collet ff66c90af0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Bug #67412 	fileinfo: cdf_count_chain insufficient boundary check
 2014-06-10 14:23:37 +02:00
Remi Collet da5d40bae6 NEWS 2014-06-10 14:23:31 +02:00
Remi Collet 40ef6e07e0 Bug #67412 fileinfo: cdf_count_chain insufficient boundary check 
Upstream:
https://github.com/file/file/commit/40bade80cbe2af1d0b2cd0420cebd5d5905a2382
 2014-06-10 14:22:04 +02:00
Remi Collet 9d0ca077ee NEWS 2014-06-10 14:16:32 +02:00
Remi Collet f6fee381be Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #67411 	fileinfo: cdf_check_stream_offset insufficient boundary check
 2014-06-10 14:16:07 +02:00
Remi Collet 2b33a41162 NEWS 2014-06-10 14:16:00 +02:00