php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
75,299 Commits 549 Branches 1,484 Tags
ca313caa4bb84d86c4f0b37493791fe27ee869af
Commit Graph

75299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bob Weinand ca313caa4b Merge branch 'PHP-5.4' into PHP-5.5 2014-02-20 17:48:38 +01:00
Bob Weinand afa03a470e Use nicer output for characters < 32 and > 126 in exception strings 
Using question marks might confuse more than it helps.
Users are wondering what happened to their string...
 2014-02-20 17:39:58 +01:00
Brad Daily 143bb29c1a Fixes #66714: imageconvolution breakage in 5.5.9 
5.5.9 included some GD fixes related to #66356. One of those fixes changed the 
above section of imageconvolution, but the variable was mistyped.
 2014-02-19 15:24:15 -06:00
Daniel Lowrey a7d3606650 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Skip failing tests when EC unavailable (RHEL)

Conflicts:
	ext/openssl/openssl.c
 2014-02-19 04:01:08 -07:00
Daniel Lowrey 633f898f15 Skip failing tests when EC unavailable (RHEL) 2014-02-19 03:57:37 -07:00
Anatol Belski 8dd99dd2dc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated libmagic.patch
 2014-02-18 19:08:45 +01:00
Anatol Belski a289b37f48 updated libmagic.patch 2014-02-18 19:08:16 +01:00
Stanislav Malyshev 1cc5d1009f MErge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update news with CVE
 2014-02-18 08:47:43 -08:00
Stanislav Malyshev ee4b3892f8 update news with CVE 2014-02-18 08:36:51 -08:00
Julien Pauli 0afcbb0ba9 5.5.11-dev next 2014-02-18 16:45:48 +01:00
Julien Pauli be354936b7 5.5.11 next for NEWS 2014-02-18 16:40:19 +01:00
Remi Collet bd8cd98d6d Set fileinfo version to 1.0.5 (as in php 5.4, no diff) 2014-02-18 13:57:53 +01:00
Remi Collet a6ad3a558a NEWS 2014-02-18 13:57:28 +01:00
Remi Collet bdd65b578c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #66731 file: infinite recursion
 2014-02-18 13:57:10 +01:00
Remi Collet 9f449df1e4 NEWS 2014-02-18 13:56:58 +01:00
Remi Collet 89f864c547 Fixed Bug #66731 file: infinite recursion 
Upstream commit (available in file-5.17)

https://github.com/glensc/file/commit/3c081560c23f20b2985c285338b52c7aae9fdb0f
https://github.com/glensc/file/commit/cc9e74dfeca5265ad725acc926ef0b8d2a18ee70
 2014-02-18 13:54:33 +01:00
Stanislav Malyshev 58b7f21c3f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.27 now
  update NEWS

Conflicts:
	configure.in
	main/php_version.h
 2014-02-17 21:22:03 -08:00
Stanislav Malyshev c612440e0f 5.4.27 now 2014-02-17 21:19:25 -08:00
Stanislav Malyshev b79d2285df update NEWS 2014-02-17 21:16:48 -08:00
Daniel Lowrey bd9aa181dc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed broken build when EC unavailable
 2014-02-17 19:38:30 -05:00
Daniel Lowrey a80cec1190 Fixed broken build when EC unavailable 2014-02-17 18:55:39 -05:00
Julien Pauli 66f76ec1f9 Updated NEWS for #65753 2014-02-17 11:13:38 +01:00
Julien Pauli 641a0c86d9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Updated NEWS for #65753
 2014-02-17 11:09:31 +01:00
Julien Pauli b04159eed4 Updated NEWS for #65753 2014-02-17 11:05:34 +01:00
Julien Pauli baafdad150 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Export JsonSerializable Interface (bug #65753)
 2014-02-17 10:36:13 +01:00
Julien Pauli 786234d351 Export JsonSerializable Interface (bug #65753) 2014-02-17 10:25:40 +01:00
Yasuo Ohgaki f7f524aada Update NEWS 2014-02-16 10:47:13 +09:00
Yasuo Ohgaki 3fcdecf658 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed possbile injections against pg_insert()/pg_delete()/pg_update()/pg_select()
 2014-02-16 10:45:50 +09:00
Yasuo Ohgaki f275fdcf00 Fixed possbile injections against pg_insert()/pg_delete()/pg_update()/pg_select() 2014-02-16 10:45:15 +09:00
Yasuo Ohgaki f9537c2a0b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Refactor build_tablename()
 2014-02-16 07:51:50 +09:00
Yasuo Ohgaki 6f14b5ab41 Refactor build_tablename() 2014-02-16 07:51:27 +09:00
Yasuo Ohgaki 8c9fd8fb53 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Revise encoding blacklist
 2014-02-16 06:25:01 +09:00
Yasuo Ohgaki 9f251548ae Revise encoding blacklist 2014-02-16 06:21:39 +09:00
Felipe Pena a65a546640 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fix ZTS build when HAVE_PQESCAPELITERAL is not set
  Update NEWS
 2014-02-15 11:05:08 -02:00
Felipe Pena 9d84f6c06e - Fix ZTS build when HAVE_PQESCAPELITERAL is not set 2014-02-15 11:04:49 -02:00
Yasuo Ohgaki fbb1827da8 Update NEWS 2014-02-15 19:21:54 +09:00
Yasuo Ohgaki 7ce88b2d8a Update NEWS 2014-02-15 19:20:34 +09:00
Yasuo Ohgaki 6e0b8b4288 Merge branch 'PHP-5.4' into PHP-5.5 2014-02-15 18:29:36 +09:00
Yasuo Ohgaki 832c21cabf Refactor and cleanup. WS is cleaned up. Use -b if it is needed. 
Added compatibility macros, PQescapeStringConn, PGSQLescapeLiteral/Identifier, PGSQLfree.
 2014-02-15 18:20:58 +09:00
Daniel Lowrey cf0741fd5b Update NEWS 2014-02-14 21:42:36 -07:00
Daniel Lowrey 5cc851e83e Update NEWS 2014-02-14 21:41:18 -07:00
Daniel Lowrey 65adb74984 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix for bug66501 - "key type not supported in this PHP build"
 2014-02-14 18:15:24 -07:00
mk-j 19524fc6fe Fix for bug66501 - "key type not supported in this PHP build" 2014-02-14 18:11:46 -07:00
Veres Lajos f9829690d4 a few typofixes 2014-02-14 17:12:52 +02:00
Lior Kaplan c09bd9def0 Merge branch 'PHP-5.4' into PHP-5.5 2014-02-14 15:30:00 +02:00
Veres Lajos 35101e9ef4 a few typofixes 2014-02-14 14:51:10 +02:00
Derick Rethans 39e721cf50 Fixed ZTS and added fix to NEWS. 2014-02-11 11:27:01 +00:00
Mats Lindh 6188674f1e Replace old SVN references to Git 2014-02-09 21:17:26 +02:00
Anatol Belski e41059c633 update libs_version.txt 2014-02-06 09:13:05 +01:00
Hannes Magnusson 1e0fdf0256 Fix year 2014-02-05 10:15:11 -08:00