php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 03:03:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
75,344 Commits 549 Branches 1,486 Tags
678ef6a13334bbabef9781dacaa1e9c46a243fbf
Commit Graph

32280 Commits

Author SHA1 Message Date
Anatol Belski 678ef6a133 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix missing include
 2013-07-23 18:07:16 +02:00
Anatol Belski f00d796b7e fix missing include 2013-07-23 18:06:51 +02:00
Johannes Schlüter 416e270835 Merge branch 'PHP-5.5' 2013-07-23 14:14:18 +02:00
Johannes Schlüter 7b92a22772 Fix bug 65299 2013-07-23 14:13:22 +02:00
Johannes Schlüter 6b4742582f Merge branch 'PHP-5.5' 2013-07-23 13:15:15 +02:00
Johannes Schlüter 5a8b0ca8fa Merge branch 'PHP-5.4' into PHP-5.5 2013-07-23 12:57:08 +02:00
Johannes Schlüter c28ab73d73 Fix compiler warning on redefined constant 2013-07-23 12:50:37 +02:00
Anatol Belski 94e15ff387 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
 2013-07-23 10:00:24 +02:00
Anatol Belski 8aebe0f1e7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
 2013-07-23 10:00:07 +02:00
Anatol Belski 9b6aa268a3 fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt 2013-07-23 09:59:08 +02:00
Andrey Hristov a48e2bad62 Merge branch 'master' of ssh://git.php.net/php-src 2013-07-22 11:03:10 +02:00
Andrey Hristov a047ece2e0 Disable a flag 2013-07-22 11:02:48 +02:00
Stanislav Malyshev 8d2651d8fc Merge branch 'PHP-5.5' 
* PHP-5.5:
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
 2013-07-21 23:15:03 -07:00
Stanislav Malyshev b8d4a6939e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
 2013-07-21 23:14:42 -07:00
Yoshinari Takaoka 1b4103c09d - addressed bug #65159, Misleading configure help text for --with-mysql-sock 2013-07-21 23:12:54 -07:00
Stanislav Malyshev 46cc826770 Merge branch 'pull-request/231' 
* pull-request/231:
  update Zend Engine logo as per Zeev, and tweak PHP logos ... :)
  fix for scrolling, other minor tweaks
  Bump up table width a bit more and make columns consistent
  Bringing CSS up to this decade's standards.
 2013-07-21 22:49:26 -07:00
Stanislav Malyshev e68cd521dc Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
 2013-07-21 22:48:03 -07:00
Stanislav Malyshev 83ced9124e Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly 2013-07-21 22:47:10 -07:00
Stanislav Malyshev 3cbb48f055 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
 2013-07-21 22:31:37 -07:00
Stanislav Malyshev 476924ec3d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
 2013-07-21 22:31:19 -07:00
Andrey da3886de6d Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT 2013-07-21 22:25:21 -07:00
Stanislav Malyshev 10c547018f Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added recursivetreeiterator::setPostfix() method
 2013-07-21 22:22:02 -07:00
Joshua Thijssen 5027fa79d7 Added recursivetreeiterator::setPostfix() method 2013-07-21 22:20:58 -07:00
Stanislav Malyshev 1a05648e6d Merge branch 'PHP-5.5' 
* PHP-5.5:
  next is 5.5.2
  add a few comment
  allow both the old and new cfg argument to work. (the old of course should contain the typo)
  mssql.compatability_mode fix

Conflicts:
	configure.in
	main/php_version.h
 2013-07-21 21:17:59 -07:00
Veres Lajos e7a00a2566 add a few comment 2013-07-21 21:14:38 -07:00
Lajos Veres f51b8d8820 allow both the old and new cfg argument to work. (the old of course should contain the typo) 2013-07-21 21:12:19 -07:00
Veres Lajos b8941a73cc mssql.compatability_mode fix 2013-07-21 21:12:16 -07:00
Stanislav Malyshev 02457554a3 Merge branch 'PHP-5.5' 
* PHP-5.5:
  backward compatibility
  HASH_KEY_NON_EXISTANT fix
 2013-07-21 20:10:31 -07:00
