clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,306 Commits 491 Branches 1,363 Tags 846 MiB
bc87ba8ee6
Commit Graph

79306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev
03c703b8bd add a test case previously broken by a bad fix 2014-04-24 23:58:38 -07:00
Stanislav Malyshev
a328803803 Revert "Fixed bug #64604" 
This reverts commit b05c088a3a.
Breaks parsing urls where query has : in it, like: /foo/bar?baz=goo:boo
 2014-04-24 23:50:45 -07:00
Anatol Belski
5c34146104 updated libmagic.patch for 5.6+ 2014-04-24 20:16:06 +02:00
Anatol Belski
305c025cdd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated libmagic.patch
 2014-04-24 20:15:01 +02:00
Anatol Belski
db960e82b4 updated libmagic.patch 2014-04-24 20:13:47 +02:00
Anatol Belski
8f43032ea4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  backport this piece from 5.6, related to the #66307 fix
 2014-04-24 19:52:53 +02:00
Anatol Belski
d7bb09cc1d backport this piece from 5.6, related to the #66307 fix 2014-04-24 19:50:23 +02:00
Anatol Belski
0c381e19ad updated NEWS 2014-04-24 19:35:52 +02:00
Anatol Belski
74ce9da5dc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66307 Fileinfo crashes with powerpoint files

Conflicts:
	ext/fileinfo/libmagic/readcdf.c
 2014-04-24 19:33:54 +02:00
Anatol Belski
03fa5501a8 Fixed bug #66307 Fileinfo crashes with powerpoint files 2014-04-24 19:30:34 +02:00
Anatol Belski
4350c89428 fix CFLAGS_PHPDBGS and some formatting 2014-04-24 13:15:16 +02:00
Anatol Belski
cd2641973c Merge remote-tracking branch 'phpdbg/master' into PHP-5.6 2014-04-24 11:05:52 +02:00
Anatol Belski
3e6a387454 use a portable strndup implementation 2014-04-24 11:01:54 +02:00
Anatol Belski
165994043a fixed C89 compat 2014-04-24 11:00:36 +02:00
Anatol Belski
5da403264f prepare config.w32 2014-04-24 10:58:30 +02:00
Anatol Belski
9280e25534 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix dll export
 2014-04-24 10:52:59 +02:00
Anatol Belski
acfed1c4c7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix dll export
 2014-04-24 10:52:22 +02:00
Anatol Belski
03be983398 fix dll export 2014-04-24 10:51:42 +02:00
krakjoe
f1493e0069 add parser files to dist 2014-04-24 08:09:35 +01:00
Stanislav Malyshev
ab8065e4ec Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix accepting ill-formed UTF-8 characters
 2014-04-22 16:57:47 -07:00
Stanislav Malyshev
aca526a13b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix accepting ill-formed UTF-8 characters

Conflicts:
	ext/phar/phar_path_check.c
 2014-04-22 16:57:17 -07:00
Jakub Zelenka
61499bf282 Fix accepting ill-formed UTF-8 characters 
Conflicts:
	ext/phar/phar_path_check.c
 2014-04-22 16:55:58 -07:00
George Wang
742f4704a9 sapi/litespeed/lsapi_main.c: Fix bug #63228 
Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]
 2014-04-22 10:48:14 -03:00
Bob Weinand
4784d99866 Added autogenerated phpdbg parser files to .gitignore 2014-04-22 00:19:38 +02:00
Bob Weinand
708af5fd8e Merge sapi/phpdbg into PHP-5.6 2014-04-21 23:30:08 +02:00
Bob Weinand
447ec05f31 Fixed infinite loop when quitting (sometimes) 2014-04-21 23:14:06 +02:00
krakjoe
c1e12316f1 fixup help, behaviour of step command when not executing 2014-04-21 22:00:21 +01:00
krakjoe
e9668d4ce8 buffer input to repeat commands 2014-04-21 21:43:19 +01:00
krakjoe
bb0f0347dd Merge branch 'master' of https://github.com/krakjoe/phpdbg 2014-04-21 21:28:02 +01:00
krakjoe
0873f2bfb4 remove -e option in favour of taking script from argv[] 2014-04-21 21:24:41 +01:00
Stanislav Malyshev
32d5f269a0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
 2014-04-20 17:23:52 -07:00
Stanislav Malyshev
dafb2af705 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.

Conflicts:
	ext/phar/phar_path_check.c
 2014-04-20 17:22:21 -07:00
Danack
ea4cee93c8 Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives. 2014-04-20 17:19:20 -07:00
Andrew Kehrig
186ffcb72c Fix #50444: PDO-ODBC changes for 64-bit 
This bug is also referenced in
[#61777](https://bugs.php.net/bug.php?id=61777) and is still present in
the latest stable release of the 5.5 branch. I see two tickets exist for
this problem already, and I'm just submitting these changes via github
as a reminder that this is a serious problem for anyone using PDO_ODBC
on the x64 builds.
 2014-04-20 16:49:15 -07:00
Stanislav Malyshev
5272d6c896 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix a compiler warning in php_rand.h
 2014-04-20 16:36:36 -07:00
Stanislav Malyshev
8b903f24d5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix a compiler warning in php_rand.h
 2014-04-20 16:35:49 -07:00
Rouven Weßling
68283c9f4a Fix a compiler warning in php_rand.h 2014-04-20 16:35:36 -07:00
Stanislav Malyshev
0df431482f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix #66908: php-fpm reload leaks epoll_create() file descriptor
 2014-04-20 16:25:03 -07:00
Stanislav Malyshev
6bad228b4e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #66908: php-fpm reload leaks epoll_create() file descriptor
 2014-04-20 16:23:43 -07:00
Julio Pintos
49341e992a Fix #66908: php-fpm reload leaks epoll_create() file descriptor 
This patch fixes descriptor leak which could lead to DoS once Max open files is reached
 2014-04-20 16:21:49 -07:00
Stanislav Malyshev
774f16318b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #65701: Do not use cache for file file copy
 2014-04-20 15:27:39 -07:00
Stanislav Malyshev
5addf223d5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #65701: Do not use cache for file file copy
 2014-04-20 15:25:03 -07:00
Boro Sitnikovski
a18cec1b86 Fix bug #65701: Do not use cache for file file copy 2014-04-20 15:22:44 -07:00
Bob Weinand
577c6ed0ce Fixed stepping 2014-04-20 20:20:59 +02:00
Bob Weinand
422dc49c0d Merge branch 'master' of https://github.com/krakjoe/phpdbg 
Conflicts:
	phpdbg_help.c
	phpdbg_prompt.c
 2014-04-20 19:55:44 +02:00
krakjoe
f96feea00c step by line and opcode modes preserved, set stepping added, help updated 2014-04-20 18:46:35 +01:00
krakjoe
373b9ecd05 rename next to continue, cleanup help 2014-04-20 17:10:52 +01:00
Bob Weinand
56293fc0dd Update help 2014-04-20 16:55:49 +02:00
Bob Weinand
e097919f16 Stepping is now line by line with gdb style command 2014-04-20 16:47:24 +02:00
Bob Weinand
d21d5c98a5 Fixed potential bug in run command 2014-04-20 13:28:11 +02:00