July 2013 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 388a66: Unit test case for User_Schema
by Michal Čihař 28 Jul '13

28 Jul '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 388a66cd4e1163e000f774df16aabd03b945ef88 https://github.com/phpmyadmin/phpmyadmin/commit/388a66cd4e1163e000f774df16a… Author: adamgsoc2013 <adamgsoc2013(a)gmail.com> Date: 2013-07-28 (Sun, 28 Jul 2013) Changed paths: A test/classes/schema/User_Schema_test.php Log Message: ----------- Unit test case for User_Schema Commit: 6292715857291f1b58cfac5ca35c63e72513d708 https://github.com/phpmyadmin/phpmyadmin/commit/6292715857291f1b58cfac5ca35… Author: adamgsoc2013 <adamgsoc2013(a)gmail.com> Date: 2013-07-28 (Sun, 28 Jul 2013) Changed paths: M ChangeLog M browse_foreigners.php M config.sample.inc.php M doc/config.rst M examples/config.manyhosts.inc.php M examples/create_tables.sql M examples/create_tables_drizzle.sql M js/messages.php M js/navigation.js R libraries/.htaccess M libraries/Config.class.php M libraries/DisplayResults.class.php M libraries/Error.class.php M libraries/Error_Handler.class.php M libraries/List_Database.class.php M libraries/PMA.php M libraries/RecentTable.class.php A libraries/String.class.php A libraries/StringAbstractType.class.php A libraries/StringByte.int.php M libraries/StringCType.class.php M libraries/StringMB.class.php M libraries/StringNative.class.php M libraries/StringNativeType.class.php A libraries/StringType.int.php M libraries/Util.class.php M libraries/bookmark.lib.php M libraries/common.inc.php M libraries/config.default.php M libraries/config.values.php M libraries/config/Validator.class.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/engines/bdb.lib.php M libraries/engines/berkeleydb.lib.php M libraries/engines/binlog.lib.php M libraries/engines/innobase.lib.php M libraries/engines/innodb.lib.php M libraries/engines/memory.lib.php M libraries/engines/merge.lib.php M libraries/engines/mrg_myisam.lib.php M libraries/engines/myisam.lib.php M libraries/engines/ndbcluster.lib.php M libraries/engines/pbxt.lib.php M libraries/navigation/Navigation.class.php M libraries/navigation/NavigationHeader.class.php M libraries/navigation/NavigationTree.class.php M libraries/navigation/Nodes/Node.class.php M libraries/navigation/Nodes/Node_Database.class.php M libraries/navigation/Nodes/Node_Event.class.php M libraries/navigation/Nodes/Node_Function.class.php M libraries/navigation/Nodes/Node_Procedure.class.php M libraries/navigation/Nodes/Node_Table.class.php M libraries/navigation/Nodes/Node_View.class.php M libraries/operations.lib.php M libraries/plugins/auth/swekey/swekey.auth.lib.php M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/schema/Export_Relation_Schema.class.php M libraries/schema/Pdf_Relation_Schema.class.php M libraries/server_bin_log.lib.php M libraries/server_status.lib.php M libraries/sql.lib.php M libraries/sqlparser.lib.php A libraries/string.inc.php R libraries/string.lib.php M navigation.php M pmd_display_field.php M pmd_pdf.php M po/hr.po M schema_export.php M server_status.php R setup/frames/.htaccess R setup/lib/.htaccess M test/classes/plugin/import/ImportOds_test.php M test/classes/plugin/transformations/Image_JPEG_Inline_test.php M test/classes/plugin/transformations/Image_Link_test.php M test/classes/plugin/transformations/Image_PNG_Inline_test.php M test/classes/plugin/transformations/Text_Plain_Dateformat_test.php M test/classes/plugin/transformations/Text_Plain_Download_test.php M test/classes/plugin/transformations/Text_Plain_External_test.php M test/classes/plugin/transformations/Text_Plain_Formatted_test.php M test/classes/plugin/transformations/Text_Plain_Hex_test.php M test/classes/plugin/transformations/Text_Plain_Imagelink_test.php M test/classes/plugin/transformations/Text_Plain_Link_test.php R test/libraries/PMA_STR_sub_test.php M test/libraries/PMA_StringCType_test.php M test/libraries/PMA_StringMB_test.php M test/libraries/PMA_StringNativeType_test.php M test/libraries/PMA_StringNative_test.php M test/libraries/PMA_relation_cleanup_test.php M test/libraries/PMA_string_test.php M themes/.gitignore M themes/original/css/navigation.css.php A themes/original/img/b_undo.png M themes/original/img/sprites.png M themes/original/sprites.lib.php M themes/pmahomme/css/navigation.css.php A themes/pmahomme/img/b_undo.png M themes/pmahomme/img/sprites.png M themes/pmahomme/sprites.lib.php Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UT_plu_table Commit: 6cae4843ebab8497ddf49abbf53b473aa3b0014d https://github.com/phpmyadmin/phpmyadmin/commit/6cae4843ebab8497ddf49abbf53… Author: adamgsoc2013 <adamgsoc2013(a)gmail.com> Date: 2013-07-28 (Sun, 28 Jul 2013) Changed paths: M test/classes/schema/User_Schema_test.php Log Message: ----------- rename to test case function name Commit: a413b6bb6b814e028e2f2aa3142fc74e282628e2 https://github.com/phpmyadmin/phpmyadmin/commit/a413b6bb6b814e028e2f2aa3142… Author: Michal Čihař <michal(a)cihar.com> Date: 2013-07-28 (Sun, 28 Jul 2013) Changed paths: A test/classes/schema/User_Schema_test.php Log Message: ----------- Merge pull request #544 from adamgsoc2013/UT_plu_table Unit test case for User_Schema Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0c21130100bf...a413b6bb6b81

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] c44eb7: no use of the code segment
by Marc Delisle 28 Jul '13