Veres Lajos 4749457a49 HASH_KEY_NON_EXISTANT fix 2013-07-21 20:09:53 -07:00
Xinchen Hui a522f2d1c9 Merge branch 'PHP-5.5' 2013-07-21 21:07:50 +08:00
Xinchen Hui c7b58e4967 Merge branch 'PHP-5.4' into PHP-5.5 2013-07-21 21:07:27 +08:00
Xinchen Hui 3380de9774 Fixed bug #65304 (Use of max int in array_sum) 2013-07-21 21:07:19 +08:00
Gustavo André dos Santos Lopes cbd1faf077 Merge branch 'PHP-5.5' 
* PHP-5.5:
  intl: remove extra quotes from arginfo params
 2013-07-21 03:30:42 +02:00
Gustavo André dos Santos Lopes 3363e04fb4 intl: remove extra quotes from arginfo params 2013-07-21 03:30:28 +02:00
Rui Hirokawa cb607d4f78 updated test script for bug #65045. 2013-07-21 10:18:33 +09:00
Anatol Belski c6651942ce Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix header include
  new NEWS for next release
 2013-07-18 15:29:17 +02:00
Anatol Belski d8dd4d9b02 fix header include 
stddef.h is needed to have offsetof macros on windows (at least)
 2013-07-18 15:28:20 +02:00
Johannes Schlüter f7e204d7ed Slightly modernize ext_skel and sekelton/ 
- .svnignore ->.gitignore
- Add .gitignore entries for DSO stand-alone builds stuff
- Docs don't use CVS but SVN
- reorder extname.c file so it needs less forward declarations
- take forward declarations out of php_extname.h
- Drop #if for 12 years old PHP version compatibility
 2013-07-17 23:18:13 +02:00
Arpad Ray b594949144 Merge branch 'PHP-5.5' 
* PHP-5.5:
  regenerate url scanner
  Fixed bug #50308 - session id not appended properly for empty anchor tags
 2013-07-17 16:28:12 +01:00
Arpad Ray 31edf4df56 regenerate url scanner 2013-07-17 16:28:01 +01:00
Arpad Ray 94ab37f06a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #50308 - session id not appended properly for empty anchor tags
 2013-07-17 16:19:53 +01:00
Arpad Ray e6ae977082 Fixed bug #50308 - session id not appended properly for empty anchor tags 
The issue was actually because a lack of space before a "/" marking the tag
as empty. This was being swallowed in the rule for unquoted values. Fixed
by making that rule exclude quotes (as per spec anyway).
 2013-07-17 16:07:26 +01:00
Arpad Ray fb53871d94 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix bug #62129 - rfc1867 crashes php even though turned off
 2013-07-17 11:09:37 +01:00
Arpad Ray 0d3d739bf7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #62129 - rfc1867 crashes php even though turned off
 2013-07-17 11:05:23 +01:00
Arpad Ray ba3234888d Fix bug #62129 - rfc1867 crashes php even though turned off 
Patch by gxd305 at gmail dot com
 2013-07-17 11:02:48 +01:00
Anatol Belski be721d5d8b Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix TS build
 2013-07-16 18:06:05 +02:00
Anatol Belski fd5cdf89a8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix TS build
 2013-07-16 18:05:45 +02:00
Anatol Belski bb6d74918e fix TS build 2013-07-16 18:05:14 +02:00
Anatol Belski 12aec9ec8e Merge branch 'PHP-5.5' 
* PHP-5.5:
  added sapi check for dl() test
 2013-07-16 15:43:59 +02:00
Anatol Belski f37ac6f591 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  added sapi check for dl() test
 2013-07-16 15:43:37 +02:00