clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,209 Commits 494 Branches 1,367 Tags 801 MiB
bbc37e78e8
Commit Graph

78209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
734c28d242 Merge branch 'PHP-5.6' 
* PHP-5.6:
  brought the ext/sybase_ct/config.w32 up to date
 2013-12-25 23:31:17 +01:00
Anatol Belski
9f9179cc62 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  brought the ext/sybase_ct/config.w32 up to date
 2013-12-25 23:30:59 +01:00
Anatol Belski
5b0620831c brought the ext/sybase_ct/config.w32 up to date 2013-12-25 23:29:42 +01:00
Xinchen Hui
43cfa7f12a Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2013-12-25 15:36:55 +08:00
Xinchen Hui
bd0a8f31a4 Merge branch 'master' of git.php.net:php-src 2013-12-25 15:36:45 +08:00
Xinchen Hui
03e36cd5b8 Merge branch 'PHP-5.6' 2013-12-25 15:35:02 +08:00
Xinchen Hui
d316040857 Fix test 2013-12-25 15:34:39 +08:00
Stanislav Malyshev
b3c43a1aec Merge branch 'PHP-5.6' 
* PHP-5.6:
  5.4.25 next
 2013-12-24 22:23:55 -08:00
Stanislav Malyshev
c6df27db0f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.4.25 next
 2013-12-24 22:23:42 -08:00
Stanislav Malyshev
a2503c6af3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.25 next

Conflicts:
	configure.in
	main/php_version.h
 2013-12-24 22:23:24 -08:00
Stanislav Malyshev
8e5048f9fb 5.4.25 next 2013-12-24 22:22:04 -08:00
Anatol Belski
3af0ee0ea3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed incompatible pointer in phpdbg on win64
 2013-12-24 21:09:45 +01:00
Anatol Belski
00c7b973bb fixed incompatible pointer in phpdbg on win64 2013-12-24 21:08:33 +01:00
Bob Weinand
c02acf3c29 Merge branch 'PHP-5.6' 2013-12-24 13:20:12 +01:00
Bob Weinand
ddf733fa69 Fixed #18 
Errors not displaying in some configurations
 2013-12-24 13:19:18 +01:00
Bob Weinand
2b98abd9a8 Merge branch 'master' of sapi/phpdbg into PHP-5.6 
merge is necessary,
 2013-12-24 13:18:18 +01:00
Bob Weinand
8064d8dfd6 Fixed #18 
Errors not displaying in some configurations
 2013-12-24 13:11:57 +01:00
Joe Watkins
ca8ff0725b update credits 2013-12-24 09:04:32 +00:00
Joe Watkins
e07dfa96b3 Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' of https://git.php.net/repository/php-src:
  Fixed credits in phpdbg.* files
  Added breaking upon fatal-ish error
  fix NEWS file for master
  credits file for phpdbg
  Fixed credits in phpdbg.* files
  reformat
  credits file
 2013-12-24 09:03:55 +00:00
Joe Watkins
e538c1ad3f update credits headers 2013-12-24 09:03:22 +00:00
Joe Watkins
7b17d6c4bf Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 
* 'PHP-5.6' of https://git.php.net/repository/php-src:
  Fixed credits in phpdbg.* files
  Added breaking upon fatal-ish error
  credits file for phpdbg
  Fixed credits in phpdbg.* files
  reformat
  credits file
 2013-12-24 09:02:52 +00:00
Bob Weinand
ad358593a8 Merge branch 'PHP-5.6' 2013-12-24 00:37:20 +01:00
Bob Weinand
ca882858f4 Fixed credits in phpdbg.* files 2013-12-24 00:34:23 +01:00
Bob Weinand
ebfe304d6a Merge branch 'master' of sapi/phpdbg into PHP-5.6 2013-12-24 00:33:25 +01:00
Bob Weinand
0577ccad28 Added breaking upon fatal-ish error 2013-12-24 00:30:37 +01:00
Stanislav Malyshev
6daa84f199 fix NEWS file for master 2013-12-23 15:25:38 -08:00
Joe Watkins
617aefbcda credits file for phpdbg 2013-12-24 00:16:47 +01:00
Bob Weinand
6f63609251 Fixed credits in phpdbg.* files 2013-12-23 23:55:07 +01:00
Joe Watkins
056f6fd895 Merge branch 'PHP-5.6' 
* PHP-5.6:
  credits file for phpdbg
 2013-12-23 22:37:36 +00:00
Joe Watkins
265fdd9139 credits file for phpdbg 2013-12-23 22:36:30 +00:00
Stanislav Malyshev
392f6830a1 Merge branch 'PHP-5.6' 
* PHP-5.6:
  restore NEWS to the state of 6c5e93fe17
 2013-12-23 14:10:44 -08:00
Stanislav Malyshev
571ac34393 restore NEWS to the state of 6c5e93fe17 2013-12-23 14:10:08 -08:00
krakjoe
7b215b36bc reformat 2013-12-23 21:54:45 +00:00
krakjoe
2d82e994b6 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-12-23 21:52:32 +00:00
krakjoe
d82e7ee7f8 credits file 2013-12-23 21:52:22 +00:00
Dmitry Stogov
67eccf8617 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable)
 2013-12-23 16:54:54 +04:00
Dmitry Stogov
a00e7f22d2 Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable) 2013-12-23 16:53:34 +04:00
Dmitry Stogov
fff72bc93b Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 
* 'PHP-5.6' of git.php.net:php-src:
  removed outdated IsDebuggerPresent declaration
 2013-12-23 16:05:59 +04:00
Dmitry Stogov
bd88bed670 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  removed outdated IsDebuggerPresent declaration
 2013-12-23 16:05:38 +04:00
Dmitry Stogov
209ec406ca Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry)
 2013-12-23 16:05:18 +04:00
Dmitry Stogov
ccb29a6e41 Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry) 2013-12-23 16:04:10 +04:00
Anatol Belski
f4a96983e1 Merge branch 'PHP-5.6' 
* PHP-5.6:
  removed outdated IsDebuggerPresent declaration
 2013-12-23 12:01:26 +01:00
Anatol Belski
19039984e2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  removed outdated IsDebuggerPresent declaration
 2013-12-23 12:01:10 +01:00
Anatol Belski
3f7a145b5a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  removed outdated IsDebuggerPresent declaration
 2013-12-23 12:00:49 +01:00
Anatol Belski
f156e684ac removed outdated IsDebuggerPresent declaration 
This piece of code seems to retain compatibility with some windows
versions before 2000. Today it's not relevant anymore and only
produces a warning C4273 because of the conflicting prototype. In
VC9 the declaration is present in winbase.h:4142, but available
is it already in winxp. Here's the doc link
http://msdn.microsoft.com/en-us/library/windows/desktop/ms680345(v=vs.85).aspx
 2013-12-23 11:53:47 +01:00
Dmitry Stogov
62fa84a031 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added suggestion about opcache.revalidate_freq setting in development environment
 2013-12-23 13:11:22 +04:00
Dmitry Stogov
8650d2dda6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added suggestion about opcache.revalidate_freq setting in development environment
 2013-12-23 13:10:42 +04:00
Dmitry Stogov
f7b6db7555 Added suggestion about opcache.revalidate_freq setting in development environment 2013-12-23 13:09:45 +04:00
Dmitry Stogov
5bc9e006e8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
  fix news
  opcodes
  opcodes

Conflicts:
	NEWS
 2013-12-23 12:52:27 +04:00
Dmitry Stogov
f5c200fce9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
  opcodes
 2013-12-23 12:50:42 +04:00