28 Jul '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c44eb79b49423261b51af23e0b3af6f0a48ad217 https://github.com/phpmyadmin/phpmyadmin/commit/c44eb79b49423261b51af23e0b3… Author: Spun Nakandala <supun.nakandala(a)gmail.com> Date: 2013-07-27 (Sat, 27 Jul 2013) Changed paths: M import.php Log Message: ----------- no use of the code segment Commit: 3dd358746d8f3b2d903d3ce9fb691a211a43f384 https://github.com/phpmyadmin/phpmyadmin/commit/3dd358746d8f3b2d903d3ce9fb6… Author: Spun Nakandala <supun.nakandala(a)gmail.com> Date: 2013-07-27 (Sat, 27 Jul 2013) Changed paths: M import.php Log Message: ----------- removed include sql.php from import.php Commit: 5d539b1b61378afe3cb5bb52181277dcf2eb0a35 https://github.com/phpmyadmin/phpmyadmin/commit/5d539b1b61378afe3cb5bb52181… Author: Spun Nakandala <supun.nakandala(a)gmail.com> Date: 2013-07-27 (Sat, 27 Jul 2013) Changed paths: M libraries/sql.lib.php Log Message: ----------- duplicate messages after without php code clicked corrected Commit: 7b778576023b4d005cab384af62a04ac0ca4586c https://github.com/phpmyadmin/phpmyadmin/commit/7b778576023b4d005cab384af62… Author: Spun Nakandala <supun.nakandala(a)gmail.com> Date: 2013-07-27 (Sat, 27 Jul 2013) Changed paths: M libraries/sql.lib.php Log Message: ----------- Query results operations not shown in Show PHP Code Commit: 0c21130100bf651ae015b204f3879820d71962d0 https://github.com/phpmyadmin/phpmyadmin/commit/0c21130100bf651ae015b204f38… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-28 (Sun, 28 Jul 2013) Changed paths: M import.php M libraries/sql.lib.php Log Message: ----------- Merge pull request #541 from scnakandala/gsoc_2013_2 Refactoring SQL executor Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cd0167fb80b1...0c21130100bf

1 0

[Phpmyadmin-git] [phpmyadmin/website] 743ee0: specify prior to which version is affected.
by Dieter Adriaenssens 28 Jul '13

28 Jul '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/website Commit: 743ee0be422b1baaa4f686bc727ba66812e5ed11 https://github.com/phpmyadmin/website/commit/743ee0be422b1baaa4f686bc727ba6… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-07-28 (Sun, 28 Jul 2013) Changed paths: M templates/security/PMASA-2013-11 M templates/security/PMASA-2013-12 M templates/security/PMASA-2013-13 M templates/security/PMASA-2013-15 M templates/security/PMASA-2013-8 M templates/security/PMASA-2013-9 Log Message: ----------- specify prior to which version is affected.

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin]
by lem9 28 Jul '13

28 Jul '13

Branch: refs/tags/RELEASE_4_0_5RC1 Home: https://github.com/phpmyadmin/phpmyadmin

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 52b9b6: 4.0.5-rc1
by Marc Delisle 28 Jul '13

28 Jul '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 52b9b6c81f6e62858c9e3d495925d5e2ab65ff75 https://github.com/phpmyadmin/phpmyadmin/commit/52b9b6c81f6e62858c9e3d49592… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-28 (Sun, 28 Jul 2013) Changed paths: M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.0.5-rc1 Commit: 6d2efd9c7b21971de07c6b72b844c11644bc253b https://github.com/phpmyadmin/phpmyadmin/commit/6d2efd9c7b21971de07c6b72b84… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-28 (Sun, 28 Jul 2013) Log Message: ----------- Merge branch 'MAINT_4_0_5' into QA_4_0 Commit: e73bfee67c89aa8afdf900339dc7c19fee18d7cb https://github.com/phpmyadmin/phpmyadmin/commit/e73bfee67c89aa8afdf900339dc… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-28 (Sun, 28 Jul 2013) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.0.6-dev Commit: cd0167fb80b1cdd44d4d81952083c04648b1a74b https://github.com/phpmyadmin/phpmyadmin/commit/cd0167fb80b1cdd44d4d8195208… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-28 (Sun, 28 Jul 2013) Log Message: ----------- Merge branch 'QA_4_0' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fdb0ad1f69cc...cd0167fb80b1

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 52b9b6: 4.0.5-rc1
by Marc Delisle 28 Jul '13

28 Jul '13

Branch: refs/heads/QA_4_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 52b9b6c81f6e62858c9e3d495925d5e2ab65ff75 https://github.com/phpmyadmin/phpmyadmin/commit/52b9b6c81f6e62858c9e3d49592… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-28 (Sun, 28 Jul 2013) Changed paths: M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.0.5-rc1 Commit: 6d2efd9c7b21971de07c6b72b844c11644bc253b https://github.com/phpmyadmin/phpmyadmin/commit/6d2efd9c7b21971de07c6b72b84… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-28 (Sun, 28 Jul 2013) Log Message: ----------- Merge branch 'MAINT_4_0_5' into QA_4_0 Commit: e73bfee67c89aa8afdf900339dc7c19fee18d7cb https://github.com/phpmyadmin/phpmyadmin/commit/e73bfee67c89aa8afdf900339dc… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-28 (Sun, 28 Jul 2013) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.0.6-dev Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0e9e7f28a21e...e73bfee67c89

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 52b9b6: 4.0.5-rc1
by Marc Delisle 28 Jul '13

28 Jul '13

Branch: refs/heads/MAINT_4_0_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 52b9b6c81f6e62858c9e3d495925d5e2ab65ff75 https://github.com/phpmyadmin/phpmyadmin/commit/52b9b6c81f6e62858c9e3d49592… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-28 (Sun, 28 Jul 2013) Changed paths: M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.0.5-rc1

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin]
by lem9 28 Jul '13

28 Jul '13

Branch: refs/heads/MAINT_4_0_5 Home: https://github.com/phpmyadmin/phpmyadmin

1 0

[Phpmyadmin-git] [phpmyadmin/website] f36e81: create PMASA-2013-8 draft
by Marc Delisle 28 Jul '13

28 Jul '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/website Commit: f36e81ee806d1ca80e8dc690079c8703a67ef78f https://github.com/phpmyadmin/website/commit/f36e81ee806d1ca80e8dc690079c87… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-07-05 (Fri, 05 Jul 2013) Changed paths: A templates/security/PMASA-2013-8 Log Message: ----------- create PMASA-2013-8 draft Commit: 7a2fa816e0e39168ae4c1cdbe6e987cfed63ad98 https://github.com/phpmyadmin/website/commit/7a2fa816e0e39168ae4c1cdbe6e987… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-07-07 (Sun, 07 Jul 2013) Changed paths: M templates/security/PMASA-2013-8 Log Message: ----------- add commit hash for QA_4_0 fix Commit: 480e99bdc30da2c3ea5cca25e69838b86881a08e https://github.com/phpmyadmin/website/commit/480e99bdc30da2c3ea5cca25e69838… Author: J.M <me(a)mynetx.net> Date: 2013-07-08 (Mon, 08 Jul 2013) Changed paths: A templates/security/PMASA-2013-9 Log Message: ----------- First draft of PMASA-2013-9 Commit: e77bb1bbdb51b081f976654cbaef90b017b7376e https://github.com/phpmyadmin/website/commit/e77bb1bbdb51b081f976654cbaef90… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-19 (Fri, 19 Jul 2013) Changed paths: A templates/security/PMASA-2013-12 Log Message: ----------- First draft of PMASA-2013-12 Commit: fb3f08a860b8be4de128b44471d7f82fbbe40917 https://github.com/phpmyadmin/website/commit/fb3f08a860b8be4de128b44471d7f8… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-23 (Tue, 23 Jul 2013) Changed paths: A templates/security/PMASA-2013-14 Log Message: ----------- First draft for PMASA-2013-14 Commit: 6e4bad4179aa132c6086db0e43f508d264db6872 https://github.com/phpmyadmin/website/commit/6e4bad4179aa132c6086db0e43f508… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-23 (Tue, 23 Jul 2013) Changed paths: A templates/security/PMASA-2013-15 Log Message: ----------- First draft for PMASA-2013-15 Commit: c162d187f1c2c05445942dda9a3e3a387adb1c1a https://github.com/phpmyadmin/website/commit/c162d187f1c2c05445942dda9a3e3a… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-07-27 (Sat, 27 Jul 2013) Changed paths: M templates/_littleboxes.tpl M templates/about.tpl M templates/downloads.tpl M templates/improve.tpl M templates/themes.tpl Log Message: ----------- Merge remote-tracking branch 'origin/master' into website-security Commit: 7e653d5b483ba4e08595f163858759bcfcda0000 https://github.com/phpmyadmin/website/commit/7e653d5b483ba4e08595f163858759… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-07-27 (Sat, 27 Jul 2013) Changed paths: A templates/security/PMASA-2013-11 Log Message: ----------- add first draft of PMASA_2013-11 Commit: 2fbfc5ea8865b71270f8a35658f666ef85da093e https://github.com/phpmyadmin/website/commit/2fbfc5ea8865b71270f8a35658f666… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-27 (Sat, 27 Jul 2013) Changed paths: M templates/security/PMASA-2013-11 Log Message: ----------- Clarify website name, fix small typo Commit: f3bf89fb9d2c8f9a65f641743fa46d357ee53079 https://github.com/phpmyadmin/website/commit/f3bf89fb9d2c8f9a65f641743fa46d… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-07-27 (Sat, 27 Jul 2013) Changed paths: M templates/security/PMASA-2013-11 Log Message: ----------- update PMASA-2013-11 : don't mention MITM, as this a way to possibly exploit, not the reason for the bug Commit: 5780d9e716a305da5d555e614be649cbae0f5037 https://github.com/phpmyadmin/website/commit/5780d9e716a305da5d555e614be649… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-07-27 (Sat, 27 Jul 2013) Changed paths: M templates/security/PMASA-2013-11 Log Message: ----------- add commit fixing vulnerability in version 4.0.x Commit: e8bb55fd8f6856c63eadc02bf2fb587159820eb1 https://github.com/phpmyadmin/website/commit/e8bb55fd8f6856c63eadc02bf2fb58… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-07-27 (Sat, 27 Jul 2013) Changed paths: A templates/security/PMASA-2013-13 Log Message: ----------- add first draft of PMASA-2013-13 Commit: feb02a52af60e9b6865eaf297f8e051df39261f7 https://github.com/phpmyadmin/website/commit/feb02a52af60e9b6865eaf297f8e05… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-28 (Sun, 28 Jul 2013) Changed paths: M templates/security/PMASA-2013-11 M templates/security/PMASA-2013-12 M templates/security/PMASA-2013-13 M templates/security/PMASA-2013-14 M templates/security/PMASA-2013-15 M templates/security/PMASA-2013-8 M templates/security/PMASA-2013-9 Log Message: ----------- Announcement dates for PMASAs Compare: https://github.com/phpmyadmin/website/compare/3f4c1711a890...feb02a52af60

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 56e9ed: fix unescaped parameter, see PMASA-2013-8 for deta...
by Marc Delisle 28 Jul '13

28 Jul '13

Branch: refs/heads/STABLE Home: https://github.com/phpmyadmin/phpmyadmin Commit: 56e9ede5223219cef2187ced385924ef2e0ae21d https://github.com/phpmyadmin/phpmyadmin/commit/56e9ede5223219cef2187ced385… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-07-07 (Sun, 07 Jul 2013) Changed paths: M libraries/DisplayResults.class.php Log Message: ----------- fix unescaped parameter, see PMASA-2013-8 for details Commit: ff27a2c5e0c706f401b7ee8677cbd46568a4eca2 https://github.com/phpmyadmin/phpmyadmin/commit/ff27a2c5e0c706f401b7ee8677c… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-07-07 (Sun, 07 Jul 2013) Changed paths: M libraries/DisplayResults.class.php Log Message: ----------- add total as parameter to message Commit: 2005c4b7c15afa61a41e1087464fe12645f535e1 https://github.com/phpmyadmin/phpmyadmin/commit/2005c4b7c15afa61a41e1087464… Author: J.M <me(a)mynetx.net> Date: 2013-07-07 (Sun, 07 Jul 2013) Changed paths: M ChangeLog M server_status.php Log Message: ----------- [security] Fix stored XSS in Server status monitor, see PMASA-2013-9 Commit: d096a0fc46ef4708f3f4a440a8aba40163e3b72a https://github.com/phpmyadmin/phpmyadmin/commit/d096a0fc46ef4708f3f4a440a8a… Author: J.M <me(a)mynetx.net> Date: 2013-07-07 (Sun, 07 Jul 2013) Changed paths: M ChangeLog M libraries/navigation/NavigationHeader.class.php Log Message: ----------- [security] Fix stored XSS in navigation panel logo link, see PMASA-2013-9 Commit: e0d8568ac681073b09f10ad1c4d801df36290036 https://github.com/phpmyadmin/phpmyadmin/commit/e0d8568ac681073b09f10ad1c4d… Author: J.M <me(a)mynetx.net> Date: 2013-07-07 (Sun, 07 Jul 2013) Changed paths: M ChangeLog M libraries/config/validate.lib.php Log Message: ----------- [security] Fix self-XSS in setup, trusted proxies validation, see PMASA-2013-9 Commit: 0fea53b7b82134ce0e1979a71b7ce080b5b6ff9a https://github.com/phpmyadmin/phpmyadmin/commit/0fea53b7b82134ce0e1979a71b7… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-17 (Wed, 17 Jul 2013) Changed paths: M libraries/Error.class.php M libraries/Error_Handler.class.php M libraries/common.inc.php Log Message: ----------- [security] Avoid full path disclosure from some libraries script, see PMASA-2013-12 Move the PHPMYADMIN constant definition earlier Commit: 45d3f4326cad32b09b8d3a07382faf1eeda30dba https://github.com/phpmyadmin/phpmyadmin/commit/45d3f4326cad32b09b8d3a07382… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-17 (Wed, 17 Jul 2013) Changed paths: M libraries/Config.class.php M libraries/List_Database.class.php M libraries/PMA.php M libraries/RecentTable.class.php M libraries/bookmark.lib.php Log Message: ----------- Fix merge conflicts Commit: 8e4fe7c57a976f2ce9a6931687f4697d519111ec https://github.com/phpmyadmin/phpmyadmin/commit/8e4fe7c57a976f2ce9a6931687f… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-17 (Wed, 17 Jul 2013) Changed paths: M libraries/common.inc.php Log Message: ----------- [security] Avoid full path disclosure from libraries/common.inc.php, see PMASA-2013-12 Commit: 90d968b447729405ee8b6cc5bb406b832ec3c99f https://github.com/phpmyadmin/phpmyadmin/commit/90d968b447729405ee8b6cc5bb4… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-17 (Wed, 17 Jul 2013) Changed paths: M libraries/config.default.php M libraries/plugins/auth/swekey/swekey.auth.lib.php Log Message: ----------- Fix merge conflicts Commit: 7992beb8e42f2a4a3dab275b119d1ebd58e3b164 https://github.com/phpmyadmin/phpmyadmin/commit/7992beb8e42f2a4a3dab275b119… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-17 (Wed, 17 Jul 2013) Changed paths: M libraries/common.inc.php Log Message: ----------- Move protection statement at beginning of script Commit: 7bfe445f9919716460e006faf7aa226279944e23 https://github.com/phpmyadmin/phpmyadmin/commit/7bfe445f9919716460e006faf7a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-17 (Wed, 17 Jul 2013) Changed paths: M libraries/engines/bdb.lib.php M libraries/engines/berkeleydb.lib.php M libraries/engines/binlog.lib.php M libraries/engines/innobase.lib.php M libraries/engines/innodb.lib.php M libraries/engines/memory.lib.php M libraries/engines/merge.lib.php M libraries/engines/mrg_myisam.lib.php M libraries/engines/myisam.lib.php M libraries/engines/ndbcluster.lib.php M libraries/engines/pbxt.lib.php Log Message: ----------- Fix merge conflicts Commit: 142e465c80a1fb3d71e214d29c566c15a416518d https://github.com/phpmyadmin/phpmyadmin/commit/142e465c80a1fb3d71e214d29c5… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-17 (Wed, 17 Jul 2013) Changed paths: M libraries/pmd_common.php M libraries/schema/Pdf_Relation_Schema.class.php Log Message: ----------- [security] Avoid full path disclosure from some libraries scripts, see PMASA-2013-12 Commit: f7065ee2a828368f4037dbaba5aeb69803094eea https://github.com/phpmyadmin/phpmyadmin/commit/f7065ee2a828368f4037dbaba5a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-17 (Wed, 17 Jul 2013) Changed paths: R libraries/.htaccess Log Message: ----------- Delete .htaccess which does not work on all web servers Commit: 14292721367bafa8778b436063e0fb893364e709 https://github.com/phpmyadmin/phpmyadmin/commit/14292721367bafa8778b436063e… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-17 (Wed, 17 Jul 2013) Changed paths: R setup/frames/.htaccess R setup/lib/.htaccess Log Message: ----------- Remove other .htaccess for directories which are not at risk Commit: 257bd7349c312a05bde28732d8b8a72d0191cdad https://github.com/phpmyadmin/phpmyadmin/commit/257bd7349c312a05bde28732d8b… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-17 (Wed, 17 Jul 2013) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for full path disclosure fixes Commit: 974d0dedeea7c79ac4533e614d9c0c3abd97e8f9 https://github.com/phpmyadmin/phpmyadmin/commit/974d0dedeea7c79ac4533e614d9… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-23 (Tue, 23 Jul 2013) Changed paths: M ChangeLog M pmd_pdf.php Log Message: ----------- [security] Fix control user SQL injection in pmd_pdf.php, see PMASA-2013-15 Commit: 8ef025ef3d05c164654fee7001517626cf604bb1 https://github.com/phpmyadmin/phpmyadmin/commit/8ef025ef3d05c164654fee70015… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-23 (Tue, 23 Jul 2013) Changed paths: M ChangeLog M schema_export.php Log Message: ----------- [security] Fix control user SQL injection in schema_export.php, see PMASA-2015 Commit: 1293e9b6e9eb7a831c5738f346ea44dee6d1bf0f https://github.com/phpmyadmin/phpmyadmin/commit/1293e9b6e9eb7a831c5738f346e… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-23 (Tue, 23 Jul 2013) Changed paths: M ChangeLog M libraries/schema/Export_Relation_Schema.class.php Log Message: ----------- [security] Fix self-XSS in schema export, see PMASA-2013-14 Commit: b9c814ed6d59733c54965e01e90ffd5d3348fd2c https://github.com/phpmyadmin/phpmyadmin/commit/b9c814ed6d59733c54965e01e90… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-07-27 (Sat, 27 Jul 2013) Changed paths: M ChangeLog M version_check.php Log Message: ----------- [security] Fix unencoded json object, see PMASA-2013-11 Commit: e0c8704f725c56c87b644676ded94dba695de39f https://github.com/phpmyadmin/phpmyadmin/commit/e0c8704f725c56c87b644676ded… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-07-27 (Sat, 27 Jul 2013) Changed paths: M ChangeLog M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php Log Message: ----------- [security] Fix stored XSS in link transformation plugin, see PMASA-2013-13 Commit: ad54449d105365dbbd39ae879306f1037fe238cd https://github.com/phpmyadmin/phpmyadmin/commit/ad54449d105365dbbd39ae87930… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-28 (Sun, 28 Jul 2013) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.0.4.2 release Commit: 1c5fc019bb03e95c287f94d39acfb31c36db642b https://github.com/phpmyadmin/phpmyadmin/commit/1c5fc019bb03e95c287f94d39ac… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-28 (Sun, 28 Jul 2013) Changed paths: M ChangeLog M README M doc/conf.py R libraries/.htaccess M libraries/Config.class.php M libraries/DisplayResults.class.php M libraries/Error.class.php M libraries/Error_Handler.class.php M libraries/List_Database.class.php M libraries/PMA.php M libraries/RecentTable.class.php M libraries/bookmark.lib.php M libraries/common.inc.php M libraries/config.default.php M libraries/config/validate.lib.php M libraries/engines/bdb.lib.php M libraries/engines/berkeleydb.lib.php M libraries/engines/binlog.lib.php M libraries/engines/innobase.lib.php M libraries/engines/innodb.lib.php M libraries/engines/memory.lib.php M libraries/engines/merge.lib.php M libraries/engines/mrg_myisam.lib.php M libraries/engines/myisam.lib.php M libraries/engines/ndbcluster.lib.php M libraries/engines/pbxt.lib.php M libraries/navigation/NavigationHeader.class.php M libraries/plugins/auth/swekey/swekey.auth.lib.php M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php M libraries/pmd_common.php M libraries/schema/Export_Relation_Schema.class.php M libraries/schema/Pdf_Relation_Schema.class.php M pmd_pdf.php M schema_export.php M server_status.php R setup/frames/.htaccess R setup/lib/.htaccess M version_check.php Log Message: ----------- Merge branch 'MAINT_4_0_4' into STABLE Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a20e99adb55b...1c5fc019bb03

1 0